2 Commity e45d65179f ... ccde78597c

Autor SHA1 Wiadomość Data
  ming ccde78597c 设备管理九宫格去除badge显示 2 tygodni temu
  gez b6804e4c5f Merge branch 'ming' of uskycloud/usky-web-mobile into master 2 tygodni temu

+ 10 - 2
src/pages/business/fireIot/deviceManage/components/deviceDetails.vue

@@ -69,7 +69,7 @@
           </view> -->
         </view>
         <!--  -->
-        <view v-else>
+        <view v-if="tabPosition == 0">
           <view class="flex" style="flex-wrap: wrap; line-height: 36px">
             <view style="width: 50%" v-for="realTime in realTimeDataList" :key="realTime">
               {{ realTime.attributeName + ":" }}
@@ -78,6 +78,14 @@
             </view>
           </view>
         </view>
+
+        <view v-else>
+          <br/>
+          设备调试数据待对接
+          <br/>
+          <br/>
+          <br/>
+        </view>
       </view>
 
       <u-modal :show="modalShow" @confirm="modalShow = false" @close="modalShow = false" :closeOnClickOverlay="true">
@@ -198,7 +206,7 @@ function init() {
 /**
  * @tabs切换change事件
  */
-const list = ref(["实时数据", "历史数据"]);
+const list = ref(["实时数据", "历史数据","设备调试"]);
 const tabPosition = ref(0);
 function tabPositionChange(index) {
   tabPosition.value = index;

+ 1 - 1
src/pages/business/fireIot/deviceManage/index.vue

@@ -18,7 +18,7 @@
       <view class="deviceManage">
         <u-grid :border="true">
           <u-grid-item v-for="(base, index) in dataList" :key="index" @click="handleToDevice(base.id, base.productName)">
-            <u-badge type="primary" max="9999" :value="base.deviceCount" :showZero="true" :absolute="true" :offset="[10, 10, 0, 0]"></u-badge>
+            <!-- <u-badge type="primary" max="9999" :value="base.deviceCount" :showZero="true" :absolute="true" :offset="[10, 10, 0, 0]"></u-badge> -->
             <image class="mb15 mt35" style="width: 40px; height: 40px" :src="base.typeImg" mode="aspectFill"></image>
             <view class="mb15 text-ellipsis" style="width: 100%; text-align: center">{{ base.productName }}</view>
           </u-grid-item>