From c0a7df34b21d65b54119844abc5d95ca70495e71 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 08 May 2021 16:07:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/components/real-popup/main.vue | 1 -
src/page/index/logo.vue | 14 +++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/components/real-popup/main.vue b/src/components/real-popup/main.vue
index 475a5c8..34ce97a 100644
--- a/src/components/real-popup/main.vue
+++ b/src/components/real-popup/main.vue
@@ -562,7 +562,6 @@
}).then((resdata) => {});
// that.onLoad(that.page, that.query);
if (t == "办结") {
- console.log(t, 354343);
location.reload();
} else {
that.$router.push({
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index a4d3190..dc91434 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -194,7 +194,7 @@
<el-form-item>
<el-button
type="success"
- @click.stop="updateJtyep(form, 1, '办结')"
+ @click.stop="updateJtyep(form, 2, '办结')"
>办结
</el-button>
@@ -538,10 +538,14 @@
},
}).then((resdata) => {});
- that.$router.push({
- path: "/policeTracking/track",
- query: that.form,
- });
+ if (t == "办结") {
+ location.reload();
+ } else {
+ that.$router.push({
+ path: "/policeTracking/track",
+ query: that.form,
+ });
+ }
});
},
beginTimeOrEndTime(time) {
--
Gitblit v1.9.3