From 462a7fdc5813c3f5505b789522a4856ba8ff1db7 Mon Sep 17 00:00:00 2001
From: xusd <xu13181496959@163.com>
Date: Fri, 20 Sep 2024 11:33:31 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9C=BA=E5=BA=8A=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E3=80=81=E6=9C=BA=E5=BA=8A=E7=BB=84=E4=BB=B6=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=202=E3=80=81=E6=9C=BA=E5=BA=8A?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E5=9B=BE=E7=89=87=E3=80=81=E6=9C=BA=E5=BA=8A?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E5=88=A4=E6=96=AD=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 imt-ui/src/views/system/baseData/modelinfo/index.vue |  2 +-
 .../system/equip/componentInfo/ComponentInfoForm.vue | 12 ++++++------
 .../views/system/equip/equipInfo/EquipInfoForm.vue   | 12 ++++++------
 imt-ui/src/views/system/equip/equipInfo/index.vue    |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/imt-ui/src/views/system/baseData/modelinfo/index.vue b/imt-ui/src/views/system/baseData/modelinfo/index.vue
index 075339b..dd272e2 100644
--- a/imt-ui/src/views/system/baseData/modelinfo/index.vue
+++ b/imt-ui/src/views/system/baseData/modelinfo/index.vue
@@ -63,7 +63,7 @@
 <!--            :src="scope.row.modelPicPath"-->
 <!--            style="display: block; width: 100px; height: 100px; margin: 0 auto"-->
 <!--          />-->
-          <span v-if="scope.row.modelPicPath == null">-</span>
+          <span v-if="scope.row.modelPicPath == null || scope.row.modelPicPath === ''">-</span>
           <el-image v-else
             style="width: 100px; height: 100px"
             :src="scope.row.modelPicPath"
diff --git a/imt-ui/src/views/system/equip/componentInfo/ComponentInfoForm.vue b/imt-ui/src/views/system/equip/componentInfo/ComponentInfoForm.vue
index a2e3396..149b65e 100644
--- a/imt-ui/src/views/system/equip/componentInfo/ComponentInfoForm.vue
+++ b/imt-ui/src/views/system/equip/componentInfo/ComponentInfoForm.vue
@@ -35,12 +35,12 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="组件状态" prop="status">
-          <el-select v-model="formData.status" placeholder="请选择组件状态" style="width:100%">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMPONENT_STATUS)"
-                       :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="组件状态" prop="status">-->
+<!--          <el-select v-model="formData.status" placeholder="请选择组件状态" style="width:100%">-->
+<!--            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMPONENT_STATUS)"-->
+<!--                       :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="备注" prop="remark">
           <el-input v-model="formData.remark" :rows="4" type="textarea" placeholder="请输入备注"/>
         </el-form-item>
diff --git a/imt-ui/src/views/system/equip/equipInfo/EquipInfoForm.vue b/imt-ui/src/views/system/equip/equipInfo/EquipInfoForm.vue
index b3d85c6..0011bbe 100644
--- a/imt-ui/src/views/system/equip/equipInfo/EquipInfoForm.vue
+++ b/imt-ui/src/views/system/equip/equipInfo/EquipInfoForm.vue
@@ -48,12 +48,12 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="机床状态" prop="status">
-          <el-select v-model="formData.status" placeholder="请选择机床状态" style="width: 100%">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.EQUIP_STATUS)"
-                       :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"/>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="机床状态" prop="status">-->
+<!--          <el-select v-model="formData.status" placeholder="请选择机床状态" style="width: 100%">-->
+<!--            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.EQUIP_STATUS)"-->
+<!--                       :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"/>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="备注" prop="remark">
           <el-input v-model="formData.remark" type="textarea" :rows="4" placeholder="请输入备注"/>
         </el-form-item>
diff --git a/imt-ui/src/views/system/equip/equipInfo/index.vue b/imt-ui/src/views/system/equip/equipInfo/index.vue
index 25f008f..7b34a28 100644
--- a/imt-ui/src/views/system/equip/equipInfo/index.vue
+++ b/imt-ui/src/views/system/equip/equipInfo/index.vue
@@ -60,7 +60,7 @@
       </el-table-column>
       <el-table-column label="二维码" align="center" prop="qrcodePicPath">
         <template v-slot="scope">
-          <span v-if="scope.row.qrcodePicPath == null">-</span>
+          <span v-if="scope.row.qrcodePicPath == null || scope.row.qrcodePicPath === ''">-</span>
 <!--          <img-->
 <!--            :src="scope.row.qrcodePicPath"-->
 <!--            style="display: block; width: 100px; height: 100px; margin: 0 auto"-->