问题反馈修改

pages/index/comp/indexZhuanZhi.vue

@@ -23,7 +23,7 @@
                     <view class="header-item-value">{{ devCount.eventCount || 0 }}</view>
                     <view class="header-item-label">事件数量</view>
                 </view>
-                <view class="header-item">
+                <view class="header-item" @click="projectNum(false)">
                     <view class="header-item-value">{{ devCount.projectCount || 0 }}</view>
                     <view class="header-item-label">项目个数</view>
                 </view>
@@ -34,8 +34,9 @@
         <view class="header">
             <view class="header-item">
                 <view class="header-item-value">{{
-                    devCount.currentOnLineDevCount + devCount.currentOffLineDevCount || 0
-                }}</view>
+                        devCount.currentOnLineDevCount + devCount.currentOffLineDevCount || 0
+                    }}
+                </view>
                 <view class="header-item-label">设备总数</view>
             </view>
             <view class="header-item" @click="jump('currentOnLineDevs')">
@@ -54,7 +55,7 @@
                 <view class="header-item-value">{{ devCount.currentEventCount || 0 }}</view>
                 <view class="header-item-label">事件数量</view>
             </view>
-            <view class="header-item" @click="projectNum">
+            <view class="header-item" @click="projectNum(true)">
                 <view class="header-item-value">{{ devCount.currentProjectCount || 0 }}</view>
                 <view class="header-item-label">项目个数</view>
             </view>
@@ -80,10 +81,18 @@ export default {
                 url: '/pages/zhuanzhi/warning',
             })
         },
-        projectNum() {
-            uni.navigateTo({
-                url: '/pages/project/list',
-            })
+        projectNum(now) {
+            console.log(now)
+            if (now) {
+                let engineering = uni.getStorageSync('engineering')
+                uni.navigateTo({
+                    url: '/pages/project/list?engineeringName=' + engineering.name + '&engineeringId=' + engineering.id,
+                })
+            } else {
+                uni.navigateTo({
+                    url: '/pages/project/list',
+                })
+            }
         },
         jump(type) {
             switch (type) {
@@ -99,7 +108,8 @@ export default {
             }
         },
     },
-    created() {},
+    created() {
+    },
 }
 </script>
 <style lang="scss">

pages/index/index.vue

@@ -16,7 +16,7 @@
                 </template>
                 <template slot="right">
                     <text class="hide-txt mr5" style="font-size: 28rpx">{{
-                            select.engineeringName || '创建工程'
+                            select.engineeringName || emptyEngineeringName
                         }}
                     </text>
                     <uni-icons type="bottom" size="16" color="#111" v-if="select.engineeringName"></uni-icons>
@@ -74,7 +74,17 @@ export default {
             navTabHeight: 0
         }
     },
-
+    computed: {
+        emptyEngineeringName() {
+            if (this.userInfo.authorities === 'tourist') {
+                return '创建工程'
+            } else if (this.userInfo.authorities === 'market_user') {
+                return '请联系管理员配置工程'
+            } else {
+                return '创建工程'
+            }
+        }
+    },
     methods: {
         selectEngineering() {
             if (this.select.engineeringName) {
@@ -82,6 +92,17 @@ export default {
                     url: '/pages/home/selectEngineering',
                 })
             } else {
+                if(this.userInfo.authorities === 'tourist'){
+                    return uni.showToast({
+                        title: '此功能仅对VIP用户开放',
+                        icon: 'none',
+                    })
+                }else if(this.userInfo.authorities === 'market_user'){
+                    return uni.showToast({
+                        title: '请联系管理员配置工程',
+                        icon: 'none',
+                    })
+                }
                 uni.navigateTo({
                     url: '/pages/engineering/new',
                 })
@@ -95,6 +116,8 @@ export default {
             if (this.engineeringList.length === 0) {
                 console.log('没有工程')
                 uni.removeStorageSync(this.$cacheKey.engineering)
+                this.select.engineeringName = ''
+                this.select.engineeringId = ''
                 this.projectList = []
             } else {
                 if (!engineering) {