From 89a17f6bf42bf7dede6581804f4687f90b0118b8 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Mon, 23 Dec 2024 09:26:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/equipment/MaintenanceAudit/Audit.vue | 8 ++++----
 src/pages/equipment/MaintenanceAudit/index.vue | 7 ++++---
 src/pages/login/login/index.vue                | 2 +-
 vue.config.js                                  | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/pages/equipment/MaintenanceAudit/Audit.vue b/src/pages/equipment/MaintenanceAudit/Audit.vue
index 4faefaa..603a691 100644
--- a/src/pages/equipment/MaintenanceAudit/Audit.vue
+++ b/src/pages/equipment/MaintenanceAudit/Audit.vue
@@ -266,10 +266,10 @@ export default class ChangePalletNew extends BasePage {
   workId: any = '';
   workCode: any = '';
   goneList: any = [
-    {
-      label: '待审核',
-      value: '2',
-    },
+    // {
+    //   label: '待审核',
+    //   value: '2',
+    // },
     {
       label: '审核通过',
       value: '1',
diff --git a/src/pages/equipment/MaintenanceAudit/index.vue b/src/pages/equipment/MaintenanceAudit/index.vue
index 8731d6f..68e987a 100644
--- a/src/pages/equipment/MaintenanceAudit/index.vue
+++ b/src/pages/equipment/MaintenanceAudit/index.vue
@@ -18,7 +18,8 @@
     <!-- <u-tabs name="cate_name" count="cate_count" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs> -->
     <view class="list" v-show="current == 0" v-for="(item, index) in listdata" :key="index" @click="linkdetails(item)">
       <div class="list-top">
-        <div class="tag">{{ item.resultInspect == 2 ? '待审核' : item.resultInspect == 1 ? '审核通过' : '驳回' }}</div>
+        <div class="tag">{{ item.workStatus == '2' ? '维修中' : item.workStatus == '1' ? '维修完成' : '待维修' }}</div>
+        <div class="tag">{{ item.resultInspect == '2' ? '待审核' : item.resultInspect == '1' ? '审核通过' : '驳回' }}</div>
       </div>
       <div class="list-top">
         <div class="name">维修单号: {{ item.orderCode }}</div>
@@ -276,8 +277,8 @@ export default class RepairAudit extends BasePage {
         line-height: 24px;
         // box-shadow: 0 1rpx 20rpx 0 #54B0D7;
         border: 2px solid #54b0d7;
-        position: absolute;
-        right: 18px;
+        // position: absolute;
+        // right: 18px;
         color: #54b0d7;
       }
       .tag1 {
diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index d10052a..5d71586 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
     // console.log('Version////', this.Version);
   }
   ///********版本号修改区域**********
-  version = '0.0.160'; //正式版本号
+  version = '0.0.161'; //正式版本号
   //version = '0.0.14'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;
diff --git a/vue.config.js b/vue.config.js
index f84b364..9f028b7 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -12,9 +12,9 @@ module.exports = {
         // },
       },
       '/dev-api': {
-        target: 'http://192.168.3.63:8080',
+        //target: 'http://192.168.3.63:8080',
         // target: 'http://192.168.3.66:8080',
-        // target: 'http://192.168.3.231:8080',
+        target: 'http://192.168.3.231:8080', //贵迎
         //target: 'http://192.168.3.158:8080',
         changeOrigin: true,
         pathRewrite: {