From e0ea2095b289c8c9434cfe5c1c73cc809a2a9fe2 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Wed, 20 Nov 2024 11:53:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |   3 +
 api/api.js                                    |  14 ++-
 common/betone_components/betone-list.vue      |  64 ++++++----
 .../betone_components/betone-new-header.vue   |   2 -
 common/betone_components/betone-tabbar.vue    |   5 +-
 common/betone_components/betone-upload.vue    |   4 +-
 manifest.json                                 |  12 ++
 pages.json                                    |  40 ++-----
 pages/home/components/alarm.vue               |  56 ++++-----
 pages/home/components/eacharts.vue            |  74 +++++++-----
 pages/home/components/swiper.vue              |   3 +-
 pages/home/index.vue                          | 111 +++++++++++-------
 pages/my/feedback.vue                         |   2 -
 pages/my/my.vue                               |   2 +
 pages/my/records.vue                          |   1 -
 pages/register/index.vue                      |   1 -
 pages/submission/components/subForm.vue       |   2 +-
 utils/tabbar.js                               |  22 ++--
 18 files changed, 227 insertions(+), 191 deletions(-)

diff --git a/App.vue b/App.vue
index 0644e96..bc7d070 100644
--- a/App.vue
+++ b/App.vue
@@ -1,5 +1,8 @@
 <script>
 export default {
+  onLaunch: function (options) {
+    uni.hideTabBar()
+  },
   onReady() {
 
   },
diff --git a/api/api.js b/api/api.js
index fdadf20..6c69cc5 100644
--- a/api/api.js
+++ b/api/api.js
@@ -109,13 +109,25 @@ const install = (Vue, vm) => {
         authorization: false,
         isparams: true
     })
+    // 工作台  workBenches/overview
+    let overview = (params) => http.get('/workBenches/overview', { ...params }, {
+        authorization: false,
+        isparams: true
+    })
+
     // 获取用户信息   /
     let getUserInfo = (params) => http.get('/blade-system/user/info', { ...params }, {
         authorization: false,
         isparams: true
     })
+
+    // 派单   /lab/workOrder/update
+    let sendOrders = (params) => http.get('/workOrder/update', { ...params }, {
+        authorization: false,
+        isparams: true
+    })
     // 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
-    vm.$u.api = { getTenantInfo, login, logout, register, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList,upkeepStat,pieStat,getUserInfo };
+    vm.$u.api = { getTenantInfo, login, logout, register, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList,upkeepStat,pieStat,getUserInfo,overview };
 }
 
 export default {
diff --git a/common/betone_components/betone-list.vue b/common/betone_components/betone-list.vue
index e91bcd5..658bbcb 100644
--- a/common/betone_components/betone-list.vue
+++ b/common/betone_components/betone-list.vue
@@ -37,18 +37,18 @@
                             <u-button size="mini" plain style="margin-right: 32rpx"
                                 @click.stop="goPage(item, 'breakdownView')">查看</u-button>
 
-                            <!-- 接单 -->
-                            <block v-if="item.status == 0&&dataTypes==1">
+                            <!-- 状态0 客服才能进行派单 -->
+                            <block v-if="item.status == 0 && dataTypes == 2">
                                 <u-button size="mini" :plain="true" style="margin-right: 32rpx"
                                     @click.stop="sendOrders()" type="primary">派单</u-button>
                             </block>
                             <block v-if="item.status == 0 && dataTypes == 4">
-                                <u-button size="mini" :plain="true" style="margin-right: 32rpx"
-                                    type="primary" @click="orderConfirm(item)">接单确认</u-button>
+                                <u-button size="mini" :plain="true" style="margin-right: 32rpx" type="primary"
+                                    @click="orderConfirm(item)">接单确认</u-button>
                             </block>
-                            <block v-if="item.status == 2&&dataTypes==4">
-                                <u-button size="mini" :plain="true" style="margin-right: 32rpx"
-                                    type="primary" @click="goPage(item, 'details')">维修</u-button>
+                            <block v-if="item.status == 2 && dataTypes == 4">
+                                <u-button size="mini" :plain="true" style="margin-right: 32rpx" type="primary"
+                                    @click="goPage(item, 'details')">维修</u-button>
                             </block>
                             <!-- 待提报 --提报 修改-->
                             <block v-if="item.status == -1">
@@ -58,17 +58,23 @@
                                     type="primary" @click="goPage(item, 'breakdownUpdate')">修改</u-button>
                             </block>
                             <!-- 待维修 -- 查看位置-->
-                            <block v-if="(dataTypes==1)&&(item.status == 1 || item.status == 2 || item.status == 3)">
+                            <block v-if="(dataTypes == 1) && (item.status == 1 || item.status == 2 || item.status == 3)">
                                 <u-button size="mini" :plain="true" style="margin-right: 32rpx" :hair-line="true"
-                                    type="primary" @click="goPage(item,'location')">查看位置</u-button>
+                                    type="primary" @click="goPage(item, 'location')">查看位置</u-button>
                             </block>
-                          
-
-                            <block v-if="item.status == 5&& dataTypes == 1">
+                            <block v-if="item.status == 5 && dataTypes == 1">
                                 <u-button size="mini" :plain="true" style="margin-right: 32rpx" :hair-line="true"
                                     type="primary" @click="goPage(item, 'evaluate')">评价</u-button>
 
                             </block>
+                            <!-- 关闭 -->
+                            <!-- <block>
+                                <u-button size="mini" plain style="margin-right: 32rpx">关闭</u-button>
+                            </block> -->
+                            <!-- 驳回 -->
+                            <!-- <block v-if="dataTypes == 1">
+                                <u-button size="mini" plain style="margin-right: 32rpx">驳回</u-button>
+                            </block> -->
                         </view>
                     </view>
                 </view>
@@ -80,10 +86,10 @@
 
 
         <!-- 派单弹框  选择维修人员 -->
-        <u-select v-model="sendOrdersShow" :list="sendOrdersList" @confirm="sendOrdersConfirm"
-            :isShowsearch="true"  value-name="id" title="选择维修人员"></u-select>
+        <u-select v-model="sendOrdersShow" :list="sendOrdersList" @confirm="sendOrdersConfirm" :isShowsearch="true"
+            value-name="id" title="选择维修人员"></u-select>
+
 
-        
     </view>
 </template>
 
@@ -110,7 +116,7 @@ export default {
                 已完成: "#CECECE",
                 待维修: '#E99D42'
             },
-           
+
             current: 0,
             loadingState: "loadmore",
             isNomore: false,
@@ -250,26 +256,32 @@ export default {
         },
         // 确认派单
         sendOrdersConfirm(e) {
-            console.log(44444,e);
             // 确定派单 传参
             // {"id":"1857232935845892097","reportUnit":"","maintenanceTeam":"1847218701580435458","dispatchTime":"2024-11-15 00:00:00","planCompleteTime":"","repairPerson":null,"status":1,"remark":""}
+            let query_ = {
+                id:e.id,
+                reportUnit:e.reportUnit,
+                status:1,//
+
+            }
+
 
         },
         // 维修人员  接单确认
-        orderConfirm(row){
+        orderConfirm(row) {
 
         },
         // 获取维修人员列表
-        getRepairPersons(){
-            this.$u.api.getRepairPersons().then(res=>{
-                if(res.code == 200){
+        getRepairPersons() {
+            this.$u.api.getRepairPersons().then(res => {
+                if (res.code == 200) {
                     let data_ = res.data
-                    data_.forEach(i=>{
-                        this.sendOrdersList.push({...i,label:i.name})
+                    data_.forEach(i => {
+                        this.sendOrdersList.push({ ...i, label: i.name })
                     })
-                     
+
                 }
-               
+
             })
         },
         //   跳转详情
@@ -306,7 +318,7 @@ export default {
                     url: `/pages/submission/evaluate${this.$u.queryParams(param)}`,
                 });
             }
-            if(type == 'location'){//查看位置
+            if (type == 'location') {//查看位置
                 uni.navigateTo({
                     url: `/pages/order/location`,
                 })
diff --git a/common/betone_components/betone-new-header.vue b/common/betone_components/betone-new-header.vue
index fc775e8..2e65709 100644
--- a/common/betone_components/betone-new-header.vue
+++ b/common/betone_components/betone-new-header.vue
@@ -100,11 +100,9 @@ export default {
     },
     findUnreadNoticeIdCallBack(res) {
       var that = this;
-      // console.log("TTTT:::::");
       that.unreadNoticeIds = res.data;
     },
     getMemberSecurityInfo(res) {
-      // console.log("res::::::KKK", res);
       if (res) {
         this.rs(res);
       } else {
diff --git a/common/betone_components/betone-tabbar.vue b/common/betone_components/betone-tabbar.vue
index b1ad817..0499c03 100644
--- a/common/betone_components/betone-tabbar.vue
+++ b/common/betone_components/betone-tabbar.vue
@@ -9,6 +9,7 @@
       :mid-button-size="170"
       :icon-size="60"
       @change="tabbatChange"
+      v-model="current"
     ></u-tabbar>
   </view>
 </template>
@@ -39,12 +40,12 @@ export default {
     // 判断权限
     getPermission() {
       const tabBarList = uni.getStorageSync("tabBarList");
-      this.current=0
+      this.current=global.tabBarCurrent
       this.list = tabBarList;
     },
     tabbatChange(index) {
 				global.tabBarCurrent = index
-				uni.switchTab({
+				uni.navigateTo({
 					url: this.list[index].pagePath,
 				})
 			}
diff --git a/common/betone_components/betone-upload.vue b/common/betone_components/betone-upload.vue
index 48b8ad2..869b441 100644
--- a/common/betone_components/betone-upload.vue
+++ b/common/betone_components/betone-upload.vue
@@ -102,7 +102,7 @@ export default {
         formData: {},
         success: (res) => {
           let info = JSON.parse(res.data);
-          console.log("上传成功", info); // 上传成功后的操作
+          // console.log("上传成功", info); // 上传成功后的操作
 
           this.fileList.push({
             'link': info.data.link,
@@ -112,7 +112,7 @@ export default {
           this.$refs.BetLoading.hide()
         },
         error: (uploadFileRes) => {
-          console.log("上传失败", uploadFileRes.data); // 上传成功后的操作
+          // console.log("上传失败", uploadFileRes.data); // 上传成功后的操作
           this.$refs.BetLoading.hide()
         },
       });
diff --git a/manifest.json b/manifest.json
index 0aae32b..9f4f9fe 100644
--- a/manifest.json
+++ b/manifest.json
@@ -113,6 +113,18 @@
         "appid" : "",
         "setting" : {
             "urlCheck" : true
+        },
+        "permission" : {}
+    },
+    "h5" : {
+        "sdkConfigs" : {
+            "maps" : {
+                "amap" : {
+                    "key" : "a9632baa2c4ae13a34c1fb265dda41f5",
+                    "securityJsCode" : "",
+                    "serviceHost" : ""
+                }
+            }
         }
     }
 }
diff --git a/pages.json b/pages.json
index a52bbd0..7d60a1f 100644
--- a/pages.json
+++ b/pages.json
@@ -23,7 +23,7 @@
                 "navigationBarTitleText": "记录",
                 "enablePullDownRefresh": false,
                 "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "rgba(248,248,248,1)"
+                "navigationBarBackgroundColor": "#F8F8F8"
             }
         },
         {
@@ -32,7 +32,7 @@
                 "navigationBarTitleText": "意见反馈",
                 "enablePullDownRefresh": false,
                 "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "rgba(248,248,248,1)"
+                "navigationBarBackgroundColor": "#F8F8F8"
             }
         },
         {
@@ -41,7 +41,7 @@
                 "navigationBarTitleText": "维修报送",
                 "enablePullDownRefresh": false,
                 "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "rgba(248,248,248,1)"
+                "navigationBarBackgroundColor": "#F8F8F8"
             }
         },
         {
@@ -50,7 +50,7 @@
                 "navigationBarTitleText": "维修报送",
                 "enablePullDownRefresh": false,
                 "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "rgba(248,248,248,1)"
+                "navigationBarBackgroundColor": "#F8F8F8"
             }
         },
         {
@@ -68,7 +68,7 @@
                 "navigationBarTitleText": "维修详情",
                 "enablePullDownRefresh": false,
                 "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "rgba(248,248,248,1)",
+                "navigationBarBackgroundColor": "#F8F8F8",
                 "app-plus": {
                     "titleNView": {}
                 }
@@ -80,7 +80,7 @@
                 "navigationBarTitleText": "评价",
                 "enablePullDownRefresh": false,
                 "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "rgba(248,248,248,1)",
+                "navigationBarBackgroundColor": "#F8F8F8",
                 "app-plus": {
                     "titleNView": {}
                 }
@@ -99,7 +99,7 @@
                 "navigationBarTitleText": "查看位置",
                 "enablePullDownRefresh": false,
                 "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "rgba(248,248,248,1)",
+                "navigationBarBackgroundColor": "#F8F8F8",
                 "app-plus": {
                     "titleNView": {}
                 }
@@ -140,7 +140,7 @@
                 "navigationBarTitleText": "巡检任务单",
                 "enablePullDownRefresh": false,
                 "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "rgba(248,248,248,1)",
+                "navigationBarBackgroundColor": "#F8F8F8",
                 "app-plus": {
                     "titleNView": {}
                 }
@@ -159,7 +159,7 @@
                "navigationBarTitleText": "巡检计划",
                 "enablePullDownRefresh": false,
                 "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "rgba(248,248,248,1)",
+                "navigationBarBackgroundColor": "#F8F8F8",
                 "app-plus": {
                     "titleNView": {}
                 }
@@ -172,27 +172,5 @@
         "navigationBarTitleText": "科研医疗建筑运维平台",
         "navigationBarBackgroundColor": "#FFFFFF",
         "backgroundColor": "#fff"
-    },
-    "tabBar": {
-        "list": [
-            {
-                "pagePath": "pages/home/index"
-            },
-            {
-                "pagePath": "pages/submission/index"
-            },
-            {
-                "pagePath": "pages/order/tasking"
-            },
-            {
-                "pagePath": "pages/my/my"
-            },
-            {
-                "pagePath": "pages/inspection/quest"
-            },
-            {
-                "pagePath": "pages/inspection/plan"
-            }
-        ]
     }
 }
\ No newline at end of file
diff --git a/pages/home/components/alarm.vue b/pages/home/components/alarm.vue
index 03cc0df..327451e 100644
--- a/pages/home/components/alarm.vue
+++ b/pages/home/components/alarm.vue
@@ -1,10 +1,7 @@
 <template>
   <view>
     <view v-for="(item, index) in list" :key="index" class="alarm-box">
-      <view
-        class="alarm-left"
-        :style="`borderColor: ${colorList[item.alarmName]} `"
-      >
+      <view class="alarm-left" :style="{ borderColor: item.color }">
         <i>{{ item.alarmName }}</i>
         <i>{{ item.levelNanme }}</i>
       </view>
@@ -27,43 +24,28 @@ export default {
         特别严重: "rgba(189,49,36,1)",
         严重: "rgba(233,157,66,1)",
       },
-      list: [
-        // {
-        //   title1: "通风柜",
-        //   title2: "德力西",
-        //   title3: "FSAJ",
-        //   title4: "2024-08-09",
-        //   title5: "一级",
-        //   title6: "特别严重",
-        // },
-        // {
-        //   title1: "通风柜",
-        //   title2: "德力西",
-        //   title3: "FSAJ",
-        //   title4: "2024-08-09",
-        //   title5: "一级",
-        //   title6: "严重",
-        // },
-      ],
+      list: [],
     };
   },
-  mounted(){
+  mounted() {
     this.deviceList()
   },
-  methods:{
-    deviceList(){
-      this.$u.api.deviceList().then(res=>{
-        if(res.code ==200){
-          let data_ =res.data
+  methods: {
+    deviceList() {
+      this.$u.api.deviceList().then(res => {
+        if (res.code == 200) {
+          let data_ = res.data
           data_.forEach(v => {
-            if(v.alarmLevel==1){
+            if (v.alarmLevel == 1) {
               v.alarmName = '一级'
               v.levelNanme = '超级严重'
+
             }
-            if(v.alarmLevel==2){
+            if (v.alarmLevel == 2) {
               v.alarmName = '二级'
               v.levelNanme = '严重'
             }
+            v.color = this.colorList[v.levelNanme]
           });
           this.list = res.data
         }
@@ -79,6 +61,7 @@ export default {
   border-radius: 20rpx;
   display: flex;
   flex-direction: row;
+
   .alarm-left {
     width: 160rpx;
     height: 160rpx;
@@ -86,37 +69,44 @@ export default {
     border: 16rpx solid rgba(189, 49, 36, 1);
     border-radius: 50%;
     margin: 36rpx 36rpx 36rpx 48rpx;
+
     i {
       display: block;
       text-align: center;
+
       &:nth-child(1) {
         color: rgba(16, 16, 16, 1);
         font-size: 28rpx;
         padding-top: 30rpx;
       }
+
       &:nth-child(2) {
         color: rgba(190, 190, 190, 1);
         font-size: 26rpx;
       }
     }
   }
+
   .alarm-center {
     flex: 1;
     color: rgba(154, 154, 154, 1);
     font-size: 24rpx;
     position: relative;
+
     text {
       display: block;
       line-height: 40rpx;
       font-size: 24rpx;
+
       &:nth-child(1) {
         color: rgba(0, 0, 0, 1);
         font-size: 28rpx;
         padding: 28rpx 0 8rpx 0;
       }
-      &:nth-child(2) {
-      }
+
+      &:nth-child(2) {}
     }
+
     .alarm-center-btn {
       width: 160rpx;
       height: 60rpx;
@@ -128,7 +118,7 @@ export default {
       line-height: 60rpx;
       text-align: center;
       position: absolute;
-      top: 80rpx;
+      top: 28rpx;
       right: 40rpx;
       cursor: pointer;
     }
diff --git a/pages/home/components/eacharts.vue b/pages/home/components/eacharts.vue
index 21c86d4..587f2b2 100644
--- a/pages/home/components/eacharts.vue
+++ b/pages/home/components/eacharts.vue
@@ -2,20 +2,12 @@
   <view class="eacharts-box">
     <view class="eacharts-time">
       <u-form :model="form" ref="uForm">
-        <u-form-item label="选择时间:" label-width="140" :border-bottom="false"
-          ><u-input
-            v-model="form.searchTime"
-            type="select"
-            @click="calendarShow = true"
-            :border="true"
-            placeholder="请选择时间"
-        /></u-form-item>
+        <u-form-item label="选择时间:" label-width="140" :border-bottom="false">
+          <u-input v-model="form.searchTime" type="select" @click="calendarShow = true" :border="true"
+            placeholder="请选择时间" />
+        </u-form-item>
       </u-form>
-      <u-calendar
-        v-model="calendarShow"
-        :mode="mode"
-        @change="change"
-      ></u-calendar>
+      <u-calendar v-model="calendarShow" :mode="mode" @change="change"></u-calendar>
     </view>
     <!-- eacharts 图表 -->
     <view class="echarts" v-if="type == 'maintenanceStatistics'">
@@ -33,7 +25,7 @@
         <text class="pie-title">设备分类</text>
       </view>
     </view>
-   
+
   </view>
 </template>
 <script>
@@ -56,37 +48,45 @@ export default {
       },
       calendarShow: false,
       mode: "range",
-      upkeepStatInfo:{},
-      pieInfo:{},//饼图数据
+      upkeepStatInfo: {},
+      pieInfo: {},//饼图数据
     };
   },
   mounted() {
-    
+
     // 维修统计
     if (this.type == "maintenanceStatistics") {
       this.upkeepStat()
-      
-      
+
+
     }
     if (this.type == "maintenanceStatisticsPie") {
       this.pieStat()
-     
+
     }
   },
   methods: {
     // 维修统计
-    upkeepStat(){
-      this.$u.api.upkeepStat().then(res=>{
-        if(res.code== 200){
+    upkeepStat() {
+      let query_ = {
+        startTime: this.form.startTime,
+        endTime: this.form.endTime,
+      }
+      this.$u.api.upkeepStat(query_).then(res => {
+        if (res.code == 200) {
           this.upkeepStatInfo = JSON.parse(JSON.stringify(res.data))
           this.maintenanceInit();
         }
       })
     },
     // 饼图数据
-    pieStat(){
-      this.$u.api.pieStat().then(res=>{
-        if(res.code == 200){
+    pieStat() {
+      let query_ = {
+        startTime: this.form.startTime,
+        endTime: this.form.endTime,
+      }
+      this.$u.api.pieStat(query_).then(res => {
+        if (res.code == 200) {
           this.pieInfo = res.data
           this.maintenancePieLeftInit();
           this.maintenancePieRightInit();
@@ -97,10 +97,16 @@ export default {
       this.calendarShow = true;
     },
     change(e) {
-      console.log(e);
       this.form.startTime = e.startDate;
       this.form.endTime = e.endDate;
       this.form.searchTime = e.startDate + "-" + e.endDate;
+      if (this.type == "maintenanceStatistics") {
+        this.upkeepStat()
+      }
+      if (this.type == "maintenanceStatisticsPie") {
+        this.pieStat()
+      }
+
       // 查询数据
     },
     // 维修统计柱状图
@@ -177,11 +183,11 @@ export default {
                 fontSize: 8, // 是否显示标签[ default: false ]
                 position: "outside", // 标签的位置。'outside'饼图扇区外侧，通过视觉引导线连到相应的扇区。'inside','inner' 同 'inside',饼图扇区内部。'center'在饼图中心位置。
                 formatter: "{b}\n {c}", // 标签内容
-                color:'#000'
+                color: '#000'
               },
             },
 
-            data:  this.pieInfo.fault,
+            data: this.pieInfo.fault,
             emphasis: {
               itemStyle: {
                 shadowBlur: 10,
@@ -227,10 +233,10 @@ export default {
                 fontSize: 8, // 是否显示标签[ default: false ]
                 position: "outside", // 标签的位置。'outside'饼图扇区外侧，通过视觉引导线连到相应的扇区。'inside','inner' 同 'inside',饼图扇区内部。'center'在饼图中心位置。
                 formatter: "{b}\n {c}", // 标签内容
-                color:'#000'
+                color: '#000'
               },
             },
-            data:  this.pieInfo.device,
+            data: this.pieInfo.device,
             labelLine: {
               // 标签的视觉引导线样式,在 label 位置 设置为'outside'的时候会显示视觉引导线。
               normal: {
@@ -264,10 +270,12 @@ export default {
   margin: 0 40rpx 32rpx;
   border-radius: 20rpx;
   overflow: hidden;
+
   .eacharts-time {
     margin: 0 136rpx 0 24rpx;
     display: flex;
     flex-direction: row;
+
     text {
       line-height: 60rpx;
       color: rgba(16, 16, 16, 1);
@@ -276,21 +284,25 @@ export default {
       margin-right: 10rpx;
     }
   }
+
   .echarts {
     width: calc(100% - 64rpx);
     height: 308rpx;
     margin: 0 auto 20rpx;
   }
+
   .echartsPie {
     width: calc(100% - 64rpx);
     min-height: 308rpx;
     margin: 0 auto 0;
+
     .pie-item {
       width: 100%;
       height: 368rpx;
       // float: left;
     }
   }
+
   .pie-title {
     height: 30rpx;
     text-align: center;
diff --git a/pages/home/components/swiper.vue b/pages/home/components/swiper.vue
index 981c16a..0cda1be 100644
--- a/pages/home/components/swiper.vue
+++ b/pages/home/components/swiper.vue
@@ -40,11 +40,10 @@ export default {
   methods: {
     // 点击通告栏
     click(id) {
-      console.log(id, "======>id");
+      // console.log(id, "======>id");
     },
     workList(){
       this.$u.api.workList().then(res=>{
-        console.log(1111111111111,res)
         if(res.code == 200){
           this.list = res.data
         }
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 88df414..53f1186 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -3,6 +3,7 @@
     <view class="">
       <view class="banner-swiper" v-if="swiperList.length > 0">
         <view class="logo-txt">科研医疗建筑运维平台</view>
+        <u-icon class="logo-scan" style="padding-right:12rpx" @click="scanCode" size="45" name="scan"></u-icon>
         <u-swiper height="444" :list="swiperList" mode="none"></u-swiper>
       </view>
       <view class="work-title">工作台</view>
@@ -48,32 +49,7 @@ export default {
   data() {
     return {
       swiperList: [],
-      workList: [
-        {
-          name: "实验室巡检",
-          img: require("@/static/images/home/lab_xj.png"),
-          num: 10,
-          pagePath: '/pages/inspection/records'
-        },
-        {
-          name: "报送记录",
-          img: require("@/static/images/home/bs_jl.png"),
-          num: 0,
-          pagePath: '/pages/submission/records'
-        },
-        {
-          name: "设备报警",
-          img: require("@/static/images/home/alarm.png"),
-          num: 2,
-          pagePath: ''
-        },
-        {
-          name: "其他",
-          img: require("@/static/images/home/full.png"),
-          num: 0,
-          pagePath: ''
-        },
-      ],
+      workList: [],
     };
   },
   onShow() {
@@ -86,34 +62,70 @@ export default {
     });
     //工作台
     this.getUserInfo()
+    this.getoverview()
   },
   methods: {
-    getUserInfo(){
-      this.$u.api.getUserInfo().then(res=>{
-        if(res.code == 200){
-          console.log(1111111,res.data)
-          if(res.data.backGroundPic!=''){
+    // 工作台 列表  overview
+    getoverview() {
+      this.$u.api.overview().then(res => {
+        if (res.code == 200) {
+          let data_ = res.data
+          data_.forEach(item => {
+            if (item.name.indexOf('巡检') > 0) {
+              item.pagePath = '/pages/inspection/records'
+              item.img = require("@/static/images/home/lab_xj.png")
+            }
+            if (item.name.indexOf('记录') > 0) {
+              item.pagePath = '/pages/submission/records'
+              item.img = require("@/static/images/home/bs_jl.png")
+            }
+            if (item.name.indexOf('报警') > 0) {
+              item.pagePath = ''
+              item.img = require("@/static/images/home/alarm.png")
+            }
+          });
+          data_.push({
+            name: "其他",
+            img: require("@/static/images/home/full.png"),
+            num: 0,
+            pagePath: ''
+          })
+          this.workList = data_
+        }
+
+
+      })
+    },
+    getUserInfo() {
+      this.$u.api.getUserInfo().then(res => {
+        if (res.code == 200) {
+
+          if (res.data.backGroundPic != '') {
             this.swiperList.push(res.data.backGroundPic)
-          }else{
+          } else {
             this.swiperList.push(require("@/static/images/home/lab.png"))
           }
-        }else{
-          this.swiperList.push(require("@/static/images/home/lab.png"))
         }
+      }).catch(err => {
+        this.swiperList.push(require("@/static/images/home/lab.png"))
       })
     },
-    getworkbench() {
-      console.log(55);
-      // this.$u.api.getworkbench().then(res=>{
-
-      // }).catch(err=>{
-
-      // })
-    },
-    goPage(item){
+    goPage(item) {
       uni.navigateTo({
         url: item.pagePath,
       });
+    },
+    scanCode() {
+      uni.scanCode({
+        success: (res) => {
+          console.log('扫码结果：' + res.result);
+          // 扫码成功后的操作，例如：
+          // this.handleScanResult(res.result);
+        },
+        fail: (err) => {
+          console.error('扫码失败：' + err);
+        }
+      });
     }
   },
 };
@@ -125,6 +137,7 @@ export default {
   padding: 0;
   background: rgba(239, 239, 239, 1);
   padding-top: var(--status-bar-height);
+
   .banner-swiper {
     margin-bottom: 64rpx;
     position: relative;
@@ -137,6 +150,14 @@ export default {
       left: 20rpx;
       z-index: 10;
     }
+
+    .logo-scan {
+      position: absolute;
+      right: 20rpx;
+      top: 40rpx;
+      z-index: 10;
+      color: rgba(255, 255, 255, 1);
+    }
   }
 
   .work-title {
@@ -153,8 +174,8 @@ export default {
     margin: 0 40rpx 32rpx;
 
     .workbench-item {
-      width: 160rpx;
-      height: 148rpx;
+      width: 150rpx;
+      height: 150rpx;
       background-color: rgba(58, 98, 215, 0.57);
       border-radius: 8rpx;
       position: relative;
diff --git a/pages/my/feedback.vue b/pages/my/feedback.vue
index 6cba4c1..7a17f41 100644
--- a/pages/my/feedback.vue
+++ b/pages/my/feedback.vue
@@ -109,7 +109,6 @@ export default {
     },
     // 提交意见反馈
     submitFeedback() {
-      console.log(this.form);
       if (this.from.type == "") {
         uni.showToast({ title: "请选择反馈类型", icon: "none" });
         return false;
@@ -124,7 +123,6 @@ export default {
       }
 
       this.$u.api.subEditRecords(this.from).then((res) => {
-        console.log("提交成功", res);
         if (res.code == 200) {
           uni.showToast({ title: "提交成功", icon: "none" });
           setTimeout(() => {
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 80cbe0b..6872d54 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -30,6 +30,7 @@
   </view>
 </template>
 <script>
+import global from "@/utils/global.js";
 export default {
   computed: {
 
@@ -98,6 +99,7 @@ export default {
               uni.removeStorageSync("token");
               uni.removeStorageSync("userinfo");
               uni.removeStorageSync("tabBarList");
+              global.tabBarCurrent = 0
               uni.redirectTo({
                 url: "/pages/login/login",
               });
diff --git a/pages/my/records.vue b/pages/my/records.vue
index d1df1a2..0592f82 100644
--- a/pages/my/records.vue
+++ b/pages/my/records.vue
@@ -83,7 +83,6 @@ export default {
     },
     // 人员选择
     changeSelect(e) {
-      console.log(11111, e)
       this.searchInfo.name = this.getUserData[e].name
       this.searchInfo.id = this.getUserData[e].id
       if (this.type == "login") {
diff --git a/pages/register/index.vue b/pages/register/index.vue
index 5bab787..804a8a6 100644
--- a/pages/register/index.vue
+++ b/pages/register/index.vue
@@ -208,7 +208,6 @@ export default {
       this.mapInfo.showMapSelect = true
     },
     commitCheck(e) {
-      console.log(e, 565);
       if (e) {
         uni.$emit('commitCheck', e);
         this.registerInfo.area = e.name
diff --git a/pages/submission/components/subForm.vue b/pages/submission/components/subForm.vue
index 1e422dd..3e5efea 100644
--- a/pages/submission/components/subForm.vue
+++ b/pages/submission/components/subForm.vue
@@ -178,7 +178,7 @@ export default {
             this.$u.api.workOrderSave(this.breakdownInfo).then(res => {
                 this.$refs.BetLoading.hide();
                 if (res.code == 200) {
-                    uni.redirectTo({
+                    uni.navigateTo({
                         url: "/pages/submission/records",
                     });
                 }
diff --git a/utils/tabbar.js b/utils/tabbar.js
index 4b469fa..3a2be92 100644
--- a/utils/tabbar.js
+++ b/utils/tabbar.js
@@ -3,30 +3,30 @@ const ordinary = [{
     iconPath: "photo",
     selectedIconPath: "photo-fill",
     text: "接单记录",
-    pagePath: "pages/order/tasking",
+    pagePath: "/pages/order/tasking",
 },  {
     iconPath: "account",
     selectedIconPath: "account-fill",
     text: "我的",
-    pagePath: "pages/my/my",
+    pagePath: "/pages/my/my",
 }]
 //   客户看到的页面
 const member = [{
     iconPath: "photo",
     selectedIconPath: "photo-fill",
     text: "工作台",
-    pagePath: "pages/home/index",
+    pagePath: "/pages/home/index",
 },
 {
     iconPath: "plus-circle",
     selectedIconPath: "plus-circle-fill",
     text: "一键报送",
-    pagePath: "pages/submission/index",
+    pagePath: "/pages/submission/index",
 }, {
     iconPath: "account",
     selectedIconPath: "account-fill",
     text: "我的",
-    pagePath: "pages/my/my",
+    pagePath: "/pages/my/my",
 },
 ]
 // 维修负责人看到的页面
@@ -34,34 +34,34 @@ const manage = [{
     iconPath: "photo",
     selectedIconPath: "photo-fill",
     text: "接单记录",
-    pagePath: "pages/order/tasking",
+    pagePath: "/pages/order/tasking",
 }, {
     iconPath: "setting",
     selectedIconPath: "setting-fill",
     text: "巡检计划",
-    pagePath: "pages/inspection/plan",
+    pagePath: "/pages/inspection/plan",
 }, {
     iconPath: "account",
     selectedIconPath: "account-fill",
     text: "我的",
-    pagePath: "pages/my/my",
+    pagePath: "/pages/my/my",
 }]
 // 维修人员 看到的菜单
 const repair = [{
     iconPath: "photo",
     selectedIconPath: "photo-fill",
     text: "接单记录",
-    pagePath: "pages/order/tasking",
+    pagePath: "/pages/order/tasking",
 }, {
     iconPath: "setting",
     selectedIconPath: "setting-fill",
     text: "维修任务",
-    pagePath: "pages/inspection/quest",
+    pagePath: "/pages/inspection/quest",
 }, {
     iconPath: "account",
     selectedIconPath: "account-fill",
     text: "我的",
-    pagePath: "pages/my/my",
+    pagePath: "/pages/my/my",
 }]
 export default {
     ordinary,