From e9d257f68ce50423b950bf3de60a50a4c3f5ccac Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Tue, 16 May 2023 14:47:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8F=91=E6=8B=8D=E7=85=A7=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/css/element.less | 3 +
src/store/index.js | 21 +++++-
src/utils/api/index.js | 19 ++++-
.../components/setschedule.vue | 74 ++++++++++---------
src/views/realTimeMonitor/index.vue | 40 +++++++++-
src/views/realTimeSearch/index.vue | 4 -
6 files changed, 119 insertions(+), 42 deletions(-)
diff --git a/src/assets/css/element.less b/src/assets/css/element.less
index 239358a..85d1292 100644
--- a/src/assets/css/element.less
+++ b/src/assets/css/element.less
@@ -53,3 +53,6 @@
left: 50%;
margin-top: 0px !important;
}
+.el-button--small {
+ padding: 9px 9px;
+}
diff --git a/src/store/index.js b/src/store/index.js
index 3750046..46fcd8a 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -8,9 +8,28 @@ export default new Vuex.Store({
//用户登录token 存储
token: "",
username: "",
+ channelid: "",
+ termid: "",
+ },
+
+ getters: {
+ channelid: (state) => state.channelid,
},
- getters: {},
mutations: {
+ //保存通道id
+ SET_CHANNELID(state, channelid) {
+ state.channelid = channelid;
+ localStorage.setItem("channelid", channelid);
+ console.log(state);
+ console.log("store、localstorage保存channelid成功！");
+ },
+ //保存装置id termid
+ SET_TERMID(state, termid) {
+ state.termid = termid;
+ localStorage.setItem("termid", termid);
+ console.log(state);
+ console.log("store、localstorage保存termid成功！");
+ },
SET_TOKEN(state, token) {
state.token = token;
localStorage.setItem("token", token);
diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index 552b2b5..6b2842a 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -351,7 +351,6 @@ export function getResolutionRatio(data) {
});
}
-
//设置图像参数 setImageParams
//查询图像分辨率 getImageParams
@@ -421,7 +420,6 @@ export function getTerminalInfoJoggle(data) {
});
}
-
//根据通道编号获取设备列表
export function getTermListByChannelJoggle(data) {
return request({
@@ -430,3 +428,20 @@ export function getTermListByChannelJoggle(data) {
data,
});
}
+
+//下发时间表设置
+export function getPhotoTimeJoggle(data) {
+ return request({
+ url: "/api/getPhotoTime",
+ method: "post",
+ data,
+ });
+}
+//拍照时间表查询触发
+export function selectPhotoTimeGetJoggle(data) {
+ return request({
+ url: "/api/selectPhotoTimeGet",
+ method: "post",
+ data,
+ });
+}
diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue
index 7b21768..65e0b2b 100644
--- a/src/views/realTimeMonitor/components/setschedule.vue
+++ b/src/views/realTimeMonitor/components/setschedule.vue
@@ -19,6 +19,9 @@
>
查询
+ 查询实际时间表
时间表:
@@ -136,27 +139,19 @@
{{ val.endTime }}
间隔：
{{ val.span }}分钟
-
选择通道
-
+
+ {{ val.name }}
+
+
@@ -184,6 +179,7 @@ import {
getScheduleRulelListJoggle,
setScheduleRulel,
getScheduleRulelAccessList,
+ selectPhotoTimeGetJoggle,
} from "@/utils/api/index";
export default {
props: {
@@ -218,7 +214,7 @@ export default {
//获取当前装置内容
deviceListData: {}, //当前装置信息
zzchannel: [], //当前装置通道
- checkList: [], //选中的通道
+ checkList: "", //选中的通道
};
},
mounted() {},
@@ -254,6 +250,23 @@ export default {
this.$message.error("查询失败");
});
},
+ //查询时间时间表
+ inquireRealbtn() {
+ console.log(this.selaccess, this.selfacilityId);
+ selectPhotoTimeGetJoggle({
+ channel: this.selaccess,
+ termId: this.selfacilityId,
+ })
+ .then((res) => {
+ this.$message.success("查询成功");
+ // this.shedulenr = res.data.list.join("; ")
+ this.shedulenr = res.data.list;
+ this.loading = false;
+ })
+ .catch((err) => {
+ this.$message.error("查询失败");
+ });
+ },
//获取线路列表数据
deviceList() {
getScheduleRulelListJoggle({
@@ -365,31 +378,22 @@ export default {
list: [
{
termid: this.deviceListData.zzid,
- channelidlist: this.checkList,
+ channelidlist: [this.checkList],
},
],
})
.then((res) => {
this.isShowset = false;
this.$message.success("添加成功");
+ console.log(this.checkList);
+ this.$store.commit("SET_CHANNELID", this.checkList); //将通道保存在vuex中
+ this.$store.commit("SET_TERMID", this.deviceListData.zzid); //将装置保存在vuex中
this.deviceList();
})
.catch((err) => {
this.$message.error("添加失败");
});
}
-
- // if (this.parmsList.length == 0)
- // return this.$message.error("通道不能为空");
- // setScheduleRulel({ ruleid: this.scheduleid, list: this.parmsList })
- // .then((res) => {
- // this.isShowset = false;
- // this.$message.success("添加成功");
- // this.deviceList();
- // })
- // .catch((err) => {
- // this.$message.error("添加失败");
- // });
},
closebtn() {
this.isShowset = false;
@@ -452,6 +456,10 @@ export default {
.deviceTable {
padding: 16px 8px 0 8px;
height: calc(100% - 16px);
+
+ .el-table--small {
+ margin-bottom: 8px;
+ }
.rulesBox {
display: flex;
flex-direction: row;
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index 8657901..b010f06 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -92,7 +92,14 @@
操作项
拍照时间表设置拍照时间表
+
+ 下发时间表