From 9fcc8bcb99d365d74a24c1329ec5e7623f57b342 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期二, 19 三月 2024 14:56:28 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui
---
src/views/system/recovery/index.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/views/system/recovery/index.vue b/src/views/system/recovery/index.vue
index ca754c0..ea7654a 100644
--- a/src/views/system/recovery/index.vue
+++ b/src/views/system/recovery/index.vue
@@ -22,7 +22,7 @@
<p>寮傚父鏁�</p >
</div>
<div class="dashboard-item">
- <h3 style="color: #7868d9">{{ totalViews }}</h3>
+ <h3>{{ totalViews }}</h3>
<p>鐢熸垚寮傚父宸ュ崟鏁�</p >
</div>
<div class="dashboard-item">
@@ -94,15 +94,16 @@
<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="serialNumber" />
+ <el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" width="180px" />
<el-table-column label="璁惧鍚嶇О" align="center" prop="name" />
- <el-table-column label="涓婃姤閮ㄩ棬" align="center" prop="deptName" />
+ <el-table-column label="鏍囩" align="center" prop="tag" />
<el-table-column label="璁惧鐘舵��" align="center" prop="onState">
<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="address" />
+ <el-table-column label="鍖哄煙" align="center" prop="region" />
+ <el-table-column label="璇︾粏鍦板潃" align="center" prop="address" />
<el-table-column label="鏄惁鐢熸垚寮傚父宸ュ崟" align="center" prop="defaultOrder">
<template slot-scope="scope">
<dict-tag :options="dict.type.platform_yes_no" :value="scope.row.defaultOrder"/>
@@ -139,7 +140,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.deptName }} </el-form-item>
+ <el-form-item label="鏍囩锛�">{{ form.deptName }} </el-form-item>
<el-form-item label="璁惧鐘舵�侊細">
<div v-if="form.onState === 1">鍙敤</div>
<div v-else-if="form.onState === 2">涓嶅彲鐢�</div>
--
Gitblit v1.8.0