diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index ef58415..1219e48 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -1,5 +1,20 @@
import request from "../request";
-
+//获取登录
+export function loginJoggle(data) {
+ return request({
+ url: "/api/login",
+ method: "post",
+ data,
+ });
+}
+//声光报警
+export function alarmMarkJoggle(data) {
+ return request({
+ url: "/api/alarmMark",
+ method: "post",
+ data,
+ });
+}
//实时监控页面
//获取线路树状结构
export function getdyTreeListJoggle(data) {
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 55133b3..f1ebf17 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -34,7 +34,7 @@
-
+
+
-
+ -->
登录
@@ -61,36 +61,34 @@
diff --git a/src/views/devicePhotoSchedule/components/setdevice.vue b/src/views/devicePhotoSchedule/components/setdevice.vue
index 9fc5522..7069df3 100644
--- a/src/views/devicePhotoSchedule/components/setdevice.vue
+++ b/src/views/devicePhotoSchedule/components/setdevice.vue
@@ -38,6 +38,7 @@
ref="tree"
node-key="id"
:default-expand-all="true"
+ @check="getCheckedNodes"
>
{{ data.name }}
@@ -79,6 +80,7 @@ export default {
children: "list",
label: "name",
},
+ termidArr: [],
ruleid: "",
parmsList: [], //选中的通道
multipleSelection: [],
@@ -90,6 +92,8 @@ export default {
//全选
checkAll: true,
isIndeterminate: true, //全选设置默认选中
+ timer: null,
+ termidArrNum: -1,
};
},
mounted() {},
@@ -106,7 +110,6 @@ export default {
getScheduleRulelAccessList({})
.then((res) => {
this.listnr = res.data.list;
-
this.aisleList = res.data.channellist;
})
.catch((err) => {});
@@ -132,42 +135,36 @@ export default {
handleCheckBox() {
console.log(this.zzListCheck);
},
- //遍历数据
- eachTreeData(data, callback, childKey) {
- if (!childKey) childKey = "children";
- data.forEach((d) => {
- if (callback(d) !== false && d[childKey])
- this.eachTreeData(d[childKey], callback, childKey);
- });
- },
- //给树的每一个节点 添加一个唯一值key，并算出默认选中的节点key数组
- addKeyToList(data) {
- let key = 0;
- this.eachTreeData(data, (d) => {
- d.key = key++;
- });
- },
+
//获取所选值
getCheckedNodes() {
this.parmsList = [];
const checkedNodes = this.$refs.tree.getCheckedNodes(false, true); //若节点可被选择，则返回目前被选中的节点所组成的数组
//const checkedParam = []; //定义选中的数组
let index = -1;
- // console.log(checkedNodes);
+ console.log(checkedNodes);
if (checkedNodes.length !== 0) {
checkedNodes.forEach((item) => {
- // 父节点结构的情况 判断是否有list子节点，如果有定义数组结构
- if (item.list !== undefined) {
- index++;
- this.parmsList[index] = {
- //name: item.name,
- termid: item.id,
- channelidlist: [],
- };
- } else {
- //如果没有list 把子节点id push到 定义的数组channelidlist中
- this.parmsList[index].channelidlist.push(item.id);
+ if (item.list == undefined) {
+ console.log("1111111111111");
+ console.log(item);
+ this.termidArr.push(item.id);
}
+
+ // 父节点结构的情况 判断是否有list子节点，如果有定义数组结构
+ // if (item.list !== undefined) {
+ // index++;
+ // this.parmsList[index] = {
+ // //name: item.name,
+ // termid: item.id,
+ // channelidlist: [],
+ // };
+ // console.log(item);
+ // } else {
+ // console.log("aaaaaaaaaaaaaa");
+ // //如果没有list 把子节点id push到 定义的数组channelidlist中
+ // this.parmsList[index].channelidlist.push(item.id);
+ // }
//通过bsManufacturer 判断是否是 线路 获取线路id
// if (item.bsManufacturer !== undefined) {
// this.ruleid = item.id;
@@ -181,60 +178,57 @@ export default {
.filter((item) => item.channelidlist.length !== 0)
.map((item) => {
return {
- termid: item.termid,
- channelidlist: item.channelidlist,
+ termid: this.termidArr[0],
+ channelidlist: [this.checkedAisle],
};
});
+
+ this.termidArr = Array.from(new Set(this.termidArr));
+ console.log(this.termidArr);
console.log(this.parmsList);
return this.parmsList;
},
// 保存确定操作
submitForm() {
- console.log(this.zzListCheck);
- console.log(this.checkedAisle);
- let checkzzList = [];
- for (let i = 0; i < this.zzListCheck.length; i++) {
- console.log(this.zzListCheck[i]);
- checkzzList.push({
- termid: this.zzListCheck[i],
- channelidlist: [this.checkedAisle],
- });
- }
- console.log(checkzzList);
- if (this.zzListCheck.length == 0) {
- this.$message.error("请选择通道");
- } else {
- setScheduleRulel({
- scheduleid: this.selid,
- list: checkzzList,
+ console.log(this.termidArr);
+ this.timer = window.setInterval(() => {
+ this.termidArrNum++;
+ console.log(this.termidArrNum);
+ if (this.termidArrNum < this.termidArr.length) {
+ this.sureSum();
+ } else {
+ this.$message.success("添加成功");
+ this.isShow = false;
+ this.$parent.deviceList();
+ clearTimeout(this.timer);
+ }
+ }, 1000);
+ },
+ //时间表
+ sureSum() {
+ setScheduleRulel({
+ list: [
+ {
+ termid: this.termidArr[this.termidArrNum],
+ channelidlist: [this.checkedAisle],
+ },
+ ],
+ scheduleid: this.selid,
+ })
+ .then((res) => {
+ // this.$message.success("添加成功");
})
- .then((res) => {
- this.isShow = false;
- this.$message.success("添加成功");
- this.$parent.deviceList();
- })
- .catch((err) => {
- this.$message.error("添加失败");
- });
- }
- // if (this.parmsList.length == 0)
- // return this.$message.error("通道不能为空");
- // setScheduleRulel({ list: this.parmsList, ruleid: this.selid })
- // .then((res) => {
- // this.isShow = false;
- // this.$message.success("添加成功");
- // this.$parent.deviceList();
- // })
- // .catch((err) => {
- // this.$message.error("添加失败");
- // });
+ .catch((err) => {
+ this.$message.error("添加失败");
+ });
},
display() {
this.isShow = true;
},
hide() {
this.isShow = false;
+ clearTimeout(this.timer);
},
},
};
diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue
index 8cb0219..d94f742 100644
--- a/src/views/realTimeMonitor/components/setschedule.vue
+++ b/src/views/realTimeMonitor/components/setschedule.vue
@@ -31,11 +31,11 @@
> -->
-
+
+
暂无设置时间表
@@ -246,7 +246,9 @@ export default {
timeloading: false,
};
},
- mounted() {},
+ mounted() {
+ console.log(this.selaccess);
+ },
methods: {
handleClick(tab, event) {
console.log(tab, event);
@@ -260,7 +262,22 @@ export default {
this.accesslist = res.data.list;
console.log(this.accesslist);
this.selaccess = res.data.list[0].channelid;
- this.inquireRealbtn();
+ //this.inquireRealbtn();
+ console.log(this.selaccess);
+ this.loading = true;
+ getSchedulenr({
+ channelid: this.selaccess,
+ terminalid: 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("查询失败");
+ });
})
.catch((err) => {});
},
@@ -285,56 +302,6 @@ export default {
//查询时间表
//查询真是时间时间表
- inquirebtn() {
- console.log(this.selaccess, this.selfacilityId, this.newcmdzzid);
- this.timeloading = true;
- selectPhotoTimeGetJoggle({
- channel: this.selaccess,
- termId: this.selfacilityId,
- cmdId: this.newcmdzzid,
- })
- .then((res) => {
- this.$message.success("查询成功");
- console.log(this.shedulenr);
- this.newrequestId = res.data.requestId;
- this.searchRealtime();
- })
- .catch((err) => {
- this.$message.error("查询失败");
- });
- },
- searchRealtime() {
- selectPhotoTimeJoggle({
- channel: this.selaccess,
- termId: this.selfacilityId,
- cmdId: this.newcmdzzid,
- requestId: this.newrequestId,
- }).then((res) => {
- console.log(res);
- if (res.data.isNew == true && this.timernum < 10) {
- clearInterval(this.timer);
- this.timer = null;
- this.inquirebtn();
- this.timernum = 0;
- } else if (res.data.isNew == false && this.timernum > 10) {
- this.i = 0;
- clearInterval(this.timer);
- this.timer = null;
- this.$message({
- message: "时间表查询无响应，请稍后再试！",
- type: "warning",
- });
- }
- // if (res.data.isNew == true) {
- // this.shedulenr = res.data.list;
- // this.$message({
- // message: "装置信息已更新",
- // type: "success",
- // });
- // clearInterval(this.timer);
- // }
- });
- },
//获取线路列表数据
deviceList() {
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index dd0596e..3649588 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -152,7 +152,7 @@
关闭GPS
-->
-
声光报警