From 4172a45c661ee22429e645dfa02d6c4a77eec668 Mon Sep 17 00:00:00 2001
From: chengxiangling <291105840@qq.com>
Date: 星期三, 14 五月 2025 11:22:21 +0800
Subject: [PATCH] 提交修改等
---
/dev/null | 0
src/views/mainPlan/weldSeamEcharts/index.vue | 2 +-
src/views/mainPlan/sheetMetalSupplyGap/index.vue | 8 ++++----
src/utils/i18n/locales/plan/index.js | 8 ++++----
src/views/mainPlan/plateProcessStat/index.vue | 2 +-
src/layout/components/Navbar.vue | 4 ++--
src/views/mainPlan/sheetMetalRedundantReport/index.vue | 12 ++++++------
7 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/dist.zip b/dist.zip
deleted file mode 100644
index 87f879c..0000000
--- a/dist.zip
+++ /dev/null
Binary files differ
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index ca25744..79a4e20 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -22,7 +22,7 @@
<div class="mt5">
<!-- <el-button @click="changeLanguage('zh')">涓枃</el-button>
<el-button @click="changeLanguage('en')">English</el-button> -->
- <el-dropdown>
+ <!-- <el-dropdown>
<img class="zh_icon" v-if="locale==='zh'" src="@/assets/images/zh.svg" alt="zh" />
<img class="zh_icon" v-if="locale==='en'" src="@/assets/images/en.svg" alt="en" />
<template #dropdown>
@@ -31,7 +31,7 @@
<el-dropdown-item @click="changeLanguage('en','en-US')">{{ $t(`common.topNav.en`) }}</el-dropdown-item>
</el-dropdown-menu>
</template>
- </el-dropdown>
+ </el-dropdown> -->
</div>
<div class="avatar-container">
<el-dropdown
diff --git a/src/utils/i18n/locales/plan/index.js b/src/utils/i18n/locales/plan/index.js
index a180dea..f3700a2 100644
--- a/src/utils/i18n/locales/plan/index.js
+++ b/src/utils/i18n/locales/plan/index.js
@@ -5,7 +5,7 @@
viewAssociatedRequirements: "鏌ョ湅鍏宠仈闇�姹�",
setMode: "璁剧疆妯″紡",
CustomizePlannedCompletionDate: "鑷畾涔夎鍒掑畬宸ユ棩",
- tipsBugSheetMetal: "灏嗚嚜瀹氫箟鐨勬棩鏈熻祴鍊肩粰宸ュ崟鐨勮鍒掑畬宸ユ棩",
+ tipsBugSheetMetal: "灏嗙敓鎴愮殑閽ｉ噾闇�姹傜殑璁″垝寮�宸ユ棩鍜岃鍒掑畬宸ユ棩璧嬪�肩粰宸ュ崟",
tipsBugSheetMetal2: "灏嗚嚜瀹氫箟鐨勬棩鏈熻祴鍊肩粰宸ュ崟鐨勮鍒掑畬宸ユ棩",
metalWeldWork: "鐒婄紳宸ュ崟鏁版嵁",
parseUpload: "宸叉垚鍔熶笂浼犲拰瑙ｆ瀽",
@@ -141,7 +141,7 @@
salesOrder: "閿�鍞鍗曞彿",
salesOrderLine: "閿�鍞鍗曡",
goodProductsQuantity: "鑹搧鏁伴噺",
- processNumber: "宸ュ簭鍙�",
+ processNumber: "宸ュ簭搴忓彿",
factoryCenter: "宸ヤ綔涓績",
dependencyDepartment: "鎵�灞為儴闂�",
planStartDay: "璁″垝寮�宸ユ棩",
@@ -158,7 +158,7 @@
startDateOfProcessPlan: "宸ュ簭璁″垝寮�濮嬫棩鏈�",
planStartDay: "璁″垝寮�濮嬫棩",
planEndDay: "璁″垝瀹屽伐鏃�",
- endDateOfProcessPlan: "宸ュ簭璁″垝缁撴潫鏃ユ湡",
+ endDateOfProcessPlan: "宸ュ簭璁″垝瀹屾垚鏃ユ湡",
standardTime: "鏍囧噯宸ユ椂",
processOrder: "宸ュ簭鎺掑簭",
integrationDay: "闆嗘垚鏃ユ湡",
@@ -189,7 +189,7 @@
// 閽ｉ噾渚涘簲缂哄彛鎶ヨ〃
requireID: "闇�姹侷D",
requireTraceID: "闇�姹傝拷婧疘D",
- bomLowCode: "BOM浣庨樁鐮�",
+ bomLowCode: "浣庨樁鐮�",
bomUsage: "BOM鐢ㄩ噺",
matchState: "鍖归厤鐘舵��",
matchPattern: "鍖归厤妯″紡",
diff --git a/src/views/mainPlan/plateProcessStat/index.vue b/src/views/mainPlan/plateProcessStat/index.vue
index 63dff3b..dc15b18 100644
--- a/src/views/mainPlan/plateProcessStat/index.vue
+++ b/src/views/mainPlan/plateProcessStat/index.vue
@@ -13,7 +13,7 @@
<el-col :span="12">
<el-form-item :label="$t('plan.query.workOrderNo')" prop="num">
<el-input
- :style="{ width: locale === 'zh' ? '200px' : '250px' }"
+ :style="{ width: locale === 'zh' ? '180px' : '250px' }"
v-model="queryParams.workOrderNo"
:placeholder="`${$t('common.common.placeholder')}${$t(
'plan.query.workOrderNo'
diff --git a/src/views/mainPlan/sheetMetalRedundantReport/index.vue b/src/views/mainPlan/sheetMetalRedundantReport/index.vue
index 3042536..d667dca 100644
--- a/src/views/mainPlan/sheetMetalRedundantReport/index.vue
+++ b/src/views/mainPlan/sheetMetalRedundantReport/index.vue
@@ -9,10 +9,10 @@
label-position="left"
>
<el-row type="flex" justify="left">
- <el-col :span="locale === 'zh' ? 5 : 8">
+ <el-col :span="locale === 'zh' ? 6 : 8">
<el-form-item :label-width="locale === 'zh' ? '48px' : '100px'" :label="$t('plan.query.itemNumber')" prop="itemNumber">
<el-input
- :style="{ width: locale === 'zh' ? '140px' : '210px' }"
+ :style="{ width: locale === 'zh' ? '180px' : '210px' }"
v-model="queryParams.itemNumber"
:placeholder="`${$t('common.common.placeholder')}${$t(
'plan.query.itemNumber'
@@ -22,13 +22,13 @@
/>
</el-form-item>
</el-col>
- <el-col :span="locale === 'zh' ? 9 : 8">
+ <el-col :span="locale === 'zh' ? 6 : 8">
<el-form-item
:label="$t('plan.query.workOrderNo')"
prop="documentNumber"
>
<el-input
- :style="{ width: locale === 'zh' ? '140px' : '330px' }"
+ :style="{ width: locale === 'zh' ? '180px' : '280px' }"
v-model="queryParams.documentNumber"
:placeholder="`${$t('common.common.placeholder')}${$t(
'plan.query.workOrderNo'
@@ -38,7 +38,7 @@
/>
</el-form-item>
</el-col>
- <el-col :span="locale === 'zh' ? 10 : 8" style="text-align: right">
+ <el-col :span="locale === 'zh' ? 12 : 8" style="text-align: right">
<el-form-item class="column-with-margin">
<el-button type="primary" icon="Search" @click="handleQuery">{{
$t("common.common.query")
@@ -125,7 +125,7 @@
align: "center",
},
{
- title: t("plan.table.subItemPartNumber"),
+ title: t("plan.table.itemNumber"),
field: "itemNumber",
width: 200,
align: "center",
diff --git a/src/views/mainPlan/sheetMetalSupplyGap/index.vue b/src/views/mainPlan/sheetMetalSupplyGap/index.vue
index 7a5e4f8..5df714f 100644
--- a/src/views/mainPlan/sheetMetalSupplyGap/index.vue
+++ b/src/views/mainPlan/sheetMetalSupplyGap/index.vue
@@ -9,14 +9,14 @@
label-position="left"
>
<el-row type="flex" justify="left">
- <el-col :span="locale === 'zh' ?6 :9">
+ <el-col :span="locale === 'zh' ?7 :9">
<el-form-item
:label-width="locale === 'zh' ? '90px' : '130px'"
:label="$t('plan.query.requireTraceID')"
prop="requireTrackId"
>
<el-input
- :style="{ width: locale === 'zh' ? '140px' : '230px' }"
+ :style="{ width: locale === 'zh' ? '180px' : '230px' }"
v-model="queryParams.requireTrackId"
:placeholder="`${$t('common.common.placeholder')}${$t('plan.query.requireTraceID')}`"
clearable
@@ -24,10 +24,10 @@
/>
</el-form-item>
</el-col>
- <el-col :span="locale === 'zh' ? 8 : 9">
+ <el-col :span="locale === 'zh' ? 7: 9">
<el-form-item :label-width="locale === 'zh' ? '48px' : '100px'" :label="$t('plan.query.itemNumber')" prop="bomLineCode">
<el-input
- :style="{ width: locale === 'zh' ? '140px' : '210px' }"
+ :style="{ width: locale === 'zh' ? '180px' : '210px' }"
v-model="queryParams.bomLineCode"
:placeholder="`${$t('common.common.placeholder')}${$t(
'plan.query.itemNumber'
diff --git a/src/views/mainPlan/weldSeamEcharts/index.vue b/src/views/mainPlan/weldSeamEcharts/index.vue
index 2f3f626..9fb72c7 100644
--- a/src/views/mainPlan/weldSeamEcharts/index.vue
+++ b/src/views/mainPlan/weldSeamEcharts/index.vue
@@ -10,7 +10,7 @@
<el-form :model="queryParams" ref="queryRef" :inline="true" label-width="90px">
<el-row :gutter="20">
<el-col :span="12">
- <el-form-item label="缁熻鏃ユ湡" style="width: 50%;">
+ <el-form-item label="缁熻鏃ユ湡" style="width: 60%;">
<el-date-picker
v-model="totalDay"
value-format="YYYY-MM"
--
Gitblit v1.9.3