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 1/3] =?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,
       });
     },
     // 表头样式

From 4e6b43538ec4a7694250600ab233f2cd3cff8577 Mon Sep 17 00:00:00 2001
From: lukeyan <1727408482@qq.com>
Date: Thu, 29 Jun 2023 19:11:45 +0800
Subject: [PATCH 2/3] =?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/api/closeLoopDispose/index.js             |  2 +-
 src/utils/request.js                          |  4 +-
 .../closeLoopDispose/components/backlog.vue   |  3 +-
 .../components/backlogDetailDialog.vue        |  4 +-
 .../components/backlogDetailForm.vue          | 38 -------------------
 .../closeLoopDispose/components/complete.vue  |  5 ++-
 .../closeLoopDispose/components/copy.vue      |  5 ++-
 .../closeLoopDispose/components/myCourse.vue  |  6 ++-
 .../companyList/components/clearDialog.vue    |  9 +++--
 .../companyScore/components/companyTable.vue  |  2 +
 .../systemManagement/companyScore/index.vue   |  2 +-
 11 files changed, 26 insertions(+), 54 deletions(-)

diff --git a/src/api/closeLoopDispose/index.js b/src/api/closeLoopDispose/index.js
index b0aea83..976f3de 100644
--- a/src/api/closeLoopDispose/index.js
+++ b/src/api/closeLoopDispose/index.js
@@ -35,7 +35,7 @@ export function get_backlog_company_tree(params) {
 // 审批流程 
 export function get_backlog_approve(data) {
     return request({
-        url: '/workflow/external/task/approve',
+        url: '/closedloopdisposal/workflow/updateFlowableStatus',
         method: 'post',
         data
     })
diff --git a/src/utils/request.js b/src/utils/request.js
index 2835a24..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.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' },
 })
diff --git a/src/views/closeLoopDispose/components/backlog.vue b/src/views/closeLoopDispose/components/backlog.vue
index 879724a..d0a4eae 100644
--- a/src/views/closeLoopDispose/components/backlog.vue
+++ b/src/views/closeLoopDispose/components/backlog.vue
@@ -30,10 +30,11 @@
       <div class="search_table">
         <el-table
           :data="table_data"
+          height="580"
           :header-cell-style="table_header"
           :cell-style="{ background: 'revert', 'text-align': 'center' }"
         >
-          <el-table-column prop="procDefName" label="流程名称" width="380">
+          <el-table-column prop="processName" label="流程名称" width="380">
           </el-table-column>
           <el-table-column prop="createTime" label="创建时间" width="200">
           </el-table-column>
diff --git a/src/views/closeLoopDispose/components/backlogDetailDialog.vue b/src/views/closeLoopDispose/components/backlogDetailDialog.vue
index 6d4169c..a3b41e8 100644
--- a/src/views/closeLoopDispose/components/backlogDetailDialog.vue
+++ b/src/views/closeLoopDispose/components/backlogDetailDialog.vue
@@ -180,7 +180,7 @@ export default {
       margin-left: 8px;
       width: 550px;
       //   border: 0.1px solid #5b748c;
-      height: 49vh;
+      height: 38vh;
       //   overflow-y: auto;
     }
     // .section_tree::-webkit-scrollbar {
@@ -211,7 +211,7 @@ export default {
   }
   .el-tree {
     /* 树形数据过长添加滚动条 */
-    height: 49vh;
+    height: 38vh;
     overflow: auto;
     // box-shadow: 5px 5px 10px #126a58;
     border-radius: 0px;
diff --git a/src/views/closeLoopDispose/components/backlogDetailForm.vue b/src/views/closeLoopDispose/components/backlogDetailForm.vue
index 9a9a896..4052bfd 100644
--- a/src/views/closeLoopDispose/components/backlogDetailForm.vue
+++ b/src/views/closeLoopDispose/components/backlogDetailForm.vue
@@ -166,44 +166,6 @@ export default {
         section: "",
       },
       backlog_list: [
-        {
-          id: "1",
-          personUrl: "../../../assets/companyFile/avatar.png",
-          name: "吴沁",
-          team: "技侦大队",
-          backlog_value:
-            "2022年8月20日0时32分,我队接到预警称浙江浙江鑫甬生物化工股份有限公司存在运输车辆频繁违章情况。接报后值班民警于立即到达现场,经现场了解到:危化品运输车(浙B2M50R)为外来租赁货车,司机王某(身份证号:42109119880717****)疑似前科重点人员。目前司机已经带回所以便进一步调查。2022年8月20日0时32分,我队接到预警称浙江浙江鑫甬生物化工股份有限公司存在运输车辆频繁违章情况。接报后值班民警于立即到达现场,经现场了解到:危化品运输车(浙B2M50R)为外来租赁货车,司机王某(身份证号:42109119880717****)疑似前科重点人员。目前司机已经带回所以便进一步调查。",
-          attachment_value: "20220820现场处置照片.jpg",
-          send_person: "蔡坤、黄毅、李丹丹、张强强",
-          backlog_time: "2022-11-13  12:10:08",
-        },
-        {
-          id: "2",
-          personUrl: "../../../assets/companyFile/avatar.png",
-          name: "吴沁",
-          team: "技侦大队",
-          backlog_value:
-            "2022年8月26日12时许,经过分析,我队决定对浙江浙江鑫甬生物化工股份有限公司的外来租赁危化品运输车(浙B2M50R)司机王某(身份证号:42109119880717****）做出吊销货车驾照处罚，立即执行。",
-        },
-        {
-          id: "3",
-          personUrl: "../../../assets/companyFile/avatar.png",
-          name: "吴沁",
-          team: "技侦大队",
-          backlog_value:
-            "2022年8月26日12时许,经过分析,我队决定对浙江浙江鑫甬生物化工股份有限公司的外来租赁危化品运输车(浙B2M50R)司机王某(身份证号:42109119880717****）做出吊销货车驾照处罚，立即执行。",
-        },
-        {
-          id: "4",
-          personUrl: "../../../assets/companyFile/avatar.png",
-          name: "吴沁",
-          team: "技侦大队",
-          backlog_value:
-            "2022年8月20日0时32分,我队接到预警称浙江浙江鑫甬生物化工股份有限公司存在运输车辆频繁违章情况。接报后值班民警于立即到达现场,经现场了解到:危化品运输车(浙B2M50R)为外来租赁货车,司机王某(身份证号:42109119880717****)疑似前科重点人员。目前司机已经带回所以便进一步调查。2022年8月20日0时32分,我队接到预警称浙江浙江鑫甬生物化工股份有限公司存在运输车辆频繁违章情况。接报后值班民警于立即到达现场,经现场了解到:危化品运输车(浙B2M50R)为外来租赁货车,司机王某(身份证号:42109119880717****)疑似前科重点人员。目前司机已经带回所以便进一步调查。",
-          attachment_value: "20220820现场处置照片.jpg",
-          send_person: "蔡坤、黄毅、李丹丹、张强强",
-          backlog_time: "2022-11-13  12:10:08",
-        },
       ],
       status_list: [
         { label: "待审核", value: "1" },
diff --git a/src/views/closeLoopDispose/components/complete.vue b/src/views/closeLoopDispose/components/complete.vue
index 5af094c..d83419c 100644
--- a/src/views/closeLoopDispose/components/complete.vue
+++ b/src/views/closeLoopDispose/components/complete.vue
@@ -44,10 +44,11 @@
       <div class="search_table">
         <el-table
           :data="table_data"
+          height="580"
           :header-cell-style="table_header"
           :cell-style="{ background: 'revert', 'text-align': 'center' }"
         >
-          <el-table-column prop="procDefName" label="流程名称" width="380">
+          <el-table-column prop="processName" label="流程名称" width="380">
           </el-table-column>
           <el-table-column prop="createTime" label="创建时间" width="200">
           </el-table-column>
@@ -113,7 +114,7 @@ export default {
         // { label: "待审核", value: "1" },
         { label: "审核中", value: "1" },
         { label: "审核完成", value: "2" },
-        { label: "驳回完成", value: "3" },
+        { label: "驳回", value: "3" },
       ],
       pickerOptions: {
         shortcuts: [
diff --git a/src/views/closeLoopDispose/components/copy.vue b/src/views/closeLoopDispose/components/copy.vue
index ce3b5cc..0bc1b61 100644
--- a/src/views/closeLoopDispose/components/copy.vue
+++ b/src/views/closeLoopDispose/components/copy.vue
@@ -44,6 +44,7 @@
       <div class="search_table">
         <el-table
           :data="table_data"
+          height="580"
           :header-cell-style="table_header"
           :cell-style="{ background: 'revert', 'text-align': 'center' }"
         >
@@ -73,7 +74,7 @@
                 size="small"
                 class="operation"
                 @click="check_details(scope.row)"
-                >处置
+                >详情
               </el-button>
             </template>
           </el-table-column>
@@ -112,7 +113,7 @@ export default {
         // { label: "待审核", value: "1" },
         { label: "审核中", value: "1" },
         { label: "审核完成", value: "2" },
-        { label: "驳回完成", value: "3" },
+        { label: "驳回", value: "3" },
       ],
       pickerOptions: {
         shortcuts: [
diff --git a/src/views/closeLoopDispose/components/myCourse.vue b/src/views/closeLoopDispose/components/myCourse.vue
index 51d325f..03e95cf 100644
--- a/src/views/closeLoopDispose/components/myCourse.vue
+++ b/src/views/closeLoopDispose/components/myCourse.vue
@@ -41,10 +41,11 @@
       <div class="search_table">
         <el-table
           :data="table_data"
+          height="580"
           :header-cell-style="table_header"
           :cell-style="{ background: 'revert', 'text-align': 'center' }"
         >
-          <el-table-column prop="procDefName" label="流程名称" width="380">
+          <el-table-column prop="processName" label="流程名称" width="380">
           </el-table-column>
           <el-table-column prop="createTime" label="创建时间" width="200">
           </el-table-column>
@@ -106,7 +107,7 @@ export default {
         // { label: "待审核", value: "1" },
         { label: "审核中", value: "1" },
         { label: "审核完成", value: "2" },
-        { label: "驳回完成", value: "3" },
+        { label: "驳回", value: "3" },
       ],
       pickerOptions: {
         shortcuts: [
@@ -396,6 +397,7 @@ export default {
     .btn {
       margin-left: 8px;
       margin-right: 2px;
+      height: 3.7vh;
       .el-button {
         width: 70px;
         height: 3.7vh !important;
diff --git a/src/views/systemManagement/companyList/components/clearDialog.vue b/src/views/systemManagement/companyList/components/clearDialog.vue
index 34d479c..dcf16cf 100644
--- a/src/views/systemManagement/companyList/components/clearDialog.vue
+++ b/src/views/systemManagement/companyList/components/clearDialog.vue
@@ -9,7 +9,7 @@
     <div class="text">删除后将同时清空企业的全部信息，确认继续吗？</div>
     <div slot="footer" class="dialog-footer">
       <el-button @click="saveFormData">确 定</el-button>
-      <el-button>取 消</el-button>
+      <el-button @click="close">取 消</el-button>
     </div></el-dialog
   >
 </template>
@@ -25,12 +25,12 @@ export default {
   },
   methods: {
     open(num, item) {
-      console.log(num,item,'item');
+      console.log(num, item, "item");
       this.visible = true;
       this.id = item.id;
     },
     saveFormData() {
-        const params = `idList=${this.id}`
+      const params = `idList=${this.id}`;
       deleteCompanyList(params).then((res) => {
         if (res.code === 200) {
           this.$message.success("删除成功");
@@ -42,6 +42,9 @@ export default {
         }
       });
     },
+    close() {
+      this.visible = false;
+    },
   },
 };
 </script>
diff --git a/src/views/systemManagement/companyScore/components/companyTable.vue b/src/views/systemManagement/companyScore/components/companyTable.vue
index 8422a94..3fea506 100644
--- a/src/views/systemManagement/companyScore/components/companyTable.vue
+++ b/src/views/systemManagement/companyScore/components/companyTable.vue
@@ -223,12 +223,14 @@ export default {
   border: 0.1px solid #3f5564;
 }
 /deep/.el-table__body-wrapper::-webkit-scrollbar {
+  display: none;
   width: 6px;
   background-color: #5e666a;
   border-radius: 4px;
 }
 
 /deep/.el-table__body-wrapper::-webkit-scrollbar-thumb {
+  display: none;
   width: 5px;
   background-color: #3c4b4a;
   border-radius: 4px;
diff --git a/src/views/systemManagement/companyScore/index.vue b/src/views/systemManagement/companyScore/index.vue
index 1591812..7d932d8 100644
--- a/src/views/systemManagement/companyScore/index.vue
+++ b/src/views/systemManagement/companyScore/index.vue
@@ -275,7 +275,7 @@ export default {
   }
   .table_body {
     width: 85.2vw;
-    height: 71vh;
+    height: 68vh;
     margin-top: 3vh;
     // border: 0.1px solid #4d8f89;
   }

From f2c6ac0fa8ea3af161e204329b61d7c95a0e3c63 Mon Sep 17 00:00:00 2001
From: lukeyan <1727408482@qq.com>
Date: Fri, 30 Jun 2023 10:12:22 +0800
Subject: [PATCH 3/3] =?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                          |  2 +-
 .../closeLoopDispose/components/backlog.vue   |  6 +--
 .../components/backlogDetailForm.vue          |  2 +-
 .../closeLoopDispose/components/complete.vue  |  4 +-
 .../components/completeDetailForm.vue         |  2 +-
 .../closeLoopDispose/components/copy.vue      |  4 +-
 .../components/copyDetailForm.vue             |  2 +-
 .../closeLoopDispose/components/myCourse.vue  | 50 +++++++++++++------
 .../components/myCourseDetailForm.vue         |  2 +-
 9 files changed, 47 insertions(+), 27 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 d0a4eae..5fe8016 100644
--- a/src/views/closeLoopDispose/components/backlog.vue
+++ b/src/views/closeLoopDispose/components/backlog.vue
@@ -38,7 +38,7 @@
           </el-table-column>
           <el-table-column prop="createTime" label="创建时间" width="200">
           </el-table-column>
-          <el-table-column prop="course_type" label="流程类型" width="200">
+          <el-table-column prop="processType" label="流程类型" width="200">
           </el-table-column>
           <el-table-column prop="process_status" label="流程状态">
             <template slot-scope="scope">
@@ -223,7 +223,7 @@ export default {
         //   return "#FDA722";
         case "审核完成":
           return "#2eb9ef";
-        case "驳回完成":
+        case "驳回":
           return "#e55b5b";
       }
     },
@@ -235,7 +235,7 @@ export default {
         case 2 :
           return "审核完成";
         case 3 :
-          return "驳回完成";
+          return "驳回";
       }
     },
     handleSizeChange(val) {
diff --git a/src/views/closeLoopDispose/components/backlogDetailForm.vue b/src/views/closeLoopDispose/components/backlogDetailForm.vue
index 4052bfd..aa9726b 100644
--- a/src/views/closeLoopDispose/components/backlogDetailForm.vue
+++ b/src/views/closeLoopDispose/components/backlogDetailForm.vue
@@ -117,7 +117,7 @@
             <!-- 第一行，处理意见 -->
             <div class="dispose_idea">
               <div class="backlog_text">处理意见:</div>
-              <div class="backlog_value">{{ item.comment }}</div>
+              <div class="backlog_value">{{ item.comment.comment }}</div>
             </div>
             <!-- 第二行，附件 按需显示或者隐藏 -->
             <!-- <div v-if="attachment_show" class="attachment">
diff --git a/src/views/closeLoopDispose/components/complete.vue b/src/views/closeLoopDispose/components/complete.vue
index d83419c..03321d3 100644
--- a/src/views/closeLoopDispose/components/complete.vue
+++ b/src/views/closeLoopDispose/components/complete.vue
@@ -258,7 +258,7 @@ export default {
         //   return "#FDA722";
         case "审核完成":
           return "#2eb9ef";
-        case "驳回完成":
+        case "驳回":
           return "#e55b5b";
       }
     },
@@ -270,7 +270,7 @@ export default {
         case 2 :
           return "审核完成";
         case 3 :
-          return "驳回完成";
+          return "驳回";
       }
     },
     handleSizeChange(val) {
diff --git a/src/views/closeLoopDispose/components/completeDetailForm.vue b/src/views/closeLoopDispose/components/completeDetailForm.vue
index d990566..b2a2496 100644
--- a/src/views/closeLoopDispose/components/completeDetailForm.vue
+++ b/src/views/closeLoopDispose/components/completeDetailForm.vue
@@ -85,7 +85,7 @@
             <!-- 第一行，处理意见 -->
             <div class="dispose_idea">
               <div class="complete_text">处理意见:</div>
-              <div class="complete_value">{{ item.comment }}</div>
+              <div class="complete_value">{{ item.comment.comment }}</div>
             </div>
             <!-- 第二行，附件 按需显示或者隐藏 -->
             <!-- <div v-if="attachment_show" class="attachment"> -->
diff --git a/src/views/closeLoopDispose/components/copy.vue b/src/views/closeLoopDispose/components/copy.vue
index 0bc1b61..d0f301d 100644
--- a/src/views/closeLoopDispose/components/copy.vue
+++ b/src/views/closeLoopDispose/components/copy.vue
@@ -255,7 +255,7 @@ export default {
         //   return "#FDA722";
         case "审核完成":
           return "#2eb9ef";
-        case "驳回完成":
+        case "驳回":
           return "#e55b5b";
       }
     },
@@ -267,7 +267,7 @@ export default {
         case 2 :
           return "审核完成";
         case 3 :
-          return "驳回完成";
+          return "驳回";
       }
     },
     handleSizeChange(val) {
diff --git a/src/views/closeLoopDispose/components/copyDetailForm.vue b/src/views/closeLoopDispose/components/copyDetailForm.vue
index 33ae73c..c5d8ed2 100644
--- a/src/views/closeLoopDispose/components/copyDetailForm.vue
+++ b/src/views/closeLoopDispose/components/copyDetailForm.vue
@@ -85,7 +85,7 @@
             <!-- 第一行，处理意见 -->
             <div class="dispose_idea">
               <div class="course_text">处理意见:</div>
-              <div class="course_value">{{ item.comment }}</div>
+              <div class="course_value">{{ item.comment.comment }}</div>
             </div>
             <!-- 第二行，附件 按需显示或者隐藏 -->
             <!-- <div v-if="attachment_show" class="attachment"> -->
diff --git a/src/views/closeLoopDispose/components/myCourse.vue b/src/views/closeLoopDispose/components/myCourse.vue
index 03e95cf..3fd1a6e 100644
--- a/src/views/closeLoopDispose/components/myCourse.vue
+++ b/src/views/closeLoopDispose/components/myCourse.vue
@@ -3,10 +3,10 @@
   <div>
     <div class="course_body">
       <div class="search_top">
-        <div class="btn">
+        <!-- <div class="btn">
           <el-button @click="search_data">搜索</el-button>
           <el-button @click="reset">重置</el-button>
-        </div>
+        </div> -->
         <el-form :model="search" class="search_top_form">
           <el-form-item label="流程状态">
             <el-select v-model="search.course_status" @change="change_course">
@@ -36,6 +36,10 @@
               placeholder="请选择关键词"
             ></el-input>
           </el-form-item>
+          <el-form-item>
+            <el-button @click="search_data">搜索</el-button>
+            <el-button @click="reset">重置</el-button>
+          </el-form-item>
         </el-form>
       </div>
       <div class="search_table">
@@ -176,10 +180,12 @@ export default {
       };
       get_my_course(param).then((res) => {
         // 根据返回码值判断流程状态
-        for( let i = 0; i<res.rows.length;i++) {
-          res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus)
+        for (let i = 0; i < res.rows.length; i++) {
+          res.rows[i].process_status = this.process_change(
+            res.rows[i].alarmStatus
+          );
         }
-        console.log('res.rows',res.rows);
+        console.log("res.rows", res.rows);
         this.table_data = res.rows;
         this.total = res.total;
       });
@@ -194,7 +200,7 @@ export default {
     },
     // 详情点击跳转
     check_details(val) {
-      console.log('12344',val);
+      console.log("12344", val);
       this.$emit("change_to_detail", val); // 通知跳转
     },
     // 转换时间格式
@@ -257,31 +263,31 @@ export default {
         //   return "#FDA722";
         case "审核完成":
           return "#2eb9ef";
-        case "驳回完成":
+        case "驳回":
           return "#e55b5b";
       }
     },
     // 根据返回码值判断流程状态
     process_change(val) {
-      switch(val) {
-        case 1 :
+      switch (val) {
+        case 1:
           return "审核中";
-        case 2 :
+        case 2:
           return "审核完成";
-        case 3 :
-          return "驳回完成";
+        case 3:
+          return "驳回";
       }
     },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.pageNum = 1;
       this.pageSize = val;
-      this.search_data()
+      this.search_data();
     },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
       this.pageNum = val;
-      this.search_data()
+      this.search_data();
     },
   },
 };
@@ -371,7 +377,6 @@ export default {
           border-radius: 0px;
           height: 3.7vh;
           border: 1px solid #3d505e;
-          // border: 0.5px dashed;
           background: #283436;
           color: #fff;
         }
@@ -386,6 +391,21 @@ export default {
           background: #283436;
         }
       }
+      .el-button {
+        width: 70px;
+        height: 3.7vh !important;
+        border: 1px solid #4a6072;
+        color: #fff;
+        border-radius: 0px !important;
+        background: #323f43;
+      }
+      .el-button:focus,
+      .el-button:hover {
+        color: #34e1b3;
+        border: 2px solid #137868;
+        background: url("~@/assets/companyFile/2121.png") no-repeat !important;
+        background-size: 100% 100% !important;
+      }
     }
     /deep/.el-range-separator {
       color: #fff;
diff --git a/src/views/closeLoopDispose/components/myCourseDetailForm.vue b/src/views/closeLoopDispose/components/myCourseDetailForm.vue
index 46cf1b5..39d5ec9 100644
--- a/src/views/closeLoopDispose/components/myCourseDetailForm.vue
+++ b/src/views/closeLoopDispose/components/myCourseDetailForm.vue
@@ -85,7 +85,7 @@
             <!-- 第一行，处理意见 -->
             <div class="dispose_idea">
               <div class="course_text">处理意见:</div>
-              <div class="course_value">{{ item.comment }}</div>
+              <div class="course_value">{{ item.comment.comment }}</div>
             </div>
             <!-- 第二行，附件 按需显示或者隐藏 -->
             <!-- <div v-if="attachment_show" class="attachment"> -->