调整菜单列表

pages/home/components/eacharts_nightpie.vue

@@ -51,7 +51,6 @@ export default {
           {
             name: "",
             type: "pie",
-            radius: [20, 50],
             center: ['50%', '50%'],
             roseType: 'area',
             label: {

pages/home/index.vue

@@ -18,20 +18,48 @@
       </view>
       <view class="menu_box">
         <view class="menu_title">工作台</view>
-        <view class="menu_list clearfix">
+        <view class="menu_list clearfix" v-if="dataTypes==1">
           <view class="item_box" @click="goPage('/pages/inspection/plan')">
             <view class="item_img">
               <image src="@/static/images/home/left.svg" mode="aspectFit" />
             </view>
             <view class="item_txt">巡检计划</view>
           </view>
-          <view class="item_box" @click="goPage('/pages/submission/records?type=submission')">
+          <view class="item_box" @click="goPage('/pages/submission/records?name=报送记录')">
             <view class="item_img">
               <image src="@/static/images/home/left.svg" mode="aspectFit" />
             </view>
             <view class="item_txt">报送记录</view>
           </view>
         </view>
+        <view class="menu_list clearfix" v-else-if="dataTypes==4">
+          <view class="item_box" @click="goPage('/pages/submission/records?name=维修任务')">
+            <view class="item_img">
+              <image src="@/static/images/home/left.svg" mode="aspectFit" />
+            </view>
+            <view class="item_txt">维修任务</view>
+          </view>
+          <view class="item_box" @click="goPage('/pages/inspection/quest')">
+            <view class="item_img">
+              <image src="@/static/images/home/left.svg" mode="aspectFit" />
+            </view>
+            <view class="item_txt">巡检任务</view>
+          </view>
+        </view>
+        <view class="menu_list clearfix" v-else>
+          <view class="item_box" @click="goPage('/pages/submission/records?name=接单记录')">
+            <view class="item_img">
+              <image src="@/static/images/home/left.svg" mode="aspectFit" />
+            </view>
+            <view class="item_txt">接单记录</view>
+          </view>
+          <view class="item_box" @click="goPage('/pages/inspection/quest')">
+            <view class="item_img">
+              <image src="@/static/images/home/left.svg" mode="aspectFit" />
+            </view>
+            <view class="item_txt">巡检任务</view>
+          </view>
+        </view>
       </view>
 
 
@@ -65,6 +93,12 @@ export default {
     eachartsPie,
     eachartsNightpie
   },
+  computed: {
+
+    dataTypes() {
+      return this.$store.state.dataType
+    },
+  },
   data() {
     return {
       swiperList: [],
@@ -269,6 +303,7 @@ export default {
     position: relative;
     margin: 0 32rpx;
     border-radius: 20rpx;
+
     &::after {
       content: '';
       position: absolute;

pages/inspection/quest.vue

@@ -1,6 +1,6 @@
 <template>
     <view class="page-css">
-        <u-navbar v-if="planOrderId" title="巡检任务" back-icon-color="rgb(0, 0, 0)" back-icon-size="54" :title-bold="true"
+        <u-navbar  title="巡检任务" back-icon-color="rgb(0, 0, 0)" back-icon-size="54" :title-bold="true"
             :title-size="38" title-color="rgb(0, 0, 0)"></u-navbar>
         <view class="protocol-content">
             <u-tabs-swiper ref="tabs" :list="subsectionList" :current="subsectionCurrent" :is-scroll="false"
@@ -111,7 +111,7 @@
         </betone-modal>
 
         <betone-loading ref="BetLoading" />
-        <betone-tabbar ref="tabbarRef" v-if="!planOrderId" />
+        <!-- <betone-tabbar ref="tabbarRef" v-if="!planOrderId" /> -->
 
         <betone-modal v-model="detailsShow" v-if="detailsShow" :title="'下载内容'" @confirm="detailsShowFn"
             @cancel="detailsShow = false">
@@ -212,7 +212,7 @@ export default {
 
             // 实验室巡检  跳转进来
             if (!this.planOrderId) {
-                this.$refs.tabbarRef.getPermission();
+                // this.$refs.tabbarRef.getPermission();
             }
 
         });

pages/submission/records.vue

@@ -1,13 +1,12 @@
 <template>
   <view class="page-css">
-    <!-- <betone-list type="submission" ref="tablist"></betone-list> -->
+    <u-navbar  :title="type" back-icon-color="rgb(0, 0, 0)" back-icon-size="54" :title-bold="true"
-    <u-navbar v-if="type != ''" title="报送记录" back-icon-color="rgb(0, 0, 0)" back-icon-size="54" :title-bold="true"
     :title-size="38" title-color="rgb(0, 0, 0)"></u-navbar>
-    <view class="page-header-txt" v-if="type == ''">科研医疗建筑运维平台</view>
+    <!-- <view class="page-header-txt" v-if="type == ''">科研医疗建筑运维平台</view> -->
     <view class="page-box">
       <view class="page-search-top">
         <betone-new-input v-model="searchInfo.requirementCode" :placeholder="dataTypes == 1 ? '搜索单号' : '搜索单号或单位名称'"
-          icon="search" style="margin-bottom: 32rpx" @changevalue="searchData()" />
+          icon="search" style="margin-bottom: 32rpx;margin-top: 32rpx;" @changevalue="searchData()" />
         <u-tabs :list="tabList" :is-scroll="true" :current="current" @change="changeTab"></u-tabs>
       </view>
       <view class="order-box">
@@ -141,7 +140,7 @@
       <sp-html2pdf-render domId="capture" ref="renderRef" @renderOver="renderOver" pdfFileName="这是一个pdf文件"
         @beforeSavePDF="beforeSavePDF" @successSavePDF="successSavePDF"></sp-html2pdf-render>
     </view>
-    <betone-tabbar ref="tabbarRef" v-if="type == ''" />
+    <!-- <betone-tabbar ref="tabbarRef" v-if="type == ''" /> -->
   </view>
 </template>
 
@@ -219,13 +218,13 @@ export default {
     this.getRecordsList();
   },
   onLoad(options) {
-    this.type = options.type?options.type:''
+    this.type = options.name?options.name:''
   },
   onShow() {
     this.$nextTick(() => {
      
       if(this.type==''){
-        this.$refs.tabbarRef.getPermission();
+        // this.$refs.tabbarRef.getPermission();
       }
       this.getRecordsList()
     });
@@ -532,6 +531,7 @@ export default {
     .page-search-top {
       background-color: #fff;
       padding: 0 40rpx 0;
+      overflow: hidden;
     }
 
     .order-box {

store/index.js

@@ -41,7 +41,7 @@ const store = new Vuex.Store({
           commit('updateTabbar', tabBar.ordinary)
 
           uni.reLaunch({
-            url: "/pages/submission/records",
+            url: "/pages/home/index",
           });
 
 
@@ -51,7 +51,7 @@ const store = new Vuex.Store({
           commit('updateTabbar', tabBar.manage)
 
           uni.reLaunch({
-            url: "/pages/submission/records",
+            url: "/pages/home/index",
           });
           // this.$u.api.updateCoordinate().then(res=>{
 
@@ -63,11 +63,9 @@ const store = new Vuex.Store({
           commit('updateTabbar', tabBar.repair)
 
           uni.reLaunch({
-            url: "/pages/submission/records",
+            url: "/pages/home/index",
           });
 
-
-
           // 如果是维修人员登录   则实时更新当前维修人员的位置
 
         }

utils/tabbar.js

@@ -2,13 +2,8 @@
 const ordinary = [{
     iconPath: "photo",
     selectedIconPath: "photo-fill",
-    text: "接单记录",
+    text: "工作台",
-    pagePath: "/pages/submission/records",
+    pagePath: "/pages/home/index",
-},  {
-    iconPath: "setting",
-    selectedIconPath: "setting-fill",
-    text: "巡检任务",
-    pagePath: "/pages/inspection/quest",
 },{
     iconPath: "account",
     selectedIconPath: "account-fill",
@@ -38,13 +33,8 @@ const member = [{
 const manage = [{
     iconPath: "photo",
     selectedIconPath: "photo-fill",
-    text: "接单记录",
+    text: "工作台",
-    pagePath: "/pages/submission/records",
+    pagePath: "/pages/home/index",
-}, {
-    iconPath: "setting",
-    selectedIconPath: "setting-fill",
-    text: "巡检任务",
-    pagePath: "/pages/inspection/quest",
 }, {
     iconPath: "account",
     selectedIconPath: "account-fill",
@@ -55,13 +45,8 @@ const manage = [{
 const repair = [{
     iconPath: "photo",
     selectedIconPath: "photo-fill",
-    text: "维修任务",
+    text: "工作台",
-    pagePath: "/pages/submission/records",
+    pagePath: "/pages/home/index",
-}, {
-    iconPath: "setting",
-    selectedIconPath: "setting-fill",
-    text: "巡检任务",
-    pagePath: "/pages/inspection/quest",
 },{
     iconPath: "account",
     selectedIconPath: "account-fill",