From 7f71c68a35419fb9efeaf934fd499856e15e977f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 22 八月 2024 16:39:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/monitor/recovery/index.vue | 22 ++++++----
src/views/system/contract/score/index.vue | 7 +++
src/views/system/monitor/video/index.vue | 21 ++++++----
src/views/system/monitor/face/index.vue | 22 ++++++----
src/views/system/monitor/car/index.vue | 22 ++++++----
5 files changed, 58 insertions(+), 36 deletions(-)
diff --git a/src/views/system/contract/score/index.vue b/src/views/system/contract/score/index.vue
index d578e8c..399a0bb 100644
--- a/src/views/system/contract/score/index.vue
+++ b/src/views/system/contract/score/index.vue
@@ -388,12 +388,17 @@
if (null != this.daterangeAuditingTime && '' != this.daterangeAuditingTime) {
this.queryParams["auditingStartTime"] = this.daterangeAuditingTime[0];
this.queryParams["auditingEndTime"] = this.daterangeAuditingTime[1];
+ } else {
+ this.queryParams["auditingStartTime"] = null;
+ this.queryParams["auditingEndTime"] = null;
}
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
this.queryParams["createStartTime"] = this.daterangeCreateTime[0];
this.queryParams["createEndTime"] = this.daterangeCreateTime[1];
+ } else {
+ this.queryParams["createStartTime"] = null;
+ this.queryParams["createEndTime"] = null;
}
- console.log("this.queryParams", this.queryParams)
listAuditing(this.queryParams).then(response => {
this.auditingList = response.rows;
this.total = response.total;
diff --git a/src/views/system/monitor/car/index.vue b/src/views/system/monitor/car/index.vue
index 60604c5..e700418 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">
@@ -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();
},
diff --git a/src/views/system/monitor/face/index.vue b/src/views/system/monitor/face/index.vue
index 2beba5d..11ceac1 100644
--- a/src/views/system/monitor/face/index.vue
+++ b/src/views/system/monitor/face/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">
@@ -217,12 +216,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 },
@@ -297,6 +297,9 @@
created() {
this.getVideoCount();
this.getList();
+ listDept({ status: 0 }).then(response => {
+ this.deptList = response.data.filter(item => item.area);
+ });
},
methods: {
/** 鏌ヨ璁惧璧勪骇鍒楄〃 */
@@ -341,6 +344,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.queryParams.address = '';
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/src/views/system/monitor/recovery/index.vue b/src/views/system/monitor/recovery/index.vue
index cd2018d..5278610 100644
--- a/src/views/system/monitor/recovery/index.vue
+++ b/src/views/system/monitor/recovery/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">
@@ -165,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 },
@@ -243,6 +243,9 @@
created() {
this.getList();
this.getVideoCount();
+ listDept({ status: 0 }).then(response => {
+ this.deptList = response.data.filter(item => item.area);
+ });
},
methods: {
/** 鏌ヨ璁惧璧勪骇鍒楄〃 */
@@ -292,6 +295,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.queryParams.address = '';
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/src/views/system/monitor/video/index.vue b/src/views/system/monitor/video/index.vue
index f94d070..37c11f7 100644
--- a/src/views/system/monitor/video/index.vue
+++ b/src/views/system/monitor/video/index.vue
@@ -46,15 +46,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">
@@ -180,11 +179,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 +260,9 @@
created() {
this.getVideoCount();
this.getList();
+ listDept({ status: 0 }).then(response => {
+ this.deptList = response.data.filter(item => item.area);
+ });
},
methods: {
/** 鏌ヨ璁惧璧勪骇鍒楄〃 */
@@ -304,6 +308,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.queryParams.address = '';
this.resetForm("queryForm");
this.handleQuery();
},
--
Gitblit v1.8.0