From bf399dc65aa67c4355b0fdc516f8da5ca7234c82 Mon Sep 17 00:00:00 2001
From: mark <mark18340872469@163.com>
Date: 星期日, 09 十月 2022 16:34:22 +0800
Subject: [PATCH] Merge branch 'shandong' of http://192.168.5.5:10010/r/web/saas-web into shandong
---
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