From 8fb7cc0325027caa4ed7574443e24f5bd7a8efb7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 02 九月 2024 23:09:45 +0800
Subject: [PATCH] 考核结果图表bug，登录路由权限控制
---
src/views/system/monitor/car/index.vue | 61 +++++++++++++++++-------------
1 files changed, 35 insertions(+), 26 deletions(-)
diff --git a/src/views/system/monitor/car/index.vue b/src/views/system/monitor/car/index.vue
index 62d07cf..29c4736 100644
--- a/src/views/system/monitor/car/index.vue
+++ b/src/views/system/monitor/car/index.vue
@@ -44,15 +44,14 @@
v-model="queryParams.address"
placeholder="璇烽�夋嫨鍖哄煙"
clearable
+ @change="handleQuery"
>
- <el-option label="鑷础甯�" value="鑷础甯�"/>
- <el-option label="娌挎哗鍖�" value="娌挎哗鍖�"/>
- <el-option label="澶у畨鍖�" value="澶у畨鍖�"/>
- <el-option label="璐′簳鍖�" value="璐′簳鍖�"/>
- <el-option label="鑷祦浜曞尯" value="鑷祦浜曞尯"/>
- <el-option label="楂樻柊鍖�" value="楂樻柊鍖�"/>
- <el-option label="鑽ｅ幙" value="鑽ｅ幙"/>
- <el-option label="瀵岄『鍘�" value="瀵岄『鍘�"/>
+ <el-option
+ v-for="dept in deptList"
+ :key="dept.deptId"
+ :label="dept.area"
+ :value="dept.deptId"
+ />
</el-select>
</el-form-item>
<el-form-item label="璁惧鐘舵��" prop="onState">
@@ -78,7 +77,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 +86,32 @@
@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="a" 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="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="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"/>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button
@@ -138,7 +139,7 @@
<el-col :span="12">
<el-form-item label="璁惧缂栫爜锛�">{{ form.serialNumber }}</el-form-item>
<el-form-item label="璁惧鍚嶇О锛�">{{ form.name }} </el-form-item>
- <el-form-item label="鍦板尯锛�">{{ form.address }} </el-form-item>
+ <el-form-item label="鍦板尯锛�">{{ form.area }} </el-form-item>
<el-form-item label="涓婃姤閮ㄩ棬锛�">{{ form.deptName }} </el-form-item>
<el-form-item label="璁惧鐘舵�侊細">
<div v-if="form.onState === 1">鍙敤</div>
@@ -176,12 +177,13 @@
<script>
import { videoCount, listMonitor, getMonitor, delMonitor, addMonitor, updateMonitor } from "@/api/platform/monitor";
-
+import { listDept } from "@/api/system/dept";
export default {
name: "Monitor",
dicts: ['sys_normal_disable','platform_yes_no','camera_state'],
data() {
return {
+ deptList: [],
// 鍒椾俊鎭�
columns: [
{ key: 0, label: `鏍囩`, visible: true },
@@ -190,8 +192,11 @@
{ key: 3, label: `鏄惁鐢熸垚寮傚父宸ュ崟`, visible: true },
{ key: 4, label: `鏁版嵁鏃堕棿`, visible: true },
{ key: 5, label: `绠＄悊鍗曚綅`, visible: true },
- { key: 6, label: `杩囪溅鏁版嵁閲廯, visible: true },
- { key: 7, label: `鎸佺画鏃犳暟鎹ぉ鏁癭, visible: true },
+ { key: 6, label: `褰撴棩鎶撴媿閲廯, visible: true },
+ { key: 7, label: `鏃堕挓鍑嗙‘鐜嘸, visible: true },
+ { key: 8, label: `澶у浘鍙敤鐜嘸, visible: true },
+ { key: 9, label: `涓昏灞炴�т竴鑷寸巼`, visible: true },
+ { key: 10, label: `閲嶈灞炴�т竴鑷寸巼`, visible: true },
],
count: {
totalPosts: 0,
@@ -254,6 +259,9 @@
created() {
this.getVideoCount();
this.getList();
+ listDept({ status: 0 }).then(response => {
+ this.deptList = response.data.filter(item => item.area);
+ });
},
methods: {
/** 鏌ヨ璁惧璧勪骇鍒楄〃 */
@@ -303,6 +311,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.queryParams.address = '';
this.resetForm("queryForm");
this.handleQuery();
},
--
Gitblit v1.8.0