dedsudiyu 2 vuotta sitten
vanhempi
commit
4f17f0a981

+ 18 - 6
src/views/comprehensive/laboratoryManagement/subject/deviceList.vue

@@ -953,12 +953,24 @@ export default {
         subjectId:this.subjectData.id
       };
       listBySubjectId(obj).then(response => {
-        this.$set(this,'listCgq',response.data.listCgq);
-        this.$set(this,'listYtj',response.data.listYtj);
-        this.$set(this,'listkzsb',response.data.listkzsb);
-        this.$set(this,'listSpjk',response.data.listSpjk);
-        this.$set(this,'listHK',response.data.listHK);
-        this.$set(this,'listXxp',response.data.listXxp);
+        if(response.data.listCgq){
+          this.$set(this,'listCgq',response.data.listCgq);
+        }
+        if(response.data.listYtj){
+          this.$set(this,'listYtj',response.data.listYtj);
+        }
+        if(response.data.listkzsb){
+          this.$set(this,'listkzsb',response.data.listkzsb);
+        }
+        if(response.data.listSpjk){
+          this.$set(this,'listSpjk',response.data.listSpjk);
+        }
+        if(response.data.listHK){
+          this.$set(this,'listHK',response.data.listHK);
+        }
+        if(response.data.listXxp){
+          this.$set(this,'listXxp',response.data.listXxp);
+        }
       });
     },
     //返回上一页

+ 1 - 1
src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -87,7 +87,7 @@
             <div :class="rightButtonType == 2 ? 'buttonColorA' : 'buttonColorB'" @click="rightButtonClick(2)">物联控制</div>
             <div :class="rightButtonType == 3 ? 'buttonColorA' : 'buttonColorB'" @click="rightButtonClick(3)">视频监控</div>
             <div :class="rightButtonType == 4 ? 'buttonColorA' : 'buttonColorB'" @click="rightButtonClick(4)">声光报警</div>
-            <div :class="rightButtonType == 5 ? 'buttonColorA' : 'buttonColorB'" @click="rightButtonClick(5)">智能门禁</div>
+            <!--<div :class="rightButtonType == 5 ? 'buttonColorA' : 'buttonColorB'" @click="rightButtonClick(5)">智能门禁</div>-->
           </div>
           <!--传感器-->
           <div class="bottom-max-box" :class="rightButtonType == 4?'overflow-box':''">