测试bug修改

pages/index/comp/device.vue

@@ -37,7 +37,7 @@
             <view style="flex: 1"></view>
             <template v-if="deviceListFilter.length">
                 <template v-if="transfer || share">
-                    <view class="nav-menu nav-menu-btn" @click="submit">完成 </view>
+                    <view class="nav-menu nav-menu-btn" @click="submit">确定 </view>
                 </template>
                 <template v-else>
                     <view

pages/index/comp/indexGongCheng.vue

@@ -1,26 +1,30 @@
 <template>
     <view class="index-zhuyonghu">
-        <view class="canneng-index-title mb20">所有工程统计信息</view>
-        <view class="header">
-            <view class="header-item">
-                <view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
-                <view class="header-item-label">设备总数</view>
+        <template v-if="devCount.engineeringListLength > 1">
+            <view class="canneng-index-title mb20">所有工程设备统计</view>
+            <view class="header">
+                <view class="header-item">
+                    <view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
+                    <view class="header-item-label">设备总数</view>
+                </view>
+                <view class="header-item" @click="jump('onLineDevs')">
+                    <view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
+                    <view class="header-item-label">在线设备</view>
+                </view>
+                <view class="header-item" @click="jump('offLineDevs')">
+                    <view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
+                    <view class="header-item-label">离线设备</view>
+                </view>
             </view>
-            <view class="header-item" @click="jump('onLineDevs')">
-                <view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
-                <view class="header-item-label">在线设备</view>
-            </view>
-            <view class="header-item" @click="jump('offLineDevs')">
-                <view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
-                <view class="header-item-label">离线设备</view>
-            </view>
-        </view>
-        <view class="canneng-index-title mb20 mt20">当前工程统计信息</view>
+            <view class="mt20"></view>
+        </template>
+        <view class="canneng-index-title mb20">当前工程设备统计</view>
         <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')">
@@ -37,7 +41,7 @@
             <Cn-grid title="">
                 <Cn-grid-item src="/static/device2.png" text="设备注册" @click="registerDevice"></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-item src="/static/feedback2.png" text="问题反馈" @click="submitFeedBack"></Cn-grid-item>
             </Cn-grid>
         </view>
     </view>
@@ -57,7 +61,7 @@ export default {
     },
     methods: {
         submitFeedBack() {
-            uni.navigateTo({ url: '/pages/home/feedback' })
+            uni.navigateTo({url: '/pages/home/feedback'})
         },
         registerDevice() {
             uni.showModal({
@@ -66,15 +70,23 @@ export default {
                 confirmText: '直连装置',
                 cancelText: '网关接入',
                 cancelColor: '#007aff',
-                success: ({ confirm, cancel }) => {
+                success: ({confirm, cancel}) => {
                     if (confirm) {
-                        uni.navigateTo({
-                            url: '/pages/device/new',
-                        })
+                        if (this.devCount.engineeringListLength > 1) {
+                            uni.navigateTo({
+                                url: '/pages/device/new',
+                            })
+                        } else {
+                            uni.navigateTo({
+                                url: '/pages/engineering/new?from=index'
+                            })
+                        }
+
                     } else if (cancel) {
-                        uni.navigateTo({
-                            url: '/pages/gateway/list',
-                        })
+                        // uni.navigateTo({
+                        //     url: '/pages/gateway/list',
+                        // })
+                        this.$util.toast('功能正在开发，敬请期待')
                     }
                 },
             })

pages/index/comp/indexYouKe.vue

@@ -1,21 +1,24 @@
 <template>
     <view class="index-zhuyonghu">
-        <view class="canneng-index-title mb20">所有工程统计信息</view>
-        <view class="header">
-            <view class="header-item">
-                <view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
-                <view class="header-item-label">设备总数</view>
+        <template v-if="devCount.engineeringListLength > 1">
+            <view class="canneng-index-title mb20">所有工程设备统计</view>
+            <view class="header">
+                <view class="header-item">
+                    <view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
+                    <view class="header-item-label">设备总数</view>
+                </view>
+                <view class="header-item" @click="jump('onLineDevs')">
+                    <view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
+                    <view class="header-item-label">在线设备</view>
+                </view>
+                <view class="header-item" @click="jump('offLineDevs')">
+                    <view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
+                    <view class="header-item-label">离线设备</view>
+                </view>
             </view>
-            <view class="header-item" @click="jump('onLineDevs')">
-                <view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
-                <view class="header-item-label">在线设备</view>
-            </view>
-            <view class="header-item" @click="jump('offLineDevs')">
-                <view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
-                <view class="header-item-label">离线设备</view>
-            </view>
-        </view>
-        <view class="canneng-index-title mb20 mt20">当前工程统计信息</view>
+            <view class="mt20"></view>
+        </template>
+        <view class="canneng-index-title mb20">当前工程设备统计</view>
         <view class="header">
             <view class="header-item">
                 <view class="header-item-value">{{
@@ -42,7 +45,7 @@ export default {
             default: {},
         },
     },
-    methods:{
+    methods: {
         jump(type) {
             switch (type) {
                 default:
@@ -56,7 +59,7 @@ export default {
                     break
             }
         },
-    }
+    },
 }
 </script>
 <style lang="scss"></style>

pages/index/comp/indexYunWei.vue

@@ -1,33 +1,36 @@
 <template>
     <view class="index-zhuanzhi">
-        <view class="canneng-index-title mb20">所有工程统计信息</view>
-        <view class="header">
-            <view class="header-item">
-                <view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
-                <view class="header-item-label">设备总数</view>
+        <template v-if="devCount.engineeringListLength > 1">
+            <view class="canneng-index-title mb20">所有工程设备统计</view>
+            <view class="header">
+                <view class="header-item">
+                    <view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
+                    <view class="header-item-label">设备总数</view>
+                </view>
+                <view class="header-item" @click="jump('onLineDevs')">
+                    <view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
+                    <view class="header-item-label">在线设备</view>
+                </view>
+                <view class="header-item" @click="jump('offLineDevs')">
+                    <view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
+                    <view class="header-item-label">离线设备</view>
+                </view>
+                <view class="header-item">
+                    <view class="header-item-value">{{ devCount.alarmCount || 0 }}</view>
+                    <view class="header-item-label">告警数量</view>
+                </view>
+                <view class="header-item">
+                    <view class="header-item-value">{{ devCount.eventCount || 0 }}</view>
+                    <view class="header-item-label">事件数量</view>
+                </view>
+                <view class="header-item" @click="projectNum">
+                    <view class="header-item-value">{{ devCount.projectCount || 0 }}</view>
+                    <view class="header-item-label">项目个数</view>
+                </view>
             </view>
-            <view class="header-item" @click="jump('onLineDevs')">
-                <view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
-                <view class="header-item-label">在线设备</view>
-            </view>
-            <view class="header-item" @click="jump('offLineDevs')">
-                <view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
-                <view class="header-item-label">离线设备</view>
-            </view>
-            <view class="header-item">
-                <view class="header-item-value">{{ devCount.alarmCount || 0 }}</view>
-                <view class="header-item-label">告警数量</view>
-            </view>
-            <view class="header-item">
-                <view class="header-item-value">{{ devCount.eventCount || 0 }}</view>
-                <view class="header-item-label">事件数量</view>
-            </view>
-            <view class="header-item" @click="projectNum">
-                <view class="header-item-value">{{ devCount.projectCount || 0 }}</view>
-                <view class="header-item-label">项目个数</view>
-            </view>
-        </view>
-        <view class="canneng-index-title mb20 mt20">当前工程统计信息</view>
+            <view class="mt20"></view>
+        </template>
+        <view class="canneng-index-title mb20">当前工程设备统计</view>
         <view class="header">
             <view class="header-item">
                 <view class="header-item-value">{{

pages/index/comp/indexZhuYongHu.vue

@@ -1,21 +1,24 @@
 <template>
     <view class="index-zhuyonghu">
-        <view class="canneng-index-title mb20">所有工程统计信息</view>
-        <view class="header">
-            <view class="header-item">
-                <view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
-                <view class="header-item-label">设备总数</view>
+        <template v-if="devCount.engineeringListLength > 1">
+            <view class="canneng-index-title mb20">所有工程设备统计</view>
+            <view class="header">
+                <view class="header-item">
+                    <view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
+                    <view class="header-item-label">设备总数</view>
+                </view>
+                <view class="header-item" @click="jump('onLineDevs')">
+                    <view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
+                    <view class="header-item-label">在线设备</view>
+                </view>
+                <view class="header-item" @click="jump('offLineDevs')">
+                    <view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
+                    <view class="header-item-label">离线设备</view>
+                </view>
             </view>
-            <view class="header-item" @click="jump('onLineDevs')">
-                <view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
-                <view class="header-item-label">在线设备</view>
-            </view>
-            <view class="header-item" @click="jump('offLineDevs')">
-                <view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
-                <view class="header-item-label">离线设备</view>
-            </view>
-        </view>
-        <view class="canneng-index-title mb20 mt20">当前工程统计信息</view>
+            <view class="mt20"></view>
+        </template>
+        <view class="canneng-index-title mb20">当前工程设备统计</view>
         <view class="header">
             <view class="header-item">
                 <view class="header-item-value">{{
@@ -37,7 +40,7 @@
             <Cn-grid title="">
                 <Cn-grid-item src="/static/device2.png" text="设备注册" @click="registerDevice"></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-item src="/static/feedback2.png" text="问题反馈" @click="submitFeedBack"></Cn-grid-item>
             </Cn-grid>
         </view>
     </view>

pages/index/comp/indexZhuanZhi.vue

@@ -1,33 +1,36 @@
 <template>
     <view class="index-zhuanzhi">
-        <view class="canneng-index-title mb20">所有工程统计信息</view>
-        <view class="header">
-            <view class="header-item">
-                <view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
-                <view class="header-item-label">设备总数</view>
+        <template v-if="devCount.engineeringListLength > 1">
+            <view class="canneng-index-title mb20">所有工程设备统计</view>
+            <view class="header">
+                <view class="header-item">
+                    <view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
+                    <view class="header-item-label">设备总数</view>
+                </view>
+                <view class="header-item" @click="jump('onLineDevs')">
+                    <view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
+                    <view class="header-item-label">在线设备</view>
+                </view>
+                <view class="header-item" @click="jump('offLineDevs')">
+                    <view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
+                    <view class="header-item-label">离线设备</view>
+                </view>
+                <view class="header-item">
+                    <view class="header-item-value">{{ devCount.alarmCount || 0 }}</view>
+                    <view class="header-item-label">告警数量</view>
+                </view>
+                <view class="header-item">
+                    <view class="header-item-value">{{ devCount.eventCount || 0 }}</view>
+                    <view class="header-item-label">事件数量</view>
+                </view>
+                <view class="header-item" @click="projectNum">
+                    <view class="header-item-value">{{ devCount.projectCount || 0 }}</view>
+                    <view class="header-item-label">项目个数</view>
+                </view>
             </view>
-            <view class="header-item" @click="jump('onLineDevs')">
-                <view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
-                <view class="header-item-label">在线设备</view>
-            </view>
-            <view class="header-item" @click="jump('offLineDevs')">
-                <view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
-                <view class="header-item-label">离线设备</view>
-            </view>
-            <view class="header-item">
-                <view class="header-item-value">{{ devCount.alarmCount || 0 }}</view>
-                <view class="header-item-label">告警数量</view>
-            </view>
-            <view class="header-item">
-                <view class="header-item-value">{{ devCount.eventCount || 0 }}</view>
-                <view class="header-item-label">事件数量</view>
-            </view>
-            <view class="header-item" @click="projectNum">
-                <view class="header-item-value">{{ devCount.projectCount || 0 }}</view>
-                <view class="header-item-label">项目个数</view>
-            </view>
-        </view>
-        <view class="canneng-index-title mb20 mt20">当前工程统计信息</view>
+            <view class="mt20"></view>
+        </template>
+        <view class="canneng-index-title mb20">当前工程设备统计</view>
         <view class="header">
             <view class="header-item">
                 <view class="header-item-value">{{