diff --git a/src/pages/index/index.js b/src/pages/index/index.js
index accd5533..6ca74b53 100644
--- a/src/pages/index/index.js
+++ b/src/pages/index/index.js
@@ -296,6 +296,27 @@ Vue.use(vuescroll, {
         },
     },
 })
+const scrollDirective = {
+    bind(el, binding) {
+        const handler = binding.value;
+        const scrollHandler = (event) => {
+            handler(event);
+        };
+        // 存储滚动处理函数，方便后续解绑
+        el._scrollHandler = scrollHandler;
+        window.addEventListener('scroll', scrollHandler);
+    },
+    unbind(el) {
+        if (el._scrollHandler) {
+            window.removeEventListener('scroll', el._scrollHandler);
+            delete el._scrollHandler;
+        }
+    },
+}
+
+//  按钮权限控制指令
+Vue.directive('scroll', scrollDirective);
+
 
 //  按钮权限控制指令
 Vue.directive('permission', {
diff --git a/src/views/projectFront/laborManage/allAttendanceManageComponents/attendanceOverview.vue b/src/views/projectFront/laborManage/allAttendanceManageComponents/attendanceOverview.vue
index 5209acff..c2749a7f 100644
--- a/src/views/projectFront/laborManage/allAttendanceManageComponents/attendanceOverview.vue
+++ b/src/views/projectFront/laborManage/allAttendanceManageComponents/attendanceOverview.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="attendanceManage fullHeight whiteBlock" ref="attendanceManage">
-    <vue-scroll style="width: 100%; height: 100%">
+    <vue-scroll style="width: 100%; height: 100%" ref="scrollDiv">
       <el-form
         :inline="true"
         :model="formInline"
@@ -15,6 +15,7 @@
         </el-form-item>
         <el-form-item v-if="formInline.type == 1">
           <el-date-picker
+            ref="monthPicker"
             value-format="yyyy-MM"
             v-model="formInline.monthTime"
             type="monthrange"
@@ -28,6 +29,7 @@
         </el-form-item>
         <el-form-item v-else-if="formInline.type == 2">
           <el-date-picker
+            ref="monthPicker"
             value-format="yyyy-MM-dd"
             v-model="formInline.dayTime"
             type="daterange"
@@ -41,6 +43,7 @@
         </el-form-item>
         <el-form-item>
           <el-select
+            ref="enterpriseTypeSelectRef"
             filterable
             :clearable="true"
             v-model="formInline.enterpriseTypeId"
@@ -56,6 +59,7 @@
         </el-form-item>
         <el-form-item>
           <el-select
+           ref="enterpriseSelectRef"
             filterable
             :clearable="true"
             v-model="formInline.enterpriseId"
@@ -73,6 +77,7 @@
         </el-form-item>
         <el-form-item>
           <el-select
+            ref="teamSelectRef"
             filterable
             :clearable="true"
             v-model="formInline.teamId"
@@ -89,6 +94,7 @@
         </el-form-item>
         <el-form-item>
           <el-select
+            ref="departmentSelectRef"
             filterable
             :clearable="true"
             v-model="formInline.departmentId"
@@ -280,7 +286,31 @@ export default {
       deep: true,
     },
   },
+  mounted() {
+    this.$nextTick(() => {
+      this.$refs.scrollDiv.$el.children[0].addEventListener(
+        "scroll",
+        this.handleScroll,
+        true
+      );
+    });
+  },
   methods: {
+    handleScroll(e) {
+      console.log("滚动了", this.$refs.enterpriseTypeSelectRef);
+      // 时间框隐藏
+      if (this.$refs.monthPicker && this.$refs.monthPicker.pickerVisible) {
+        this.$refs.monthPicker.handleClose();
+      }
+
+      // 下拉框隐藏
+      const objRefList = ["enterpriseTypeSelectRef", "enterpriseSelectRef", "teamSelectRef", "departmentSelectRef"];
+      objRefList.forEach((item) => {
+        if (this.$refs[item] && this.$refs[item].visible) {
+          this.$refs[item].blur();
+        }
+      })
+    },
     initDate() {
       this.getCountWorkerDailyAttendanceStatisticsV2();
       this.getListData();
diff --git a/src/views/projectFront/laborManage/allAttendanceManageComponents/dayAttendanceReport.vue b/src/views/projectFront/laborManage/allAttendanceManageComponents/dayAttendanceReport.vue
index adbe3b99..3a31e31d 100644
--- a/src/views/projectFront/laborManage/allAttendanceManageComponents/dayAttendanceReport.vue
+++ b/src/views/projectFront/laborManage/allAttendanceManageComponents/dayAttendanceReport.vue
@@ -420,6 +420,7 @@
             <el-button
               icon="el-icon-circle-check"
               type="primary"
+              :loading="exportLoading"
               @click="onSumbit"
               >确定</el-button
             >
@@ -543,6 +544,7 @@ export default {
           title: "进出场打卡",
         },
       ],
+      exportLoading: false,
       videoTypeList: [],
     };
   },
@@ -554,6 +556,7 @@ export default {
     onSumbit() {
       this.$refs.exportSettingInfo.validate((valid) => {
         if (valid) {
+          this.exportLoading = true;
           const requestData = {
             ...this.exportSettingInfo,
             startDate: this.exportSettingInfo.startDate[0],
@@ -600,12 +603,25 @@ export default {
             .catch((error) => {
               // 处理错误
               console.error(error);
+            })
+            .finally(() => {
+              this.exportLoading = false;
             });
         }
       });
     },
+    initExportSetting() {
+      this.exportSettingInfo = {
+        startDate: [],
+        downloadType: "",
+      };
+    },
     // 导出设置
     handleExportSetting() {
+      this.initExportSetting(); // 重置导出设置表单信息
+      this.$nextTick(() => {
+        this.$refs.exportSettingInfo.clearValidate(); // 重置表单验证信息
+      });
       this.exportSettingDialog = true;
     },
     handleSelectionChange(row) {
@@ -659,27 +675,27 @@ export default {
           this.countWorkerDailyInfo = [
             {
               title: "当日进场",
-              countNum: res.inServiceCount,
+              countNum: res.result.inServiceCount,
               content: "当日在职人数之和",
             },
             {
               title: "当日出勤",
-              countNum: res.attendanceCount,
+              countNum: res.result.attendanceCount,
               content: "累加当日的总出勤人数之和",
             },
             {
               title: "当日缺勤",
-              countNum: res.absentCount,
+              countNum: res.result.absentCount,
               content: "累加当日的未出勤人数之和",
             },
             {
               title: "出勤率",
-              countNum: res.attendanceRate,
+              countNum: res.result.attendanceRate,
               content: "当日出勤人数*1.0/当日在职人数",
             },
             {
               title: "当日退场",
-              countNum: res.leftCount,
+              countNum: res.result.leftCount,
               content: "当日退场人数之和",
             },
           ];
diff --git a/src/views/projectFront/laborManage/allAttendanceManageComponents/dayAttendanceReportDetail.vue b/src/views/projectFront/laborManage/allAttendanceManageComponents/dayAttendanceReportDetail.vue
index 7dbebb03..9d6e6726 100644
--- a/src/views/projectFront/laborManage/allAttendanceManageComponents/dayAttendanceReportDetail.vue
+++ b/src/views/projectFront/laborManage/allAttendanceManageComponents/dayAttendanceReportDetail.vue
@@ -326,7 +326,7 @@ export default {
                 },
               ]),
             },
-            data: result.map((item) => item.absence),
+            data: result.map((item) => item.attendance),
           },
           {
             name: "累计缺勤",
@@ -343,7 +343,7 @@ export default {
                 },
               ]),
             },
-            data: result.map((item) => item.attendance),
+            data: result.map((item) => item.absence),
           },
         ],
         dataZoom: [
@@ -423,17 +423,17 @@ export default {
           this.countWorkerDailyInfo = [
             {
               title: "在职",
-              countNum: res.inServe,
+              countNum: res.result.inServe,
               content: "在职天数",
             },
             {
               title: "出勤",
-              countNum: res.attendance,
+              countNum: res.result.attendance,
               content: "出勤天数",
             },
             {
               title: "缺勤",
-              countNum: res.absence,
+              countNum: res.result.absence,
               content: "缺勤天数",
             },
           ];
diff --git a/src/views/projectFront/laborManage/allAttendanceManageComponents/monthAttendanceReport.vue b/src/views/projectFront/laborManage/allAttendanceManageComponents/monthAttendanceReport.vue
index 2c7a123f..b02654f8 100644
--- a/src/views/projectFront/laborManage/allAttendanceManageComponents/monthAttendanceReport.vue
+++ b/src/views/projectFront/laborManage/allAttendanceManageComponents/monthAttendanceReport.vue
@@ -143,7 +143,7 @@
           >
             <template slot-scope="scope">
               <span
-                style="cursor: pointer;color: #5181F6;"
+                style="cursor: pointer; color: #5181f6"
                 @click="handleSelectionChange(scope.row)"
                 >{{ scope.row.workerName }}</span
               >
@@ -324,6 +324,7 @@
             <el-button
               icon="el-icon-circle-check"
               type="primary"
+              :loading="isLoading"
               @click="onSumbit"
               >确定</el-button
             >
@@ -477,6 +478,7 @@ export default {
           title: "每日明细",
         },
       ],
+      isLoading: false,
       enterpriseListData: [],
       showTime: [],
       itemKey: "",
@@ -676,20 +678,25 @@ export default {
     onSumbit() {
       this.$refs.exportSettingInfo.validate((valid) => {
         if (valid) {
+          this.isLoading = true;
           const requestData = {
             ...this.exportSettingInfo,
             startDate: this.exportSettingInfo.startDate[0],
             endDate: this.exportSettingInfo.startDate[1],
             projectSn: this.projectSn,
-          }
-          fetch(this.$http.defaults.baseURL + 'xmgl/workerDailyAttendanceStatisticsV2/exportWorkerDailyAttendancesStaticsByMonthXls', {
-            method: "post",
-            headers: {
-              Authorization: this.$store.state.userInfo.token,
-              "Content-Type": "application/json", // 设置请求头的内容类型为JSON
-            },
-            body: JSON.stringify(requestData),
-          })
+          };
+          fetch(
+            this.$http.defaults.baseURL +
+              "xmgl/workerDailyAttendanceStatisticsV2/exportWorkerDailyAttendancesStaticsByMonthXls",
+            {
+              method: "post",
+              headers: {
+                Authorization: this.$store.state.userInfo.token,
+                "Content-Type": "application/json", // 设置请求头的内容类型为JSON
+              },
+              body: JSON.stringify(requestData),
+            }
+          )
             .then((response) => {
               // 处理响应
               if (!response.ok) {
@@ -699,12 +706,26 @@ export default {
             })
             .then((blob) => {
               console.log("导出成功");
+              const groupByTypeName = {
+                1: "按项目",
+                2: "按参建单位",
+                3: "按班组/部门",
+                4: "按人员",
+              }
+              let objName = "";
+              if(this.exportSettingInfo.groupByType == 1 || this.exportSettingInfo.groupByType == 3) {
+                const find = this.downloadTypeList.find(item => item.id == this.exportSettingInfo.downloadType)
+                objName = find ? `-${find.title}` : ``;
+              } else if(this.exportSettingInfo.groupByType == 2) {
+                const find = this.enterpriseListData.find(item => item.id == this.exportSettingInfo.enterpriseId)
+                objName = find ? `-${find.enterpriseName}` : "";
+              }
               // 创建一个下载链接
               const url = window.URL.createObjectURL(blob);
               // 创建一个<a>元素
               const link = document.createElement("a");
               link.href = url;
-              link.download = '考勤月报.xlsx'; // 指定下载文件的文件名
+              link.download = `考勤月报-${groupByTypeName[this.exportSettingInfo.groupByType]}${objName}.xlsx`; // 指定下载文件的文件名
               // 模拟点击下载链接
               document.body.appendChild(link);
               link.click();
@@ -718,12 +739,27 @@ export default {
             .catch((error) => {
               // 处理错误
               console.error(error);
+            }).finally(() => {
+              this.isLoading = false;
             });
         }
       });
     },
+    initExportSetting() {
+      this.exportSettingInfo = {
+        groupByType: 1,
+        startDate: [],
+        downloadType: "",
+        enterpriseId: "",
+        hourValBegin: "",
+      };
+    },
     // 导出设置
     handleExportSetting() {
+      this.initExportSetting(); // 重置导出设置表单信息
+      this.$nextTick(() => {
+        this.$refs.exportSettingInfo.clearValidate(); // 重置表单验证信息
+      });
       this.exportSettingDialog = true;
     },
     handleSelectionChange(row) {
diff --git a/src/views/projectFront/laborManage/allAttendanceManageComponents/punchCardRecord.vue b/src/views/projectFront/laborManage/allAttendanceManageComponents/punchCardRecord.vue
index 5b8665fe..454de8e3 100644
--- a/src/views/projectFront/laborManage/allAttendanceManageComponents/punchCardRecord.vue
+++ b/src/views/projectFront/laborManage/allAttendanceManageComponents/punchCardRecord.vue
@@ -129,7 +129,7 @@
           >
             <template slot-scope="scope">
               <span
-                style="cursor: pointer;color: #5181F6;"
+                style="cursor: pointer; color: #5181f6"
                 @click="handleSelectionChange(scope.row)"
                 >{{ scope.row.workerName }}</span
               >
@@ -574,7 +574,54 @@ export default {
     onSumbit() {},
     // 导出设置
     handleExportSetting() {
-      this.exportSettingDialog = true;
+      // this.exportSettingDialog = true;
+      const requestData = {
+        // ...this.exportSettingInfo,
+        // startDate: this.exportSettingInfo.startDate[0],
+        // endDate: this.exportSettingInfo.startDate[1],
+        projectSn: this.projectSn,
+        idList: this.$refs.multipleTable.selection.map((item) => item.id),
+      };
+      fetch(
+        this.$http.defaults.baseURL + "xmgl/workerAttendance/exportXls",
+        {
+          method: "post",
+          headers: {
+            Authorization: this.$store.state.userInfo.token,
+            "Content-Type": "application/json", // 设置请求头的内容类型为JSON
+          },
+          body: JSON.stringify(requestData),
+        }
+      )
+        .then((response) => {
+          // 处理响应
+          if (!response.ok) {
+            throw new Error("导出失败");
+          }
+          return response.blob();
+        })
+        .then((blob) => {
+          console.log("导出成功");
+          // 创建一个下载链接
+          const url = window.URL.createObjectURL(blob);
+          // 创建一个<a>元素
+          const link = document.createElement("a");
+          link.href = url;
+          link.download = "人员考勤.xlsx"; // 指定下载文件的文件名
+          // 模拟点击下载链接
+          document.body.appendChild(link);
+          link.click();
+          document.body.removeChild(link);
+          // 释放URL对象
+          window.URL.revokeObjectURL(url);
+          // 处理导出的文件
+          // 这里可以使用blob对象来获取导出的文件内容或者将其保存到本地
+          this.exportSettingDialog = false; // 关闭对话框
+        })
+        .catch((error) => {
+          // 处理错误
+          console.error(error);
+        });
     },
     handleSelectionChange(row) {
       this.multipleSelection = row;
diff --git a/src/views/projectFront/safeManage/v2/riskRankingComponents/controlList.vue b/src/views/projectFront/safeManage/v2/riskRankingComponents/controlList.vue
index 7216dc72..050fd357 100644
--- a/src/views/projectFront/safeManage/v2/riskRankingComponents/controlList.vue
+++ b/src/views/projectFront/safeManage/v2/riskRankingComponents/controlList.vue
@@ -11,7 +11,9 @@
             v-model="queryParams.controlListType"
           >
             <el-radio-button :label="1"
-              >风险点({{ RiskListPointCountRiskNumInfo.riskPointNum }})</el-radio-button
+              >风险点({{
+                RiskListPointCountRiskNumInfo.riskPointNum
+              }})</el-radio-button
             >
             <el-radio-button :label="2"
               >危险源({{
@@ -20,7 +22,12 @@
             >
           </el-radio-group>
         </div>
-        <el-form size="medium" :model="queryParams" ref="queryForm" :inline="true">
+        <el-form
+          size="medium"
+          :model="queryParams"
+          ref="queryForm"
+          :inline="true"
+        >
           <el-form-item label="工程类型" prop="projectType">
             <el-select
               v-model="queryParams.projectType"
@@ -81,21 +88,35 @@
             ></el-cascader>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" plain @click="handleQuery">查询</el-button>
-            <el-button type="warning" plain @click="handleRefresh">刷新</el-button>
+            <el-button type="primary" plain @click="handleQuery"
+              >查询</el-button
+            >
+            <el-button type="warning" plain @click="handleRefresh"
+              >刷新</el-button
+            >
             <el-button
-              :disabled="$refs.multipleTable && $refs.multipleTable.selection.length == 0"
-              :type="$refs.multipleTable && $refs.multipleTable.selection.length == 0 ? 'info' : 'danger'"
+              :disabled="
+                $refs.multipleTable && $refs.multipleTable.selection.length == 0
+              "
+              :type="
+                $refs.multipleTable && $refs.multipleTable.selection.length == 0
+                  ? 'info'
+                  : 'danger'
+              "
               plain
               class="delete_btn"
               @click="deleteAttendanceBatch"
               >批量删除</el-button
             >
-            
+
             <el-button @click="openRiskPoint" type="primary" size="medium"
               >风险点识别</el-button
             >
-            <el-dropdown @command="handleCommand" class="el-button" style="padding: 0">
+            <el-dropdown
+              @command="handleCommand"
+              class="el-button"
+              style="padding: 0"
+            >
               <el-button type="primary">
                 批量设置<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
@@ -233,18 +254,23 @@
         class="new-tables"
         :key="queryParams.dynamicType"
       >
-        <el-table-column type="selection" align="center" width="55"></el-table-column>
+        <el-table-column
+          type="selection"
+          align="center"
+          width="55"
+        ></el-table-column>
         <template v-if="queryParams.controlListType == 1">
           <template v-if="queryParams.dynamicType == 1">
             <el-table-column
-              show-overflow-tooltip
               align="center"
               prop="riskPointName"
               label="风险点名称"
             >
+              <template slot-scope="scope">
+                {{ fullPathCutOut(scope.row.riskPointName, 3) }}
+              </template>
             </el-table-column>
             <el-table-column
-              show-overflow-tooltip
               align="center"
               prop="riskSituationDescription"
               label="风险情况描述"
@@ -259,7 +285,6 @@
             </el-table-column>
             <el-table-column
               align="center"
-              show-overflow-tooltip
               prop="specificResponsibilityAreaNames"
               label="具体责任区域"
             >
@@ -272,13 +297,14 @@
             </el-table-column>
             <el-table-column
               align="center"
-              show-overflow-tooltip
               prop="effectiveTimeBegin"
               label="有效时间"
             >
               <template slot-scope="scope">
                 <template v-if="scope.row.effectiveTimeBegin">
-                  {{ scope.row.effectiveTimeBegin }}至{{ scope.row.effectiveTimeEnd }}
+                  {{ scope.row.effectiveTimeBegin }}至{{
+                    scope.row.effectiveTimeEnd
+                  }}
                 </template>
                 <div class="color_e400" v-else>未设置</div>
               </template>
@@ -300,7 +326,11 @@
               align="center"
             >
               <template slot-scope="scope">
-                {{ scope.row.activityFrequency ? scope.row.activityFrequency : "--" }}
+                {{
+                  scope.row.activityFrequency
+                    ? scope.row.activityFrequency
+                    : "--"
+                }}
               </template>
             </el-table-column>
             <el-table-column
@@ -355,20 +385,25 @@
               align="center"
             >
               <template slot-scope="scope">
-                {{ scope.row.identificationTime ? scope.row.identificationTime : "--" }}
+                {{
+                  scope.row.identificationTime
+                    ? scope.row.identificationTime
+                    : "--"
+                }}
               </template>
             </el-table-column>
           </template>
           <template v-if="queryParams.dynamicType == 2">
             <el-table-column
-              show-overflow-tooltip
               align="center"
               prop="riskPointName"
               label="风险点名称"
             >
+            <template slot-scope="scope">
+                {{ fullPathCutOut(scope.row.riskPointName, 3) }}
+              </template>
             </el-table-column>
             <el-table-column
-              show-overflow-tooltip
               align="center"
               prop="riskSituationDescription"
               label="风险情况描述"
@@ -383,7 +418,6 @@
             </el-table-column>
             <el-table-column
               align="center"
-              show-overflow-tooltip
               prop="specificResponsibilityAreaNames"
               label="具体责任区域"
             >
@@ -396,13 +430,14 @@
             </el-table-column>
             <el-table-column
               align="center"
-              show-overflow-tooltip
               prop="effectiveTimeBegin"
               label="有效时间"
             >
               <template slot-scope="scope">
                 <template v-if="scope.row.effectiveTimeBegin">
-                  {{ scope.row.effectiveTimeBegin }}至{{ scope.row.effectiveTimeEnd }}
+                  {{ scope.row.effectiveTimeBegin }}至{{
+                    scope.row.effectiveTimeEnd
+                  }}
                 </template>
                 <div class="color_e400" v-else>未设置</div>
               </template>
@@ -493,7 +528,11 @@
               align="center"
             >
               <template slot-scope="scope">
-                {{ scope.row.identificationTime ? scope.row.identificationTime : "--" }}
+                {{
+                  scope.row.identificationTime
+                    ? scope.row.identificationTime
+                    : "--"
+                }}
               </template>
             </el-table-column>
           </template>
@@ -501,20 +540,23 @@
         <template v-if="queryParams.controlListType == 2">
           <template v-if="queryParams.dynamicType == 1">
             <el-table-column
-              show-overflow-tooltip
               align="center"
               prop="riskPointName"
               label="风险点名称"
             >
+              <template slot-scope="scope">
+                {{ fullPathCutOut(scope.row.riskPointName, 3) }}
+              </template>
             </el-table-column>
             <el-table-column
-              show-overflow-tooltip
               align="center"
               prop="riskDescription"
               label="风险情况描述"
             >
               <template slot-scope="scope">
-                {{ scope.row.riskDescription ? scope.row.riskDescription : "--" }}
+                {{
+                  scope.row.riskDescription ? scope.row.riskDescription : "--"
+                }}
               </template>
             </el-table-column>
             <el-table-column
@@ -565,25 +607,23 @@
               label="风险等级"
             >
               <template slot-scope="scope">
-                {{ setNameUp(scope.row.riskLevel, riskLevelList, "id", "name") }}
+                {{
+                  setNameUp(scope.row.riskLevel, riskLevelList, "id", "name")
+                }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="center"
-              show-overflow-tooltip
-              prop="validTime"
-              label="有效时间"
-            >
+            <el-table-column align="center" prop="validTime" label="有效时间">
               <template slot-scope="scope">
                 <template v-if="scope.row.effectiveTimeBegin">
-                  {{ scope.row.effectiveTimeBegin }}至{{ scope.row.effectiveTimeEnd }}
+                  {{ scope.row.effectiveTimeBegin }}至{{
+                    scope.row.effectiveTimeEnd
+                  }}
                 </template>
                 <div class="color_e400" v-else>未设置</div>
               </template>
             </el-table-column>
             <el-table-column
               align="center"
-              show-overflow-tooltip
               prop="specificResponsibilityAreaNames"
               label="具体责任区域"
             >
@@ -603,18 +643,30 @@
                 <el-tooltip placement="top">
                   <div slot="content">
                     工程措施：{{
-                      scope.row.engineeringMeasure ? scope.row.engineeringMeasure : "--"
+                      scope.row.engineeringMeasure
+                        ? scope.row.engineeringMeasure
+                        : "--"
                     }}<br />管理措施：{{
-                      scope.row.managementMeasure ? scope.row.managementMeasure : "--"
+                      scope.row.managementMeasure
+                        ? scope.row.managementMeasure
+                        : "--"
                     }}<br />个体防护：{{
-                      scope.row.personalProtection ? scope.row.personalProtection : "--"
+                      scope.row.personalProtection
+                        ? scope.row.personalProtection
+                        : "--"
                     }}<br />应急措施：{{
-                      scope.row.emergencyMeasure ? scope.row.emergencyMeasure : "--"
+                      scope.row.emergencyMeasure
+                        ? scope.row.emergencyMeasure
+                        : "--"
                     }}<br />教育措施：{{
-                      scope.row.educationalMeasure ? scope.row.educationalMeasure : "--"
+                      scope.row.educationalMeasure
+                        ? scope.row.educationalMeasure
+                        : "--"
                     }}<br />
                   </div>
-                  <div class="oneLine">{{ concatenationTextUp(scope.row) }}</div>
+                  <div class="oneLine">
+                    {{ concatenationTextUp(scope.row) }}
+                  </div>
                 </el-tooltip>
               </template>
             </el-table-column>
@@ -626,7 +678,9 @@
             >
               <template slot-scope="scope">
                 {{
-                  scope.row.controlWorkerIdsName ? scope.row.controlWorkerIdsName : "--"
+                  scope.row.controlWorkerIdsName
+                    ? scope.row.controlWorkerIdsName
+                    : "--"
                 }}
               </template>
             </el-table-column>
@@ -637,7 +691,10 @@
               label="管控情况"
             >
               <template slot-scope="scope">
-                <div @click="openImplementingRecord(scope.row)" v-if="scope.row.workable == 1">
+                <div
+                  @click="openImplementingRecord(scope.row)"
+                  v-if="scope.row.workable == 1"
+                >
                   已落实(<span class="color_518">查看落实情况</span>)
                 </div>
                 <div v-else>--</div>
@@ -645,12 +702,15 @@
             </el-table-column>
             <el-table-column
               prop="identificationTime"
-              show-overflow-tooltip
               label="辨识时间"
               align="center"
             >
               <template slot-scope="scope">
-                {{ scope.row.identificationTime ? scope.row.identificationTime : "--" }}
+                {{
+                  scope.row.identificationTime
+                    ? scope.row.identificationTime
+                    : "--"
+                }}
               </template>
             </el-table-column>
             <el-table-column
@@ -660,7 +720,11 @@
               align="center"
             >
               <template slot-scope="scope">
-                {{ scope.row.checkWorkerIdsName ? scope.row.checkWorkerIdsName : "--" }}
+                {{
+                  scope.row.checkWorkerIdsName
+                    ? scope.row.checkWorkerIdsName
+                    : "--"
+                }}
               </template>
             </el-table-column>
             <el-table-column
@@ -693,7 +757,11 @@
               align="center"
             >
               <template slot-scope="scope">
-                {{ scope.row.activityFrequency ? scope.row.activityFrequency : "--" }}
+                {{
+                  scope.row.activityFrequency
+                    ? scope.row.activityFrequency
+                    : "--"
+                }}
               </template>
             </el-table-column>
             <el-table-column
@@ -713,25 +781,23 @@
               label="风险等级"
             >
               <template slot-scope="scope">
-                {{ setNameUp(scope.row.riskLevel, riskLevelList, "id", "name") }}
+                {{
+                  setNameUp(scope.row.riskLevel, riskLevelList, "id", "name")
+                }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="center"
-              show-overflow-tooltip
-              prop="validTime"
-              label="有效时间"
-            >
+            <el-table-column align="center" prop="validTime" label="有效时间">
               <template slot-scope="scope">
                 <template v-if="scope.row.effectiveTimeBegin">
-                  {{ scope.row.effectiveTimeBegin }}至{{ scope.row.effectiveTimeEnd }}
+                  {{ scope.row.effectiveTimeBegin }}至{{
+                    scope.row.effectiveTimeEnd
+                  }}
                 </template>
                 <div class="color_e400" v-else>未设置</div>
               </template>
             </el-table-column>
             <el-table-column
               align="center"
-              show-overflow-tooltip
               prop="specificResponsibilityAreaNames"
               label="具体责任区域"
             >
@@ -764,7 +830,9 @@
             >
               <template slot-scope="scope">
                 {{
-                  scope.row.controlWorkerIdsName ? scope.row.controlWorkerIdsName : "--"
+                  scope.row.controlWorkerIdsName
+                    ? scope.row.controlWorkerIdsName
+                    : "--"
                 }}
               </template>
             </el-table-column>
@@ -775,7 +843,10 @@
               label="管控情况"
             >
               <template slot-scope="scope">
-                <div @click="openImplementingRecord(scope.row)" v-if="scope.row.workable == 1">
+                <div
+                  @click="openImplementingRecord(scope.row)"
+                  v-if="scope.row.workable == 1"
+                >
                   已落实(<span class="color_518">查看落实情况</span>)
                 </div>
                 <div v-else>--</div>
@@ -788,7 +859,11 @@
               align="center"
             >
               <template slot-scope="scope">
-                {{ scope.row.identificationTime ? scope.row.identificationTime : "--" }}
+                {{
+                  scope.row.identificationTime
+                    ? scope.row.identificationTime
+                    : "--"
+                }}
               </template>
             </el-table-column>
             <el-table-column
@@ -798,7 +873,11 @@
               align="center"
             >
               <template slot-scope="scope">
-                {{ scope.row.checkWorkerIdsName ? scope.row.checkWorkerIdsName : "--" }}
+                {{
+                  scope.row.checkWorkerIdsName
+                    ? scope.row.checkWorkerIdsName
+                    : "--"
+                }}
               </template>
             </el-table-column>
             <el-table-column
@@ -904,7 +983,10 @@
             </el-form-item>
             <template v-if="queryParams.dynamicType == 1">
               <el-form-item label="区域部位" prop="areaLocation">
-                <el-input placeholder="请输入" v-model="setForm.areaLocation"></el-input>
+                <el-input
+                  placeholder="请输入"
+                  v-model="setForm.areaLocation"
+                ></el-input>
               </el-form-item>
               <el-form-item label="活动频次" prop="activityFrequency">
                 <el-input-number
@@ -916,7 +998,10 @@
               </el-form-item>
             </template>
             <template v-if="queryParams.dynamicType == 2">
-              <el-form-item label="设备设施属性" prop="equipmentFacilityAttribute">
+              <el-form-item
+                label="设备设施属性"
+                prop="equipmentFacilityAttribute"
+              >
                 <el-input
                   placeholder="请输入"
                   v-model="setForm.equipmentFacilityAttribute"
@@ -929,7 +1014,10 @@
                 ></el-input>
               </el-form-item>
               <el-form-item label="所在位置" prop="location">
-                <el-input placeholder="请输入" v-model="setForm.location"></el-input>
+                <el-input
+                  placeholder="请输入"
+                  v-model="setForm.location"
+                ></el-input>
               </el-form-item>
             </template>
             <el-form-item label="责任区域" prop="specificResponsibilityAreaIds">
@@ -983,7 +1071,10 @@
             </el-form-item>
           </template>
           <template v-else-if="batchSettingType == 5">
-            <el-form-item label="管控责任人单位" prop="controlWorkerEnterpriseIds">
+            <el-form-item
+              label="管控责任人单位"
+              prop="controlWorkerEnterpriseIds"
+            >
               <el-cascader
                 v-model="setForm.controlWorkerEnterpriseIds"
                 :options="enterpriseInfoList"
@@ -1041,20 +1132,55 @@
             </el-form-item>
           </template>
           <template v-else-if="batchSettingType == 7">
-            <el-form-item label="工程措施" label-width="120px" prop="engineeringMeasure">
-              <el-input type="textarea" v-model="setForm.engineeringMeasure"></el-input>
+            <el-form-item
+              label="工程措施"
+              label-width="120px"
+              prop="engineeringMeasure"
+            >
+              <el-input
+                type="textarea"
+                v-model="setForm.engineeringMeasure"
+              ></el-input>
             </el-form-item>
-            <el-form-item label="管理措施" label-width="120px" prop="managementMeasure">
-              <el-input type="textarea" v-model="setForm.managementMeasure"></el-input>
+            <el-form-item
+              label="管理措施"
+              label-width="120px"
+              prop="managementMeasure"
+            >
+              <el-input
+                type="textarea"
+                v-model="setForm.managementMeasure"
+              ></el-input>
             </el-form-item>
-            <el-form-item label="个体防护" label-width="120px" prop="personalProtection">
-              <el-input type="textarea" v-model="setForm.personalProtection"></el-input>
+            <el-form-item
+              label="个体防护"
+              label-width="120px"
+              prop="personalProtection"
+            >
+              <el-input
+                type="textarea"
+                v-model="setForm.personalProtection"
+              ></el-input>
             </el-form-item>
-            <el-form-item label="应急措施" label-width="120px" prop="emergencyMeasure">
-              <el-input type="textarea" v-model="setForm.emergencyMeasure"></el-input>
+            <el-form-item
+              label="应急措施"
+              label-width="120px"
+              prop="emergencyMeasure"
+            >
+              <el-input
+                type="textarea"
+                v-model="setForm.emergencyMeasure"
+              ></el-input>
             </el-form-item>
-            <el-form-item label="教育措施" label-width="120px" prop="educationalMeasure">
-              <el-input type="textarea" v-model="setForm.educationalMeasure"></el-input>
+            <el-form-item
+              label="教育措施"
+              label-width="120px"
+              prop="educationalMeasure"
+            >
+              <el-input
+                type="textarea"
+                v-model="setForm.educationalMeasure"
+              ></el-input>
             </el-form-item>
           </template>
         </el-form>
@@ -1089,7 +1215,11 @@
             <el-button @click="openHazardSource" type="primary" size="medium"
               >危险源识别</el-button
             >
-            <el-dropdown @command="handleCommand" class="el-button" style="padding: 0">
+            <el-dropdown
+              @command="handleCommand"
+              class="el-button"
+              style="padding: 0"
+            >
               <el-button type="primary">
                 批量设置<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
@@ -1100,9 +1230,15 @@
             </el-dropdown>
             <el-button
               :disabled="
-                $refs.sourceDangerTable && $refs.sourceDangerTable.selection.length == 0
+                $refs.sourceDangerTable &&
+                $refs.sourceDangerTable.selection.length == 0
+              "
+              :type="
+                $refs.sourceDangerTable &&
+                $refs.sourceDangerTable.selection.length == 0
+                  ? 'info'
+                  : 'danger'
               "
-              :type="$refs.sourceDangerTable && $refs.sourceDangerTable.selection.length == 0 ? 'info' : 'danger'"
               plain
               @click="deleteAttendanceBatchSourceDanger"
               >批量删除</el-button
@@ -1116,7 +1252,11 @@
           :height="424"
           class="new-tables"
         >
-          <el-table-column type="selection" align="center" width="55"></el-table-column>
+          <el-table-column
+            type="selection"
+            align="center"
+            width="55"
+          ></el-table-column>
           <el-table-column
             width="180"
             show-overflow-tooltip
@@ -1124,7 +1264,11 @@
             label="分部分项工程/作业任务"
           >
             <template slot-scope="scope">
-              {{ scope.row.subProjectWorkTask ? scope.row.subProjectWorkTask : "--" }}
+              {{
+                scope.row.subProjectWorkTask
+                  ? scope.row.subProjectWorkTask
+                  : "--"
+              }}
             </template>
           </el-table-column>
           <el-table-column
@@ -1190,7 +1334,9 @@
           >
             <template slot-scope="scope">
               <template v-if="scope.row.effectiveTimeBegin">
-                {{ scope.row.effectiveTimeBegin }}至{{ scope.row.effectiveTimeEnd }}
+                {{ scope.row.effectiveTimeBegin }}至{{
+                  scope.row.effectiveTimeEnd
+                }}
               </template>
               <div class="color_e400" v-else>未设置</div>
             </template>
@@ -1202,7 +1348,9 @@
             align="center"
           >
             <template slot-scope="scope">
-              {{ scope.row.activityFrequency ? scope.row.activityFrequency : "--" }}
+              {{
+                scope.row.activityFrequency ? scope.row.activityFrequency : "--"
+              }}
             </template>
           </el-table-column>
           <el-table-column
@@ -1222,8 +1370,14 @@
             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>
@@ -1497,7 +1651,11 @@
           :height="424"
           class="new-tables"
         >
-          <el-table-column type="selection" align="center" width="55"></el-table-column>
+          <el-table-column
+            type="selection"
+            align="center"
+            width="55"
+          ></el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="fullPath"
@@ -1621,35 +1779,85 @@
             :height="424"
             class="new-tables pl-30"
           >
-            <el-table-column type="selection" align="center" width="55"></el-table-column>
+            <el-table-column
+              type="selection"
+              align="center"
+              width="55"
+            ></el-table-column>
             <template v-if="relatedBusinessInfo.projectType == 1">
-              <el-table-column prop="regionName" label="危大工程名称"> </el-table-column>
+              <el-table-column prop="regionName" label="危大工程名称">
+              </el-table-column>
               <el-table-column align="center" prop="regionCode" label="类别">
               </el-table-column>
-              <el-table-column align="center" prop="enterpriseName" label="类别描述">
+              <el-table-column
+                align="center"
+                prop="enterpriseName"
+                label="类别描述"
+              >
               </el-table-column>
-              <el-table-column align="center" prop="enterpriseName" label="危大工程概况">
+              <el-table-column
+                align="center"
+                prop="enterpriseName"
+                label="危大工程概况"
+              >
               </el-table-column>
-              <el-table-column align="center" prop="dutyUserName" label="施工部位">
+              <el-table-column
+                align="center"
+                prop="dutyUserName"
+                label="施工部位"
+              >
               </el-table-column>
-              <el-table-column align="center" prop="dutyUserName" label="责任人">
+              <el-table-column
+                align="center"
+                prop="dutyUserName"
+                label="责任人"
+              >
               </el-table-column>
-              <el-table-column align="center" prop="dutyUserName" label="计划施工时间">
+              <el-table-column
+                align="center"
+                prop="dutyUserName"
+                label="计划施工时间"
+              >
               </el-table-column>
-              <el-table-column align="center" prop="dutyUserName" label="最终验收状态">
+              <el-table-column
+                align="center"
+                prop="dutyUserName"
+                label="最终验收状态"
+              >
               </el-table-column>
             </template>
             <template v-if="relatedBusinessInfo.projectType == 2">
-              <el-table-column prop="regionName" label="设备名称"> </el-table-column>
-              <el-table-column align="center" prop="specificationsModel" label="规格型号">
+              <el-table-column prop="regionName" label="设备名称">
               </el-table-column>
-              <el-table-column align="center" prop="enterpriseName" label="项目设备编号">
+              <el-table-column
+                align="center"
+                prop="specificationsModel"
+                label="规格型号"
+              >
               </el-table-column>
-              <el-table-column align="center" prop="enterpriseName" label="设备位置">
+              <el-table-column
+                align="center"
+                prop="enterpriseName"
+                label="项目设备编号"
+              >
               </el-table-column>
-              <el-table-column align="center" prop="dutyUserName" label="设备来源单位">
+              <el-table-column
+                align="center"
+                prop="enterpriseName"
+                label="设备位置"
+              >
               </el-table-column>
-              <el-table-column align="center" prop="dutyUserName" label="设备责任人">
+              <el-table-column
+                align="center"
+                prop="dutyUserName"
+                label="设备来源单位"
+              >
+              </el-table-column>
+              <el-table-column
+                align="center"
+                prop="dutyUserName"
+                label="设备责任人"
+              >
               </el-table-column>
             </template>
           </el-table>
@@ -1696,7 +1904,11 @@
         size="medium"
       >
         <div class="risk_detail_top">
-          <el-form-item label-width="120px" label="风险点名称" prop="riskPointName">
+          <el-form-item
+            label-width="120px"
+            label="风险点名称"
+            prop="riskPointName"
+          >
             <el-tooltip
               class="item"
               effect="dark"
@@ -1708,7 +1920,11 @@
               </div>
             </el-tooltip>
           </el-form-item>
-          <el-form-item label-width="120px" label="风险描述" prop="riskDescription">
+          <el-form-item
+            label-width="120px"
+            label="风险描述"
+            prop="riskDescription"
+          >
             <el-tooltip
               class="item"
               effect="dark"
@@ -1734,7 +1950,11 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label-width="120px" label="有效时间" prop="effectiveTime">
+          <el-form-item
+            label-width="120px"
+            label="有效时间"
+            prop="effectiveTime"
+          >
             <el-date-picker
               v-model="riskListDetailForm.effectiveTime"
               type="daterange"
@@ -1756,7 +1976,11 @@
                 placeholder="请输入"
               ></el-input>
             </el-form-item>
-            <el-form-item label-width="120px" label="规格型号" prop="specificationsModel">
+            <el-form-item
+              label-width="120px"
+              label="规格型号"
+              prop="specificationsModel"
+            >
               <el-input
                 v-model="riskListDetailForm.specificationsModel"
                 placeholder="请输入"
@@ -1794,7 +2018,11 @@
               }"
             ></el-cascader>
           </el-form-item>
-          <el-form-item label-width="120px" label="活动频次" prop="activityFrequency">
+          <el-form-item
+            label-width="120px"
+            label="活动频次"
+            prop="activityFrequency"
+          >
             <el-input-number
               placeholder="请输入"
               :controls="false"
@@ -1803,14 +2031,19 @@
             ></el-input-number>
           </el-form-item>
           <el-form-item label="备注" label-width="120px" prop="remark">
-            <el-input type="textarea" v-model="riskListDetailForm.remark"></el-input>
+            <el-input
+              type="textarea"
+              v-model="riskListDetailForm.remark"
+            ></el-input>
           </el-form-item>
         </div>
         <div class="risk_detail_main">
           <div class="risk_detail_main_title">评价信息</div>
           <el-form-item label="风险评估计算器" prop="riskAssessmentCalculator">
             <div class="detail_flex">
-              <el-radio-group v-model="riskListDetailForm.riskAssessmentCalculator">
+              <el-radio-group
+                v-model="riskListDetailForm.riskAssessmentCalculator"
+              >
                 <template v-if="queryParams.dynamicType == 1">
                   <el-radio :label="1">LECD</el-radio>
                   <el-radio :label="2">直接判定法</el-radio>
@@ -1845,18 +2078,28 @@
               "
             >
               <div>
-                <div class="box1"><span>L</span>(事故或危害事件发生的可能性)</div>
+                <div class="box1">
+                  <span>L</span>(事故或危害事件发生的可能性)
+                </div>
                 <div class="box2">x</div>
-                <template v-if="riskListDetailForm.riskAssessmentCalculator == 1">
-                  <div class="box1"><span>E</span>(暴露于危害事件环境的频率)</div>
+                <template
+                  v-if="riskListDetailForm.riskAssessmentCalculator == 1"
+                >
+                  <div class="box1">
+                    <span>E</span>(暴露于危害事件环境的频率)
+                  </div>
                   <div class="box2">x</div>
                 </template>
-                <div class="box1"><span>C</span>(事故或危害事件发生的可能结果)</div>
+                <div class="box1">
+                  <span>C</span>(事故或危害事件发生的可能结果)
+                </div>
                 <div class="box2">=</div>
                 <div class="box1"><span>D</span></div>
               </div>
               <div>
-                <template v-if="riskListDetailForm.riskAssessmentCalculator == 1">
+                <template
+                  v-if="riskListDetailForm.riskAssessmentCalculator == 1"
+                >
                   <el-select
                     v-model="riskListDetailForm.lecdData.lNumber"
                     clearable
@@ -1894,7 +2137,9 @@
                     ></el-option>
                   </el-select>
                 </template>
-                <template v-else-if="riskListDetailForm.riskAssessmentCalculator == 3">
+                <template
+                  v-else-if="riskListDetailForm.riskAssessmentCalculator == 3"
+                >
                   <!-- <el-select
                   v-model="riskListDetailForm.lcdData.lNumber"
                   clearable
@@ -1931,14 +2176,18 @@
                 <el-input disabled :value="lecdDataUp"></el-input>
               </div>
             </template>
-            <template v-else-if="riskListDetailForm.riskAssessmentCalculator == 4">
+            <template
+              v-else-if="riskListDetailForm.riskAssessmentCalculator == 4"
+            >
               <div>
                 <div class="box1">
-                  <span>L</span>(危害事件或事故在当前环境和条件下发生的频率或概率)
+                  <span>L</span
+                  >(危害事件或事故在当前环境和条件下发生的频率或概率)
                 </div>
                 <!-- <div class="box2">x</div> -->
                 <div class="box1">
-                  <span>S</span>(风险事件发生后的后果严重程度(如“轻微伤害”“重伤”“死亡”)
+                  <span>S</span
+                  >(风险事件发生后的后果严重程度(如“轻微伤害”“重伤”“死亡”)
                 </div>
               </div>
               <div>
@@ -2035,7 +2284,9 @@
             </thead>
             <tbody>
               <tr v-for="item in riskList7" :key="item.id">
-                <td>{{ item.score }}({{ item.name.replace(/\([^)]*\)/g, "") }})</td>
+                <td>
+                  {{ item.score }}({{ item.name.replace(/\([^)]*\)/g, "") }})
+                </td>
                 <td
                   @click="onClickLevel(item, ele)"
                   style="cursor: pointer"
@@ -2085,31 +2336,51 @@
           </span>
         </el-form-item>
         <div class="risk_detail_main_title">管控措施</div>
-        <el-form-item label="工程措施" label-width="120px" prop="engineeringMeasure">
+        <el-form-item
+          label="工程措施"
+          label-width="120px"
+          prop="engineeringMeasure"
+        >
           <el-input
             type="textarea"
             v-model="riskListDetailForm.engineeringMeasure"
           ></el-input>
         </el-form-item>
-        <el-form-item label="管理措施" label-width="120px" prop="managementMeasure">
+        <el-form-item
+          label="管理措施"
+          label-width="120px"
+          prop="managementMeasure"
+        >
           <el-input
             type="textarea"
             v-model="riskListDetailForm.managementMeasure"
           ></el-input>
         </el-form-item>
-        <el-form-item label="个体防护" label-width="120px" prop="personalProtection">
+        <el-form-item
+          label="个体防护"
+          label-width="120px"
+          prop="personalProtection"
+        >
           <el-input
             type="textarea"
             v-model="riskListDetailForm.personalProtection"
           ></el-input>
         </el-form-item>
-        <el-form-item label="应急措施" label-width="120px" prop="emergencyMeasure">
+        <el-form-item
+          label="应急措施"
+          label-width="120px"
+          prop="emergencyMeasure"
+        >
           <el-input
             type="textarea"
             v-model="riskListDetailForm.emergencyMeasure"
           ></el-input>
         </el-form-item>
-        <el-form-item label="教育措施" label-width="120px" prop="educationalMeasure">
+        <el-form-item
+          label="教育措施"
+          label-width="120px"
+          prop="educationalMeasure"
+        >
           <el-input
             type="textarea"
             v-model="riskListDetailForm.educationalMeasure"
@@ -2197,7 +2468,11 @@
           border
           class="new-tables border-table"
         >
-          <el-table-column align="center" prop="responsibleAreaName" label="责任区域">
+          <el-table-column
+            align="center"
+            prop="responsibleAreaName"
+            label="责任区域"
+          >
           </el-table-column>
           <el-table-column
             align="center"
@@ -2205,19 +2480,35 @@
             label="管控责任人"
           >
           </el-table-column>
-          <el-table-column align="center" prop="implementationTime" label="落实时间">
+          <el-table-column
+            align="center"
+            prop="implementationTime"
+            label="落实时间"
+          >
           </el-table-column>
-          <el-table-column align="center" prop="implementationStatus" label="落实情况">
+          <el-table-column
+            align="center"
+            prop="implementationStatus"
+            label="落实情况"
+          >
             <template slot-scope="scope">
               {{ scope.row.implementationStatus }}
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="implementationPhoto" label="落实照片">
+          <el-table-column
+            align="center"
+            prop="implementationPhoto"
+            label="落实照片"
+          >
             <template slot-scope="scope">
               {{ scope.row.implementationPhoto }}
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="otherInstruction" label="其他说明">
+          <el-table-column
+            align="center"
+            prop="otherInstruction"
+            label="其他说明"
+          >
           </el-table-column>
         </el-table>
       </div>
@@ -2331,7 +2622,7 @@ export default {
         controlListType: 1,
         dynamicType: 1,
         containLibraryIds: "",
-        regionIds: "",
+        regionIds: [],
         accidentTypeId: "",
         identificationTime: [],
         effectiveTime: [],
@@ -2464,7 +2755,11 @@ export default {
       },
       riskListDetailFormRules: {
         riskAssessmentCalculator: [
-          { required: true, message: "请选择风险评估计算器", trigger: "change" },
+          {
+            required: true,
+            message: "请选择风险评估计算器",
+            trigger: "change",
+          },
         ],
       },
       riskListDetailType: "",
@@ -2481,14 +2776,14 @@ export default {
       implementingRecordInfo: {},
       implementingRecordList: [],
       RiskListPointCountRiskNumInfo: {},
-      regionalqrCodeTitle:"",
-      regionalqrCodeDialog:false,
-      regionalqrCodeList: []
+      regionalqrCodeTitle: "",
+      regionalqrCodeDialog: false,
+      regionalqrCodeList: [],
     };
   },
   created() {
     this.projectSn = this.$store.state.projectSn;
-    this.getQualityRegionList();
+    // this.getQualityRegionList();
     this.getUpdateUnitListFn();
     this.getAIDeviceFn();
 
@@ -2534,7 +2829,8 @@ export default {
       console.log(1111);
       this.$emit("openHandelDetail", {
         dynamicType: this.queryParams.dynamicType,
-        riskAssessmentCalculator: this.riskListDetailForm.riskAssessmentCalculator,
+        riskAssessmentCalculator:
+          this.riskListDetailForm.riskAssessmentCalculator,
       });
     },
     initRiskListDetailForm() {
@@ -2568,23 +2864,28 @@ export default {
       this.riskListDetailType = type;
       this.riskListDetailForm = {
         ...row,
-        lecdData: isJSON(row.lecdData) && row.lecdData && row.lecdData != "null"
-          ? JSON.parse(row.lecdData)
-          : {
-              lNumber: "",
-              eNumber: "",
-              cNumber: "",
-            },
-        lcdData: isJSON(row.lcdData) && row.lcdData && row.lcdData != "null"
-          ? JSON.parse(row.lcdData)
-          : { lNumber: "", cNumber: "" },
-        lsrData: isJSON(row.lsrData) && row.lsrData && row.lsrData != "null"
-          ? JSON.parse(row.lsrData)
-          : { lNumber: "", sNumber: "" },
+        lecdData:
+          isJSON(row.lecdData) && row.lecdData && row.lecdData != "null"
+            ? JSON.parse(row.lecdData)
+            : {
+                lNumber: "",
+                eNumber: "",
+                cNumber: "",
+              },
+        lcdData:
+          isJSON(row.lcdData) && row.lcdData && row.lcdData != "null"
+            ? JSON.parse(row.lcdData)
+            : { lNumber: "", cNumber: "" },
+        lsrData:
+          isJSON(row.lsrData) && row.lsrData && row.lsrData != "null"
+            ? JSON.parse(row.lsrData)
+            : { lNumber: "", sNumber: "" },
         specificResponsibilityAreaIds: row.specificResponsibilityAreaIds
           ? row.specificResponsibilityAreaIds.split(",")
           : [],
-        controlWorkerIds: row.controlWorkerIds ? row.controlWorkerIds.split(",") : [],
+        controlWorkerIds: row.controlWorkerIds
+          ? row.controlWorkerIds.split(",")
+          : [],
         controlWorkerEnterpriseIds: row.controlWorkerEnterpriseIds
           ? row.controlWorkerEnterpriseIds.split(",")
           : [],
@@ -2621,7 +2922,8 @@ export default {
           lcdData: JSON.stringify(this.riskListDetailForm.lcdData),
           lsrData: JSON.stringify(this.riskListDetailForm.lsrData),
           specificResponsibilityAreaIds:
-            this.riskListDetailForm.specificResponsibilityAreaIds instanceof Array
+            this.riskListDetailForm.specificResponsibilityAreaIds instanceof
+            Array
               ? this.riskListDetailForm.specificResponsibilityAreaIds.join(",")
               : "",
           controlWorkerIds:
@@ -2693,45 +2995,105 @@ export default {
           dynamicLecdJdMax: resultInfo.dynamicLecdJdMax
             ? resultInfo.dynamicLecdJdMax
             : "",
-          dynamicLecdDMax: resultInfo.dynamicLecdDMax ? resultInfo.dynamicLecdDMax : "",
+          dynamicLecdDMax: resultInfo.dynamicLecdDMax
+            ? resultInfo.dynamicLecdDMax
+            : "",
         };
-      } else if (this.riskListDetailForm.riskAssessmentCalculator == 2 && this.queryParams.dynamicType == 1) {
+      } else if (
+        this.riskListDetailForm.riskAssessmentCalculator == 2 &&
+        this.queryParams.dynamicType == 1
+      ) {
         return {
-          dynamicZjZdMin: resultInfo.dynamicZjZdMin ? resultInfo.dynamicZjZdMin : "",
-          dynamicZjZdMax: resultInfo.dynamicZjZdMax ? resultInfo.dynamicZjZdMax : "",
-          dynamicZjJdMin: resultInfo.dynamicZjJdMin ? resultInfo.dynamicZjJdMin : "",
-          dynamicZjJdMax: resultInfo.dynamicZjJdMax ? resultInfo.dynamicZjJdMax : "",
-          dynamicZjYbMin: resultInfo.dynamicZjYbMin ? resultInfo.dynamicZjYbMin : "",
-          dynamicZjYbMax: resultInfo.dynamicZjYbMax ? resultInfo.dynamicZjYbMax : "",
-          dynamicZjDMin: resultInfo.dynamicZjDMin ? resultInfo.dynamicZjDMin : "",
-          dynamicZjDMax: resultInfo.dynamicZjDMax ? resultInfo.dynamicZjDMax : "",
+          dynamicZjZdMin: resultInfo.dynamicZjZdMin
+            ? resultInfo.dynamicZjZdMin
+            : "",
+          dynamicZjZdMax: resultInfo.dynamicZjZdMax
+            ? resultInfo.dynamicZjZdMax
+            : "",
+          dynamicZjJdMin: resultInfo.dynamicZjJdMin
+            ? resultInfo.dynamicZjJdMin
+            : "",
+          dynamicZjJdMax: resultInfo.dynamicZjJdMax
+            ? resultInfo.dynamicZjJdMax
+            : "",
+          dynamicZjYbMin: resultInfo.dynamicZjYbMin
+            ? resultInfo.dynamicZjYbMin
+            : "",
+          dynamicZjYbMax: resultInfo.dynamicZjYbMax
+            ? resultInfo.dynamicZjYbMax
+            : "",
+          dynamicZjDMin: resultInfo.dynamicZjDMin
+            ? resultInfo.dynamicZjDMin
+            : "",
+          dynamicZjDMax: resultInfo.dynamicZjDMax
+            ? resultInfo.dynamicZjDMax
+            : "",
         };
       } else if (this.riskListDetailForm.riskAssessmentCalculator == 3) {
         return {
-          dynamicLecdZdMin: resultInfo.dynamicLcdZdMin ? resultInfo.dynamicLcdZdMin : "",
-          dynamicLecdYbMin: resultInfo.dynamicLcdYbMin ? resultInfo.dynamicLcdYbMin : "",
-          dynamicLecdYbMax: resultInfo.dynamicLcdYbMax ? resultInfo.dynamicLcdYbMax : "",
-          dynamicLecdJdMin: resultInfo.dynamicLcdJdMin ? resultInfo.dynamicLcdJdMin : "",
-          dynamicLecdJdMax: resultInfo.dynamicLcdJdMax ? resultInfo.dynamicLcdJdMax : "",
-          dynamicLecdDMax: resultInfo.dynamicLcdDMax ? resultInfo.dynamicLcdDMax : "",
+          dynamicLecdZdMin: resultInfo.dynamicLcdZdMin
+            ? resultInfo.dynamicLcdZdMin
+            : "",
+          dynamicLecdYbMin: resultInfo.dynamicLcdYbMin
+            ? resultInfo.dynamicLcdYbMin
+            : "",
+          dynamicLecdYbMax: resultInfo.dynamicLcdYbMax
+            ? resultInfo.dynamicLcdYbMax
+            : "",
+          dynamicLecdJdMin: resultInfo.dynamicLcdJdMin
+            ? resultInfo.dynamicLcdJdMin
+            : "",
+          dynamicLecdJdMax: resultInfo.dynamicLcdJdMax
+            ? resultInfo.dynamicLcdJdMax
+            : "",
+          dynamicLecdDMax: resultInfo.dynamicLcdDMax
+            ? resultInfo.dynamicLcdDMax
+            : "",
         };
       } else if (this.riskListDetailForm.riskAssessmentCalculator == 4) {
         return {
-          dynamicLecdZdMin: resultInfo.staticLsrZdMin ? resultInfo.staticLsrZdMin : "",
-          dynamicLecdYbMin: resultInfo.staticLsrYbMin ? resultInfo.staticLsrYbMin : "",
-          dynamicLecdYbMax: resultInfo.staticLsrYbMax ? resultInfo.staticLsrYbMax : "",
-          dynamicLecdJdMin: resultInfo.staticLsrJdMin ? resultInfo.staticLsrJdMin : "",
-          dynamicLecdJdMax: resultInfo.staticLsrJdMax ? resultInfo.staticLsrJdMax : "",
-          dynamicLecdDMax: resultInfo.staticLsrDMax ? resultInfo.staticLsrDMax : "",
+          dynamicLecdZdMin: resultInfo.staticLsrZdMin
+            ? resultInfo.staticLsrZdMin
+            : "",
+          dynamicLecdYbMin: resultInfo.staticLsrYbMin
+            ? resultInfo.staticLsrYbMin
+            : "",
+          dynamicLecdYbMax: resultInfo.staticLsrYbMax
+            ? resultInfo.staticLsrYbMax
+            : "",
+          dynamicLecdJdMin: resultInfo.staticLsrJdMin
+            ? resultInfo.staticLsrJdMin
+            : "",
+          dynamicLecdJdMax: resultInfo.staticLsrJdMax
+            ? resultInfo.staticLsrJdMax
+            : "",
+          dynamicLecdDMax: resultInfo.staticLsrDMax
+            ? resultInfo.staticLsrDMax
+            : "",
         };
-      } else if (this.riskListDetailForm.riskAssessmentCalculator == 2 && this.queryParams.dynamicType == 2) {
+      } else if (
+        this.riskListDetailForm.riskAssessmentCalculator == 2 &&
+        this.queryParams.dynamicType == 2
+      ) {
         return {
-          dynamicZjZdMin: resultInfo.staticZjZdMin ? resultInfo.staticZjZdMin : "",
-          dynamicZjZdMax: resultInfo.staticZjZdMax ? resultInfo.staticZjZdMax : "",
-          dynamicZjJdMin: resultInfo.staticZjJdMin ? resultInfo.staticZjJdMin : "",
-          dynamicZjJdMax: resultInfo.staticZjJdMax ? resultInfo.staticZjJdMax : "",
-          dynamicZjYbMin: resultInfo.staticZjYbMin ? resultInfo.staticZjYbMin : "",
-          dynamicZjYbMax: resultInfo.staticZjYbMax ? resultInfo.staticZjYbMax : "",
+          dynamicZjZdMin: resultInfo.staticZjZdMin
+            ? resultInfo.staticZjZdMin
+            : "",
+          dynamicZjZdMax: resultInfo.staticZjZdMax
+            ? resultInfo.staticZjZdMax
+            : "",
+          dynamicZjJdMin: resultInfo.staticZjJdMin
+            ? resultInfo.staticZjJdMin
+            : "",
+          dynamicZjJdMax: resultInfo.staticZjJdMax
+            ? resultInfo.staticZjJdMax
+            : "",
+          dynamicZjYbMin: resultInfo.staticZjYbMin
+            ? resultInfo.staticZjYbMin
+            : "",
+          dynamicZjYbMax: resultInfo.staticZjYbMax
+            ? resultInfo.staticZjYbMax
+            : "",
           dynamicZjDMin: resultInfo.staticZjDMin ? resultInfo.staticZjDMin : "",
           dynamicZjDMax: resultInfo.staticZjDMax ? resultInfo.staticZjDMax : "",
         };
@@ -2838,7 +3200,9 @@ export default {
       this.defaultCheckedKeys = checkedNodeKeys.checkedKeys;
     },
     onRegionalqrCodeDelete(row) {
-      const findIndex = this.regionalqrCodeList.findIndex((item) => item.id === row.id);
+      const findIndex = this.regionalqrCodeList.findIndex(
+        (item) => item.id === row.id
+      );
       if (findIndex !== -1) {
         this.regionalqrCodeList.splice(findIndex, 1);
       }
@@ -2852,12 +3216,17 @@ export default {
       this.$refs.regionalqrCodeTree.setCheckedKeys(this.defaultCheckedKeys);
     },
     regionalqrCodeSubmit() {
-      if (this.regionalqrCodeList.length === 0) return this.$message.warning("请先勾选数据！");
+      if (this.regionalqrCodeList.length === 0)
+        return this.$message.warning("请先勾选数据！");
       const requestData = {
         regionIds: this.regionalqrCodeList.map((item) => item.id).join(","),
         projectSn: this.projectSn,
       };
-      this.exportDownload(requestData, "xmgl/riskListSource/downloadRegionQrCode", "区域二维码导出.zip");
+      this.exportDownload(
+        requestData,
+        "xmgl/riskListSource/downloadRegionQrCode",
+        "区域二维码导出.zip"
+      );
       this.regionalqrCodeDialog = false;
     },
     // 风险点识别
@@ -2883,7 +3252,9 @@ export default {
       this.defaultCheckedKeys = checkedNodeKeys.checkedKeys;
     },
     onRiskDelete(row) {
-      const findIndex = this.riskPointList.findIndex((item) => item.id === row.id);
+      const findIndex = this.riskPointList.findIndex(
+        (item) => item.id === row.id
+      );
       if (findIndex !== -1) {
         this.riskPointList.splice(findIndex, 1);
       }
@@ -2897,7 +3268,8 @@ export default {
       this.$refs.riskPointTree.setCheckedKeys(this.defaultCheckedKeys);
     },
     riskPointSubmit() {
-      if (this.riskPointList.length === 0) return this.$message.warning("请先勾选数据！");
+      if (this.riskPointList.length === 0)
+        return this.$message.warning("请先勾选数据！");
       const params = {
         libraryIds: this.riskPointList.map((item) => item.id),
         projectSn: this.$store.state.projectSn,
@@ -2926,14 +3298,17 @@ export default {
       }).then((res) => {
         if (res.success) {
           // ancestors
-          this.riskPointTreeList = this.recursionRiskListLibraryList(res.result.records);
+          this.riskPointTreeList = this.recursionRiskListLibraryList(
+            res.result.records
+          );
         }
       });
     },
     // 打开危险源
     openSourceDanger(row) {
       const index = row.riskPointName.lastIndexOf("/");
-      this.sourceDangerTitle = row.riskPointName.substring(index + 1) + "-危险源列表";
+      this.sourceDangerTitle =
+        row.riskPointName.substring(index + 1) + "-危险源列表";
       if (row && row.id) {
         this.hazardSourceInfo.libraryId = row.riskListLibraryId;
         this.hazardSourceInfo.pointId = row.id;
@@ -2968,7 +3343,7 @@ export default {
       this.queryParams.pageNo = 1;
       this.queryParams.projectType = "";
       this.queryParams.riskListLibraryId = [];
-      this.queryParams.regionIds = "";
+      this.queryParams.regionIds = [];
       this.queryParams.containLibraryIds = "";
       if (this.queryParams.controlListType == 2) {
         this.queryParams.accidentTypeId = "";
@@ -2989,7 +3364,9 @@ export default {
         type: "warning",
       })
         .then(() => {
-          const ids = this.$refs.multipleTable.selection.map((item) => item.id).join(",");
+          const ids = this.$refs.multipleTable.selection
+            .map((item) => item.id)
+            .join(",");
           //   console.log(this.$refs.multipleTable.selection);
           const obj = {
             1: deleteBatchRiskListPointApi,
@@ -3070,7 +3447,7 @@ export default {
         dynamicType: this.queryParams.dynamicType,
         projectType: this.queryParams.projectType,
         containLibraryIds: this.queryParams.containLibraryIds,
-        regionIds: this.queryParams.regionIds,
+        regionIds: this.queryParams.regionIds.join(','),
         pageNo: this.queryParams.pageNo,
         pageSize: this.queryParams.pageSize,
       };
@@ -3083,19 +3460,23 @@ export default {
           ...data,
           accidentTypeId: this.queryParams.accidentTypeId,
           identificationTime_begin:
-          this.queryParams.identificationTime instanceof Array && this.queryParams.identificationTime.length > 1
+            this.queryParams.identificationTime instanceof Array &&
+            this.queryParams.identificationTime.length > 1
               ? this.queryParams.identificationTime[0]
               : "",
           identificationTime_end:
-          this.queryParams.identificationTime instanceof Array && this.queryParams.identificationTime.length > 1
+            this.queryParams.identificationTime instanceof Array &&
+            this.queryParams.identificationTime.length > 1
               ? this.queryParams.identificationTime[1]
               : "",
-            effectiveTimeEnd_begin:
-            this.queryParams.effectiveTime instanceof Array && this.queryParams.effectiveTime.length > 1
+          effectiveTimeEnd_begin:
+            this.queryParams.effectiveTime instanceof Array &&
+            this.queryParams.effectiveTime.length > 1
               ? this.queryParams.effectiveTime[0]
               : "",
-              effectiveTimeBegin_end:
-              this.queryParams.effectiveTime instanceof Array && this.queryParams.effectiveTime.length > 1
+          effectiveTimeBegin_end:
+            this.queryParams.effectiveTime instanceof Array &&
+            this.queryParams.effectiveTime.length > 1
               ? this.queryParams.effectiveTime[1]
               : "",
           riskLevel: this.queryParams.riskLevel,
@@ -3136,24 +3517,30 @@ export default {
 
       if (command == 1) {
         const requestData = {
-          pointIds: this.$refs.multipleTable.selection.map((item) => item.id).join(","),
+          pointIds: this.$refs.multipleTable.selection
+            .map((item) => item.id)
+            .join(","),
           projectSn: this.projectSn,
         };
         this.exportDownload(requestData, objFn[command], "风险点清单导出.xlsx");
       } else if (command == 2) {
         const requestData = {
-          sourceIds: this.$refs.multipleTable.selection.map((item) => item.id).join(","),
+          sourceIds: this.$refs.multipleTable.selection
+            .map((item) => item.id)
+            .join(","),
           projectSn: this.projectSn,
         };
         this.exportDownload(requestData, objFn[command], "辨识清单导出.xlsx");
       } else if (command == 3) {
         const requestData = {
-          sourceIds: this.$refs.multipleTable.selection.map((item) => item.id).join(","),
+          sourceIds: this.$refs.multipleTable.selection
+            .map((item) => item.id)
+            .join(","),
           projectSn: this.projectSn,
         };
         this.exportDownload(requestData, objFn[command], "危险源清单导出.xlsx");
       } else if (command == 10) {
-        this.openRegionalqrCode()
+        this.openRegionalqrCode();
       }
     },
     exportDownload(requestData, url, name) {
@@ -3243,12 +3630,14 @@ export default {
     },
     // 获取整改单位列表
     getUpdateUnitListFn() {
-      selectHierarchyEnterpriseListApi({ projectSn: this.projectSn }).then((res) => {
-        console.log(res);
-        if (res.code == 200) {
-          this.enterpriseInfoList = res.result;
+      selectHierarchyEnterpriseListApi({ projectSn: this.projectSn }).then(
+        (res) => {
+          console.log(res);
+          if (res.code == 200) {
+            this.enterpriseInfoList = res.result;
+          }
         }
-      });
+      );
     },
     // 获取整改人列表
     getUpdatePersonListFn() {
@@ -3279,7 +3668,8 @@ export default {
                 this.setForm.effectiveTime.length > 1
                   ? this.setForm.effectiveTime[1]
                   : null,
-              specificResponsibilityAreaIds: this.setForm.specificResponsibilityAreaIds
+              specificResponsibilityAreaIds: this.setForm
+                .specificResponsibilityAreaIds
                 ? this.setForm.specificResponsibilityAreaIds.join(",")
                 : null,
             };
@@ -3294,20 +3684,25 @@ export default {
                   this.setForm.effectiveTime.length > 1
                     ? this.setForm.effectiveTime[1]
                     : null;
-              } else if (this.batchSettingType == 2 || this.batchSettingType == 4) {
+              } else if (
+                this.batchSettingType == 2 ||
+                this.batchSettingType == 4
+              ) {
                 item.specificResponsibilityAreaIds = this.setForm
                   .specificResponsibilityAreaIds
                   ? this.setForm.specificResponsibilityAreaIds.join(",")
                   : null;
               } else if (this.batchSettingType == 5) {
-                item.controlWorkerEnterpriseIds = this.setForm.controlWorkerEnterpriseIds
+                item.controlWorkerEnterpriseIds = this.setForm
+                  .controlWorkerEnterpriseIds
                   ? this.setForm.controlWorkerEnterpriseIds.join(",")
                   : "";
                 item.controlWorkerIds = this.setForm.controlWorkerIds
                   ? this.setForm.controlWorkerIds.join(",")
                   : "";
               } else if (this.batchSettingType == 6) {
-                item.checkWorkerEnterpriseIds = this.setForm.checkWorkerEnterpriseIds
+                item.checkWorkerEnterpriseIds = this.setForm
+                  .checkWorkerEnterpriseIds
                   ? this.setForm.checkWorkerEnterpriseIds.join(",")
                   : "";
                 item.checkWorkerIds = this.setForm.checkWorkerIds
@@ -3433,6 +3828,10 @@ export default {
       }).then((res) => {
         if (res.result.length > 0) {
           this.projectTypeList = res.result;
+          if(this.projectTypeList.length > 0) {
+            this.queryParams.projectType = this.projectTypeList[0].data;
+          }
+          this.handleQuery();
         }
       });
       // 风险因素类型
@@ -3472,7 +3871,8 @@ export default {
     },
     riskListChageLSR() {
       const countNum = Number(
-        this.riskListDetailForm.lsrData.lNumber * this.riskListDetailForm.lsrData.sNumber
+        this.riskListDetailForm.lsrData.lNumber *
+          this.riskListDetailForm.lsrData.sNumber
       ).toFixed(2);
       if (countNum > Number(this.riskAssessmentInfo.staticLsrZdMin)) {
         this.riskListDetailForm.riskLevel = 1;
@@ -3578,7 +3978,9 @@ export default {
     },
     accidentTypeUp() {
       return (accidentTypeId) => {
-        const find = this.accidentTypeList.find((item) => accidentTypeId === item.id);
+        const find = this.accidentTypeList.find(
+          (item) => accidentTypeId === item.id
+        );
         return find ? find.type : "--";
       };
     },
@@ -3590,11 +3992,21 @@ export default {
     },
     concatenationTextUp() {
       return (row) => {
-        const engineeringMeasure = row.engineeringMeasure ? row.engineeringMeasure : "--";
-        const managementMeasure = row.managementMeasure ? row.managementMeasure : "--";
-        const personalProtection = row.personalProtection ? row.personalProtection : "--";
-        const emergencyMeasure = row.emergencyMeasure ? row.emergencyMeasure : "--";
-        const educationalMeasure = row.educationalMeasure ? row.educationalMeasure : "--";
+        const engineeringMeasure = row.engineeringMeasure
+          ? row.engineeringMeasure
+          : "--";
+        const managementMeasure = row.managementMeasure
+          ? row.managementMeasure
+          : "--";
+        const personalProtection = row.personalProtection
+          ? row.personalProtection
+          : "--";
+        const emergencyMeasure = row.emergencyMeasure
+          ? row.emergencyMeasure
+          : "--";
+        const educationalMeasure = row.educationalMeasure
+          ? row.educationalMeasure
+          : "--";
 
         return `工程措施：${engineeringMeasure}\n管理措施：${managementMeasure}\n个体防护：${personalProtection}\n应急措施：${emergencyMeasure}\n教育措施：${educationalMeasure}\n`;
       };
@@ -3840,8 +4252,8 @@ export default {
   margin-bottom: 20px;
 }
 .risk_detail_main {
-  /deep/ .el-input__icon{
-     line-height: 34px;
+  /deep/ .el-input__icon {
+    line-height: 34px;
   }
   .detail_flex {
     display: flex;
@@ -3861,17 +4273,17 @@ export default {
   .detail_table3 {
     // width: calc(100% - 320px - 120px) !important;
     .el-select,
-    .el-input{
+    .el-input {
       width: 320px !important;
     }
     .box1 {
       min-width: 320px;
       width: initial !important;
-      color: #A2A4AF !important;
+      color: #a2a4af !important;
       font-size: 12px !important;
       > span {
         font-size: 14px !important;
-        color: #272D45 !important;
+        color: #272d45 !important;
       }
     }
     > div:first-child {