From 46a177111a14de992ccb8fb9ba74dd14ad4e2eec Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 15 十月 2024 01:55:25 +0800
Subject: [PATCH] 动态列自动刷新+点位在线增加未知状态
---
src/views/system/monitor/recovery/index.vue | 10 ++++-
src/views/system/point/index.vue | 9 +++-
src/views/system/monitor/video/index.vue | 41 +++++++++++---------
src/components/RightToolbar/index.vue | 8 ++--
src/views/system/monitor/face/index.vue | 8 +++
src/views/system/monitor/car/index.vue | 8 +++
src/views/system/check/result/detail/index.vue | 8 ++--
7 files changed, 58 insertions(+), 34 deletions(-)
diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue
index d3e9afd..a56bab7 100644
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@@ -77,6 +77,7 @@
title: "鏄剧ず/闅愯棌",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
+ tableKey: 0,
};
},
props: {
@@ -138,11 +139,13 @@
})
},
addDynamicColumn() {
+ this.getDyColumn()
this.showDynamicColumn = true
},
saveColumns() {
editDynamicColumn(this.dynamicColumnList).then(res => {
this.$message.success("淇濆瓨鎴愬姛")
+ this.$emit('refreshHeader');
this.showDynamicColumn = false
})
},
@@ -153,13 +156,10 @@
})
},
delColumn(id, index) {
- if (! id) {
- this.dynamicColumnList.splice(index, 1)
- return
- }
deleteDynamicColumnById(id).then(res => {
this.$message.success("鍒犻櫎鎴愬姛")
this.getDyColumn();
+ this.$emit('refreshHeader');
})
},
dynamicColumnClose() {
diff --git a/src/views/system/check/result/detail/index.vue b/src/views/system/check/result/detail/index.vue
index e078471..3456ba0 100644
--- a/src/views/system/check/result/detail/index.vue
+++ b/src/views/system/check/result/detail/index.vue
@@ -155,12 +155,12 @@
this.date = year + '-' + month;
this.queryParams.date = this.date;
let examineTag = this.$route.query.examineTag;
- if (examineTag === '2') {
- examineTag = '0'
- }
- if (examineTag === '3') {
+ if (examineTag === '2' || examineTag === '3') {
examineTag = '1'
}
+ if (examineTag === '4' || examineTag === '5') {
+ examineTag = '2'
+ }
this.queryParams.examineTag = examineTag;
this.queryParamsList.examineTag = examineTag;
this.activeIndex = examineTag;
diff --git a/src/views/system/monitor/car/index.vue b/src/views/system/monitor/car/index.vue
index d5fe796..eb8df99 100644
--- a/src/views/system/monitor/car/index.vue
+++ b/src/views/system/monitor/car/index.vue
@@ -35,6 +35,10 @@
<p>寮傚父鏁�</p>
</div>
<div class="dashboard-item">
+ <h3 style="color: #4f4f4f">{{ count.unknownNumbers }}</h3>
+ <p>鏈煡鏁�</p>
+ </div>
+ <div class="dashboard-item">
<h3>{{ count.viewsPercentage }}%</h3>
<p>璁惧杩愯鐜�</p>
</div>
@@ -174,8 +178,9 @@
}}
</el-form-item>
<el-form-item label="璁惧鐘舵�侊細">
- <div v-if="form.onState === 0">绂荤嚎</div>
+ <div v-if="form.onState === 0">鏈煡</div>
<div v-else-if="form.onState === 1">鍦ㄧ嚎</div>
+ <div v-else-if="form.onState === -1">绂荤嚎</div>
</el-form-item>
<el-form-item label="绠＄悊鍗曚綅锛�">{{ form.unitName }}</el-form-item>
</el-col>
@@ -264,6 +269,7 @@
totalPosts: 0,
totalMembers: 0,
postsPercentage: 0,
+ unknownNumbers: 0,
totalViews: 0,
viewsPercentage: 0,
totalCar: 0,
diff --git a/src/views/system/monitor/face/index.vue b/src/views/system/monitor/face/index.vue
index 900920d..f7406e3 100644
--- a/src/views/system/monitor/face/index.vue
+++ b/src/views/system/monitor/face/index.vue
@@ -35,6 +35,10 @@
<p>寮傚父鏁�</p >
</div>
<div class="dashboard-item">
+ <h3 style="color: #4f4f4f">{{ count.unknownNumbers }}</h3>
+ <p>鏈煡鏁�</p>
+ </div>
+ <div class="dashboard-item">
<h3>{{ count.viewsPercentage }}%</h3>
<p>璁惧杩愯鐜�</p >
</div>
@@ -213,8 +217,9 @@
}}
</el-form-item>
<el-form-item label="璁惧鐘舵�侊細">
- <div v-if="form.onState === 0">绂荤嚎</div>
+ <div v-if="form.onState === 0">鏈煡</div>
<div v-else-if="form.onState === 1">鍦ㄧ嚎</div>
+ <div v-else-if="form.onState === -1">绂荤嚎</div>
</el-form-item>
<el-form-item label="绠＄悊鍗曚綅锛�">{{ form.unitName }}</el-form-item>
</el-col>
@@ -301,6 +306,7 @@
totalPosts: 0,
totalMembers: 0,
postsPercentage: 0,
+ unknownNumbers: 0,
totalViews: 0,
totalFace: 0,
viewsPercentage: 0
diff --git a/src/views/system/monitor/recovery/index.vue b/src/views/system/monitor/recovery/index.vue
index f2de806..18af4f6 100644
--- a/src/views/system/monitor/recovery/index.vue
+++ b/src/views/system/monitor/recovery/index.vue
@@ -35,6 +35,10 @@
<p>寮傚父鏁�</p>
</div>
<div class="dashboard-item">
+ <h3 style="color: #4f4f4f">{{ count.unknownNumbers }}</h3>
+ <p>鏈煡鏁�</p>
+ </div>
+ <div class="dashboard-item">
<h3>{{ count.viewsPercentage }}%</h3>
<p>璁惧杩愯鐜�</p>
</div>
@@ -156,8 +160,9 @@
}}
</el-form-item>
<el-form-item label="璁惧鐘舵�侊細">
- <div v-if="form.onState === 0">寮傚父</div>
- <div v-else-if="form.onState === 1">姝ｅ父</div>
+ <div v-if="form.onState === 0">鏈煡</div>
+ <div v-else-if="form.onState === 1">鍦ㄧ嚎</div>
+ <div v-else-if="form.onState === -1">绂荤嚎</div>
</el-form-item>
<el-form-item label="绠＄悊鍗曚綅锛�">{{ form.unitName }}</el-form-item>
</el-col>
@@ -239,6 +244,7 @@
totalPosts: 0,
totalMembers: 0,
postsPercentage: 0,
+ unknownNumbers: 0,
totalViews: 0,
viewsPercentage: 0,
totalErrors: 0,
diff --git a/src/views/system/monitor/video/index.vue b/src/views/system/monitor/video/index.vue
index da9caf1..bcf28ac 100644
--- a/src/views/system/monitor/video/index.vue
+++ b/src/views/system/monitor/video/index.vue
@@ -37,6 +37,10 @@
<p>寮傚父鏁�</p>
</div>
<div class="dashboard-item">
+ <h3 style="color: #4f4f4f">{{ count.unknownNumbers }}</h3>
+ <p>鏈煡鏁�</p>
+ </div>
+ <div class="dashboard-item">
<h3>{{ count.viewsPercentage }}%</h3>
<p>璁惧杩愯鐜�</p>
</div>
@@ -109,7 +113,7 @@
placeholder="閫夋嫨鏈�">
</el-date-picker>
</el-form-item>
- <el-form-item label="鍖哄幙" prop="deptIds" required>
+ <el-form-item label="鍖哄幙" prop="deptIds">
<el-select v-model="exportForm.deptIds" multiple clearable>
<el-option
v-for="dept in deptList"
@@ -205,18 +209,18 @@
<div>{{ (scope.row.videoLoseTime * 60).toFixed(2) + '鍒嗛挓' }}</div>
</template>
</el-table-column>
- <el-table-column label="OSD鏍囨敞" align="center" prop="OSD" width="180" v-if="columns[10].visible">
+ <el-table-column label="OSD鏍囨敞" align="center" prop="osd" width="180" v-if="columns[10].visible">
<template slot-scope="scope">
- <div v-if="scope.row.OSD === 1">姝ｅ父</div>
- <div v-else-if="scope.row.OSD === 0">鏈煡</div>
- <div v-else-if="scope.row.OSD === -1">寮傚父</div>
+ <div v-if="scope.row.osd ==true">姝ｅ父</div>
+ <div v-else-if="scope.row.osd == false">寮傚父</div>
+ <div v-else-if="scope.row.osd == null">鏈煡</div>
</template>
</el-table-column>
- <el-table-column label="OSD鏃堕棿" align="center" prop="OSDTime" width="180" v-if="columns[11].visible">
+ <el-table-column label="OSD鏃堕棿" align="center" prop="osdtime" width="180" v-if="columns[11].visible">
<template slot-scope="scope">
- <div v-if="scope.row.OSDTime === 1">姝ｅ父</div>
- <div v-else-if="scope.row.OSDTime === 0">鏈煡</div>
- <div v-else-if="scope.row.OSDTime === -1">寮傚父</div>
+ <div v-if="scope.row.osdtime ==true">姝ｅ父</div>
+ <div v-else-if="scope.row.osdtime == false">寮傚父</div>
+ <div v-else-if="scope.row.osdtime == null">鏈煡</div>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" fixed="right">
@@ -254,8 +258,9 @@
}}
</el-form-item>
<el-form-item label="璁惧鐘舵�侊細">
- <div v-if="form.onState === 0">绂荤嚎</div>
+ <div v-if="form.onState === 0">鏈煡</div>
<div v-else-if="form.onState === 1">鍦ㄧ嚎</div>
+ <div v-else-if="form.onState === -1">绂荤嚎</div>
</el-form-item>
<el-form-item label="绠＄悊鍗曚綅锛�">{{ form.unitName }}</el-form-item>
</el-col>
@@ -288,9 +293,9 @@
<div v-else-if="form.videoComplete === -1">寮傚父</div>
</el-form-item>
<el-form-item label="OSD鏍囨敞锛�">
- <div v-if="form.OSD === 1">姝ｅ父</div>
- <div v-else-if="form.OSD === 0">鏈煡</div>
- <div v-else-if="form.OSD === -1">寮傚父</div>
+ <div v-if="form.osd ==true">姝ｅ父</div>
+ <div v-else-if="form.osd ==false">寮傚父</div>
+ <div v-else-if="form.osd ==null">鏈煡</div>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -299,9 +304,9 @@
</el-form-item>
<el-form-item label="褰曞儚缂哄け鏃堕暱锛�">{{ (form.videoLoseTime * 60).toFixed(2) + '鍒嗛挓' }}</el-form-item>
<el-form-item label="OSD鏃堕棿锛�">
- <div v-if="form.OSDTime === 1">姝ｅ父</div>
- <div v-else-if="form.OSDTime === 0">鏈煡</div>
- <div v-else-if="form.OSDTime === -1">寮傚父</div>
+ <div v-if="form.osdtime ==true">姝ｅ父</div>
+ <div v-else-if="form.osdtime ==false">寮傚父</div>
+ <div v-else-if="form.osdtime ==null">鏈煡</div>
</el-form-item>
</el-col>
</el-row>
@@ -342,6 +347,7 @@
totalPosts: 0,
totalMembers: 0,
postsPercentage: 0,
+ unknownNumbers: 0,
totalViews: 0,
noStore: 0,
partStore: 0,
@@ -395,9 +401,6 @@
exportRules: {
month: [
{required: true, message: "鏃堕棿涓嶈兘涓虹┖", trigger: "blur"}
- ],
- deptIds: [
- {required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur"}
],
dataType: [
{required: true, message: "鏁版嵁绫诲瀷涓嶈兘涓虹┖", trigger: "blur"}
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index ef120cf..fe4a301 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -91,10 +91,10 @@
<!-- <el-button type="danger" plain icon="el-icon-receiving" size="mini" @click="handleEditBatch"-->
<!-- v-hasPermi="['point:edit']">鎵归噺淇敼</el-button>-->
<!-- </el-col>-->
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar @refreshHeader= "getDyColumn" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="pointList" @selection-change="handleSelectionChange">
+ <el-table :key = "refreshkey" v-loading="loading" :data="pointList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="鐐逛綅鍚嶇О" prop="pointName" width="200" show-overflow-tooltip/>
<el-table-column label="鏍囩" align="center" width="200" show-overflow-tooltip>
@@ -251,6 +251,7 @@
dicts: ['point_tag', 'area_code'],
data() {
return {
+ refreshkey : 0,
dynamicColumnList: [],
needUpdateUnit: false,
importantTag: false,
@@ -335,7 +336,7 @@
this.getUnitSelect();
// this.getCascader();
this.getDeptCascader();
- this.getDyColumn()
+ this.getDyColumn();
},
methods: {
getDyColumn() {
@@ -345,6 +346,8 @@
}
getDynamicColumnList(params).then(res => {
this.dynamicColumnList = res.data
+ this.refreshkey+=1
+ console.log("鍔犺浇鍔ㄦ�佸垪"+this.refreshkey)
})
},
getDynamicValue(row, propName) {
--
Gitblit v1.8.0