diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue index 8cf3cc2..5244ecd 100644 --- a/src/views/components/carouselChart.vue +++ b/src/views/components/carouselChart.vue @@ -6,25 +6,8 @@ :options="swiperOptionTop" ref="swiperTop" > - - - - - - -
- -
- + +
`; + } else { + return `
`; + } + }, }, }, swiperOptionThumbs: { spaceBetween: 10, centeredSlides: true, slidesPerView: "auto", - touchRatio: 0.2, - lazyLoading: true, //懒加载开启 slideToClickedSlide: true, lazy: { loadPrevNext: true, loadPrevNextAmount: 5, loadOnTransitionStart: true, - //loadOnTransitionStart: true, }, - observer: true, //修改swiper自己或子元素时，自动初始化swiper - observeParents: true, //修改swiper的父元素时，自动初始化swiper - onSlideChangeEnd: function (swiper) { - swiper.update(); - }, - //loop: true, - //loopedSlides: 4, }, }; }, @@ -163,8 +140,16 @@ export default { swiperThumbs.controller.control = swiperTop; }); }, - methods: {}, + watch: { + terminalPhoto: function (newVal, oldVal) { + this.swiperOptionTop.virtual.slides = newVal; + }, + }, + created() { + console.log(this.swiperOptionTop.virtual.slides); + this.swiperOptionTop.virtual.slides = this.terminalPhoto; + }, }; diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue index 0322539..c2cb457 100644 --- a/src/views/realTimeMonitor/components/setschedule.vue +++ b/src/views/realTimeMonitor/components/setschedule.vue @@ -116,7 +116,7 @@ width="680px" append-to-body > - - + -->
-

装置信息

+

时间表规则

- - - 12:00:07 - - 16:00:07 +

时间表名称：{{ timeName }}

+ + {{ + val.startTime + }} + {{ + val.endTime + }} - 60 + {{ val.span }}

选择通道

- + + + + + + +
@@ -213,6 +246,10 @@ export default { parmsList: [], //所选装置下通道参数 scheduleid: 0, //所选时间表id checkList: [], + + //设置-获取所有通道 + timeName: "", + scheduleInfo: [], }; }, mounted() {}, @@ -226,6 +263,7 @@ export default { getChannelListJoggle({ termid: id }) .then((res) => { this.accesslist = res.data.list; + console.log(this.accesslist); this.selaccess = res.data.list[0].channelid; }) .catch((err) => {}); @@ -255,6 +293,7 @@ export default { .then((res) => { this.deviceTableData = res.data.list; this.total = res.data.total; + console.log(this.deviceTableData); this.loading = false; }) .catch((err) => {}); @@ -269,9 +308,15 @@ export default { this.loading = true; this.scheduleid = val.id; this.isShowset = true; + 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; }) .catch((err) => {}); @@ -317,6 +362,12 @@ export default { // console.log(this.parmsList); return this.parmsList; }, + //选择通道 + handleChange() { + //console.log(this.listnr); + console.log(this.checkList); + // this.$refs.tree.setCheckedKeys(this.checkedAisle); + }, // 保存确定操作 submitForm() { this.getCheckedNodes(); @@ -421,6 +472,9 @@ export default { font-size: 16px; line-height: 24px; } + .timename { + margin: 8px 0px; + } } } } diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index c237e81..63fae84 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -36,7 +36,8 @@
图片总数：{{ totalPic }}张 @@ -146,6 +147,7 @@ export default { }, data() { return { + flag: true, onlinestatus: "", //设备状态 showBigPic: true, defaultKey: "", @@ -226,17 +228,11 @@ export default { this.currentNodekey = this.lineTreeData[0].list[0].list[0].id; //第一个数据 this.newTermId = this.lineTreeData[0].list[0].list[0].id; - console.log(this.currentNodekey); - console.log("ssssssssssssssssss"); - console.log(this.newTermId); - console.log("ssssssssssssssssss"); this.cmdid = this.lineTreeData[0].list[0].list[0].cmdid; - console.log(this.cmdid); + this.$nextTick(() => { this.$refs.tree.setCurrentKey(this.currentNodekey); //一定要加这个选中了否则样式没有出来 - console.log(this.currentNodekey); this.channelId = this.currentNodekey; - console.log(this.channelId); this.getChannelList(this.channelId); //获取通道id接口 }); } @@ -255,10 +251,8 @@ export default { this.channelId = data.id; //获取当前点击的id this.cmdid = data.cmdid; this.newTermId = data.id; //获取当前点击的id + console.log(data); - console.log("1111"); - console.log(this.newTermId, this.channelId); - console.log("1111"); this.channelValue = []; this.channelOption = []; this.getChannelList(this.channelId); //获取通道id接口 @@ -315,8 +309,11 @@ export default { this.totalPic = 0; } else { this.terminalPhoto = res.data.list; - this.totalPic = res.data.num; } + + console.log(this.terminalPhoto.length); + this.totalPic = res.data.num; + //this.$refs.a.getphotodata(this.terminalPhoto); this.loading = false; console.log(this.terminalPhoto); }) @@ -340,6 +337,7 @@ export default { this.$refs.setschedule_ref.display(); this.$refs.setschedule_ref.getSingleAccess(this.channelId); this.$refs.setschedule_ref.deviceList(); + console.log(); }, handleShowErr() { this.$message({ diff --git a/vue.config.js b/vue.config.js index ccdd126..8532faf 100644 --- a/vue.config.js +++ b/vue.config.js @@ -24,22 +24,13 @@ module.exports = defineConfig({ //表示拦截以/api开头的请求路径 //target: 'http://localhost:1234', //本地nodejs服务器 target: "http://47.96.238.157:8093", //公司项目服务器环境 + //target: "http://180.166.218.222:40080", //dell //target: 'http://180.166.218.222:7200', changOrigin: true, //是否开启跨域 pathRewrite: { "^/api": "", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的 }, }, - // [process.env.VUE_APP_BASE_API]: { - // //表示拦截以/api开头的请求路径 - // //target: 'http://localhost:1234', //本地nodejs服务器 - // target: "http://47.96.238.157:8093", //公司项目服务器环境 - // //target: 'http://180.166.218.222:7200', - // changOrigin: true, //是否开启跨域 - // pathRewrite: { - // ["^" + process.env.VUE_APP_BASE_API]: "", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的 - // }, - // }, }, }, });