Merge branch 'VERSIONS-AnQuanJianCha-1223' into leb-web-dev

src/api/safetyCheck/index.js

@@ -504,9 +504,9 @@ export function securityCheckDangerTodayDangerList (query) {
   })
 }
 // 各单位隐患整改统计-更细数据-校级
-export function reportHazardReportItemsDeptRefresh (query) {
+export function reportHazardReportItemsScatterDeptRefresh (query) {
   return request({
-    url: '/report/hazardReport/itemsDeptRefresh',
+    url: '/report/hazardReport/itemsScatterDeptRefresh',
     method: 'get',
     params: query
   })

src/views/integratedManagement/laboratoryManagement/classifiedGrading/classified.vue

@@ -135,6 +135,7 @@ import {
         levelSort:0,
       },
       conditionList:[],
+      conditionListData:[],
       // 表单校验
       rules: {
         levelName: [
@@ -166,8 +167,6 @@ import {
     },
     //单个选择按钮
     handleCheckedCitiesChange(value,item) {
-      console.log(value)
-      console.log(item)
       let checkedCount = value.length;
       item.checkAll = checkedCount === item.smallClassList.length;
     },
@@ -179,7 +178,7 @@ import {
           item.checkAll=false;
           item.checkedCities=[];
         })
-        this.$set(this,'conditionList',response.data)
+        this.$set(this,'conditionListData',response.data)
       });
     },
 
@@ -230,7 +229,7 @@ import {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.laboratoryClassTypeGetClassCriteriaLevel();
+      this.$set(this,'conditionList',JSON.parse(JSON.stringify(this.conditionListData)));
       this.reset();
       this.title = "新增安全分级";
       this.open = true;
@@ -238,6 +237,7 @@ import {
     /** 修改按钮操作 */
     handleUpdate(row) {
       let self=this;
+      this.$set(this,'conditionList',JSON.parse(JSON.stringify(this.conditionListData)));
       this.reset();
       laboratoryClassLevelDetail({id:row.levelId}).then( response => {
         this.$set(this,'form',{

src/views/integratedManagement/laboratoryManagement/classifiedGrading/classtype.vue

@@ -129,6 +129,7 @@ export default {
         typeSort:0,
       },
       conditionList:[],
+      conditionListData:[],
       // 表单校验
       rules: {
         typeName: [
@@ -170,7 +171,7 @@ export default {
           item.checkAll=false;
           item.checkedCities=[];
         })
-        this.$set(this,'conditionList',response.data)
+        this.$set(this,'conditionListData',response.data)
       });
     },
 
@@ -220,7 +221,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.laboratoryClassTypeGetClassCriteria();
+      this.$set(this,'conditionList',JSON.parse(JSON.stringify(this.conditionListData)));
       this.reset();
       this.open = true;
       this.title = "新增安全分类";
@@ -228,6 +229,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       let self=this;
+      this.$set(this,'conditionList',JSON.parse(JSON.stringify(this.conditionListData)));
       this.reset();
       laboratoryClassTypeDetail({id:row.typeId}).then( response => {
         this.$set(this,'form',{
@@ -235,8 +237,6 @@ export default {
           typeName:response.data.typeName,
           typeSort:response.data.typeSort,
         });
-
-
         //原数组
         self.conditionList.forEach(function(item){
           let list=[];

src/views/iotDevice/intelligenceIot/iotHardware/index.vue

@@ -20,7 +20,7 @@
                  :inline="true" style="width:100%;">
           <el-form-item label="" prop="searchValue" label-width="50px">
             <el-input
-              maxLength="30"
+              maxLength="50"
               v-model="queryParams.searchValue"
               placeholder="请输入名称"
               style="width: 140px"

src/views/safetyCheck/components/rectificationReportDom.vue

@@ -68,8 +68,8 @@
             <div v-for="(minItem,minIndex) in item.detailList" :key="minIndex">
               <p class="for-big-title-p-1" style="text-indent: 7px;">{{minItem.index}} {{minItem.subName}}{{minItem.roomNum?minItem.roomNum:''}}房间的问题整改</p>
               <p class="for-big-title-p-1">存在问题描述：{{minItem.checkDesc}}</p>
-              <p class="for-big-title-p-1">整改措施与结果：{{minItem.checkResult}}</p>
-              <p class="for-big-title-p-1">证明材料（文字或图片）：立整立改的条款应附相关文字或整改前后照片对比及注解等；不能立整立改的条款应附整改计划、措施等材料</p>
+              <p class="for-big-title-p-1">整改结果：{{minItem.checkResult}}</p>
+              <p class="for-big-title-p-1">整改措施：{{minItem.checkMeasure}}</p>
               <div class="for-big-img-box">
                 <img class="for-big-img" :src="minItem.checkImg1" v-if="minItem.checkImg1" @click="lookImgButton(minItem.checkImg1)">
                 <img class="for-big-img" :src="minItem.checkImg2" v-if="minItem.checkImg2" @click="lookImgButton(minItem.checkImg2)">
@@ -90,8 +90,8 @@
               <p>问题的整改</p>
             </div>
             <p class="for-big-title-p-1">（1）存在问题描述：{{item.checkDesc}}</p>
-            <p class="for-big-title-p-1">（2）整改措施与结果：{{item.checkResult}}</p>
-            <p class="for-big-title-p-1">（3）证明材料（文字或图片）：立整立改的条款应附相关文字或整改前后照片对比及注解等；不能立整立改的条款应附整改计划、措施等材料</p>
+            <p class="for-big-title-p-1">（2）整改结果：{{item.checkResult}}</p>
+            <p class="for-big-title-p-1">（3）整改措施：{{item.checkMeasure}}</p>
             <div class="for-big-img-box">
               <img class="for-big-img" :src="item.checkImg1" v-if="item.checkImg1" @click="lookImgButton(item.checkImg1)">
               <img class="for-big-img" :src="item.checkImg2" v-if="item.checkImg2" @click="lookImgButton(item.checkImg2)">

src/views/safetyCheck/dataStatistics/hiddenDangerStatistics.vue

@@ -162,7 +162,7 @@ import {
   reportHazardReportDeptList,
   reportHazardReportDeptTop,
   securityCheckDangerTodayDangerList,
-  reportHazardReportItemsDeptRefresh,
+  reportHazardReportItemsScatterDeptRefresh,
   reportHazardReportOneItemsScatter,
   reportHazardReportOneItemsScatterTop,
   reportHazardReportDeptListCollege,
@@ -377,7 +377,7 @@ export default {
         ],
         series : [
           {
-            name:'整改完成率（%）',
+            name:'隐患统计数',
             label: {
               show: true,
               color:'#0183FA',
@@ -530,7 +530,7 @@ export default {
         //数据刷新
         securityCheckDangerTodayDangerList().then(response => {
           if(response.data>0){
-            reportHazardReportItemsDeptRefresh().then(response => {
+            reportHazardReportItemsScatterDeptRefresh().then(response => {
               this.msgSuccess(response.message)
               this.getList();
             });

src/views/safetyCheck/safetyHazard/rectificationReport/index.vue

@@ -168,7 +168,7 @@
       </div>
     </div>
     <list-page :propsData="propsData" v-if="pageType === 2"></list-page>
-    <el-dialog class="rectificationNotice-dialog" title='整改通知书' width="836px" append-to-body
+    <el-dialog class="rectificationNotice-dialog" title='整改报告' width="836px" append-to-body
                :visible.sync="propsReportDomType" v-if="propsReportDomType" @close="dialogOff()"
                :close-on-click-modal="false" :close-on-press-escape="false">
       <div class="scrollbar-box" style="height:600px;">