From 3f5c1ae2cfbe8d29eb11e0ac88abceaa7d6906f2 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 25 Nov 2021 15:47:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory_ys
---
src/views/commandQuery/taskDistribution.vue | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/views/commandQuery/taskDistribution.vue b/src/views/commandQuery/taskDistribution.vue
index 37beb26..454a66c 100644
--- a/src/views/commandQuery/taskDistribution.vue
+++ b/src/views/commandQuery/taskDistribution.vue
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-07-07 17:30:05
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-11-25 14:54:40
+ * @Last Modified time: 2021-11-25 15:47:19
* menu-name 监管信息
*/
<template>
@@ -43,7 +43,8 @@
:visible.sync="seeLocationFlag"
:modal-append-to-body="false"
width="width">
- <Map v-if="seeLocationFlag" ref="locationForm" />
+ <Map v-if="seeLocationFlag"
+ ref="locationForm" />
</el-dialog>
<el-dialog class="see-track"
@@ -67,7 +68,8 @@
</el-button>
</div>
- <Map v-if="seeTrackFlag" ref="tarckForm" />
+ <Map v-if="seeTrackFlag"
+ ref="tarckForm" />
</el-dialog>
</basic-container>
</template>
@@ -167,7 +169,26 @@
// editDisplay: false,
// addDisplay: false
},
-
+ {
+ label: "指令时间",
+ prop: "releaseTimeRange",
+ type: "datetime",
+ format: "yyyy-MM-dd hh:mm:ss",
+ valueFormat: "yyyy-MM-dd hh:mm:ss",
+ searchRange: true,
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入指令时间",
+ trigger: "blur",
+ },
+ ],
+ },
{
label: "接收指令人",
prop: "receiveName",
@@ -315,6 +336,11 @@
onLoad (page, params = {}) {
// this.loading = false;
this.loading = true;
+ if (this.query.releaseTimeRange) {
+ this.query["startTime"] = this.query.releaseTimeRange[0];
+ this.query["endTime"] = this.query.releaseTimeRange[1];
+ delete this.query.releaseTimeRange;
+ }
getLisperetaskDistribution(
page.currentPage,
page.pageSize,
--
Gitblit v1.9.3