From 450eabb4bfacb5fb717f6d4ef85c231fc43a770b Mon Sep 17 00:00:00 2001
From: lukeyan <1727408482@qq.com>
Date: Thu, 29 Jun 2023 10:45:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                          |  4 +-
 .../components/backlogDetailForm.vue          |  4 +-
 .../closeLoopDispose/components/complete.vue  |  2 +-
 .../components/companyDetails.vue             | 42 +++++++++----------
 .../companyScore/components/companyTable.vue  | 42 +++++++++----------
 5 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 17c8c35..dd427d8 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,10 +4,10 @@ import vm from "../main";
 import { getToken } from '@/utils/auth'
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const request = axios.create({
-  //baseURL: 'http://172.18.113.50:8080/zhapi',
+  baseURL: 'http://172.18.113.50:8080/zhapi',
   //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强
   //baseURL: 'http://192.168.0.188:8888/zhapi',
-  baseURL: `http://${window.location.host}/zhapi`,
+  //baseURL: `http://${window.location.host}/zhapi`,
   timeout: 50000,
   headers: { 'content-type': 'application/json' },
 })
diff --git a/src/views/closeLoopDispose/components/backlogDetailForm.vue b/src/views/closeLoopDispose/components/backlogDetailForm.vue
index 0ef80c5..9a9a896 100644
--- a/src/views/closeLoopDispose/components/backlogDetailForm.vue
+++ b/src/views/closeLoopDispose/components/backlogDetailForm.vue
@@ -21,7 +21,9 @@
           <div class="basic_message_value">
             {{ this.basic_message.alarmTime }}
           </div>
-          <div class="basic_message_value"></div>
+          <div class="basic_message_value">
+            {{ this.basic_message.alarmLevel }}
+          </div>
         </div>
         <div class="basic_message_text_two">
           <div class="basic_message_text">企业名称:</div>
diff --git a/src/views/closeLoopDispose/components/complete.vue b/src/views/closeLoopDispose/components/complete.vue
index 3be4683..556d742 100644
--- a/src/views/closeLoopDispose/components/complete.vue
+++ b/src/views/closeLoopDispose/components/complete.vue
@@ -74,7 +74,7 @@
                 size="small"
                 class="operation"
                 @click="check_details(scope.row)"
-                >处置
+                >详情
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/systemManagement/companyScore/components/companyDetails.vue b/src/views/systemManagement/companyScore/components/companyDetails.vue
index 6554e11..9c22a26 100644
--- a/src/views/systemManagement/companyScore/components/companyDetails.vue
+++ b/src/views/systemManagement/companyScore/components/companyDetails.vue
@@ -63,47 +63,47 @@
           </div>
           <div class="score_portion">
             <div class="score_img">
-              <div class="img_box img_02"></div>
+              <div class="img_box img_05"></div>
             </div>
-            <div class="score_name">内部治安安全</div>
+            <div class="score_name">人员安全</div>
             <div class="score_num">
-              {{ this.score_two }}
+              {{ this.score_five }}
             </div>
           </div>
           <div class="score_portion">
             <div class="score_img">
-              <div class="img_box img_03"></div>
+              <div class="img_box img_04"></div>
             </div>
-            <div class="score_name">危化品运输安全</div>
+            <div class="score_name">消防安全</div>
             <div class="score_num">
-              {{ this.score_three }}
+              {{ this.score_four }}
             </div>
           </div>
           <div class="score_portion">
             <div class="score_img">
-              <div class="img_box img_04"></div>
+              <div class="img_box img_03"></div>
             </div>
-            <div class="score_name">消防安全</div>
+            <div class="score_name">危化品运输安全</div>
             <div class="score_num">
-              {{ this.score_four }}
+              {{ this.score_three }}
             </div>
           </div>
           <div class="score_portion">
             <div class="score_img">
-              <div class="img_box img_05"></div>
+              <div class="img_box img_08"></div>
             </div>
-            <div class="score_name">人员安全</div>
+            <div class="score_name">列管物品安全</div>
             <div class="score_num">
-              {{ this.score_five }}
+              {{ this.score_eight }}
             </div>
           </div>
           <div class="score_portion">
             <div class="score_img">
-              <div class="img_box img_06"></div>
+              <div class="img_box img_02"></div>
             </div>
-            <div class="score_name">网络安全</div>
+            <div class="score_name">内部治安安全</div>
             <div class="score_num">
-              {{ this.score_six }}
+              {{ this.score_two }}
             </div>
           </div>
           <div class="score_portion">
@@ -117,20 +117,20 @@
           </div>
           <div class="score_portion">
             <div class="score_img">
-              <div class="img_box img_08"></div>
+              <div class="img_box img_09"></div>
             </div>
-            <div class="score_name">列管物品安全</div>
+            <div class="score_name">防攻击安全</div>
             <div class="score_num">
-              {{ this.score_eight }}
+              {{ this.score_nine }}
             </div>
           </div>
           <div class="score_portion">
             <div class="score_img">
-              <div class="img_box img_09"></div>
+              <div class="img_box img_06"></div>
             </div>
-            <div class="score_name">防攻击安全</div>
+            <div class="score_name">网络安全</div>
             <div class="score_num">
-              {{ this.score_nine }}
+              {{ this.score_six }}
             </div>
           </div>
         </div>
diff --git a/src/views/systemManagement/companyScore/components/companyTable.vue b/src/views/systemManagement/companyScore/components/companyTable.vue
index 07a826b..ef50346 100644
--- a/src/views/systemManagement/companyScore/components/companyTable.vue
+++ b/src/views/systemManagement/companyScore/components/companyTable.vue
@@ -19,15 +19,9 @@
         >
         </el-table-column>
         <el-table-column
-          prop="tbSafeCompanyStatisticsScoreDetails[3].score"
-          label="内部治安安全"
-          width="140"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="tbSafeCompanyStatisticsScoreDetails[5].score"
-          label="危化品运输安全"
-          width="140"
+          prop="tbSafeCompanyStatisticsScoreDetails[7].score"
+          label="人员安全"
+          width="120"
         >
         </el-table-column>
         <el-table-column
@@ -37,27 +31,27 @@
         >
         </el-table-column>
         <el-table-column
-          prop="tbSafeCompanyStatisticsScoreDetails[7].score"
-          label="人员安全"
-          width="120"
+          prop="tbSafeCompanyStatisticsScoreDetails[5].score"
+          label="危化品运输安全"
+          width="140"
         >
         </el-table-column>
         <el-table-column
-          prop="tbSafeCompanyStatisticsScoreDetails[0].score"
-          label="网络安全"
-          width="120"
+          prop="tbSafeCompanyStatisticsScoreDetails[4].score"
+          label="列管物品安全"
+          width="140"
         >
         </el-table-column>
         <el-table-column
-          prop="tbSafeCompanyStatisticsScoreDetails[2].score"
-          label="道路安全"
-          width="120"
+          prop="tbSafeCompanyStatisticsScoreDetails[3].score"
+          label="内部治安安全"
+          width="140"
         >
         </el-table-column>
         <el-table-column
-          prop="tbSafeCompanyStatisticsScoreDetails[4].score"
-          label="列管物品安全"
-          width="140"
+          prop="tbSafeCompanyStatisticsScoreDetails[2].score"
+          label="道路安全"
+          width="120"
         >
         </el-table-column>
         <el-table-column
@@ -66,6 +60,12 @@
           width="130"
         >
         </el-table-column>
+        <el-table-column
+          prop="tbSafeCompanyStatisticsScoreDetails[0].score"
+          label="网络安全"
+          width="120"
+        >
+        </el-table-column>
       </el-table-column>
       <el-table-column prop="operation" label="操作">
         <template slot-scope="scope">
-- 
2.36.3


From c332bdf4e83584c31bdde6b988f3770fd656f4a2 Mon Sep 17 00:00:00 2001
From: lukeyan <1727408482@qq.com>
Date: Thu, 29 Jun 2023 10:45:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A41?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index dd427d8..affd2a5 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,10 +4,10 @@ import vm from "../main";
 import { getToken } from '@/utils/auth'
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const request = axios.create({
-  baseURL: 'http://172.18.113.50:8080/zhapi',
-  //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强
+  //baseURL: 'http://172.18.113.50:8080/zhapi',
+  //baseURL: 'http://172.18.11//.13:8080/zhapi', // 孙强
   //baseURL: 'http://192.168.0.188:8888/zhapi',
-  //baseURL: `http://${window.location.host}/zhapi`,
+  baseURL: `http://${window.location.host}/zhapi`,
   timeout: 50000,
   headers: { 'content-type': 'application/json' },
 })
-- 
2.36.3