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

.env.production

@@ -12,12 +12,12 @@ ENV = 'production'
 
 # ####################外网接口配置####################
 
-VUE_APP_BASE_API = 'lab.zjznai.com/labAppTest'
+VUE_APP_BASE_API = 'lab-demo.sxitdlc.com/appTest'
 
 
 
 # ####################内网接口配置####################
 
-VUE_APP_BASE_LOCAL_API = '192.168.1.43/labSystem'
+VUE_APP_BASE_LOCAL_API = '192.168.1.88/labSystem'
 
 

src/views/safetyCheck/checkConfiguration/configDialog.vue

@@ -39,7 +39,7 @@
           <div class="dept-table-max-box">
             <el-form :model="userQueryParamsLeft" class="form-box" ref="queryForm" :inline="true" label-width="50px">
               <el-form-item label="" prop="deptId">
-                <el-select v-model="userQueryParamsLeft.deptId" clearable placeholder="选择部门" style="width: 110px">
+                <el-select v-model="userQueryParamsLeft.deptId" clearable @change="userHandleQueryLeft" placeholder="选择部门" style="width: 110px">
                   <el-option
                     v-for="item in deptSelectList"
                     :key="item.deptId"
@@ -104,7 +104,7 @@
           <div class="dept-table-max-box">
             <el-form :model="userQueryParamsRight" class="form-box" ref="queryForm" :inline="true" label-width="50px">
               <el-form-item label="" prop="deptId">
-                <el-select v-model="userQueryParamsRight.deptId" clearable placeholder="选择部门" style="width: 110px">
+                <el-select v-model="userQueryParamsRight.deptId" clearable @change="userHandleQueryRight" placeholder="选择部门" style="width: 110px">
                   <el-option
                     v-for="item in deptSelectList"
                     :key="item.deptId"

src/views/safetyCheck/dataStatistics/checkIndexStatistics.vue

@@ -126,6 +126,7 @@
     },
     methods:{
       initializationInterface(){
+        let self = this;
         this.$set(this,'queryParams',{
           pageNum:1,
           pageSize:20,
@@ -146,7 +147,9 @@
           }else{
             this.$set(this.queryParams,'deptId','')
           }
-          this.getList();
+          setTimeout(function(){
+            self.getList();
+          },200);
         })
       },
       //实验室搜索

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/addDialog.vue

@@ -1022,9 +1022,9 @@
           maxTime = this.getMonthFinalDay(year,12);
         }
         let timeListA = minTime.split('-')
-        minTime = timeListA[0]+'-'+(timeListA[1]<10?'0'+timeListA[1]:timeListA[1])+'-'+(timeListA[2]<10?'0'+timeListA[1]:timeListA[2])
+        minTime = timeListA[0]+'-'+(timeListA[1]<10?'0'+timeListA[1]:timeListA[1])+'-'+(timeListA[2]<10?'0'+timeListA[2]:timeListA[2])
         let timeListB = maxTime.split('-')
-        maxTime = timeListB[0]+'-'+(timeListB[1]<10?'0'+timeListB[1]:timeListB[1])+'-'+(timeListB[2]<10?'0'+timeListB[1]:timeListB[2])
+        maxTime = timeListB[0]+'-'+(timeListB[1]<10?'0'+timeListB[1]:timeListB[1])+'-'+(timeListB[2]<10?'0'+timeListB[2]:timeListB[2])
         this.$set(this.dialogForm,'dateRange',[minTime,maxTime]);
       },
       //返回指定月份最后一天

src/views/safetyCheck/schoolInspection/inspectionGroup/addDialog.vue

@@ -74,7 +74,7 @@
       <div class="dept-table-max-box">
         <el-form :model="userQueryParamsLeft" class="form-box" ref="queryForm" :inline="true" label-width="50px">
           <el-form-item label="" prop="deptId">
-            <el-select v-model="userQueryParamsLeft.deptId" clearable placeholder="选择部门" style="width: 110px">
+            <el-select v-model="userQueryParamsLeft.deptId" @change="userHandleQueryLeft" clearable placeholder="选择部门" style="width: 110px">
               <el-option
                 v-for="item in deptSelectList"
                 :key="item.deptId"
@@ -124,7 +124,7 @@
         <div class="dept-table-max-box">
           <el-form :model="userQueryParamsRight" class="form-box" ref="queryForm" :inline="true" label-width="50px">
             <el-form-item label="" prop="deptId">
-              <el-select v-model="userQueryParamsRight.deptId" clearable placeholder="选择部门" style="width: 110px">
+              <el-select v-model="userQueryParamsRight.deptId" clearable @change="userHandleQueryRight" placeholder="选择部门" style="width: 110px">
                 <el-option
                   v-for="item in deptSelectList"
                   :key="item.deptId"

src/views/safetyCheck/schoolInspection/inspectionGroup/index.vue

@@ -125,14 +125,14 @@
       addDialogOpen(type,data){
         if(type==1){
           this.$set(this,'addDialogData',{
-            title:"新增巡察组",
+            title:"新增巡查组",
             addType:true,
             lookInfoType:false,
           })
           this.$set(this,'addDialogType',true)
         }else if(type == 2){
           this.$set(this,'addDialogData',{
-            title:"编辑巡察组",
+            title:"编辑巡查组",
             addType:false,
             lookInfoType:false,
             id:data.id
@@ -140,7 +140,7 @@
           this.$set(this,'addDialogType',true)
         }else if(type == 3){
           this.$set(this,'addDialogData',{
-            title:"巡察组详情",
+            title:"巡查组详情",
             addType:false,
             lookInfoType:true,
             id:data.id

src/views/safetyCheck/schoolInspection/inspectionPlan/addDialog.vue

@@ -445,7 +445,7 @@
         <div class="dept-table-max-box">
           <el-form :model="userQueryParamsLeft" class="form-box" ref="queryForm" :inline="true" label-width="50px">
             <el-form-item label="" prop="deptId">
-              <el-select v-model="userQueryParamsLeft.deptId" clearable placeholder="选择部门" style="width: 110px">
+              <el-select v-model="userQueryParamsLeft.deptId" clearable @change="userHandleQueryLeft" placeholder="选择部门" style="width: 110px">
                 <el-option
                   v-for="item in deptSelectList"
                   :key="item.deptId"
@@ -495,7 +495,7 @@
         <div class="dept-table-max-box">
           <el-form :model="userQueryParamsRight" class="form-box" ref="queryForm" :inline="true" label-width="50px">
             <el-form-item label="" prop="deptId">
-              <el-select v-model="userQueryParamsRight.deptId" clearable placeholder="选择部门" style="width: 110px">
+              <el-select v-model="userQueryParamsRight.deptId" clearable @change="userHandleQueryRight" placeholder="选择部门" style="width: 110px">
                 <el-option
                   v-for="item in deptSelectList"
                   :key="item.deptId"
@@ -1263,9 +1263,9 @@ export default {
         maxTime = this.getMonthFinalDay(year,12);
       }
       let timeListA = minTime.split('-')
-      minTime = timeListA[0]+'-'+(timeListA[1]<10?'0'+timeListA[1]:timeListA[1])+'-'+(timeListA[2]<10?'0'+timeListA[1]:timeListA[2])
+      minTime = timeListA[0]+'-'+(timeListA[1]<10?'0'+timeListA[1]:timeListA[1])+'-'+(timeListA[2]<10?'0'+timeListA[2]:timeListA[2])
       let timeListB = maxTime.split('-')
-      maxTime = timeListB[0]+'-'+(timeListB[1]<10?'0'+timeListB[1]:timeListB[1])+'-'+(timeListB[2]<10?'0'+timeListB[1]:timeListB[2])
+      maxTime = timeListB[0]+'-'+(timeListB[1]<10?'0'+timeListB[1]:timeListB[1])+'-'+(timeListB[2]<10?'0'+timeListB[2]:timeListB[2])
       this.$set(this.dialogForm,'dateRange',[minTime,maxTime]);
     },
     //返回指定月份最后一天

src/views/safetyCheck/startInspection/index.vue

@@ -29,13 +29,6 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <div style="display: flex" v-if="planType == 1">
-                <el-form-item label="计划标题" prop="title">
-                  <el-input v-model="addForm.title" placeholder="请输入计划标题" maxLength="30" style="width: 500px"/>
-                </el-form-item>
-                <p class="inquire-button-one" @click="planButton(2)"
-                   style="font-size:14px;margin-left:20px;width:100px;" v-if="planList[0]">选择计划</p>
-              </div>
               <el-form-item label="检查类型" prop="checkCategory" >
                 <el-select :disabled="planType==2" v-model="addForm.checkCategory" @change="checkCategoryChange" placeholder="请选择检查类型"
                            style="width: 500px;height: 40px;">
@@ -47,6 +40,14 @@
                   </el-option>
                 </el-select>
               </el-form-item>
+              <div style="display: flex" v-if="planType == 1">
+                <el-form-item label="计划标题" prop="title">
+                  <el-input v-model="addForm.title" placeholder="请输入计划标题" maxLength="30" style="width: 500px"/>
+                </el-form-item>
+                <p class="inquire-button-one" @click="planButton(2)"
+                   style="font-size:14px;margin-left:20px;width:100px;" v-if="planList[0]">选择计划</p>
+              </div>
+
               <div style="display: flex" v-if="planType == 2">
                 <el-form-item label="计划" prop="id">
                   <el-select v-model="addForm.id" placeholder="请选择计划"

src/views/safetyEducationExam/trainingCourse/addDialog.vue

@@ -150,7 +150,7 @@
         <div class="dept-table-max-box">
           <el-form :model="userQueryParamsLeft" class="form-box" ref="queryForm" :inline="true" label-width="50px">
             <el-form-item label="" prop="deptId">
-              <el-select v-model="userQueryParamsLeft.deptId" clearable placeholder="选择部门" style="width: 110px">
+              <el-select v-model="userQueryParamsLeft.deptId" clearable @change="userHandleQueryLeft" placeholder="选择部门" style="width: 110px">
                 <el-option
                   v-for="item in deptOptions"
                   :key="item.deptId"
@@ -201,7 +201,7 @@
         <div class="dept-table-max-box">
           <el-form :model="userQueryParamsRight" class="form-box" ref="queryForm" :inline="true" label-width="50px">
             <el-form-item label="" prop="deptId">
-              <el-select v-model="userQueryParamsRight.deptId" clearable placeholder="选择部门" style="width: 110px">
+              <el-select v-model="userQueryParamsRight.deptId" clearable @change="userHandleQueryRight" placeholder="选择部门" style="width: 110px">
                 <el-option
                   v-for="item in deptOptions"
                   :key="item.deptId"