实时监控页面优化

src/pages_company/components/c_alarm.vue

@@ -184,6 +184,10 @@ onReady(() => {
     &:not(:last-child) {
       border-bottom: 1px dashed $uni-color-error;
     }
+    &:first-child {
+      border-radius: 5px 5px 0 0;
+    }
+    background: #fefef9;
     display: flex;
     padding: 10px 15px;
     justify-content: space-between;

src/pages_online/onlineData.vue

@@ -61,7 +61,7 @@ function getCompanyList(id?: string) {
     loadingText.value = "加载中..."
 
     search.params.org_id = id || orgId.value
-    apis.mobileApi.getCompanyListByOrg(search).then(({ data, total }) => {
+    apis.mobileApi.getCompany(search).then(({ data, total }) => {
       companyTotal.value = total
       if ((search.pageIndex - 1) * search.pageSize < total) {
         companyList.value.push(...data)
@@ -145,14 +145,25 @@ onLoad(() => {
         <view class="company-list_item" v-for="(v, i) in companyList" :key="i" @click="jump(v.company_id)">
           <!-- <view class="img" @click="jumpMap(item.company_id)"><image style="width: 100%;height: 100%;" src="/static/image/blue-location.png"></image></view> -->
           <view class="left">
-            <text class="name">{{ v.name }}</text>
-            <text class="address">{{ v.address }}</text>
+            <span class="name">{{ v.name }}</span>
+            <span class="">
+              <span>排口数：{{ v.outlet_num }}</span>
+              <span style="margin-left: 15px">灶头数：{{ v.stove_num }}</span>
+            </span>
           </view>
-          <text class="right">
-            设施:
-            <text class="num">{{ v.monitor1.length }}</text>
-            处
-          </text>
+          <span class="right">
+            <span class="tag-view">
+              <uni-tag
+                :text="v.operate_status == 0 ? '营业' : v.operate_status == 1 ? '间休' : '停业'"
+                :type="v.operate_status == 0 ? 'success' : v.operate_status == 1 ? 'warning' : 'danger'"
+              />
+            </span>
+            <span class="density" :class="{ over: v.smoke_density > 0.05 }">
+              油烟:
+              <span class="num">{{ v.smoke_density }}</span>
+              mg/m³
+            </span>
+          </span>
         </view>
         <uni-load-more
           iconType="auto"
@@ -201,6 +212,10 @@ onLoad(() => {
     &:not(:last-child) {
       border-bottom: 1px dashed $uni-color-primary;
     }
+    &:first-child {
+      border-radius: 5px 5px 0 0;
+    }
+    background: #fefef9;
     display: flex;
     cursor: pointer;
     padding: 10px 15px;
@@ -221,14 +236,31 @@ onLoad(() => {
       flex-direction: column;
       .name {
         font-weight: 600;
+        padding-bottom: 3px;
+      }
+      .address {
+        color: #999;
       }
     }
     .right {
-      min-width: 100px;
+      display: flex;
+      flex-direction: column;
       text-align: right;
+      padding-left: 5px;
+      white-space: nowrap;
+      word-break: normal;
+      .tag-view {
+        margin-bottom: 8px;
+      }
       .num {
         font-weight: 600;
-        margin: 0 8px;
+        margin: 0 2px;
+      }
+      .density {
+        color: $uni-color-success;
+      }
+      .density.over {
+        color: $uni-color-error;
       }
     }
   }

src/pages_overview/clean.vue

@@ -111,7 +111,7 @@ onLoad(() => {
       height: 35px;
       line-height: 35px;
       color: $uni-color-error;
-      border-top: 1px solid $uni-color-error;
+      //border-top: 1px solid $uni-color-error;
       font-size: 14px;
       font-weight: 600;
       overflow: hidden;
@@ -120,7 +120,10 @@ onLoad(() => {
       text-align: center;
 
       &:nth-of-type(2n + 1) {
-        background: linear-gradient(rgba(0, 0, 0, 0.05), rgba(0, 0, 0, 0.05));
+        background: linear-gradient(rgba(221, 82, 77, 0.03), rgba(221, 82, 77, 0.031));
+      }
+      &:nth-of-type(2n) {
+        background: linear-gradient(rgba(221, 82, 77, 0.08), rgba(221, 82, 77, 0.08));
       }
     }
     &_none {
@@ -142,8 +145,15 @@ onLoad(() => {
     .list {
       .item {
         color: $uni-color-warning;
-        border-bottom: 1px solid $uni-color-warning;
+        //border-bottom: 1px solid $uni-color-warning;
+        &:nth-of-type(2n) {
+          background: linear-gradient(rgba(240, 173, 78, 0.08), rgba(240, 173, 78, 0.08));
+        }
+        &:nth-of-type(2n + 1) {
+          background: linear-gradient(rgba(240, 173, 78, 0.03), rgba(240, 173, 78, 0.031));
+        }
       }
+
       &_none {
         color: $uni-color-warning;
       }

src/pages_overview/over.vue

@@ -121,10 +121,10 @@ onLoad(() => {
             <text class="name">{{ item.name }}</text>
             <text class="address">{{ item.address }}</text>
           </view>
-          <view class="right">
-            <text class="num">{{ item.times }}</text>
-            <text>次</text>
-          </view>
+          <span class="right">
+            <span class="num">{{ item.times }}</span>
+            <span>次</span>
+          </span>
         </view>
         <uni-load-more
           iconType="auto"
@@ -159,6 +159,10 @@ onLoad(() => {
     &:not(:last-child) {
       border-bottom: 1px dashed $uni-color-primary;
     }
+    &:first-child {
+      border-radius: 5px 5px 0 0;
+    }
+    background: #fefef9;
     display: flex;
     padding: 10px 15px;
     justify-content: space-between;
@@ -172,9 +176,12 @@ onLoad(() => {
       }
     }
     .right {
+      margin-left: 10px;
+      white-space: nowrap;
+      word-break: normal;
       .num {
         font-weight: 600;
-        margin-right: 10px;
+        margin-right: 5px;
       }
     }
   }