From 9e8d1bd0b6fb495920921214775b84d490e032a3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 06 九月 2024 16:43:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/monitor/car/index.vue | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/views/system/monitor/car/index.vue b/src/views/system/monitor/car/index.vue
index 60604c5..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">
@@ -140,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>
@@ -178,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 },
@@ -259,6 +259,9 @@
created() {
this.getVideoCount();
this.getList();
+ listDept({ status: 0 }).then(response => {
+ this.deptList = response.data.filter(item => item.area);
+ });
},
methods: {
/** 鏌ヨ璁惧璧勪骇鍒楄〃 */
@@ -308,6 +311,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.queryParams.address = '';
this.resetForm("queryForm");
this.handleQuery();
},
--
Gitblit v1.8.0