From d38731c19c8adae19cd50518e49199e7cad66a71 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 26 Oct 2022 08:45:53 +0800 Subject: [PATCH 1/7] =?UTF-8?q?ep=20show=20=E7=BB=8F=E7=BA=AC=E5=BA=A6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/hrm/ep_form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/hrm/ep_form.vue b/src/views/hrm/ep_form.vue index feebdcca..c2b26635 100644 --- a/src/views/hrm/ep_form.vue +++ b/src/views/hrm/ep_form.vue @@ -127,7 +127,7 @@ {{form.location.area_fix_name}}- - 经纬度(form.location.xx_detail.longitude, form.location.xx_detail.latitude) + 经纬度({{form.location.xx_detail.longitude}}, {{form.location.xx_detail.latitude}}) From 283c92053eeea9825996465b18b4175f7092f125 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 26 Oct 2022 13:43:49 +0800 Subject: [PATCH 2/7] bigScreen --- src/views/bigScreen/index.vue | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue index dd29b9e0..129f8fb7 100644 --- a/src/views/bigScreen/index.vue +++ b/src/views/bigScreen/index.vue @@ -81,6 +81,16 @@
--> +
+
+ + 取消跟踪 +
+
+ + 取消轨迹 +
+
@@ -409,19 +419,27 @@
-
- - 取消跟踪 -
-
+
跟踪
-
+
+ + 跟踪 +
+
+ + 取消跟踪 +
+
轨迹
-
+
+ + 轨迹 +
+
取消轨迹
From eb56109e9d05e0fca782df9a0ff834cb4744f978 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 26 Oct 2022 14:21:35 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=90=8E=E5=88=B7=E6=96=B0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/scTable/index.vue | 6 +++--- src/views/ecm/event.vue | 2 +- src/views/ecm/event_handlefrom.vue | 2 +- src/views/ecm/myevent.vue | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue index 77ef9fc5..41968e17 100644 --- a/src/components/scTable/index.vue +++ b/src/components/scTable/index.vue @@ -306,9 +306,9 @@ export default { this.total = response.total || 0; this.summary = response.summary || {}; this.loading = false; - if(!this.hidePagination){ - this.$refs.scTable.setScrollTop(0); - } + // if(!this.hidePagination){ + // this.$refs.scTable.setScrollTop(0); + // } this.$emit("dataChange", res, this.tableData); } catch (error) { this.loading = false; diff --git a/src/views/ecm/event.vue b/src/views/ecm/event.vue index 0c0c8e37..22ed7056 100644 --- a/src/views/ecm/event.vue +++ b/src/views/ecm/event.vue @@ -212,7 +212,7 @@ export default { }) }, handleSuccess(){ - + this.$refs.table.refresh(); }, //搜索 diff --git a/src/views/ecm/event_handlefrom.vue b/src/views/ecm/event_handlefrom.vue index 284992d4..3716a02f 100644 --- a/src/views/ecm/event_handlefrom.vue +++ b/src/views/ecm/event_handlefrom.vue @@ -262,7 +262,7 @@ export default { }, onSubmit() { this.$API.ecm.event.handle.req(this.form.id, this.form).then((res) => { - this.$router.go(-1); + this.$emit("success"); this.$message.success("操作成功"); return res; }); diff --git a/src/views/ecm/myevent.vue b/src/views/ecm/myevent.vue index 3bab97d1..99cf5994 100644 --- a/src/views/ecm/myevent.vue +++ b/src/views/ecm/myevent.vue @@ -192,6 +192,7 @@ export default { }); }, handleSuccess(){ + this.$refs.table.refresh(); this.dialog.handle = false }, //搜索 From b90ca4d830ea4c48b90cf21abc6b7fce5ae42bec Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 26 Oct 2022 14:44:19 +0800 Subject: [PATCH 4/7] =?UTF-8?q?sctable=20=E6=95=B0=E6=8D=AE=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E9=94=99=E8=AF=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/scTable/index.vue | 193 ++++++++++--------------------- src/views/ecm/event.vue | 7 +- 2 files changed, 64 insertions(+), 136 deletions(-) diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue index 41968e17..99f4d290 100644 --- a/src/components/scTable/index.vue +++ b/src/components/scTable/index.vue @@ -8,43 +8,18 @@ -->