From 222a623191c8dbd934a45c5da32c6c6883c8587f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 06 九月 2024 00:18:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/monitor/recovery/index.vue | 68 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/views/system/monitor/recovery/index.vue b/src/views/system/monitor/recovery/index.vue
index 29912d5..5278610 100644
--- a/src/views/system/monitor/recovery/index.vue
+++ b/src/views/system/monitor/recovery/index.vue
@@ -2,12 +2,12 @@
<div class="app-container">
<el-card class="box-card" >
<el-row type="flex" align="middle" justify="space-between">
- <el-col :xl="8" :lg="8" :md="10" :sm="8" :xs="6">
- <div class="icon-container" style="background-color: #5599F7">
+ <el-col :span="4">
+ <div class="icon-container" style="background-color: #1890FF">
<i class="el-icon-refresh-left"></i>
</div>
</el-col>
- <el-col :xl="14" :lg="14" :md="12" :sm="14" :xs="16">
+ <el-col :span="20">
<div class="dashboard">
<div class="dashboard-item">
<h3 style="color: #5C9BF8">{{ count.totalPosts }}</h3>
@@ -20,10 +20,6 @@
<div class="dashboard-item">
<h3 style="color: #fe640d">{{ count.postsPercentage }}</h3>
<p>寮傚父鏁�</p >
- </div>
- <div class="dashboard-item">
- <h3>{{ count.totalViews }}</h3>
- <p>鐢熸垚寮傚父宸ュ崟鏁�</p >
</div>
<div class="dashboard-item">
<h3>{{ count.viewsPercentage }}%</h3>
@@ -48,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">
@@ -72,13 +67,13 @@
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button
type="warning"
plain
@@ -86,30 +81,29 @@
size="mini"
@click="handleExport"
>瀵煎嚭</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" width="55" align="center" />
<el-table-column label="璁惧鍚嶇О" align="center" prop="name" />
<el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" width="180px" />
- <el-table-column label="鏍囩" align="center" prop="publicSecurity" v-if="columns[0].visible" />
- <el-table-column label="鍖哄煙" align="center" prop="address" v-if="columns[1].visible"/>
+ <el-table-column label="鏍囩" align="center" 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" 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" 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="error" v-if="columns[3].visible" />
<el-table-column label="寮傚父鍘熷洜" align="center" prop="reason" v-if="columns[4].visible" />
<el-table-column label="寮傚父鎭㈠鏃堕棿" align="center" prop="recoveryTime" width="180" v-if="columns[5].visible">
</el-table-column>
- <el-table-column label="绠＄悊鍗曚綅" align="center" prop="managementUnit" v-if="columns[6].visible" />
+ <el-table-column label="绠＄悊鍗曚綅" align="center" prop="unitName" v-if="columns[6].visible" />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -170,12 +164,13 @@
<script>
import { recoveryException, 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 },
@@ -248,6 +243,9 @@
created() {
this.getList();
this.getVideoCount();
+ listDept({ status: 0 }).then(response => {
+ this.deptList = response.data.filter(item => item.area);
+ });
},
methods: {
/** 鏌ヨ璁惧璧勪骇鍒楄〃 */
@@ -297,6 +295,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.queryParams.address = '';
this.resetForm("queryForm");
this.handleQuery();
},
@@ -365,7 +364,7 @@
<style lang="scss" scoped>
.box-card {
- background-color: #F5F9FE;
+ background-color: #ffffff;
width: 100%;
margin-bottom: 20px;
height: 120px
@@ -374,8 +373,8 @@
display: flex;
justify-content: center;
align-items: center;
- border-radius: 20px;
- width: 20%;
+ border-radius: 10px;
+ width: 130px;
height: 80px;
margin-left: 5%;
}
@@ -386,9 +385,10 @@
.dashboard {
display: flex;
- gap: 10%;
+ gap: 5%;
align-items: center;
- margin-left: -50%;
+ justify-content: space-between;
+ margin-right: 20px;
}
.dashboard-item {
--
Gitblit v1.8.0