From b1f785cfd99b8e2ec1385bc039d1b87ec29dff8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com>
Date: Sat, 25 May 2024 14:21:17 +0800
Subject: [PATCH] 1

---
 src/store/index.js                            |  3 ++-
 .../divisionSubManage.vue                     |  7 ++++++
 .../projectProgressDetail.vue                 | 24 +++++++++++--------
 .../projectFront/quality/qualityAnalysis.vue  |  4 +++-
 .../safeSame/inspectionLedger.vue             |  4 +++-
 .../safetyEducation/safetyAnalysis.vue        |  3 ++-
 6 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index 4804dff3..39e06abb 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -52,7 +52,8 @@ export default new Vuex.Store({
     // FILEURL:'http://182.90.224.237:51234/image/',
     UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
     FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
-    WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//坤工作流地址(本地)
+    // WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//坤工作流地址(本地)
+    WORKFLOWURL: 'http://192.168.34.126:88/#/workspace/forms',//罗峰工作流地址(本地)
     // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
     // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
     // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试
diff --git a/src/views/projectFront/progressManagementAg/divisionSubManage.vue b/src/views/projectFront/progressManagementAg/divisionSubManage.vue
index e422ba86..56809ea6 100644
--- a/src/views/projectFront/progressManagementAg/divisionSubManage.vue
+++ b/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"
diff --git a/src/views/projectFront/progressManagementAg/projectProgressDetail.vue b/src/views/projectFront/progressManagementAg/projectProgressDetail.vue
index 3111e282..fd7a5666 100644
--- a/src/views/projectFront/progressManagementAg/projectProgressDetail.vue
+++ b/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="
+        <!-- v-if="
             itemForm.dutyUserId &&
               itemForm.dutyUserId === $store.state.userInfo.userId
-          "
+          " -->
+        <div
+         
         >
+       
           <el-button
-            v-if="itemForm.status === 0"
-            style="top: 16%; position: absolute; left: 94%"
+           v-if="itemForm.status === 0"
+            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%"
+          v-if="itemForm.status === 1 || itemForm.status === 3"
+          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%"
+          v-if="itemForm.status === 2"
+          style="top: 12px; position: absolute; right: 8px"
             size="mini"
             type="info"
             plain
diff --git a/src/views/projectFront/quality/qualityAnalysis.vue b/src/views/projectFront/quality/qualityAnalysis.vue
index 56c79356..08b1c5a5 100644
--- a/src/views/projectFront/quality/qualityAnalysis.vue
+++ b/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',
diff --git a/src/views/projectFront/safeSame/inspectionLedger.vue b/src/views/projectFront/safeSame/inspectionLedger.vue
index 95ff0840..9d2a9fbb 100644
--- a/src/views/projectFront/safeSame/inspectionLedger.vue
+++ b/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 +
diff --git a/src/views/projectFront/safetyEducation/safetyAnalysis.vue b/src/views/projectFront/safetyEducation/safetyAnalysis.vue
index a5a7c5ef..2daa2a57 100644
--- a/src/views/projectFront/safetyEducation/safetyAnalysis.vue
+++ b/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',