zc

src/api/laboratory/onDutyConfiguration.js

@@ -42,11 +42,11 @@ export function treeDeptSubSel(query) {
   })
 }
 //获取实验室可选值班人员列表
-export function getUserDutyList(data) {
+export function getUserDutyList(query) {
   return request({
     url: '/system/user/getUserDutyList',
-    method: 'post',
-    data: data
+    method: 'get',
+    params: query
   })
 }
 

src/utils/ruoyi.js

@@ -3,10 +3,8 @@
  * Copyright (c) 2019 ruoyi
  */
 
+let Base64 = require('js-base64').Base64;
 // 判断当前用户网络 外网/内网 返回接口地址
-
-
-
 export function judgmentNetworkReturnAddress() {
   /*判断是否是内网IP*/
     // 获取当前页面url
@@ -309,27 +307,6 @@ export function spaceJudgmentHTML(rule, value, callback) {
  * 预览地址判断
  */
 export function urlJudge(url) {
-  // let src = '';
-  // url = '/admin/statics'+url.split('statics')[1]
-  url = '/statics'+url.split('statics')[1]
-  // console.log('url',url);
-  let location = window.location.href
-  // console.log('location',location)
-  if (location.indexOf('?#/') !== -1){
-    location = location.split('?#/')[0]
-    // console.log('location1',location)
-  }else if(location.indexOf('/#/') !== -1){
-    location = location.split('/#/')[0]
-    // console.log('location2',location)
-  }
-  // console.log('src',src)
-  // if(url.indexOf('http') !== -1){
-  //   let text =  window.location.href.split('://')[0]+'://' + url.split('://')[1]
-  //   src = localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(btoa(unescape(encodeURIComponent(text))));
-  // }else{
-  //   src = localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(btoa(unescape(encodeURIComponent(window.location.href.split('://')[0]+'://' +judgmentNetworkReturnAddress() +'/admin/'+ url))));
-  // }
-  console.log('location',location);
-  console.log('url',url);
-  return location + url
+  let src = window.location.href.split('://')[0]+'://' + judgmentNetworkReturnAddress()+'/statics'+ url.split('statics')[1]
+  return localStorage.getItem('filePreviewUrl')+'/onlinePreview?url='+encodeURIComponent(btoa(unescape(encodeURIComponent(src))));
 }

src/views/comprehensive/laboratoryManagement/building/buildingDetails.vue

@@ -199,6 +199,7 @@
             <el-radio-group v-model="dialogForm.relayType" style="margin-top:4px;">
               <el-radio :label="2">新版继电器</el-radio>
               <el-radio :label="1">老版继电器</el-radio>
+              <el-radio :label="3">泥人继电器</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="继电器参数：" prop="configName" v-if="dialogForm.relayType == 2">
@@ -207,10 +208,10 @@
           <el-form-item label="状态参数：" prop="configStatus" style="width:398px;" v-if="dialogForm.relayType == 2">
             <el-input v-model="dialogForm.configStatus" placeholder="请输入状态参数" maxlength="20" style="width:300px;"/>
           </el-form-item>
-          <el-form-item label="继电器编号：" prop="relayCode" v-if="dialogForm.relayType == 1">
+          <el-form-item label="继电器编号：" prop="relayCode" v-if="dialogForm.relayType == 1 || dialogForm.relayType == 3">
             <el-input v-model="dialogForm.relayCode" placeholder="请输入继电器参数" maxlength="20" style="width:300px;"/>
           </el-form-item>
-          <el-form-item label="继电器路数：" prop="relayBit" style="width:398px;" v-if="dialogForm.relayType == 1" class="dialog-relay-bit-form-item-box">
+          <el-form-item label="继电器路数：" prop="relayBit" style="width:398px;" v-if="dialogForm.relayType == 1 || dialogForm.relayType == 3" class="dialog-relay-bit-form-item-box">
             <el-input-number v-model="dialogForm.relayBit" :min="1" :max="12" placeholder="请输入状态参数" :controls="false" style="width:300px;"></el-input-number>
           </el-form-item>
           <el-form-item label="指示灯类型：" prop="state">
@@ -505,7 +506,7 @@
                     relayType:obj.mapList[i].lightList[o].relayType,
                     state:obj.mapList[i].lightList[o].state,
                   }
-                  if(obj.mapList[i].lightList[o].relayType == 1){
+                  if(obj.mapList[i].lightList[o].relayType == 1 || obj.mapList[i].lightList[o].relayType == 3){
                     minObj.relayCode = obj.mapList[i].lightList[o].relayCode
                     minObj.relayBit = obj.mapList[i].lightList[o].relayBit
                   }else if(obj.mapList[i].lightList[o].relayType == 2){
@@ -586,7 +587,7 @@
             relayType:item.relayType?item.relayType:2,
             state:item.state?item.state:"",
           }
-          if(obj.relayType == 1){
+          if(obj.relayType == 1 || obj.relayType == 3){
             obj.relayCode = item.relayCode?item.relayCode:"";
             obj.relayBit = item.relayBit?item.relayBit:"";
           }else if(obj.relayType == 2){
@@ -640,24 +641,26 @@
           this.$refs["dialogForm"].validate(valid => {
             if (valid) {
               if(this.dialogOpenType == 1){
-                for(let i=0;i<self.mapList.length;i++){
-                  if(self.mapList[i].type == '1'){
-                    if(self.mapList[i].subId == self.dialogForm.subId){
-                      this.msgError(self.dialogForm.subName+'已被其他房间绑定')
-                      return
+                if(self.dialogForm.roomType != '-99'){
+                  for(let i=0;i<self.mapList.length;i++){
+                    if(self.mapList[i].type == '1'){
+                      if(self.mapList[i].subId == self.dialogForm.subId){
+                        this.msgError(self.dialogForm.subName+'已被其他房间绑定')
+                        return
+                      }
                     }
                   }
                 }
                 this.$set(this.mapList[this.dialogIndex],'roomType',this.dialogForm.roomType);
                 this.$set(this.mapList[this.dialogIndex],'roomNum',this.dialogForm.roomNum);
-                this.$set(this.mapList[this.dialogIndex],'roomName',this.dialogForm.roomName);
-                this.$set(this.mapList[this.dialogIndex],'subId',this.dialogForm.subId);
-                this.$set(this.mapList[this.dialogIndex],'subName',this.dialogForm.subName);
+                this.$set(this.mapList[this.dialogIndex],'roomName',self.dialogForm.roomType == '-99'?this.dialogForm.roomName:"");
+                this.$set(this.mapList[this.dialogIndex],'subId',self.dialogForm.roomType != '-99'?this.dialogForm.subId:"");
+                this.$set(this.mapList[this.dialogIndex],'subName',self.dialogForm.roomType != '-99'?this.dialogForm.subName:"");
                 this.dialogOpen = false;
               }else if(this.dialogOpenType == 6){
                 this.$set(this.mapList[this.dialogIndex].lightList[this.dialogMinIndex],'relayType',this.dialogForm.relayType);
                 this.$set(this.mapList[this.dialogIndex].lightList[this.dialogMinIndex],'state',this.dialogForm.state);
-                if(this.dialogForm.relayType == 1){
+                if(this.dialogForm.relayType == 1 || this.dialogForm.relayType == 3){
                   this.$set(this.mapList[this.dialogIndex].lightList[this.dialogMinIndex],'relayCode',this.dialogForm.relayCode);
                   this.$set(this.mapList[this.dialogIndex].lightList[this.dialogMinIndex],'relayBit',this.dialogForm.relayBit);
                 }else if(this.dialogForm.relayType == 2){
@@ -1036,7 +1039,15 @@
             }
           }
         }else if(type == 2){
-
+          if(res){
+            this.loadingInstance.close();
+            if(res.data){
+              if(res.data.url){
+                this.$set(this,'mapSrc',res.data.url)
+                this.$set(this, 'shadeBoxType', 1);
+              }
+            }
+          }
         }
       },
       beforeAvatarUpload(file) {

src/views/comprehensive/laboratoryManagement/subject/deviceList.vue

@@ -203,6 +203,7 @@
             <el-radio-group v-model="form.hardwareType">
               <el-radio :label="1">老继电器</el-radio>
               <el-radio :label="2">新继电器</el-radio>
+              <el-radio :label="3">泥人继电器</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="设备编号" prop="relayCode">

src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -905,7 +905,9 @@ export default {
           for(let i=0;i<response.data.labHardwareVOList.length;i++){
             if(response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'SWITCH'||
               response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'AI_VENTILATION'){
-              obj.VOlist.push(response.data.labHardwareVOList[i]);
+              if( response.data.labHardwareVOList[i].isPcfire == 0 ){
+                obj.VOlist.push(response.data.labHardwareVOList[i]);
+              }
             }
           }
         }

src/views/emergencyManagement/smartLoT/hardware/powerControl.vue

@@ -109,12 +109,21 @@
                 </el-tooltip>
               </el-select>
             </el-form-item>
-            <el-form-item label="继电器类型" label-width="1rem">
-              <el-radio-group v-model="form.hardwareType" @change="radioChange">
-                <el-radio :label="item.value" :key="item.value" v-for="(item,index) in hardwardTypeList">{{item.label}}</el-radio>
-              </el-radio-group>
+<!--            <el-form-item label="继电器类型" label-width="1rem">-->
+<!--              <el-radio-group v-model="form.hardwareType" @change="radioChange">-->
+<!--                <el-radio :label="item.value" :key="item.value" v-for="(item,index) in hardwardTypeList">{{item.label}}</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+            <el-form-item label="继电器类型" prop="relayCode">
+              <el-select v-model="form.hardwareType" placeholder="请选择继电器" clearable @change="radioChange" @clear="loadClear">
+                <el-option v-for="relay in hardwardTypeList"
+                           :key="relay.value"
+                           :label="relay.label"
+                           :value="relay.value">
+                </el-option>
+              </el-select>
             </el-form-item>
-            <el-form-item label="绑定继电器" prop="relayCode" v-if="form.hardwareType==1">
+            <el-form-item label="绑定继电器" prop="relayCode" v-if="form.hardwareType==1 || form.hardwareType==3">
               <el-select v-model="form.relayCode" placeholder="请选择继电器" clearable @change="loadRelayNum" @clear="loadClear">
                 <el-option v-for="relay in relayList"
                            :key="relay.code"
@@ -277,7 +286,8 @@
         ],
         hardwardTypeList:[
           {value:1,label:"老继电器"},
-          {value:2,label:"新继电器"}
+          {value:2,label:"新继电器"},
+          {value:3,label:"泥人继电器"}
         ],
         mtopic:"lab/hardware/data",
         //mqtt发送id数组
@@ -302,6 +312,19 @@
             list.push(obj);
           }
           self.relayNumList = list;
+        }else if(this.form.hardwareType==3){
+          this.relayNumList =[
+            {name:1},
+            {name:2},
+            {name:3},
+            {name:4},
+            {name:5},
+            {name:6},
+            {name:7},
+            {name:8},
+            {name:9},
+            {name:10},
+          ]
         }
       },
       // 开启关闭验证
@@ -531,7 +554,24 @@
           }
           list.push(obj);
         }
-        this.relayNumList = list;
+        console.log(list)
+        if(list.length>0){
+          this.relayNumList = list;
+        }else{
+          this.relayNumList =[
+            {name:1},
+            {name:2},
+            {name:3},
+            {name:4},
+            {name:5},
+            {name:6},
+            {name:7},
+            {name:8},
+            {name:9},
+            {name:10},
+          ]
+        }
+
       },
       loadHardware(){
         let self = this;

src/views/emergencyManagement/smartLoT/hardware/smartVentilation.vue

@@ -88,17 +88,26 @@
                 </el-tooltip>
               </el-select>
             </el-form-item>
-            <el-form-item label="继电器类型" label-width="1rem" @change="radioChange">
-              <el-radio-group v-model="form.hardwareType">
-                <el-radio :label="item.value" :key="item.value" v-for="item in hardwardTypeList">{{item.label}}</el-radio>
-              </el-radio-group>
+<!--            <el-form-item label="继电器类型" label-width="1rem" @change="radioChange">-->
+<!--              <el-radio-group v-model="form.hardwareType">-->
+<!--                <el-radio :label="item.value" :key="item.value" v-for="item in hardwardTypeList">{{item.label}}</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+            <el-form-item label="继电器类型" prop="relayCode">
+              <el-select v-model="form.hardwareType" placeholder="请选择继电器" clearable @change="radioChange" @clear="loadClear">
+                <el-option v-for="relay in hardwardTypeList"
+                           :key="relay.value"
+                           :label="relay.label"
+                           :value="relay.value">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="通风类型" label-width="1rem">
               <el-radio-group v-model="form.pcType">
                 <el-radio :label="item.value" :key="item.value" v-for="item in hardwardTypeListOne">{{item.label}}</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="绑定继电器" prop="relayCode" v-if="form.hardwareType==1">
+            <el-form-item label="绑定继电器" prop="relayCode" v-if="form.hardwareType==1 || form.hardwareType==3">
               <el-select v-model="form.relayCode" placeholder="请选择继电器" clearable @change="loadRelayNum" @clear="loadClear">
                 <el-option v-for="relay in relayList"
                            :key="relay.code"
@@ -252,7 +261,8 @@
         ],
         hardwardTypeList:[
           {value:1,label:"老继电器"},
-          {value:2,label:"新继电器"}
+          {value:2,label:"新继电器"},
+          {value:3,label:"泥人继电器"}
         ],
         hardwardTypeListOne:[
           {value:0,label:"排风扇"},
@@ -284,6 +294,19 @@
             list.push(obj);
           }
           self.relayNumList = list;
+        }else if(this.form.hardwareType==3){
+          this.relayNumList =[
+            {name:1},
+            {name:2},
+            {name:3},
+            {name:4},
+            {name:5},
+            {name:6},
+            {name:7},
+            {name:8},
+            {name:9},
+            {name:10},
+          ]
         }
       },
       async tableButton(row){
@@ -513,7 +536,23 @@
           }
           list.push(obj);
         }
-        this.relayNumList = list;
+        console.log(this.relayNumList)
+        if(list.length>0){
+          this.relayNumList = list;
+        }else{
+          this.relayNumList =[
+            {name:1},
+            {name:2},
+            {name:3},
+            {name:4},
+            {name:5},
+            {name:6},
+            {name:7},
+            {name:8},
+            {name:9},
+            {name:10},
+          ]
+        }
       },
       loadHardware(){
         let self = this;