From 044bb53105e90967c750125314e0142fa03f9901 Mon Sep 17 00:00:00 2001
From: yjl <1490736767@qq.com>
Date: Thu, 30 Mar 2023 10:06:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E6=9E=97=E6=B9=BE-=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/http.js                         |  8 +++----
 src/store/index.js                            |  6 +++--
 .../jlw/qualityManage/rightTop.vue            | 24 ++++++++++++++-----
 .../jlw/safeManage/leftBottom.vue             | 10 +++++---
 .../projectAdmin/jlw/safeManage/rightTop.vue  |  8 ++++---
 5 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 5918d3a6..0c261f24 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -44,7 +44,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
   // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
-  // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
+  // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上旧
   // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
   // axios.defaults.baseURL = 'http://47.97.202.104:6023/';
   // axios.defaults.baseURL = 'http://139.9.66.234:8/';
@@ -78,16 +78,16 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://192.168.34.221:8188' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.221:8210' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.221:12346' //郭圣雄本地
-  axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地
+  // axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地
   // axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上
   // axios.defaults.baseURL = 'http://101.43.164.214:12345/#/'//内蒙古线上
-
+  axios.defaults.baseURL = 'http://121.196.214.246/api'//金林湾线上新
 
 } else if (process.env.NODE_ENV == 'debug') {
   axios.defaults.baseURL = 'https://www.ceshi.com'
 } else if (process.env.NODE_ENV == 'production') {
   let host = window.location.host
-  axios.defaults.baseURL = window.location.protocol + '//' + host + '/'
+  axios.defaults.baseURL = window.location.protocol + '//' + host + '/api'
   // axios.defaults.baseURL ='http://192.168.34.216:6023/'
   // axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/"
   // axios.defaults.baseURL = 'http://zhgd.loganwy.com/'
diff --git a/src/store/index.js b/src/store/index.js
index 12b33dff..aca30247 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -72,12 +72,14 @@ export default new Vuex.Store({
     // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
     // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式
     // FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式
-    UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台
-    FILEURL: 'http://182.90.224.147:100/image/',//演示平台
+    // UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台
+    // FILEURL: 'http://182.90.224.147:100/image/',//演示平台
     // UPLOADURL: 'http://139.9.66.234:7072/upload/image',//三江集团
     // FILEURL: 'http://139.9.66.234:7072/image/',//三江集团
     // UPLOADURL: 'http://182.90.224.147:18170/upload/image',//瑞士恒通
     // FILEURL: 'http://182.90.224.147:18170/image/',//瑞士恒通
+    UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾新地址
+    FILEURL: 'http://121.196.214.246/image/',//金林湾新地址
 
     ACCOUNTTYPE: [
       "系统管理员",
diff --git a/src/views/projectAdmin/jlw/qualityManage/rightTop.vue b/src/views/projectAdmin/jlw/qualityManage/rightTop.vue
index 45ee0859..6de232ff 100644
--- a/src/views/projectAdmin/jlw/qualityManage/rightTop.vue
+++ b/src/views/projectAdmin/jlw/qualityManage/rightTop.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 质量问题 -->
-  <Card :title="title" style="position: relative;">
+  <Card :title="title" style="position: relative">
     <!-- <el-date-picker
       v-model="dateRange"
       size="mini"
@@ -14,13 +14,22 @@
     <div class="wrap">
       <div class="charts">
         <div class="chart">
-          <JRingChart :title="{ text: total.totalNum, subTitle: '问题总数' }" :color="['#3CABFD']" />
+          <JRingChart
+            :title="{ text: total.totalNum, subTitle: '问题总数' }"
+            :color="['#3CABFD']"
+          />
         </div>
         <div class="chart">
-          <JRingChart :title="{ text: total.notCloseNum, subTitle: '未闭合问题' }" :color="['#557DEE']" />
+          <JRingChart
+            :title="{ text: total.notCloseNum, subTitle: '未闭合问题' }"
+            :color="['#557DEE']"
+          />
         </div>
         <div class="chart">
-          <JRingChart :title="{ text: total.rectificationNum, subTitle: '未整改问题' }" :color="['#FE6C7F']" />
+          <JRingChart
+            :title="{ text: total.rectificationNum, subTitle: '未整改问题' }"
+            :color="['#FE6C7F']"
+          />
         </div>
         <div class="chart">
           <JRingChart
@@ -72,9 +81,12 @@ export default {
       let data = {
         projectSn: this.$store.state.projectSn
       }
-      selectQualityStatisticsApi(data).then(res => {
+      selectQualityStatisticsApi(data).then((res) => {
+        console.log('res====', res)
         this.total = res.result.total
-        let ratio = this.total.totalNum ? ((this.total.closeNum / this.total.totalNum) * 100).toFixed(2) : 0
+        let ratio = this.total.totalNum
+          ? ((this.total.closeNum / this.total.totalNum) * 100).toFixed(2)
+          : 0
         this.total.ratioNum = ratio + '%'
       })
     }
diff --git a/src/views/projectAdmin/jlw/safeManage/leftBottom.vue b/src/views/projectAdmin/jlw/safeManage/leftBottom.vue
index a59d6ac1..e7d7c2e0 100644
--- a/src/views/projectAdmin/jlw/safeManage/leftBottom.vue
+++ b/src/views/projectAdmin/jlw/safeManage/leftBottom.vue
@@ -14,8 +14,8 @@
       <div class="rate">
         <div class="chart">
           <JRingChart
-            :title="{ text: completeRatio + '%', y: '40%' }"
-            :data="[{ value: totalNum }, { value: closeNum }]"
+            :title="{ text: closeRatio + '%', y: '40%' }"
+            :data="[{ value: closeNum }, { value: totalNum }]"
             :color="['#5BE2F6', '#193F54']"
           />
         </div>
@@ -23,9 +23,12 @@
       </div>
       <div class="rate">
         <div class="chart">
+          <!-- title="{ text: 60 + '%', y: '40%' }"
+            :data="[100, 60]" -->
+
           <JRingChart
             :title="{ text: closeRatio + '%', y: '40%' }"
-            :data="[{ value: totalNum }, { value: closeNum }]"
+            :data="[{ value: closeNum }, { value: totalNum }]"
             :color="['#FF6C7F', '#39273D']"
           />
         </div>
@@ -69,6 +72,7 @@ export default {
       this.closeRatio = res.result.closeRatio
       this.closeNum = res.result.closeNum
       this.closeRatio = res.result.closeRatio
+      this.rectifyCompleteNum = res.result.rectifyCompleteNum
     })
     // selectRectifiedSecurityManageList2Api({ projectSn: this.$store.state.projectSn }).then(res => {
     //   console.log('------',res)
diff --git a/src/views/projectAdmin/jlw/safeManage/rightTop.vue b/src/views/projectAdmin/jlw/safeManage/rightTop.vue
index fd2ad67b..4cb96408 100644
--- a/src/views/projectAdmin/jlw/safeManage/rightTop.vue
+++ b/src/views/projectAdmin/jlw/safeManage/rightTop.vue
@@ -31,9 +31,9 @@
       </div>
       <div class="chart">
         <JRingChart
-          :title="{ text: completeRatio + '%', subTitle: '及时整改率' }"
+          :title="{ text: closeRatio + '%', subTitle: '及时整改率' }"
           :color="['#ff5e66', '#5084d4']"
-          :data="[{ value: totalNum }, { value: closeNum }]"
+          :data="[{ value: closeNum }, { value: totalNum }]"
         />
       </div>
       <!-- <div class="count">
@@ -74,7 +74,8 @@ export default {
       completeRatio: 0, //项目及时整改率
       reviewNum: 0, //待复查数
       rectificationNum: 0, //待整改数
-      closeNum: 0
+      closeNum: 0,
+      closeRatio: 0
     }
   },
   mounted() {
@@ -88,6 +89,7 @@ export default {
       this.reviewNum = res.result.reviewNum
       this.rectificationNum = res.result.rectificationNum
       this.closeNum = res.result.closeNum
+      this.closeRatio = res.result.closeRatio
     })
   },
   methods: {