From 65af8143f89d2de87bd6d9ba9bd5a08b034f6b09 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 20 八月 2024 17:46:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/monitor/car/index.vue | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/views/system/monitor/car/index.vue b/src/views/system/monitor/car/index.vue
index d9a3556..60604c5 100644
--- a/src/views/system/monitor/car/index.vue
+++ b/src/views/system/monitor/car/index.vue
@@ -78,7 +78,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button
type="warning"
plain
@@ -87,30 +87,29 @@
@click="handleExport"
v-hasPermi="['system:monitor:export']"
>瀵煎嚭</el-button>
- </el-col>
+ </el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="monitorList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" align="center" />
<el-table-column label="璁惧鍚嶇О" align="center" prop="name" width="280" fixed show-overflow-tooltip/>
<el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" width="180"/>
- <el-table-column label="鏍囩" align="center" prop="publicSecurity" width="180" v-if="columns[0].visible"/>
- <el-table-column label="鍖哄煙" align="center" prop="address" width="180" v-if="columns[1].visible"/>
+ <el-table-column label="鏍囩" align="center" width="180" v-if="columns[0].visible">
+ <template slot-scope="scope">
+ <div>{{ scope.row.provinceTag == 0 ? "鐪佸巺" : "甯傚眬" }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍖哄煙" align="center" prop="area" width="180" v-if="columns[1].visible" />
<el-table-column label="璁惧鐘舵��" align="center" prop="onState" v-if="columns[2].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.camera_state" :value="scope.row.onState"/>
</template>
</el-table-column>
- <el-table-column label="鏄惁鐢熸垚寮傚父宸ュ崟" align="center" prop="defaultOrder" width="180" v-if="columns[3].visible">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.platform_yes_no" :value="scope.row.defaultOrder"/>
- </template>
- </el-table-column>
- <el-table-column label="鏁版嵁鏃堕棿" align="center" prop="installedTime" width="180" v-if="columns[4].visible"/>
- <el-table-column label="绠＄悊鍗曚綅" align="center" prop="managementUnit" width="180" v-if="columns[5].visible"/>
+ <el-table-column label="鏄惁鐢熸垚寮傚父宸ュ崟" align="center" prop="error" width="180" v-if="columns[3].visible" />
+ <el-table-column label="鏁版嵁鏃堕棿" align="center" prop="mongoCreateTime" width="180" v-if="columns[4].visible"/>
+ <el-table-column label="绠＄悊鍗曚綅" align="center" prop="unitName" width="180" v-if="columns[5].visible"/>
<el-table-column label="褰撴棩鎶撴媿閲�" align="center" prop="dataCount" width="180" v-if="columns[6].visible"/>
- <el-table-column label="鏃堕挓鍑嗙‘鐜�" align="center" prop="a" width="180" v-if="columns[7].visible"/>
+ <el-table-column label="鏃堕挓鍑嗙‘鐜�" align="center" prop="clockPercent" width="180" v-if="columns[7].visible"/>
<el-table-column label="澶у浘鍙敤鐜�" align="center" prop="bigUsefulPercent" width="180" v-if="columns[8].visible"/>
<el-table-column label="涓昏灞炴�т竴鑷寸巼" align="center" prop="majorConPercent" width="180" v-if="columns[9].visible"/>
<el-table-column label="閲嶈灞炴�т竴鑷寸巼" align="center" prop="importantConPercent" width="180" v-if="columns[10].visible"/>
--
Gitblit v1.8.0