Merge branch 'web-v2' into web-v2-pro

src/utils/ruoyi.js

@@ -310,7 +310,8 @@ export function spaceJudgmentHTML(rule, value, callback) {
  */
 export function urlJudge(url) {
   // let src = '';
-  url = '/admin/statics'+url.split('statics')[1]
+  // 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)
@@ -328,5 +329,7 @@ export function urlJudge(url) {
   // }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
 }

src/views/comprehensive/laboratoryManagement/accessAuthorization/lookImpower.vue

@@ -27,8 +27,8 @@
         </el-table-column>
         <el-table-column label="授权状态" align="left" prop="isretry">
           <template slot-scope="scope">
-            <span v-if="scope.row.impowerStatus">成功</span>
-            <span v-if="!scope.row.impowerStatus">失败</span>
+            <span v-if="scope.row.state">成功</span>
+            <span v-if="!scope.row.state">失败</span>
           </template>
         </el-table-column>
         <el-table-column label="类别" align="left" prop="userType"></el-table-column>

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

@@ -100,7 +100,7 @@
             </el-form-item>
             <el-form-item label="实验室" prop="subjectId">
               <el-select v-model="form.subjectId" placeholder="请选择实验室">
-                <el-option v-for="lab in labListOptions"
+                <el-option style="max-width: 200px" v-for="lab in labListOptions"
                            :key="lab.id"
                            :label="lab.name"
                            :value="lab.id">

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

@@ -130,7 +130,7 @@
             </el-form-item>
             <el-form-item label="实验室" prop="subjectId">
               <el-select v-model="form.subjectId" placeholder="请选择实验室">
-                <el-option v-for="lab in labListOptions"
+                <el-option style="max-width: 200px" v-for="lab in labListOptions"
                            :key="lab.id"
                            :label="lab.name"
                            :value="lab.id">

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

@@ -79,7 +79,7 @@
             </el-form-item>
             <el-form-item label="实验室" prop="subjectId">
               <el-select v-model="form.subjectId" placeholder="请选择实验室">
-                <el-option v-for="lab in labListOptions"
+                <el-option style="max-width: 200px" v-for="lab in labListOptions"
                            :key="lab.id"
                            :label="lab.name"
                            :value="lab.id">

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

@@ -128,7 +128,7 @@
             </el-form-item>
             <el-form-item label="实验室" prop="subjectId">
               <el-select v-model="form.subjectId" placeholder="请选择实验室" :disabled="disabledType">
-                <el-option v-for="lab in labListOptions"
+                <el-option style="max-width: 200px" v-for="lab in labListOptions"
                            :key="lab.id"
                            :label="lab.name"
                            :value="lab.id">

src/views/newEvacuationBigDataHome.vue

@@ -213,7 +213,9 @@
         if(this.maxMapList[num]){
           let list = [];
           let index = 0;
-          if(num-2<=0 && num+2>=(self.maxMapList.length-1)){
+          if(num == self.maxMapList.length-1){
+            index = 0
+          }else if(num-2<=0 && num+2>=(self.maxMapList.length-1)){
             index = 0;
           }else if (num > (self.maxMapList.length-6) && (num-2) > 0){
             if(num + 2 > (self.maxMapList.length-1)){

src/views/securityCheck/checkRecord/addCheck.vue

@@ -508,6 +508,9 @@ export default {
             obj.detailsList[i].jcxId = obj.detailsList[i].jcxId + ',';
             obj.detailsList[i].yhImg = obj.detailsList[i].yhImg + '';
           }
+          for(let b=0;b<obj.detailsList.length;b++){
+            obj.detailsList[b].jcxId= obj.detailsList[b].jcxId.substring(0,(obj.detailsList[b].jcxId.length)-1)
+          }
           obj.zgStatus = 0;
           if(type == 1){
             obj.isCg = 1;

src/views/securityCheck/checkRecord/unsubmittedInfo.vue

@@ -590,6 +590,9 @@
               obj.detailsList[i].yhImg = obj.detailsList[i].yhImg + '';
               obj.detailsList[i].voice = null;
             }
+            for(let b=0;b<obj.detailsList.length;b++){
+              obj.detailsList[b].jcxId= obj.detailsList[b].jcxId.substring(0,(obj.detailsList[b].jcxId.length)-1)
+            }
             obj.zgStatus = 0;
             obj.ids=this.hiddenDangerIdList
             if(type == 1){