diff --git a/src/main.js b/src/main.js index 3cbdfcb..6d89aab 100644 --- a/src/main.js +++ b/src/main.js @@ -60,7 +60,7 @@ Vue.directive("debounce", { } timer = setTimeout(() => { binding.value(); - }, 2000); + }, 500); }); }, }); diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue index 3f591fa..c69bd72 100644 --- a/src/views/components/carouselChart.vue +++ b/src/views/components/carouselChart.vue @@ -3,8 +3,10 @@
+
+ +
@@ -33,7 +43,13 @@ @click="handleBigpic(item, index)" :class="activeSmall === index ? 'borderActive' : ''" > -
+

--通道{{ item.channelId }}

+
+ +
@@ -108,6 +135,14 @@ export default { this.bigPicPath = this.terminalPhoto[0].path; this.fiveList = this.terminalPhoto.slice(this.page - 1, this.pagesize); this.total = this.terminalPhoto.length / this.pagesize; + console.log("this.bigPicPath"); + }, + watch: { + terminalPhoto: function (newVal, oldVal) { + this.bigPicPath = this.terminalPhoto[0].path; + this.fiveList = this.terminalPhoto.slice(this.page - 1, this.pagesize); + this.total = this.terminalPhoto.length / this.pagesize; + }, }, methods: { @@ -180,7 +215,7 @@ export default { width: 100%; display: flex; flex-direction: column; - height: calc(100% - 24px); + height: calc(100% - 0px); box-sizing: border-box; .picTop { width: 100%; @@ -250,7 +285,7 @@ export default { } .picBottom { width: 100%; - height: 18%; + height: 20%; position: relative; .smallPicBox { width: 100%; diff --git a/src/views/devicePhotoSchedule/components/setdevice.vue b/src/views/devicePhotoSchedule/components/setdevice.vue index 2f85bb0..f37e6eb 100644 --- a/src/views/devicePhotoSchedule/components/setdevice.vue +++ b/src/views/devicePhotoSchedule/components/setdevice.vue @@ -4,14 +4,27 @@ title="设置" :visible.sync="isShow" :close-on-click-modal="false" - width="720px" + width="1020px" >

时间表规则

- - {{ val.startTime }} - {{ val.endTime }} - + + {{ + val.startTime + }} + {{ + val.endTime + }} + {{ val.span }} @@ -19,13 +32,28 @@
- - {{ val.name }} - + + + {{ val.name }} +
-
通道:
+
@@ -54,12 +82,13 @@ export default { }, data() { return { + contentStyle: { width: "90px" }, isShow: false, - selid: 0,//选中时间表id - ruleSchedule:[],//时间表规则 - checkedAisle: [],//选中通道数据 - aisleList:[],//通道数据内容 - listnr: [],//通道树状结构 + selid: 0, //选中时间表id + ruleSchedule: [], //时间表规则 + checkedAisle: "", //选中通道数据 + aisleList: [], //通道数据内容 + listnr: [], //通道树状结构 defaultProps: { children: "list", label: "name", @@ -110,7 +139,8 @@ export default { }, ], multipleSelection: [], - + //新是数据结构参数 + newzzList: [], }; }, mounted() {}, @@ -118,7 +148,8 @@ export default { //判断 getdataform(val) { this.selid = val.id; - this.ruleSchedule = val.list + this.ruleSchedule = val.list; + console.log(this.ruleSchedule, "时间规则"); this.getlistnr(); }, //获取所有通道 @@ -131,25 +162,30 @@ export default { .catch((err) => {}); }, //选择通道 - handleChange(){ - console.log(this.listnr) - console.log(this.checkedAisle) + handleChange() { + console.log(this.listnr); + console.log(this.checkedAisle); + this.newzzList = this.listnr.filter((item) => { + console.log(item); + }); + + console.log(this.newzzList); this.$refs.tree.setCheckedKeys(this.checkedAisle); }, //遍历数据 - eachTreeData(data, callback, childKey){ - if (!childKey) childKey = 'children'; - data.forEach(d => { - if (callback(d) !== false && d[childKey]) this.eachTreeData(d[childKey], callback, childKey); - }) + 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){ + addKeyToList(data) { let key = 0; this.eachTreeData(data, (d) => { - d.key = key++ - }) - + d.key = key++; + }); }, //获取所选值 getCheckedNodes() { diff --git a/src/views/devicePhotoSchedule/index.vue b/src/views/devicePhotoSchedule/index.vue index bd7066d..2287c50 100644 --- a/src/views/devicePhotoSchedule/index.vue +++ b/src/views/devicePhotoSchedule/index.vue @@ -45,21 +45,7 @@ - +
时间表:
-
+
{{ val }}
+
暂无设置时间表
@@ -65,24 +66,7 @@ - + -
- + {{ deviceListData.zzname }} + +

时间表规则

时间表名称：{{ timeName }}

选择通道
- - - - - - - +
取 消 - 确 定 + 确 定
@@ -245,11 +191,14 @@ export default { ruleid: "", //线路id parmsList: [], //所选装置下通道参数 scheduleid: 0, //所选时间表id - checkList: [], //设置-获取所有通道 timeName: "", scheduleInfo: [], + //获取当前装置内容 + deviceListData: {}, //当前装置信息 + zzchannel: [], //当前装置通道 + checkList: [], //选中的通道 }; }, mounted() {}, @@ -265,6 +214,7 @@ export default { this.accesslist = res.data.list; console.log(this.accesslist); this.selaccess = res.data.list[0].channelid; + this.inquirebtn(); }) .catch((err) => {}); }, @@ -311,13 +261,24 @@ export default { console.log(val); this.scheduleInfo = val.list; this.timeName = val.name; - getScheduleRulelAccessList({ termid: this.selfacilityId }) .then((res) => { this.listnr = res.data.list; console.log("1111111111111111111"); console.log(this.listnr); - this.loading = false; + this.deviceListData = { + dyname: this.listnr[0].name, + dyid: this.listnr[0].id, + xlname: this.listnr[0].list[0].name, + xlid: this.listnr[0].list[0].id, + zzname: this.listnr[0].list[0].list[0].name, + zzcmid: this.listnr[0].list[0].list[0].cmdid, + zzid: this.listnr[0].list[0].list[0].id, + }; + this.zzchannel = this.listnr[0].list[0].list[0].list; + console.log(this.deviceListData); + console.log(this.zzchannel); + this.this.loading = false; }) .catch((err) => {}); }, @@ -370,18 +331,45 @@ export default { }, // 保存确定操作 submitForm() { - this.getCheckedNodes(); - 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(); + //this.getCheckedNodes(); + console.log("111111111111111111111"); + console.log(this.deviceListData); + console.log(this.checkList); + console.log(this.scheduleid); + console.log("22222222222222222"); + if (this.checkList.length == 0) { + this.$message.error("请选择通道"); + } else { + setScheduleRulel({ + scheduleid: this.scheduleid, + list: [ + { + termid: this.deviceListData.zzid, + channelidlist: this.checkList, + }, + ], }) - .catch((err) => { - this.$message.error("添加失败"); - }); + .then((res) => { + this.isShowset = false; + this.$message.success("添加成功"); + 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("添加失败"); + // }); }, display() { this.isShow = true; @@ -404,6 +392,7 @@ export default { .flexonly { display: flex; flex-wrap: wrap; + align-content: flex-start; } .flexno { display: flex; diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index 3e09d5a..b47630e 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -38,9 +38,9 @@ :terminalPhoto="terminalPhoto" v-if="terminalPhoto.length > 0" > -
+
@@ -79,9 +79,33 @@ 时间表设置 - 手动拍照 + > --> + + + 手动拍照 + + + {{ item.label }} + + + + + 手动拍视频 + + + {{ item.label }} + +