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/views/comprehensive/laboratoryManagement/building/buildingDetails.vue

@@ -640,19 +640,21 @@
           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);
@@ -1036,7 +1038,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/personnel/onDutyConfiguration/index.vue

@@ -330,8 +330,8 @@
         }
         this.loading = true;
         let obj = JSON.parse(JSON.stringify(this.queryParams))
-        obj.subjectIds = self.getSubList;
-        obj.dateList = self.checkList.sort(self.compare('time', 'inverted'));
+        obj.subjectIds = self.getSubList+''
+        obj.dateList = self.checkList.sort(self.compare('time', 'inverted'))+'';
         getUserDutyList(obj).then( response => {
           //处理用户数据
           for(let i=0;i<self.userCheckList.length;i++){