From 78dd4bed061d252efbb2a2dbb28be9db10ab716e Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Tue, 9 Aug 2022 10:09:20 +0800
Subject: [PATCH] =?UTF-8?q?3D=E5=BA=93=E6=88=BF=E9=85=8D=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=BB=91=E5=AE=9A=E6=B6=88=E6=81=AF=20=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86=E9=83=A8=E5=88=86=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E4=BF=AE=E6=94=B9=20=E9=97=A8=E7=A6=81?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=83=8C=E6=99=AF=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/SecurityDoor.vue         |  7 +++++
 .../deviceManage/module/deviceDetail.vue      | 28 +++++++++----------
 .../storeManage/warehouse3DConfig/index.vue   |  3 ++
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/views/components/SecurityDoor.vue b/src/views/components/SecurityDoor.vue
index 4792bc4..ddfa206 100644
--- a/src/views/components/SecurityDoor.vue
+++ b/src/views/components/SecurityDoor.vue
@@ -111,4 +111,11 @@ export default {
     font-size: 16px;
   }
 }
+::v-deep
+  .el-table--striped
+  .el-table__body
+  tr.el-table__row--striped
+  td.el-table__cell {
+  background: #02255f;
+}
 </style>
diff --git a/src/views/storeManage/deviceManage/module/deviceDetail.vue b/src/views/storeManage/deviceManage/module/deviceDetail.vue
index 57231e6..24a72d9 100644
--- a/src/views/storeManage/deviceManage/module/deviceDetail.vue
+++ b/src/views/storeManage/deviceManage/module/deviceDetail.vue
@@ -28,12 +28,12 @@
       <div class="setting-dialog">
         <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
           <el-form-item label="设备厂商" prop="supplier">
-            <el-select v-model="form.supplier" style="width: 370px;">
+            <el-select v-model="form.supplier" style="width: 370px;" :disabled="crud.status.edit === 1">
               <el-option v-for="item in supplierOptions" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
           <el-form-item v-if="isInsidedevices || isOutsidedevices" label="设备ID" prop="deviceId">
-            <el-input v-model="form.deviceId" style="width: 370px;" />
+            <el-input v-model="form.deviceId" style="width: 370px;" :disabled="crud.status.edit === 1" />
           </el-form-item>
           <el-form-item label="设备名称" prop="deviceName">
             <el-input v-model="form.deviceName" style="width: 370px;" />
@@ -50,16 +50,16 @@
           </el-form-item>
           <!-- 密集架 -->
           <el-form-item v-if="selectedDeviceType === '密集架'" label="区号" prop="areaNo">
-            <el-input v-model="form.areaNo" style="width: 370px;" />
+            <el-input v-model="form.areaNo" style="width: 370px;" :disabled="crud.status.edit === 1" />
           </el-form-item>
           <el-form-item v-if="selectedDeviceType === '密集架'" label="起始列号" prop="firstColumnNo">
-            <el-input v-model.number="form.firstColumnNo" style="width: 150px;" />
+            <el-input v-model.number="form.firstColumnNo" style="width: 150px;" :disabled="crud.status.edit === 1" />
           </el-form-item>
           <el-form-item v-if="selectedDeviceType === '密集架'" label="总列数" prop="sumColumnNo">
-            <el-input v-model.number="form.sumColumnNo" style="width: 150px;" />
+            <el-input v-model.number="form.sumColumnNo" style="width: 150px;" :disabled="crud.status.edit === 1" />
           </el-form-item>
           <el-form-item v-if="selectedDeviceType === '密集架'" label="节数" prop="partNo">
-            <el-input v-model.number="form.partNo" style="width: 150px;" />
+            <el-input v-model.number="form.partNo" style="width: 150px;" :disabled="crud.status.edit === 1" />
           </el-form-item>
           <!-- 回转柜 || 摄像头 -->
           <el-form-item v-if="selectedDeviceType === '回转柜' || selectedDeviceType === '摄像头'" label="账号" prop="deviceAccount">
@@ -70,7 +70,7 @@
           </el-form-item>
           <!-- 回转柜 -->
           <el-form-item v-if="selectedDeviceType === '回转柜'" label="柜号" prop="cupboardNo">
-            <el-input v-model="form.cupboardNo" style="width: 370px;" />
+            <el-input v-model="form.cupboardNo" style="width: 370px;" :disabled="crud.status.edit === 1" />
           </el-form-item>
           <!-- 摄像头 -->
           <el-form-item v-if="selectedDeviceType === '摄像头'" label="频道" prop="videoRoute">
@@ -78,11 +78,11 @@
           </el-form-item>
           <!-- 密集架 || 回转柜 -->
           <el-form-item v-if="selectedDeviceType === '密集架' || selectedDeviceType === '回转柜'" label="层数" prop="rowNo">
-            <el-input v-model.number="form.rowNo" style="width: 150px;" />
+            <el-input v-model.number="form.rowNo" style="width: 150px;" :disabled="crud.status.edit === 1" />
           </el-form-item>
           <!-- 回转柜 -->
           <el-form-item v-if="selectedDeviceType === '回转柜'" label="每层列数" prop="columnRowNo">
-            <el-input v-model.number="form.columnRowNo" style="width: 150px;" />
+            <el-input v-model.number="form.columnRowNo" style="width: 150px;" :disabled="crud.status.edit === 1" />
           </el-form-item>
           <!-- 密集架 || 回转柜 -->
           <el-form-item v-if="selectedDeviceType === '密集架' || selectedDeviceType === '回转柜'" label="联动操作" prop="isLinkage">
@@ -504,19 +504,19 @@ export default {
       border-color: #fd8042;
       background-color: #fd8042;
       &.is-disabled {
-        border-color: #7E4021;
-        background-color: #7E4021;
+        border-color: #7e4021;
+        background-color: #7e4021;
       }
     }
     &.binding-param-btn {
       border-color: #1aae93;
       background-color: #1aae93;
       &.is-disabled {
-        border-color: #0D5649;
-        background-color: #0D5649;
+        border-color: #0d5649;
+        background-color: #0d5649;
       }
     }
-    &.is-disabled{
+    &.is-disabled {
       color: #666;
     }
   }
diff --git a/src/views/storeManage/warehouse3DConfig/index.vue b/src/views/storeManage/warehouse3DConfig/index.vue
index e69c48f..1713d47 100644
--- a/src/views/storeManage/warehouse3DConfig/index.vue
+++ b/src/views/storeManage/warehouse3DConfig/index.vue
@@ -182,7 +182,10 @@ export default {
           this.form.displayParams.push({ paramName: paramValue.self.paramName, paramValue: paramValue.self.paramId, unit: paramValue.self.paramId })
         }
       }
+      this.form.id = null
       displayConfigApi.bind(this.form).then(() => {
+        this.$message.success('绑定成功 ')
+        this.dialogVisible = false
         this.getDisplayConfigList()
       })
     },