flx：修改管控清单bug

src/views/projectFront/safeManage/v2/riskRankingComponents/controlList.vue

@@ -10,8 +10,14 @@
             border
             v-model="queryParams.controlListType"
           >
-            <el-radio-button :label="1">风险点({{RiskListPointCountRiskNumInfo.riskPointNum}})</el-radio-button>
+            <el-radio-button :label="1"
-            <el-radio-button :label="2">危险源({{RiskListPointCountRiskNumInfo.hazardSourceNum}})</el-radio-button>
+              >风险点({{ RiskListPointCountRiskNumInfo.riskPointNum }})</el-radio-button
+            >
+            <el-radio-button :label="2"
+              >危险源({{
+                RiskListPointCountRiskNumInfo.hazardSourceNum
+              }})</el-radio-button
+            >
           </el-radio-group>
         </div>
         <el-form size="medium" :model="queryParams" ref="queryForm" :inline="true">
@@ -31,7 +37,10 @@
             </el-select>
           </el-form-item>
           <el-form-item prop="dynamicType">
-            <el-radio-group @change="onControlListTypeChange" v-model="queryParams.dynamicType">
+            <el-radio-group
+              @change="onControlListTypeChange"
+              v-model="queryParams.dynamicType"
+            >
               <el-radio :label="1">动态风险</el-radio>
               <el-radio :label="2">静态风险</el-radio>
             </el-radio-group>
@@ -192,8 +201,15 @@
                 <el-option label="未落实" :value="0"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item v-if="queryParams.dynamicType == 1" label="风险点名称" prop="riskPointName">
+            <el-form-item
-              <el-input v-model="queryParams.riskPointName" placeholder="请输入"></el-input>
+              v-if="queryParams.dynamicType == 1"
+              label="风险点名称"
+              prop="riskPointName"
+            >
+              <el-input
+                v-model="queryParams.riskPointName"
+                placeholder="请输入"
+              ></el-input>
             </el-form-item>
           </template>
         </el-form>
@@ -621,10 +637,7 @@
               label="管控情况"
             >
               <template slot-scope="scope">
-                <div
+                <div @click="openSourceDanger(scope.row)" v-if="scope.row.workable == 1">
-                  @click="openSourceDanger(scope.row)"
-                  v-if="scope.row.workable == 1"
-                >
                   已落实(<span class="color_518">查看落实情况</span>)
                 </div>
                 <div v-else>--</div>
@@ -762,10 +775,7 @@
               label="管控情况"
             >
               <template slot-scope="scope">
-                <div
+                <div @click="openSourceDanger(scope.row)" v-if="scope.row.workable == 1">
-                  @click="openSourceDanger(scope.row)"
-                  v-if="scope.row.workable == 1"
-                >
                   已落实(<span class="color_518">查看落实情况</span>)
                 </div>
                 <div v-else>--</div>
@@ -913,7 +923,10 @@
                 ></el-input>
               </el-form-item>
               <el-form-item label="规格型号" prop="specificationsModel">
-                <el-input placeholder="请输入" v-model="setForm.specificationsModel"></el-input>
+                <el-input
+                  placeholder="请输入"
+                  v-model="setForm.specificationsModel"
+                ></el-input>
               </el-form-item>
               <el-form-item label="所在位置" prop="location">
                 <el-input placeholder="请输入" v-model="setForm.location"></el-input>
@@ -1104,27 +1117,53 @@
           class="new-tables"
         >
           <el-table-column type="selection" align="center" width="55"></el-table-column>
-          <el-table-column width="180" show-overflow-tooltip prop="subProjectWorkTask" label="分部分项工程/作业任务">
+          <el-table-column
+            width="180"
+            show-overflow-tooltip
+            prop="subProjectWorkTask"
+            label="分部分项工程/作业任务"
+          >
             <template slot-scope="scope">
               {{ scope.row.subProjectWorkTask ? scope.row.subProjectWorkTask : "--" }}
             </template>
           </el-table-column>
-          <el-table-column width="160" show-overflow-tooltip align="center" prop="workNameContent" label="作业活动名称及内容">
+          <el-table-column
+            width="160"
+            show-overflow-tooltip
+            align="center"
+            prop="workNameContent"
+            label="作业活动名称及内容"
+          >
             <template slot-scope="scope">
               {{ scope.row.workNameContent ? scope.row.workNameContent : "--" }}
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip align="center" prop="riskDescription" label="风险描述">
+          <el-table-column
+            show-overflow-tooltip
+            align="center"
+            prop="riskDescription"
+            label="风险描述"
+          >
             <template slot-scope="scope">
               {{ scope.row.riskDescription ? scope.row.riskDescription : "--" }}
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip align="center" prop="accidentTypeId" label="潜在事故类型">
+          <el-table-column
+            show-overflow-tooltip
+            align="center"
+            prop="accidentTypeId"
+            label="潜在事故类型"
+          >
             <template slot-scope="scope">
               {{ accidentTypeUp(scope.row.accidentTypeId) }}
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip align="center" prop="areaLocation" label="区域/部位">
+          <el-table-column
+            show-overflow-tooltip
+            align="center"
+            prop="areaLocation"
+            label="区域/部位"
+          >
             <template slot-scope="scope">
               {{ scope.row.areaLocation ? scope.row.areaLocation : "--" }}
             </template>
@@ -1143,7 +1182,12 @@
               }}
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip prop="validTime" label="有效时间" align="center">
+          <el-table-column
+            show-overflow-tooltip
+            prop="validTime"
+            label="有效时间"
+            align="center"
+          >
             <template slot-scope="scope">
               <template v-if="scope.row.effectiveTimeBegin">
                 {{ scope.row.effectiveTimeBegin }}至{{ scope.row.effectiveTimeEnd }}
@@ -1151,22 +1195,45 @@
               <div class="color_e400" v-else>未设置</div>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip prop="activityFrequency" label="活动频次" align="center">
+          <el-table-column
+            show-overflow-tooltip
+            prop="activityFrequency"
+            label="活动频次"
+            align="center"
+          >
             <template slot-scope="scope">
               {{ scope.row.activityFrequency ? scope.row.activityFrequency : "--" }}
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip prop="updateTime" label="更新时间" align="center">
+          <el-table-column
+            show-overflow-tooltip
+            prop="updateTime"
+            label="更新时间"
+            align="center"
+          >
             <template slot-scope="scope">
               {{ scope.row.updateTime ? scope.row.updateTime : "--" }}
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip prop="identificationName" label="辨识人/辨识时间" align="center">
+          <el-table-column
+            show-overflow-tooltip
+            prop="identificationName"
+            label="辨识人/辨识时间"
+            align="center"
+          >
             <template slot-scope="scope">
-               {{ scope.row.identificationName ? scope.row.identificationName : "--" }}/{{ scope.row.identificationTime ? scope.row.identificationTime : "--" }}
+              {{ scope.row.identificationName ? scope.row.identificationName : "--" }}/{{
+                scope.row.identificationTime ? scope.row.identificationTime : "--"
+              }}
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip prop="remark" label="备注" align="center"> </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="remark"
+            label="备注"
+            align="center"
+          >
+          </el-table-column>
           <el-table-column width="220" label="操作" align="center">
             <template slot-scope="scope">
               <div class="flex2 edit">
@@ -1322,7 +1389,11 @@
       <div class="dialog_content">
         <el-form class="new-form" size="medium" :inline="true">
           <el-form-item>
-            <el-input @blur="getHazardSourceList" v-model="hazardSourceInfo.fullPath" placeholder="请输入"></el-input>
+            <el-input
+              @blur="getHazardSourceList"
+              v-model="hazardSourceInfo.fullPath"
+              placeholder="请输入"
+            ></el-input>
           </el-form-item>
         </el-form>
         <el-table
@@ -1333,19 +1404,38 @@
           class="new-tables"
         >
           <el-table-column type="selection" align="center" width="55"></el-table-column>
-          <el-table-column show-overflow-tooltip prop="fullPath" label="分部分项工程/作业任务">
+          <el-table-column
+            show-overflow-tooltip
+            prop="fullPath"
+            label="分部分项工程/作业任务"
+          >
             <template slot-scope="scope">
               {{ fullPathCutOut(scope.row.fullPath, 4) }}
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip align="center" prop="workNameContent" label="作业活动名称及内容">
+          <el-table-column
+            show-overflow-tooltip
+            align="center"
+            prop="workNameContent"
+            label="作业活动名称及内容"
+          >
             <template slot-scope="scope">
               {{ fullPathCutOut(scope.row.fullPath, 2) }}
             </template>
           </el-table-column>
-          <el-table-column align="center" show-overflow-tooltip prop="riskDescription" label="风险描述">
+          <el-table-column
+            align="center"
+            show-overflow-tooltip
+            prop="riskDescription"
+            label="风险描述"
+          >
           </el-table-column>
-          <el-table-column align="center" show-overflow-tooltip prop="riskLevel" label="风险等级">
+          <el-table-column
+            align="center"
+            show-overflow-tooltip
+            prop="riskLevel"
+            label="风险等级"
+          >
             <template slot-scope="scope">
               <span
                 class="riskcolor riskcolor_table"
@@ -1360,7 +1450,12 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column align="center" show-overflow-tooltip prop="accidentTypeId" label="潜在事故类型">
+          <el-table-column
+            align="center"
+            show-overflow-tooltip
+            prop="accidentTypeId"
+            label="潜在事故类型"
+          >
             <template slot-scope="scope">
               {{ accidentTypeUp(scope.row.accidentTypeId) }}
             </template>
@@ -1508,14 +1603,24 @@
       >
         <div class="risk_detail_top">
           <el-form-item label-width="120px" label="风险点名称" prop="riskPointName">
-            <el-tooltip class="item" effect="dark" :content="riskListDetailForm.riskPointName" placement="bottom">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="riskListDetailForm.riskPointName"
+              placement="bottom"
+            >
               <div class="risk_detail_top_box oneLine">
                 {{ riskListDetailForm.riskPointName }}
               </div>
             </el-tooltip>
           </el-form-item>
           <el-form-item label-width="120px" label="风险描述" prop="riskDescription">
-            <el-tooltip class="item" effect="dark" :content="riskListDetailForm.riskDescription" placement="bottom">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="riskListDetailForm.riskDescription"
+              placement="bottom"
+            >
               <div class="risk_detail_top_box oneLine">
                 {{ riskListDetailForm.riskDescription }}
               </div>
@@ -2295,7 +2400,7 @@ export default {
         if (res.success) {
           this.RiskListPointCountRiskNumInfo = res.result;
         }
-      })
+      });
     },
     // 落实记录
     openImplementingRecord(row) {
@@ -2357,9 +2462,19 @@ export default {
       this.riskListDetailType = type;
       this.riskListDetailForm = {
         ...row,
-        lecdData: isJSON(row.lecdData) ? JSON.parse(row.lecdData) : {},
+        lecdData: isJSON(row.lecdData) && row.lecdData != "null"
-        lcdData: isJSON(row.lcdData) ? JSON.parse(row.lcdData) : {},
+          ? JSON.parse(row.lecdData)
-        lsrData: isJSON(row.lsrData) ? JSON.parse(row.lsrData) : {},
+          : {
+              lNumber: "",
+              eNumber: "",
+              cNumber: "",
+            },
+        lcdData: isJSON(row.lcdData) && row.lcdData != "null"
+          ? JSON.parse(row.lcdData)
+          : { lNumber: "", cNumber: "" },
+        lsrData: isJSON(row.lsrData) && row.lsrData != "null"
+          ? JSON.parse(row.lsrData)
+          : { lNumber: "", sNumber: "" },
         specificResponsibilityAreaIds: row.specificResponsibilityAreaIds
           ? row.specificResponsibilityAreaIds.split(",")
           : [],
@@ -2703,7 +2818,7 @@ export default {
       this.queryParams.projectType = "";
       this.queryParams.riskListLibraryId = [];
       this.queryParams.regionIds = [];
-      if(this.queryParams.controlListType == 2) {
+      if (this.queryParams.controlListType == 2) {
         this.queryParams.accidentTypeId = "";
         this.queryParams.identificationTime = [];
         this.queryParams.effectiveTime = [];
@@ -2728,9 +2843,11 @@ export default {
             1: deleteBatchRiskListPointApi,
             2: deleteBatchRiskListSourceApi,
           };
-          const resultFn = this.sourceDangerDialog ? obj[this.queryParams.controlListType] : deleteBatchRiskListSourceApi;
+          const resultFn = this.sourceDangerDialog
+            ? obj[this.queryParams.controlListType]
+            : deleteBatchRiskListSourceApi;
           resultFn({ ids }).then((res) => {
-            if(this.sourceDangerDialog){
+            if (this.sourceDangerDialog) {
               this.getSourceDangerList();
             }
             this.getQualityRegionList();
@@ -2747,7 +2864,9 @@ export default {
         type: "warning",
       })
         .then(() => {
-          const ids = this.$refs.sourceDangerTable.selection.map((item) => item.id).join(",");
+          const ids = this.$refs.sourceDangerTable.selection
+            .map((item) => item.id)
+            .join(",");
           deleteBatchRiskListSourceApi({ ids }).then((res) => {
             this.getSourceDangerList();
             this.getQualityRegionList();
@@ -2798,10 +2917,12 @@ export default {
         projectSn: this.projectSn,
         dynamicType: this.queryParams.dynamicType,
         projectType: this.queryParams.projectType,
-        containLibraryIds: this.queryParams.containLibraryIds.length > 0
+        containLibraryIds:
+          this.queryParams.containLibraryIds.length > 0
             ? this.queryParams.containLibraryIds.join(",")
             : "",
-          regionIds: this.queryParams.regionIds.length > 0
+        regionIds:
+          this.queryParams.regionIds.length > 0
             ? this.queryParams.regionIds.join(",")
             : "",
         pageNo: this.queryParams.pageNo,
@@ -2815,14 +2936,26 @@ export default {
         data = {
           ...data,
           accidentTypeId: this.queryParams.accidentTypeId,
-          identificationTime_begin: this.queryParams.identificationTime.length > 1 ? this.queryParams.identificationTime[0] : "",
+          identificationTime_begin:
-          identificationTime_end: this.queryParams.identificationTime.length > 1 ? this.queryParams.identificationTime[1] : "",
+            this.queryParams.identificationTime.length > 1
-          effectiveTime_begin: this.queryParams.effectiveTime.length > 1 ? this.queryParams.effectiveTime[0] : "",
+              ? this.queryParams.identificationTime[0]
-          effectiveTime_end: this.queryParams.effectiveTime.length > 1 ? this.queryParams.effectiveTime[1] : "",
+              : "",
+          identificationTime_end:
+            this.queryParams.identificationTime.length > 1
+              ? this.queryParams.identificationTime[1]
+              : "",
+          effectiveTime_begin:
+            this.queryParams.effectiveTime.length > 1
+              ? this.queryParams.effectiveTime[0]
+              : "",
+          effectiveTime_end:
+            this.queryParams.effectiveTime.length > 1
+              ? this.queryParams.effectiveTime[1]
+              : "",
           riskLevel: this.queryParams.riskLevel,
           workable: this.queryParams.workable,
         };
-        if(queryParams.dynamicType == 1) {
+        if (this.queryParams.dynamicType == 1) {
           data.riskPointName = this.queryParams.riskPointName;
         }
       }
@@ -2856,25 +2989,25 @@ export default {
         10: "xmgl/riskListSource/downloadRegionQrCode",
       };
 
-      if(command == 1) {
+      if (command == 1) {
         const requestData = {
           pointIds: this.$refs.multipleTable.selection.map((item) => item.id).join(","),
           projectSn: this.projectSn,
         };
-        this.exportDownload(requestData,objFn[command], "风险点清单导出.xlsx");
+        this.exportDownload(requestData, objFn[command], "风险点清单导出.xlsx");
-      }else if(command == 2) {
+      } else if (command == 2) {
         const requestData = {
           sourceIds: this.$refs.multipleTable.selection.map((item) => item.id).join(","),
           projectSn: this.projectSn,
         };
-        this.exportDownload(requestData,objFn[command], "辨识清单导出.xlsx");
+        this.exportDownload(requestData, objFn[command], "辨识清单导出.xlsx");
-      }else if(command == 3) {
+      } else if (command == 3) {
         const requestData = {
           sourceIds: this.$refs.multipleTable.selection.map((item) => item.id).join(","),
           projectSn: this.projectSn,
         };
-        this.exportDownload(requestData,objFn[command], "危险源清单导出.xlsx");
+        this.exportDownload(requestData, objFn[command], "危险源清单导出.xlsx");
-      } else if(command == 10) {
+      } else if (command == 10) {
         const requestData = {
           regionIds: this.$refs.multipleTable.selection.map((item) => item.id).join(","),
           projectSn: this.projectSn,
@@ -3077,7 +3210,7 @@ export default {
               if (res.code == 200) {
                 this.$message.success(this.$t("message.quality.newSuccess"));
                 this.setDialog = false;
-                if(this.sourceDangerDialog){
+                if (this.sourceDangerDialog) {
                   this.getSourceDangerList();
                 }
                 this.getQualityRegionList();
@@ -3103,7 +3236,7 @@ export default {
             type: "success",
             message: this.$t("message.quality.successfullyDelete") + "!",
           });
-          if(this.sourceDangerDialog){
+          if (this.sourceDangerDialog) {
             this.getSourceDangerList();
           }
           this.getQualityRegionList();
@@ -3135,7 +3268,7 @@ export default {
                 type: "success",
                 message: this.$t("message.quality.successfullyDelete") + "!",
               });
-              if(this.sourceDangerDialog){
+              if (this.sourceDangerDialog) {
                 this.getSourceDangerList();
               }
               this.getQualityRegionList();
@@ -3176,7 +3309,9 @@ export default {
         projectSn: this.projectSn,
       }).then((res) => {
         if (res.result.length > 0) {
-          this.accidentTypeList = res.result.sort((a, b) => Date.parse(a.createTime) - Date.parse(b.createTime));
+          this.accidentTypeList = res.result.sort(
+            (a, b) => Date.parse(a.createTime) - Date.parse(b.createTime)
+          );
         }
       });
       getRegionV2TreePageApi({
@@ -3189,6 +3324,31 @@ export default {
         }
       });
     },
+    onClickLevel(item, ele) {
+      this.riskListDetailForm.lsrData.lNumber = item.score;
+      this.riskListDetailForm.lsrData.sNumber = ele.score;
+      this.riskListChageLSR();
+    },
+    riskListChageLSR() {
+      const countNum = Number(
+        this.riskListDetailForm.lsrData.lNumber * this.riskListDetailForm.lsrData.sNumber
+      ).toFixed(2);
+      if (countNum > Number(this.riskAssessmentInfo.staticLsrZdMin)) {
+        this.riskListDetailForm.riskLevel = 1;
+      } else if (
+        countNum >= Number(this.riskAssessmentInfo.staticLsrJdMin) &&
+        countNum <= Number(this.riskAssessmentInfo.staticLsrJdMax)
+      ) {
+        this.riskListDetailForm.riskLevel = 2;
+      } else if (
+        countNum >= Number(this.riskAssessmentInfo.staticLsrYbMin) &&
+        countNum <= Number(this.riskAssessmentInfo.staticLsrYbMax)
+      ) {
+        this.riskListDetailForm.riskLevel = 3;
+      } else if (countNum < Number(this.riskAssessmentInfo.staticLsrDMax)) {
+        this.riskListDetailForm.riskLevel = 4;
+      }
+    },
   },
   computed: {
     setNameUp() {