From 279ee6197ef95b683733d450616ee80539f0a8bb Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 09 Apr 2021 17:10:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/realTimePolice/real.vue | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 13fcc15..c46d4ef 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-03-17 15:21:33
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-04-07 17:36:33
+ * @Last Modified time: 2021-04-09 09:59:32
*/
<template>
<basic-container>
@@ -894,6 +894,14 @@
};
}
+ if (this.$route.query.timeDesc) {
+ values = {
+ ...params,
+ timeDesc: this.$route.query.timeDesc,
+ ...this.query,
+ };
+ }
+
this.loading = true;
getList(page.currentPage, page.pageSize, values).then((res) => {
const data = res.data.data;
@@ -1137,13 +1145,13 @@
.then(function () {
that.dialogTableVisible = false;
- axios({
- method: "post",
- url: `/api/blade-jfpts/rvideo/stop`,
- params: {
- jid: row.id,
- },
- }).then((resdata) => {});
+ // axios({
+ // method: "post",
+ // url: `/api/blade-jfpts/rvideo/stop`,
+ // params: {
+ // jid: row.id,
+ // },
+ // }).then((resdata) => {});
that.onLoad(that.page, that.query);
that.$router.push({
--
Gitblit v1.9.3