From dc78c4249592f35c65330fe7ef79efa692ed022c Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Fri, 14 Feb 2025 08:31:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/pro-tabs/bns-timeline-tabs.vue | 17 ++++++++---------
 vue.config.js                                 |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/components/pro-tabs/bns-timeline-tabs.vue b/src/components/pro-tabs/bns-timeline-tabs.vue
index 01ad8bc..08f3ee4 100644
--- a/src/components/pro-tabs/bns-timeline-tabs.vue
+++ b/src/components/pro-tabs/bns-timeline-tabs.vue
@@ -100,9 +100,9 @@
           >
             <div
               :class="{
-                highlight: index < currentCheckIndex && item.isResult,
+                highlight: index < currentCheckIndex,
                 normal: index > currentCheckIndex,
-                currentLight: index === currentCheckIndex || (index === currentCheckIndex - 1 && !item.isResult),
+                currentLight: index === currentCheckIndex,
               }"
             >
               {{ item.checkPerson }} (
@@ -113,8 +113,7 @@
             </div>
 
             <!-- <div :class="styleByType(item)">
-              {{ item.checkPerson }} (
-              {{ item.examineType === '0' ? '依次' : item.examineType === '1' ? '会签' : '或签' }})
+              {{ item.name }} ( {{ item.examineType === '0' ? '依次' : item.examineType === '1' ? '会签' : '或签' }})
               <span style="margin-left: 15px; font-size: 20px; font-weight: bold">
                 {{ index < currentCheckIndex && item.isResult ? '√' : currentCheckIndex === index ? '?' : '?' }}
               </span>
@@ -339,17 +338,17 @@ export default {
 
     // 审批状态
     auditingType(item) {
-      if (item.status === '未审核') return '未审核'
+      if (item.status === '未审核' || item.status == '') return '未审核'
       if (item.status === '已审核' && (item.agree == 1 || item.agree == 3)) return '审核通过'
       if (item.status === '已审核' && item.agree == 2) return '审核驳回'
       if (item.status === '已审核' && (item.agree == 4 || item.agree == null)) return '撤回'
     },
 
     // 根据审核状态以及审核结果添加样式
-    // styleByType(item) {
-    //   console.log('item修改样式', item)
-    //   if (item.status === '未审核') return 'currentLight'
-    // },
+    styleByType(item) {
+      console.log('item修改样式', item)
+      if (item.status === '未审核') return 'currentLight'
+    },
   },
 }
 </script>
diff --git a/vue.config.js b/vue.config.js
index 3b6828e..80d5b25 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -40,8 +40,8 @@ module.exports = {
         // target: 'http://192.168.0.58:19090', // 杰
         // target: 'http://192.168.0.14:18080', // 测试环境
         // target: 'http://218.21.27.6:1999/prod-api', // 生产环境
-        target: 'http://192.168.0.38:18080', // 郝志权
-        // target: 'http://192.168.2.125:18080', // 梁超
+        // target: 'http://192.168.0.38:18080', // 郝志权
+        target: 'http://192.168.2.125:18080', // 梁超
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: '',