'更新'

Merge pull request 'zwq' (#63 ) from zwq into develop
2022-03-16 09:43:13 +08:00 · 2022-03-16 09:41:00 +08:00 · 2022-03-16 09:00:59 +08:00 · 2022-03-16 08:58:59 +08:00 · 2022-03-16 08:42:53 +08:00 · 2022-03-15 17:04:29 +08:00
11 changed files with 99 additions and 90 deletions
--- a/src/lang/i18n/en/module/basicData.js
+++ b/src/lang/i18n/en/module/basicData.js
@@ -1,8 +1,13 @@
 /*
 * @Author: gtz
 * @Date: 2021-03-04 16:13:51
+<<<<<<< HEAD
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-15 18:33:48
+=======
 * @LastEditors: zwq
 * @LastEditTime: 2022-03-15 10:17:01
+>>>>>>> develop
 * @Description: file content
 */
 export default {
@@ -169,7 +174,13 @@ export default {
    processEquipment: 'Process Equipment',
    sheCode: 'Shelf Code',
    sheName: 'Shelf Name',
-    locaNum: 'Location Number'
+    locaNum: 'Location Number',
+    addLocation: 'Add Location',
+    columnMark: 'Column Mark',
+    rowMark: 'Row Mark',
+    status: 'Status',
+    man: 'Man',
+    woman: 'Woman'
  },
  storageBox: {
    name: 'Name',
--- a/src/lang/i18n/en/module/dashboard.js
+++ b/src/lang/i18n/en/module/dashboard.js
@@ -1,8 +1,8 @@
 /*
 * @Author: gtz
 * @Date: 2022-03-15 16:42:34
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-15 16:58:26
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-16 08:57:49
 * @Description: file content
 * @FilePath: \mt-ck-wms-ui\src\lang\i18n\en\module\dashboard.js
 */
--- a/src/lang/i18n/zh/module/basicData.js
+++ b/src/lang/i18n/zh/module/basicData.js
@@ -1,8 +1,14 @@
 /*
 * @Author: gtz
 * @Date: 2021-03-04 16:13:51
+<<<<<<< HEAD
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-15 18:33:24
+ * @Description: file content
+=======
 * @LastEditors: zwq
 * @LastEditTime: 2022-03-15 10:16:52
+>>>>>>> develop
 */
 export default {
  visual: {
@@ -159,7 +165,9 @@ export default {
    processEquipment: '工艺设备',
    sheCode: '货架编码',
    sheName: '货架名',
-    locaNum: '库存数量'
+    locaNum: '库存数量',
+    man: '男',
+    woman: '女'
  },
  storageBox: {
    name: '存储箱名称',
--- a/src/views/EquipmentManager/equipmentUtilizationRate/E10.vue
+++ b/src/views/EquipmentManager/equipmentUtilizationRate/E10.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: DY
 * @Date: 2021-12-16 15:41:11
- * @LastEditors: DY
- * @LastEditTime: 2022-03-03 15:26:05
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 09:04:30
 * @Description: E10
 -->
 <template>
@@ -84,18 +84,18 @@ export default {
  },
  created() {
    // this.getEqList()
-    this.getList()
+    // this.getList()
  },
  methods: {
-    async getEqList() {
-      const res = await equipmentList({
-        current: 1,
-        size: 999
-      })
-      if (res.code === 0) {
-        this.eqList = res.data
-      }
-    },
+    // async getEqList() {
+    //   const res = await equipmentList({
+    //     current: 1,
+    //     size: 999
+    //   })
+    //   if (res.code === 0) {
+    //     this.eqList = res.data
+    //   }
+    // },
    toE10() {
      this.$router.push({
        name: 'E10'
--- a/src/views/EquipmentManager/equipmentUtilizationRate/MCBF.vue
+++ b/src/views/EquipmentManager/equipmentUtilizationRate/MCBF.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: DY
 * @Date: 2021-12-16 15:41:11
- * @LastEditors: DY
- * @LastEditTime: 2022-03-03 15:26:28
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 09:04:19
 * @Description: MCBF
 -->
 <template>
@@ -83,18 +83,18 @@ export default {
  },
  created() {
    // this.getEqList()
-    this.getList()
+    // this.getList()
  },
  methods: {
-    async getEqList() {
-      const res = await equipmentList({
-        current: 1,
-        size: 999
-      })
-      if (res.code === 0) {
-        this.eqList = res.data
-      }
-    },
+    // async getEqList() {
+    //   const res = await equipmentList({
+    //     current: 1,
+    //     size: 999
+    //   })
+    //   if (res.code === 0) {
+    //     this.eqList = res.data
+    //   }
+    // },
    toE10() {
      this.$router.push({
        name: 'E10'
--- a/src/views/EquipmentManager/equipmentUtilizationRate/MTTR.vue
+++ b/src/views/EquipmentManager/equipmentUtilizationRate/MTTR.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: DY
 * @Date: 2021-12-16 15:41:11
- * @LastEditors: DY
- * @LastEditTime: 2022-03-03 15:26:44
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 09:04:09
 * @Description: MTTR
 -->
 <template>
@@ -83,18 +83,18 @@ export default {
  },
  created() {
    // this.getEqList()
-    this.getList()
+    // this.getList()
  },
  methods: {
-    async getEqList() {
-      const res = await equipmentList({
-        current: 1,
-        size: 999
-      })
-      if (res.code === 0) {
-        this.eqList = res.data
-      }
-    },
+    // async getEqList() {
+    //   const res = await equipmentList({
+    //     current: 1,
+    //     size: 999
+    //   })
+    //   if (res.code === 0) {
+    //     this.eqList = res.data
+    //   }
+    // },
    toE10() {
      this.$router.push({
        name: 'E10'
--- a/src/views/EquipmentManager/equipmentUtilizationRate/OEE.vue
+++ b/src/views/EquipmentManager/equipmentUtilizationRate/OEE.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: DY
 * @Date: 2021-12-16 15:41:11
- * @LastEditors: DY
- * @LastEditTime: 2022-03-03 15:26:56
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 09:03:58
 * @Description: OEE
 -->
 <template>
@@ -83,18 +83,18 @@ export default {
  },
  created() {
    // this.getEqList()
-    this.getList()
+    // this.getList()
  },
  methods: {
-    async getEqList() {
-      const res = await equipmentList({
-        current: 1,
-        size: 999
-      })
-      if (res.code === 0) {
-        this.eqList = res.data
-      }
-    },
+    // async getEqList() {
+    //   const res = await equipmentList({
+    //     current: 1,
+    //     size: 999
+    //   })
+    //   if (res.code === 0) {
+    //     this.eqList = res.data
+    //   }
+    // },
    toE10() {
      this.$router.push({
        name: 'E10'
--- a/src/views/EquipmentManager/equipmentUtilizationRate/components/E10Table.vue
+++ b/src/views/EquipmentManager/equipmentUtilizationRate/components/E10Table.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
- * @LastEditors: DY
- * @LastEditTime: 2022-03-03 16:22:24
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 09:03:35
 * @Description: E10详情表格
 -->
 <template>
@@ -108,15 +108,15 @@ export default {
      this.listQuery.startTime = this.time1
      this.listQuery.endTime = this.time2
      this.listQuery.equipmentName = this.equipmentName
-      getE10StackDetail(this.listQuery).then(res => {
-        if (res.data !== []) {
-          this.list = res.data.detail.records
-          this.total = res.data.detail.total
-          this.list.forEach(item => {
-            item.equipmentName = this.equipmentName
-          })
-        }
-      })
+      // getE10StackDetail(this.listQuery).then(res => {
+      //   if (res.data !== []) {
+      //     this.list = res.data.detail.records
+      //     this.total = res.data.detail.total
+      //     this.list.forEach(item => {
+      //       item.equipmentName = this.equipmentName
+      //     })
+      //   }
+      // })
    }
  }
 }
--- a/src/views/EquipmentManager/equipmentUtilizationRate/components/MttrTable.vue
+++ b/src/views/EquipmentManager/equipmentUtilizationRate/components/MttrTable.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
- * @LastEditors: DY
- * @LastEditTime: 2022-03-03 16:46:06
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 09:03:23
 * @Description: Mttr详情表格
 -->
 <template>
@@ -109,12 +109,12 @@ export default {
      this.listQuery.startTime = this.time1
      this.listQuery.endTime = this.time2
      this.listQuery.equipmentName = this.equipmentName
-      getMttrDetail(this.listQuery).then(res => {
-        if (res.data !== []) {
-          this.list = res.data.detail.records
-          this.total = res.data.detail.total
-        }
-      })
+      // getMttrDetail(this.listQuery).then(res => {
+      //   if (res.data !== []) {
+      //     this.list = res.data.detail.records
+      //     this.total = res.data.detail.total
+      //   }
+      // })
    }
  }
 }
--- a/src/views/basicData/GroupModule/components/staff-add.vue
+++ b/src/views/basicData/GroupModule/components/staff-add.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 10:06:01
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-15 18:33:01
 * @Description:
 -->
 <template>
@@ -169,10 +169,10 @@ export default {
        }]
      },
      sexOptions: [{
-        'label': '男',
+        'label': this.$t('module.basicData.cache.man'),
        'value': 1
      }, {
-        'label': '女',
+        'label': this.$t('module.basicData.cache.woman'),
        'value': 0
      }],
      onDutyOptions: [{
--- a/src/views/basicData/Warehouse/components/processStorageLink.vue
+++ b/src/views/basicData/Warehouse/components/processStorageLink.vue
@@ -2,7 +2,7 @@
 * @Author: gtz
 * @Date: 2022-03-03 09:16:10
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-15 14:27:57
+ * @LastEditTime: 2022-03-15 17:03:28
 * @Description: file content
 * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
 -->
@@ -11,7 +11,7 @@
    <el-card class="dashboard-main">
      <el-row class="dashboard-title">
        <div class="dashboard-header-line" />
-        <div class="dashboard-header-title">WMS库存信息</div>
+        <div class="dashboard-header-title">{{ $t('module.dashboard.title') }}</div>
      </el-row>
      <el-row class="dashboard-legend">
        <div
@@ -47,13 +47,7 @@
            size="mini"
            placeholder="请选择库存范围"
            @change="handleChange"
-          >
-            <el-option
-              v-for="item in totalPage"
-              :key="'select' + item"
-              :label="'第' + item + '页'"
-              :value="item"
-            />
+          ><el-option v-for="item in totalPage" :key="'select' + item" :label="$t('module.dashboard.pageHeader') + item + $t('module.dashboard.pageFooter')" :value="item" />
          </el-select>
        </div>
      </el-row>
@@ -123,9 +117,7 @@
                </el-col>
              </el-row>
              <div class="dashboard-layout-footer">
-                {{
-                  "第" + bottomIndex[index] + "排(" + ((current - 1) * 4 + item) + ")"
-                }}
+                {{ $t(bottomIndex[index]) + '(' + ((current - 1) * 4 + item) + ')' }}
              </div>
            </el-col>
          </el-row>
@@ -253,9 +245,7 @@
                </el-col>
              </el-row>
              <div class="dashboard-layout-footer">
-                {{
-                  "第" + bottomIndex[index] + "排(" + ((current - 1) * 4 + item) + ")"
-                }}
+                {{ $t(bottomIndex[index]) + '(' + ((current - 1) * 4 + item) + ')' }}
              </div>
            </el-col>
          </el-row>
Author	SHA1	Message	Date
Fanzink	f219b55d0c	'更新'	2022-03-16 09:43:13 +08:00
Fanzink	79b7fe0eec	'更新'	2022-03-16 09:41:00 +08:00
朱文强	2329a20c4f	Merge pull request 'zwq' (#63 ) from zwq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #63	2022-03-16 09:00:59 +08:00
zwq	7aba931c94	提交	2022-03-16 08:58:59 +08:00
zwq	176fd99cd1	Merge branch 'test' of http://git.picaiba.com/mt-ck-00a/mt-ck-wms-ui into zwq	2022-03-16 08:42:53 +08:00
朱文强	77fbbb630b	Merge pull request '仓库翻译' (#62 ) from zwq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #62	2022-03-15 17:04:29 +08:00
zwq	18b932afa1	仓库翻译	2022-03-15 17:04:06 +08:00