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

---
 src/utils/request.js                          |   2 +-
 .../closeLoopDispose/components/backlog.vue   |   9 +-
 .../closeLoopDispose/components/complete.vue  |   5 +-
 .../closeLoopDispose/components/copy.vue      |   4 +-
 .../closeLoopDispose/components/myCourse.vue  |   9 +-
 .../components/companyDetails.vue             |  34 ++--
 .../companyScore/components/companyTable.vue  | 152 ++++++++++++------
 7 files changed, 136 insertions(+), 79 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index affd2a5..17c8c35 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -5,7 +5,7 @@ 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.11//.13:8080/zhapi', // 孙强
+  //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强
   //baseURL: 'http://192.168.0.188:8888/zhapi',
   baseURL: `http://${window.location.host}/zhapi`,
   timeout: 50000,
diff --git a/src/views/closeLoopDispose/components/backlog.vue b/src/views/closeLoopDispose/components/backlog.vue
index c6dcd73..879724a 100644
--- a/src/views/closeLoopDispose/components/backlog.vue
+++ b/src/views/closeLoopDispose/components/backlog.vue
@@ -33,13 +33,13 @@
           :header-cell-style="table_header"
           :cell-style="{ background: 'revert', 'text-align': 'center' }"
         >
-          <el-table-column prop="procDefName" label="流程名称" width="420">
+          <el-table-column prop="procDefName" label="流程名称" width="380">
           </el-table-column>
-          <el-table-column prop="createTime" label="创建时间" width="280">
+          <el-table-column prop="createTime" label="创建时间" width="200">
           </el-table-column>
-          <el-table-column prop="course_type" label="流程类型" width="280">
+          <el-table-column prop="course_type" label="流程类型" width="200">
           </el-table-column>
-          <el-table-column prop="process_status" label="流程状态" width="220">
+          <el-table-column prop="process_status" label="流程状态">
             <template slot-scope="scope">
               <div :style="{ color: styleChange(scope.row.process_status) }">
                 {{ scope.row.process_status }}
@@ -333,6 +333,7 @@ export default {
         .el-input__inner {
           // width: 300px;
           border-radius: 0px;
+          height: 3.7vh;
           border: 1px solid #3d505e;
           // border: 0.5px dashed;
           background: #283436;
diff --git a/src/views/closeLoopDispose/components/complete.vue b/src/views/closeLoopDispose/components/complete.vue
index 556d742..5af094c 100644
--- a/src/views/closeLoopDispose/components/complete.vue
+++ b/src/views/closeLoopDispose/components/complete.vue
@@ -47,9 +47,9 @@
           :header-cell-style="table_header"
           :cell-style="{ background: 'revert', 'text-align': 'center' }"
         >
-          <el-table-column prop="procDefName" label="流程名称" width="420">
+          <el-table-column prop="procDefName" label="流程名称" width="380">
           </el-table-column>
-          <el-table-column prop="createTime" label="创建时间" width="240">
+          <el-table-column prop="createTime" label="创建时间" width="200">
           </el-table-column>
           <el-table-column prop="processType" label="流程类型" width="160">
           </el-table-column>
@@ -368,6 +368,7 @@ export default {
         .el-input__inner {
           // width: 300px;
           border-radius: 0px;
+          height: 3.7vh;
           border: 1px solid #3d505e;
           // border: 0.5px dashed;
           background: #283436;
diff --git a/src/views/closeLoopDispose/components/copy.vue b/src/views/closeLoopDispose/components/copy.vue
index a26ccfa..ce3b5cc 100644
--- a/src/views/closeLoopDispose/components/copy.vue
+++ b/src/views/closeLoopDispose/components/copy.vue
@@ -47,9 +47,9 @@
           :header-cell-style="table_header"
           :cell-style="{ background: 'revert', 'text-align': 'center' }"
         >
-          <el-table-column prop="processName" label="流程名称" width="420">
+          <el-table-column prop="processName" label="流程名称" width="380">
           </el-table-column>
-          <el-table-column prop="createTime" label="创建时间" width="240">
+          <el-table-column prop="createTime" label="创建时间" width="200">
           </el-table-column>
           <el-table-column prop="course_type" label="流程类型" width="200">
           </el-table-column>
diff --git a/src/views/closeLoopDispose/components/myCourse.vue b/src/views/closeLoopDispose/components/myCourse.vue
index 168f7f1..51d325f 100644
--- a/src/views/closeLoopDispose/components/myCourse.vue
+++ b/src/views/closeLoopDispose/components/myCourse.vue
@@ -44,13 +44,13 @@
           :header-cell-style="table_header"
           :cell-style="{ background: 'revert', 'text-align': 'center' }"
         >
-          <el-table-column prop="procDefName" label="流程名称" width="420">
+          <el-table-column prop="procDefName" label="流程名称" width="380">
           </el-table-column>
-          <el-table-column prop="createTime" label="创建时间" width="280">
+          <el-table-column prop="createTime" label="创建时间" width="200">
           </el-table-column>
-          <el-table-column prop="processType" label="流程类型" width="280">
+          <el-table-column prop="processType" label="流程类型" width="200">
           </el-table-column>
-          <el-table-column prop="process_status" label="流程状态" width="220">
+          <el-table-column prop="process_status" label="流程状态">
             <template slot-scope="scope">
               <div :style="{ color: styleChange(scope.row.process_status) }">
                 {{ scope.row.process_status }}
@@ -368,6 +368,7 @@ export default {
         .el-input__inner {
           // width: 300px;
           border-radius: 0px;
+          height: 3.7vh;
           border: 1px solid #3d505e;
           // border: 0.5px dashed;
           background: #283436;
diff --git a/src/views/systemManagement/companyScore/components/companyDetails.vue b/src/views/systemManagement/companyScore/components/companyDetails.vue
index 9c22a26..ec981b2 100644
--- a/src/views/systemManagement/companyScore/components/companyDetails.vue
+++ b/src/views/systemManagement/companyScore/components/companyDetails.vue
@@ -67,7 +67,7 @@
             </div>
             <div class="score_name">人员安全</div>
             <div class="score_num">
-              {{ this.score_five }}
+              {{ this.score_two }}
             </div>
           </div>
           <div class="score_portion">
@@ -76,16 +76,16 @@
             </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_03"></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">
@@ -94,7 +94,7 @@
             </div>
             <div class="score_name">列管物品安全</div>
             <div class="score_num">
-              {{ this.score_eight }}
+              {{ this.score_five }}
             </div>
           </div>
           <div class="score_portion">
@@ -103,7 +103,7 @@
             </div>
             <div class="score_name">内部治安安全</div>
             <div class="score_num">
-              {{ this.score_two }}
+              {{ this.score_six }}
             </div>
           </div>
           <div class="score_portion">
@@ -121,7 +121,7 @@
             </div>
             <div class="score_name">防攻击安全</div>
             <div class="score_num">
-              {{ this.score_nine }}
+              {{ this.score_eight }}
             </div>
           </div>
           <div class="score_portion">
@@ -130,7 +130,7 @@
             </div>
             <div class="score_name">网络安全</div>
             <div class="score_num">
-              {{ this.score_six }}
+              {{ this.score_nine }}
             </div>
           </div>
         </div>
@@ -223,23 +223,23 @@ export default {
     this.company_score = this.deatail_data.score;
     // 主页表格数据展示顺序被打乱了
     this.score_one =
-      this.deatail_data.tbSafeCompanyStatisticsScoreDetails[8].score;
+      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '防疫安全').score
     this.score_two =
-      this.deatail_data.tbSafeCompanyStatisticsScoreDetails[3].score;
+      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '人员安全').score
     this.score_three =
-      this.deatail_data.tbSafeCompanyStatisticsScoreDetails[5].score;
+      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '消防安全').score
     this.score_four =
-      this.deatail_data.tbSafeCompanyStatisticsScoreDetails[6].score;
+      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '危化运输安全').score
     this.score_five =
-      this.deatail_data.tbSafeCompanyStatisticsScoreDetails[7].score;
+      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '列管物品安全').score
     this.score_six =
-      this.deatail_data.tbSafeCompanyStatisticsScoreDetails[0].score;
+      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '内部治安安全').score
     this.score_seven =
-      this.deatail_data.tbSafeCompanyStatisticsScoreDetails[2].score;
+      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '道路安全').score
     this.score_eight =
-      this.deatail_data.tbSafeCompanyStatisticsScoreDetails[4].score;
+      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '防攻击安全').score
     this.score_nine =
-      this.deatail_data.tbSafeCompanyStatisticsScoreDetails[1].score;
+      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '网络安全').score
   },
   mounted() {
     this.get_time();
diff --git a/src/views/systemManagement/companyScore/components/companyTable.vue b/src/views/systemManagement/companyScore/components/companyTable.vue
index ef50346..8422a94 100644
--- a/src/views/systemManagement/companyScore/components/companyTable.vue
+++ b/src/views/systemManagement/companyScore/components/companyTable.vue
@@ -12,59 +12,113 @@
       </el-table-column>
       <el-table-column prop="score" label="平安指数"> </el-table-column>
       <el-table-column label="指标得分">
-        <el-table-column
-          prop="tbSafeCompanyStatisticsScoreDetails[8].score"
-          label="防疫安全"
-          width="130"
-        >
+        <el-table-column label="防疫安全" width="130">
+          <template slot-scope="scope">
+            <div
+              v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
+              :key="item.id"
+            >
+              <span v-if="item.levelIndexOne == '防疫安全'">{{
+                item.score
+              }}</span>
+            </div>
+          </template>
         </el-table-column>
-        <el-table-column
-          prop="tbSafeCompanyStatisticsScoreDetails[7].score"
-          label="人员安全"
-          width="120"
-        >
+        <el-table-column label="人员安全" width="120">
+          <template slot-scope="scope">
+            <div
+              v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
+              :key="item.id"
+            >
+              <span v-if="item.levelIndexOne == '人员安全'">{{
+                item.score
+              }}</span>
+            </div>
+          </template>
         </el-table-column>
-        <el-table-column
-          prop="tbSafeCompanyStatisticsScoreDetails[6].score"
-          label="消防安全"
-          width="120"
-        >
+        <el-table-column label="消防安全" width="120">
+          <template slot-scope="scope">
+            <div
+              v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
+              :key="item.id"
+            >
+              <span v-if="item.levelIndexOne == '消防安全'">{{
+                item.score
+              }}</span>
+            </div>
+          </template>
         </el-table-column>
-        <el-table-column
-          prop="tbSafeCompanyStatisticsScoreDetails[5].score"
-          label="危化品运输安全"
-          width="140"
-        >
+        <el-table-column label="危化运输安全" width="140">
+          <template slot-scope="scope">
+            <div
+              v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
+              :key="item.id"
+            >
+              <span v-if="item.levelIndexOne == '危化运输安全'">{{
+                item.score
+              }}</span>
+            </div>
+          </template>
         </el-table-column>
-        <el-table-column
-          prop="tbSafeCompanyStatisticsScoreDetails[4].score"
-          label="列管物品安全"
-          width="140"
-        >
+        <el-table-column label="列管物品安全" width="140">
+          <template slot-scope="scope">
+            <div
+              v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
+              :key="item.id"
+            >
+              <span v-if="item.levelIndexOne == '列管物品安全'">{{
+                item.score
+              }}</span>
+            </div>
+          </template>
         </el-table-column>
-        <el-table-column
-          prop="tbSafeCompanyStatisticsScoreDetails[3].score"
-          label="内部治安安全"
-          width="140"
-        >
+        <el-table-column label="内部治安安全" width="140">
+          <template slot-scope="scope">
+            <div
+              v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
+              :key="item.id"
+            >
+              <span v-if="item.levelIndexOne == '内部治安安全'">{{
+                item.score
+              }}</span>
+            </div>
+          </template>
         </el-table-column>
-        <el-table-column
-          prop="tbSafeCompanyStatisticsScoreDetails[2].score"
-          label="道路安全"
-          width="120"
-        >
+        <el-table-column label="道路安全" width="120">
+          <template slot-scope="scope">
+            <div
+              v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
+              :key="item.id"
+            >
+              <span v-if="item.levelIndexOne == '道路安全'">{{
+                item.score
+              }}</span>
+            </div>
+          </template>
         </el-table-column>
-        <el-table-column
-          prop="tbSafeCompanyStatisticsScoreDetails[1].score"
-          label="防攻击安全"
-          width="130"
-        >
+        <el-table-column label="防攻击安全" width="130">
+          <template slot-scope="scope">
+            <div
+              v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
+              :key="item.id"
+            >
+              <span v-if="item.levelIndexOne == '防攻击安全'">{{
+                item.score
+              }}</span>
+            </div>
+          </template>
         </el-table-column>
-        <el-table-column
-          prop="tbSafeCompanyStatisticsScoreDetails[0].score"
-          label="网络安全"
-          width="120"
-        >
+        <el-table-column label="网络安全" width="120">
+          <template slot-scope="scope">
+            <div
+              v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
+              :key="item.id"
+            >
+              <span v-if="item.levelIndexOne == '网络安全'">{{
+                item.score
+              }}</span>
+            </div>
+          </template>
         </el-table-column>
       </el-table-column>
       <el-table-column prop="operation" label="操作">
@@ -87,7 +141,7 @@ export default {
     jump_params: {
       type: Object,
       default: () => {},
-    }
+    },
   },
   data() {
     return {
@@ -97,11 +151,11 @@ export default {
   methods: {
     jump(val) {
       // console.log("jump_val", val);
-      val = Object.assign(val,this.jump_params)
+      val = Object.assign(val, this.jump_params);
       console.log("jump_val", val);
       this.$router.push({
-        path:'/home/systemManagement/companyDetails',
-        query:val
+        path: "/home/systemManagement/companyDetails",
+        query: val,
       });
     },
     // 表头样式
-- 
2.36.3