From dd88ee75bf158911d631fe77796dbca815b535c6 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Thu, 26 Dec 2024 09:56:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/status.js             | 74 ++++++++++++++++++++++--------------
 manifest.json                |  7 +---
 pages/inspection/quest.vue   | 10 ++---
 pages/submission/records.vue |  6 +--
 store/index.js               |  2 +-
 utils/website.js             |  5 ++-
 6 files changed, 58 insertions(+), 46 deletions(-)

diff --git a/config/status.js b/config/status.js
index add8c6c..a1b1593 100644
--- a/config/status.js
+++ b/config/status.js
@@ -1,10 +1,7 @@
 // 维修任务
 export const tabList = {
     '1': [
-        {
-            name: "全部",
-            key: "9999",
-        },
+       
         {
             name: "待提报",
             key: "100",
@@ -54,12 +51,13 @@ export const tabList = {
             name: "已完成",
             key: "202,203,204",
         },
-    ],
-    '2': [
         {
             name: "全部",
             key: "9999",
         },
+    ],
+    '2': [
+       
         {
             name: "待接单",
             key: "101",
@@ -88,16 +86,22 @@ export const tabList = {
             name: "已完成",
             key: "202,203,204",
         },
-    ],
-    '3': [
         {
             name: "全部",
             key: "9999",
         },
+    ],
+    '3': [
+       
+        {
+            name: "待确认",
+            key: "201",
+        },
         {
             name: "待审批",
             key: "402",
         },
+
         {
             name: "维修中",
             key: "103,404",
@@ -122,13 +126,14 @@ export const tabList = {
             name: "已完成",
             key: "203,204",
         },
-        
-    ],
-    '4': [
         {
             name: "全部",
             key: "9999",
         },
+        
+    ],
+    '4': [
+       
         {
             name: "待确认",
             key: "201,405",
@@ -153,6 +158,10 @@ export const tabList = {
             name: "已完成",
             key: "403,104,202,203,204,406",
         },
+        {
+            name: "全部",
+            key: "9999",
+        },
     ]
 }
 // 维修  状态颜色
@@ -174,10 +183,7 @@ export const tabListColor = {
 // 巡检任务
 export const tabTaskList = {
     '1': [
-        {
-            name: "全部",
-            key: "9999",
-        },
+       
         {
             name: "待巡检",
             key: "0,1",
@@ -194,12 +200,13 @@ export const tabTaskList = {
             name: "已完成",
             key: "4",
         },
-    ],
-    '3': [
         {
             name: "全部",
             key: "9999",
         },
+    ],
+    '3': [
+       
         {
             name: "待指派",
             key: "0",
@@ -216,12 +223,13 @@ export const tabTaskList = {
             name: "已完成",
             key: "4",
         },
-    ],
-    '4': [
         {
             name: "全部",
             key: "9999",
         },
+    ],
+    '4': [
+       
 
         {
             name: "待接单",
@@ -239,15 +247,16 @@ export const tabTaskList = {
             name: "已完成",
             key: "4",
         },
+        {
+            name: "全部",
+            key: "9999",
+        },
     ]
 }
 // 巡检维修
 export const tabTaskRepairList = {
     '1': [
-        {
-            name: "全部",
-            key: "9999",
-        },
+       
         {
             name: "待提交",
             key: "1",
@@ -276,12 +285,13 @@ export const tabTaskRepairList = {
             name: "已完成",
             key: "7,8",
         },
-    ],
-    '2': [
         {
             name: "全部",
             key: "9999",
         },
+    ],
+    '2': [
+      
         // {
         //     name: "不需要维修",
         //     key: "0",
@@ -314,12 +324,13 @@ export const tabTaskRepairList = {
             name: "已完成",
             key: "7,8",
         },
-    ],
-    '3': [
         {
             name: "全部",
             key: "9999",
         },
+    ],
+    '3': [
+       
         // {
         //     name: "不需要维修",
         //     key: "0",
@@ -356,12 +367,13 @@ export const tabTaskRepairList = {
             name: "已完成",
             key: "7,8",
         },
-    ],
-    '4': [
         {
             name: "全部",
             key: "9999",
         },
+    ],
+    '4': [
+       
         // {
         //     name: "不需要维修",
         //     key: "0",
@@ -395,6 +407,10 @@ export const tabTaskRepairList = {
             name: "已完成",
             key: "7,8",
         },
+        {
+            name: "全部",
+            key: "9999",
+        },
     ]
 }
 // 巡检任务和巡检维修  状态颜色
diff --git a/manifest.json b/manifest.json
index ab2ab68..73625d5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -52,12 +52,7 @@
             },
             "sdkConfigs" : {
                 "ad" : {},
-                "push" : {
-                    "unipush" : {
-                        "version" : "2",
-                        "offline" : false
-                    }
-                },
+                "push" : {},
                 "maps" : {
                     "amap" : {
                         "name" : "amapAjPJDZFvd",
diff --git a/pages/inspection/quest.vue b/pages/inspection/quest.vue
index 423079d..cb7d5da 100644
--- a/pages/inspection/quest.vue
+++ b/pages/inspection/quest.vue
@@ -37,8 +37,8 @@
                         <view class="con-btn">
                             <u-button size="mini" plain style="margin-right:16rpx"
                                 @click="taskDetails(item)">查看</u-button>
-                            <u-button size="mini" plain style="margin-right:16rpx"
-                                @click="openModel(item, 'details')">下载</u-button>
+                            <!-- <u-button size="mini" plain style="margin-right:16rpx"
+                                @click="openModel(item, 'details')">下载</u-button> -->
 
                             <!-- 巡检任务  客户 确认-->
                             <block v-if="subsectionCurrent == '0' && dataTypes == 1 && item.taskStatus == 3">
@@ -206,10 +206,10 @@ export default {
             // this.getTasktabList()
             this.getRepairPersons()
             if (this.dataTypes == 2) {
-                this.subsectionCurrent = '1'
-                this.subsectionChangeTab('1')
+                // this.subsectionCurrent = '1'
+                // this.subsectionChangeTab('1')
             } else {
-                this.changeTab('1')
+                // this.changeTab('1')
             }
 
 
diff --git a/pages/submission/records.vue b/pages/submission/records.vue
index 9b756a8..a6d44af 100644
--- a/pages/submission/records.vue
+++ b/pages/submission/records.vue
@@ -262,8 +262,8 @@ export default {
         this.current = 0
         this.searchInfo.requirementCode = this.requirementCode
       } else {
-        this.current = 1
-        this.changeTab(1)
+        // this.current = 1
+        // this.changeTab(1)
       }
       this.getType()
       this.getRecordsList()
@@ -653,7 +653,7 @@ export default {
 <style lang="scss" scoped>
 .page-css {
   padding: 0;
-  padding-top: var(--status-bar-height);
+  // padding-top: var(--status-bar-height);
 
   .page-box {
     padding: 0;
diff --git a/store/index.js b/store/index.js
index 60a818a..1170007 100644
--- a/store/index.js
+++ b/store/index.js
@@ -26,7 +26,7 @@ const store = new Vuex.Store({
         });
       } else {
         //  console.log(66666666666,role_id)
-        if (res.role_id == "1123598816738675201" || res.role_id == "1846419477876510721") {
+        if (res.role_id == "1123598816738675201" || res.role_id == "1846419477876510721"||res.role_id =='1846486905193041922') {
           commit('updateDatatype', 1) //客户
           commit('updateTabbar', tabBar.member)
 
diff --git a/utils/website.js b/utils/website.js
index 839123e..84f51f6 100644
--- a/utils/website.js
+++ b/utils/website.js
@@ -4,8 +4,9 @@
 export default {
     // baseUrl: 'http://124.221.142.15:8088/lab',
     // baseUrl:'http://192.168.0.118:80',  //李庆坤
-    // baseUrl:'http://192.168.0.109:80', //李涛
-    baseUrl:'http://192.168.1.12:80', //李涛
+    // baseUrl:'http://192.168.1.103:10001', //李涛
+    // baseUrl:'http://192.168.1.12:80', //李涛
+    baseUrl:'http://124.221.142.15:8088/api',//远程测试地址
     indexTitle: "科研医疗建筑运维平台",
     clientId: "saber", // 客户端id
     clientSecret: "saber_secret", // 客户端密钥