From ba50073d4aeda7a1e30243e6469be9c2cec472b3 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期六, 08 十月 2022 18:17:25 +0800
Subject: [PATCH] 修改检索显示的摄像机地址,调整上报页面的查询

---
 src/views/dataPush/components/device.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/dataPush/components/device.vue b/src/views/dataPush/components/device.vue
index 0fe0f61..0d6b90f 100644
--- a/src/views/dataPush/components/device.vue
+++ b/src/views/dataPush/components/device.vue
@@ -3,7 +3,7 @@
     <div class="search">
       <div class="left">
         <div class="id">
-          璁惧鍚嶇О
+          璁惧鍚嶇О/IP/缂栫爜
           <el-input v-model="inputText" placeholder="璇疯緭鍏�" clearable></el-input>
         </div>
       </div>
@@ -26,7 +26,7 @@
         ref="multipleTable"
         :data="dataList"
         :fit="true"
-        :default-sort="{ prop: 'createTime', order: 'descending' }"
+        :default-sort="{ prop: 'devCode', order: 'ascending' }"
       >
         <el-table-column prop="devName" label="璁惧鍚嶇О" show-overflow-tooltip></el-table-column>
         <!-- <el-table-column prop="devId" label="璁惧ID" show-overflow-tooltip></el-table-column> -->
@@ -35,8 +35,8 @@
         <el-table-column prop="companyCode" label="浼佷笟缂栫爜" show-overflow-tooltip></el-table-column>
         <el-table-column prop="state" label="鐘舵��" show-overflow-tooltip>
           <template slot-scope="scope">
-            <div v-if="scope.row.state == 0" class="status green">绂荤嚎</div>
-            <div v-else class="status">鍦ㄧ嚎</div>
+            <div v-if="scope.row.state == 0" class="status">绂荤嚎</div>
+            <div v-else class="status green">鍦ㄧ嚎</div>
           </template>
         </el-table-column>
 

--
Gitblit v1.8.0