服务内容配置

pages/index/comp/indexGongCheng.vue

@@ -21,9 +21,8 @@
         <view class="canneng-index-title mb20">当前工程设备统计</view>
         <view class="header">
             <view class="header-item" @click="jump('nowEngineering')">
-                <view class="header-item-value">{{
-                        devCount.currentOnLineDevCount + devCount.currentOffLineDevCount || 0
-                    }}
+                <view class="header-item-value"
+                    >{{ devCount.currentOnLineDevCount + devCount.currentOffLineDevCount || 0 }}
                 </view>
                 <view class="header-item-label">设备总数</view>
             </view>
@@ -38,10 +37,23 @@
         </view>
         <view class="canneng-index-title mt20">常用功能</view>
         <view style="padding: 20rpx 20rpx 0">
-            <Cn-grid title="">
+            <Cn-grid title="" :auto-fill="false">
                 <Cn-grid-item src="/static/device2.png" text="设备注册" @click="registerDevice(4)"></Cn-grid-item>
-                <Cn-grid-item src="/static/device2.png" text="功能调试" @click="registerDevice(2)"></Cn-grid-item>
-                <Cn-grid-item src="/static/device2.png" text="出厂调试" @click="registerDevice(3)"></Cn-grid-item>
+                <Cn-grid-item
+                    src="/static/device2.png"
+                    text="功能调试"
+                    @click="registerDevice(2)"
+                    v-if="config.feature"
+                ></Cn-grid-item>
+                <Cn-grid-item
+                    src="/static/device2.png"
+                    text="出厂调试"
+                    @click="registerDevice(3)"
+                    v-if="config.factory"
+                ></Cn-grid-item>
+                <Cn-grid-item background="#fff" v-if="!config.feature"></Cn-grid-item>
+                <Cn-grid-item background="#fff" v-if="!config.factory"></Cn-grid-item>
+                <Cn-grid-item background="#fff"></Cn-grid-item>
                 <!-- <Cn-grid-item src="/static/gateway2.png" text="网关注册" @click="registerGateway"></Cn-grid-item> -->
                 <!--                <Cn-grid-item src="/static/feedback2.png" text="问题反馈" @click="submitFeedBack"></Cn-grid-item>-->
             </Cn-grid>
@@ -52,7 +64,11 @@
 export default {
     data() {
         return {
-            loading: false,
+            loading: true,
+            config: {
+                feature: true,
+                factory: true,
+            },
         }
     },
     props: {
@@ -61,9 +77,17 @@ export default {
             default: {},
         },
     },
+    created() {
+        this.init()
+    },
     methods: {
+        init() {
+            console.log('工程init')
+            let serverConfig = uni.getStorageSync(this.$cacheKey.serverConfig)
+            serverConfig && (this.config = serverConfig)
+        },
         submitFeedBack() {
-            uni.navigateTo({url: '/pages/home/feedback'})
+            uni.navigateTo({ url: '/pages/home/feedback' })
         },
         registerDevice(type) {
             uni.showModal({
@@ -72,7 +96,7 @@ export default {
                 confirmText: '直连设备',
                 cancelText: '网关接入',
                 cancelColor: '#007aff',
-                success: ({confirm, cancel}) => {
+                success: ({ confirm, cancel }) => {
                     if (confirm) {
                         if (this.devCount.engineeringListLength > 0) {
                             uni.navigateTo({
@@ -80,10 +104,9 @@ export default {
                             })
                         } else {
                             uni.navigateTo({
-                                url: '/pages/engineering/new?from=index&type=' + type
+                                url: '/pages/engineering/new?from=index&type=' + type,
                             })
                         }
-
                     } else if (cancel) {
                         // uni.navigateTo({
                         //     url: '/pages/gateway/list',
@@ -100,8 +123,7 @@ export default {
         },
         jump(type) {
             uni.navigateTo({
-                url:
-                    '/pages/device/list?type=' + type
+                url: '/pages/device/list?type=' + type,
             })
         },
     },

pages/index/index.vue

@@ -27,7 +27,7 @@
                 <!-- 专职 -->
                 <ZhuanZhi :devCount="devCount" v-if="userInfo.authorities === 'market_user'" />
                 <!-- 工程 -->
-                <GongCheng :devCount="devCount" v-if="userInfo.authorities === 'engineering_user'" />
+                <GongCheng ref="gongCheng" :devCount="devCount" v-if="userInfo.authorities === 'engineering_user'" />
                 <!-- 主用户 -->
                 <ZhuYongHu :devCount="devCount" v-if="userInfo.authorities === 'app_vip_user'" />
                 <YouKe :devCount="devCount" v-if="userInfo.authorities === 'tourist'"></YouKe>
@@ -146,6 +146,7 @@ export default {
             if (!this.select.engineeringId) return
             if (!uni.getStorageSync(this.$cacheKey.access_token)) {
                 clearInterval(this.timer)
+                return
             }
             getDevCount(this.select.engineeringId).then((res) => {
                 // Object.assign(this.devCount, res.data)
@@ -221,6 +222,8 @@ export default {
             })
         } else {
             this.init()
+            console.log(this.$refs.gongCheng);
+            this.$refs.gongCheng?.init()
         }
     },
 }

pages/index/mine.vue

@@ -81,7 +81,7 @@
                 <view class="mine-nav-label">关注工程配置</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
-            <view class="mine-nav" @click="jump('setupServer')">
+            <view class="mine-nav" @click="jump('serverSetting')" v-if="userInfo.authorities === 'engineering_user'">
                 <image mode="aspectFill" class="mine-nav-icon" src="/static/server2.png" />
                 <view class="mine-nav-label">服务内容配置</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>