merge

src/pages/Iot/dashboard/deviceAccess/index.vue

@@ -59,6 +59,11 @@ import { onMounted, reactive } from 'vue'
 const staticImg = useStaticImg()
 
 const columns = [
+  {
+    title: '接入协议',
+    dataIndex: 'port',
+    key: 'port'
+  },
   {
     title: '接入地址',
     dataIndex: 'address',

src/pages/Iot/devOps/statistReport.vue

@@ -29,29 +29,29 @@
     </a-col>
     <a-col :xl="24" :xs="24" :md="24" >
       <a-card>
-        <template #title >
-          <pull-request-outlined  color="#eb2f96" />设备请求
-        </template>
-        <a-row>
-          <a-col :span="8" >
-            <div class="statis-item" >
-              <div class="count" >{{state.statsSource.transportReqSuccessCounter?.value}}</div>
-              <div> <check-circle-two-tone  two-tone-color="#52c41a"/> {{ state.statsSource.transportReqSuccessCounter?.name }}</div>
-            </div>
-          </a-col>
-          <a-col :span="8" >
-            <div class="statis-item" >
-              <div class="count" >{{state.statsSource.transportReqFailCounter?.value}}</div>
-              <div> <close-circle-two-tone two-tone-color="#eb2f96" /> {{ state.statsSource.transportReqFailCounter?.name }}</div>
-            </div>
-          </a-col>
-          <a-col :span="8" >
-            <div class="statis-item" >
-              <div class="count" >{{state.statsSource.transportReqFailCounter?.value}}</div>
-              <div><pie-chart-two-tone /> {{state.statsSource.transportReqFailCounter?.name}}</div>
-            </div>
-          </a-col>
-        </a-row>
+  <template #title >
+    <pull-request-outlined  color="#eb2f96" />设备请求
+  </template>
+  <a-row>
+    <a-col :span="8" >
+      <div class="statis-item" >
+        <div class="count" >{{state.statsSource.transportReqSuccessCounter?.value}}</div>
+        <div> <check-circle-two-tone  two-tone-color="#52c41a"/> {{ state.statsSource.transportReqSuccessCounter?.name }}</div>
+      </div>
+    </a-col>
+    <a-col :span="8" >
+      <div class="statis-item" >
+        <div class="count"  >{{state.statsSource.transportReqFailCounter?.value}}</div>
+        <div> <close-circle-two-tone two-tone-color="#eb2f96" /> {{ state.statsSource.transportReqFailCounter?.name }}</div>
+      </div>
+    </a-col>
+    <a-col :span="8" >
+      <div class="statis-item" >
+        <div class="count" >{{state.statsSource.transportReqTotalCounter?.value}}</div>
+        <div><pie-chart-two-tone /> {{state.statsSource.transportReqTotalCounter?.name}}</div>
+      </div>
+    </a-col>
+  </a-row>
       </a-card>
     </a-col>
     <a-col :xl="24" :xs="24" :md="24" >