From ec590f7e9f4fe7caef928438e35bf2512f29a227 Mon Sep 17 00:00:00 2001
From: xusd <xu13181496959@163.com>
Date: Tue, 12 Nov 2024 14:48:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=BA=8A=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=99=90=E5=88=B61=E4=B8=AA=EF=BC=8C?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=88=97=E8=A1=A8=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/dal/mysql/equip/EquipInfoMapper.java |  1 +
 .../src/views/system/equip/equipInfo/EquipInfoForm.vue |  2 +-
 imt-ui/src/views/system/equip/equipInfo/index.vue      | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java
index 10588be..0d2e1c0 100644
--- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java
+++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java
@@ -30,6 +30,7 @@ public interface EquipInfoMapper extends BaseMapperX<EquipInfoDO> {
                 .likeIfPresent(EquipInfoDO::getEquipName, reqVO.getEquipName())
                 .likeIfPresent(EquipInfoDO::getEquipNo, reqVO.getEquipNo())
                 .eqIfPresent(EquipInfoDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(EquipInfoDO::getRunStatus, reqVO.getRunStatus())
                 .groupBy(EquipInfoDO::getCustomerId, EquipInfoDO::getModelId)
         );
     }
diff --git a/imt-ui/src/views/system/equip/equipInfo/EquipInfoForm.vue b/imt-ui/src/views/system/equip/equipInfo/EquipInfoForm.vue
index 58bac94..9476ee9 100644
--- a/imt-ui/src/views/system/equip/equipInfo/EquipInfoForm.vue
+++ b/imt-ui/src/views/system/equip/equipInfo/EquipInfoForm.vue
@@ -146,7 +146,7 @@
           />
         </el-form-item>
         <el-form-item label="二维码图片">
-          <ImageUpload v-model="formData.qrcodePicPath" />
+          <ImageUpload v-model="formData.qrcodePicPath" :limit="1"/>
         </el-form-item>
       </el-form>
       <div
diff --git a/imt-ui/src/views/system/equip/equipInfo/index.vue b/imt-ui/src/views/system/equip/equipInfo/index.vue
index b002503..3bdcf6e 100644
--- a/imt-ui/src/views/system/equip/equipInfo/index.vue
+++ b/imt-ui/src/views/system/equip/equipInfo/index.vue
@@ -58,7 +58,7 @@
       </el-form-item>
       <el-form-item
         label="机床状态"
-        prop="status"
+        prop="runStatus"
       >
         <el-select
           v-model="queryParams.status"
@@ -67,7 +67,7 @@
           size="small"
         >
           <el-option
-            v-for="dict in this.getDictDatas(DICT_TYPE.EQUIP_STATUS)"
+            v-for="dict in this.getDictDatas(DICT_TYPE.EQUIP_RUN_STATUS)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -178,12 +178,12 @@
       <el-table-column
         label="机床状态"
         align="center"
-        prop="status"
+        prop="runStatus"
       >
         <template v-slot="scope">
           <dict-tag
-            :type="DICT_TYPE.EQUIP_STATUS"
-            :value="scope.row.status"
+            :type="DICT_TYPE.EQUIP_RUN_STATUS"
+            :value="scope.row.runStatus"
           />
         </template>
       </el-table-column>