fix: 解决冲突

src/views/projectFront/progressManagementAg/divisionSubManage.vue

@@ -195,6 +195,13 @@
                     </span>
                   </template>
                 </el-table-column>
+                <el-table-column
+                  align="center"
+                  prop="qualityRegionName"
+                  label="区域"
+                  show-overflow-tooltip
+                >
+                </el-table-column>
                 <el-table-column
                   align="center"
                   prop="startDate"

src/views/projectFront/progressManagementAg/projectProgressDetail.vue

@@ -141,17 +141,19 @@
           </el-table>
         </div> -->
       </div>
-      <div class="plan_wrap whiteBlock">
+      <div class="plan_wrap whiteBlock" style="position: relative;">
         <div class="pageTitle">进度记录</div>
+       
         <div
         v-if="
             itemForm.dutyUserId &&
               itemForm.dutyUserId === $store.state.userInfo.userId
           "
         >
+       
           <el-button
            v-if="itemForm.status === 0"
-            style="top: 16%; position: absolute; left: 94%"
+            style="top: 12px; position: absolute; right: 8px"
             size="mini"
             type="primary"
             plain
@@ -159,9 +161,10 @@
           >
             开始任务
           </el-button>
+        
           <el-button
           v-if="itemForm.status === 1 || itemForm.status === 3"
-            style="top: 16%; position: absolute; left: 94%"
+          style="top: 12px; position: absolute; right: 8px"
             size="mini"
             type="primary"
             plain
@@ -169,9 +172,10 @@
           >
             上报进度
           </el-button>
+          
           <el-button
           v-if="itemForm.status === 2"
-            style="top: 16%; position: absolute; left: 93.5%"
+          style="top: 12px; position: absolute; right: 8px"
             size="mini"
             type="info"
             plain

src/views/projectFront/quality/qualityAnalysis.vue

@@ -500,6 +500,7 @@ export default {
         // 雷达图
         radarCharts(el) {
             let ageChart = echarts.init(el);
+           
             const data = [
                 this.examineInfo2.investigateNum,
                 this.examineInfo2.notCloseNum,
@@ -507,7 +508,8 @@ export default {
                 this.examineInfo2.rectificationNum,
                 this.examineInfo2.reviewNum,
                 this.examineInfo2.verificationNum];
-            const maxCount = data.sort((a,b) => b - a)[0];
+            const maxCount = data.map(item => item).sort((a,b) => b - a)[0];
+            // console.log('~~~~~~~~~~~~~',this.examineInfo2,data);
             let option = {
                 legend: {
                     icon: 'roundRect',

src/views/projectFront/safeSame/inspectionLedger.vue

@@ -2634,6 +2634,7 @@ export default {
     },
     //导出
     exportData() {
+      
       if (this.COMPANY == "zjwj") {
         window.location.href =
           this.$http.defaults.baseURL +
@@ -2654,9 +2655,10 @@ export default {
           "&pageSize=" +
           this.pageSize;
       } else {
+        // xmgl/download/exporExcelQualityInspectionRecord
         window.location.href =
           this.$http.defaults.baseURL +
-          "xmgl/download/exporExcelQualityInspectionRecord?projectSn=" +
+          "xmgl/download/exportExcelXzSecurityQualityInspectionRecord?projectSn=" +
           this.$store.state.projectSn +
           "&recordType=" +
           this.formInline.recordType +

src/views/projectFront/safetyEducation/safetyAnalysis.vue

@@ -507,7 +507,8 @@ export default {
                 this.examineInfo2.rectificationNum,
                 this.examineInfo2.reviewNum,
                 this.examineInfo2.verificationNum];
-            const maxCount =  data.sort((a,b) => b - a)[0];
+            const maxCount =  data.map(item => item).sort((a,b) => b - a)[0];
+            // console.log('~~~~~~~~~~~~~',this.examineInfo2,data);
             let option = {
                 legend: {
                     icon: 'roundRect',

src/views/projectFront/specialWork/blindPlugWork.vue

@@ -246,7 +246,7 @@
                                 {{ workDetail.safetyWorkTicketCode }}
                             </el-form-item> -->
                             <el-form-item label="实际作业开始时间：" :label-width="formLabelWidthDetail">
-                                <el-date-picker v-model="workDetail.actualJobBeginTime" type="date"
+                                <el-date-picker v-model="workDetail.actualJobBeginTime" type="datetimerange"
                                     value-format="yyyy-MM-dd HH:mm:ss" :disabled="isDisabledDetail">
                                 </el-date-picker>
                             </el-form-item>

src/views/projectFront/specialWork/fireWork.vue

@@ -368,7 +368,7 @@
                                 {{ workDetail.certificateNo }}
                             </el-form-item> -->
                             <el-form-item label="动火作业实施时间：" :label-width="formLabelWidthDetail">
-                                <el-date-picker v-model="workDetail.hotWorkExecutionTime" type="daterange"
+                                <el-date-picker v-model="workDetail.hotWorkExecutionTime" type="datetimerange"
                                     value-format="yyyy-MM-dd HH:mm:ss" :disabled="isDisabledDetail" range-separator="至"
                                     start-placeholder="开始日期" end-placeholder="结束日期">
                                 </el-date-picker>