heyang

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

@@ -67,6 +67,11 @@
             <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
           </el-table-column>
           <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="150"/>
+          <el-table-column label="检查类型" align="center" prop="checkRange" show-overflow-tooltip width="120">
+            <template slot-scope="scope">
+              <p>{{scope.row.checkCategory==1?'综合检查':(scope.row.checkCategory==2?'专项检查':'-')}}</p>
+            </template>
+          </el-table-column>
           <el-table-column label="检查状态" align="center" prop="manageStatus" show-overflow-tooltip width="90">
             <template slot-scope="scope">
               <p :class="scope.row.manageStatus==0?'manageStatus-color-1':(scope.row.manageStatus==1?'manageStatus-color-2':(scope.row.manageStatus==2?'manageStatus-color-3':''))">{{scope.row.manageStatus==0?'待检查':(scope.row.manageStatus==1?'检查中':(scope.row.manageStatus==2?'已检查':''))}}</p>

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

@@ -1122,7 +1122,6 @@ export default {
         this.$set(this,'addDialogBoxType',type);
       }else if(type == 6){//检查设备
         //设备
-        this.$set(self,'deviceDialogTableDataList',JSON.parse(JSON.stringify(this.dialogTableList)));
         this.deviceResetQueryLeft();
         this.deviceResetQueryRight();
         this.$set(this,'addDialogBoxType',type);
@@ -1564,9 +1563,15 @@ export default {
       let self = this;
       let leftObj = JSON.parse(JSON.stringify(this.deviceQueryParamsLeft));
       leftObj.selectedHazardIds = [];
-      for(let i=0;i<self.deviceDialogTableDataList.length;i++){
-        leftObj.selectedHazardIds.push(self.deviceDialogTableDataList[i].id);
+
+      if(self.deviceDialogTableDataList[0]){
+        for(let i=0;i<self.deviceDialogTableDataList.length;i++){
+          leftObj.selectedHazardIds.push(self.deviceDialogTableDataList[i].id);
+        }
+      }else{
+        leftObj.selectedHazardIds=self.dialogForm.hazardIds.split(',');
       }
+
       findDeviceList(leftObj).then(response => {
         this.deviceTotalLeft = response.total;
         this.deviceTableListLeft = response.rows;
@@ -1596,8 +1601,12 @@ export default {
       let self = this;
       let rightObj = JSON.parse(JSON.stringify(this.deviceQueryParamsRight));
       rightObj.hazardIds = [];
-      for(let i=0;i<self.deviceDialogTableDataList.length;i++){
-        rightObj.hazardIds.push(self.deviceDialogTableDataList[i].id);
+      if(self.deviceDialogTableDataList[0]){
+        for(let i=0;i<self.deviceDialogTableDataList.length;i++){
+          rightObj.hazardIds.push(self.deviceDialogTableDataList[i].id);
+        }
+      }else{
+        rightObj.hazardIds=self.dialogForm.hazardIds.split(',');
       }
       findDeviceList(rightObj).then(response => {
         this.deviceTotalRight = response.total;

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

@@ -73,6 +73,11 @@
             <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
           </el-table-column>
           <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="150"/>
+          <el-table-column label="检查类型" align="center" prop="checkRange" show-overflow-tooltip width="120">
+            <template slot-scope="scope">
+              <p>{{scope.row.checkCategory==1?'综合检查':(scope.row.checkCategory==2?'专项检查':'-')}}</p>
+            </template>
+          </el-table-column>
           <el-table-column label="检查状态" align="center" prop="manageStatus" show-overflow-tooltip width="90">
             <template slot-scope="scope">
               <p :class="scope.row.manageStatus==0?'manageStatus-color-1':(scope.row.manageStatus==1?'manageStatus-color-2':(scope.row.manageStatus==2?'manageStatus-color-3':''))">{{scope.row.manageStatus==0?'待检查':(scope.row.manageStatus==1?'检查中':(scope.row.manageStatus==2?'已检查':''))}}</p>

src/views/safetyEducationExam/trainingCourse/addDialog.vue

@@ -400,7 +400,7 @@
             this.$set(this,'secondaryTeacherOptions',secondaryTeacherList);
           }
           //处理实验室数据&手动输入场地
-          if(this.addDialogData.subId){
+          if(this.addDialogData.subId && this.addDialogData.subId!=-1){
             obj.subId = this.addDialogData.subId;
             obj.position = "";
             obj.selectType = 1;

src/views/safetyEducationExam/trainingCourse/index.vue

@@ -44,7 +44,7 @@
         <el-table-column label="学院" prop="place" width="180" show-overflow-tooltip/>
         <el-table-column label="上课地点" prop="position" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{scope.row.subId?scope.row.subName+'-'+scope.row.subRoom:scope.row.position}}
+            {{(scope.row.subId && scope.row.subId !=-1)?scope.row.subName+'-'+scope.row.subRoom:scope.row.position}}
           </template>
         </el-table-column>
         <el-table-column label="主讲老师" prop="lecturerName" width="100" show-overflow-tooltip/>

src/views/safetyEducationExam/trainingCourse/infoDialog.vue

@@ -203,7 +203,7 @@
           lecturerName:this.infoDialogData.lecturerName,
           tutorName:this.infoDialogData.tutorName,
           userIds:this.infoDialogData.userIds,
-          place:this.infoDialogData.subId?this.infoDialogData.place+' , '+this.infoDialogData.subName:this.infoDialogData.place+' , '+this.infoDialogData.position,
+          place:(this.infoDialogData.subId && this.infoDialogData.subId!=-1)?this.infoDialogData.place+' , '+this.infoDialogData.subName:this.infoDialogData.place+' , '+this.infoDialogData.position,
           courseDate:this.infoDialogData.coStartDate,
           courseTime:this.infoDialogData.coStartTime+'至'+this.infoDialogData.coEndTime,
           content:this.infoDialogData.content,