From ae2d855c89ca722ac7309fdf1aa6ceed370e3b95 Mon Sep 17 00:00:00 2001 From: heyujie <516346543@qq.com> Date: 星期一, 11 十月 2021 20:22:30 +0800 Subject: [PATCH] 监控ui --- src/pages/analysisPower/index/App.vue | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/pages/analysisPower/index/App.vue b/src/pages/analysisPower/index/App.vue index 0d2d7f2..a5a1294 100644 --- a/src/pages/analysisPower/index/App.vue +++ b/src/pages/analysisPower/index/App.vue @@ -67,7 +67,7 @@ :cell-style="cellStyle" > <el-table-column label="搴忓彿" type="index" align="center" width="60px"></el-table-column> - <el-table-column label="鎽勫儚鏈哄悕绉�" align="center" show-overflow-tooltip > + <el-table-column label="鎽勫儚鏈哄悕绉�" align="center" show-overflow-tooltip> <template slot-scope="scope"> <span :style="scope.row.is_running ? `color:#3d68e1` : '' " @@ -75,16 +75,24 @@ </template> </el-table-column> <el-table-column label="鎽勫儚鏈哄湴鍧�" prop="addr" align="center" show-overflow-tooltip sortable></el-table-column> - <el-table-column label="鎽勫儚鏈篒P" prop="ip" align="center" width="130px" sortable :sort-method="ipSortMethod"></el-table-column> - <el-table-column label="鎽勫儚鏈虹被鍨�" align="center" width="120px" > + <el-table-column + label="鎽勫儚鏈篒P" + prop="ip" + align="center" + width="130px" + sortable + :sort-method="ipSortMethod" + ></el-table-column> + <el-table-column label="鎽勫儚鏈虹被鍨�" align="center" width="120px"> <template slot-scope="scope"> <span>{{scope.row.run_type | cameraType}}</span> </template> </el-table-column> - <el-table-column label="鎵ц绠楁硶" align="center" show-overflow-tooltip > + <el-table-column label="鎵ц绠楁硶" align="center" show-overflow-tooltip> <template slot-scope="scope"> <span v-if="scope.row.run_type === -1 ">-</span> - <span v-else>{{scope.row.tasks | taskList}}</span> + <span v-else-if="scope.row.tasks != null ">{{scope.row.tasks | taskList}}</span> + <span v-else>-</span> </template> </el-table-column> <el-table-column label="杩愯璁惧" align="center" width="160px" sortable> @@ -190,14 +198,10 @@ import { changeRunType, updatePollEnable, updatePollPeriod, updateChannelCount } from "@/api/pollConfig"; import Sysinfo from "@/components/subComponents/SystemInfo" -// import SliderVedio from '@/components/camera/slider-vedio' -// import eChartsBar from '@/components/subComponents/eChartsBar' export default { name: "PollSeting", components: { Sysinfo, - // SliderVedio, - // eChartsBar }, filters: { cameraType(type) { @@ -259,13 +263,11 @@ }, data() { return { - switchValue: true, search: "", timeout: null, taskName: [], dataList: [], barChart: {}, - localDataChannel: 2, showSysInfo: false, drawer: false, formData: {}, @@ -283,13 +285,11 @@ clearTimeout(this.timeout); }, methods: { - ipSortMethod(a,b){ - console.log(a,b); - // debugger - if(Number(a.ip.substr(a.ip.lastIndexOf('.')+1)) < Number(b.ip.substr(b.ip.lastIndexOf('.')+1))){ + ipSortMethod(a, b) { + if (Number(a.ip.substr(a.ip.lastIndexOf('.') + 1)) < Number(b.ip.substr(b.ip.lastIndexOf('.') + 1))) { return -1; } - if(Number(a.ip.substr(a.ip.lastIndexOf('.')+1)) > Number(b.ip.substr(b.ip.lastIndexOf('.')+1))){ + if (Number(a.ip.substr(a.ip.lastIndexOf('.') + 1)) > Number(b.ip.substr(b.ip.lastIndexOf('.') + 1))) { return 1; } return 0; -- Gitblit v1.8.0