소스 검색

修复锁定站 锁控柜 工卡 地图点位部分问题 2026/1/13日

pm 4 달 전
부모
커밋
ae76e255de
4개의 변경된 파일17개의 추가작업 그리고 16개의 파일을 삭제
  1. 5 4
      src/views/mes/dv/lotoStation/index.vue
  2. 1 1
      src/views/mes/hw/lockCabinet/index.vue
  3. 1 1
      src/views/mes/hw/workCard/index.vue
  4. 10 10
      src/views/system/mapconfig/index.vue

+ 5 - 4
src/views/mes/dv/lotoStation/index.vue

@@ -111,14 +111,14 @@
       />
       <el-table-column
         :label="$t('mes.lotoStation.mapName')"
-        :width="isEnglish ? '180px' : '140px'"
+        :width="isEnglish ? '180px' : '170px'"
         align="center"
         prop="mapName"
         show-overflow-tooltip
       />
       <el-table-column
         :label="$t('mes.lotoStation.motorMapName')"
-        :width="isEnglish ? '200px' : '160px'"
+        :width="isEnglish ? '200px' : '220px'"
         align="center"
         prop="motorMapName"
         show-overflow-tooltip
@@ -338,7 +338,8 @@ export default {
         size: 10,
         lotoCode: null,
         lotoName: null,
-
+        lotoId: null,
+        workstationId: null
       },
       // 表单参数
       form: {
@@ -500,7 +501,7 @@ export default {
         delete node.children
       }
       return {
-        id: node.lotoId,
+        id: node.machineryId,
         label: node.machineryName,
         children: node.children
       }

+ 1 - 1
src/views/mes/hw/lockCabinet/index.vue

@@ -326,7 +326,7 @@
           />
         </el-form-item>
         <el-form-item :label="$t('mes.lockCabinet.workstationId')" prop="workstationId" style="width: 380px">
-          <treeselect v-model="form.workstationId" :options="marsOptions"  :normalizer="Marsnormalizer" :placeholder="$t('system.post.postPlaceholder')" />
+          <treeselect v-model="form.workstationId" :options="marsOptions"  :normalizer="Marsnormalizer" :placeholder="$t('system.user.postPlaceholder')" />
         </el-form-item>
         <el-form-item :label="$t('mes.lockCabinet.hardwareId')" prop="hardwareId" style="width: 380px">
           <el-select

+ 1 - 1
src/views/mes/hw/workCard/index.vue

@@ -44,7 +44,7 @@
               v-for="dict in this.userList"
               :key="dict.value"
               :label="dict.label"
-              :value="dict.value"
+              :value="dict.label"
             />
           </el-select>
         </el-form-item>

+ 10 - 10
src/views/system/mapconfig/index.vue

@@ -27,16 +27,16 @@
                    v-hasPermi="['iscs:map:add']"
         >{{ $t('common.add') }}</el-button>
       </el-col>
-      <el-button
-        v-no-more-click
-        type="info"
-        plain
-        icon="el-icon-upload2"
-        size="mini"
-        @click="handleOpenImport"
-        v-show="sysAttrValue=='true'"
-      >{{ $t('systemOther.mapConfig.fingerprintFaceImport') }}</el-button
-      >
+<!--      <el-button-->
+<!--        v-no-more-click-->
+<!--        type="info"-->
+<!--        plain-->
+<!--        icon="el-icon-upload2"-->
+<!--        size="mini"-->
+<!--        @click="handleOpenImport"-->
+<!--        v-show="sysAttrValue=='true'"-->
+<!--      >{{ $t('systemOther.mapConfig.fingerprintFaceImport') }}</el-button-->
+<!--      >-->
       <el-col :span="1.5">
         <el-button v-no-more-click
                    type="danger"