diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue index ae213e3..811e68d 100644 --- a/src/views/components/carouselChart.vue +++ b/src/views/components/carouselChart.vue @@ -212,6 +212,7 @@ export default { }, data() { return { + localPhoto: this.terminalPhoto, OptionssalseImg: { inline: false, button: true, @@ -255,18 +256,18 @@ export default { }; }, mounted() { - console.log(this.terminalPhoto); - this.mediaType = this.terminalPhoto[0].mediaType; - this.bigPicPath = this.terminalPhoto[0].path + "!1366x768"; - this.bigArr = this.terminalPhoto[0]; - // this.bigPicPath = this.terminalPhoto[0].path + "!1366x768"; - this.fiveList = this.terminalPhoto.slice(this.page - 1, this.pagesize); - this.total = this.terminalPhoto.length / this.pagesize; + console.log(this.localPhoto); + this.mediaType = this.localPhoto[0].mediaType; + this.bigPicPath = this.localPhoto[0].path + "!1366x768"; + this.bigArr = this.localPhoto[0]; + // this.bigPicPath = this.localPhoto [0].path + "!1366x768"; + this.fiveList = this.localPhoto.slice(this.page - 1, this.pagesize); + this.total = this.localPhoto.length / this.pagesize; console.log(this.fiveList); //this.alarmList = this.fiveList[0].alarmlist; this.alarmList = this.fiveList[0].alarmlist; - console.log(this.alarmList[0]); - if (this.alarmList.length !== 0) { + + if (this.alarmList !== undefined && this.alarmList.length !== 0) { this.$nextTick(() => { this.drawlineBig(this.alarmList[0]); }); @@ -294,10 +295,10 @@ export default { watch: { terminalPhoto: function (newVal, oldVal) { console.log("我是图片我变了"); - this.terminalPhoto = oldVal.concat(newVal); - this.bigPicPath = this.terminalPhoto[0].path + "!1366x768"; - this.fiveList = this.terminalPhoto.slice(this.page - 1, this.pagesize); - this.total = this.terminalPhoto.length / this.pagesize; + this.localPhoto = oldVal.concat(newVal); + this.bigPicPath = this.localPhoto[0].path + "!1366x768"; + this.fiveList = this.localPhoto.slice(this.page - 1, this.pagesize); + this.total = this.localPhoto.length / this.pagesize; //this.drawlineBig(this.terminalPhoto[0].alarmList[0]) }, }, diff --git a/src/views/components/carouselChartmore.vue b/src/views/components/carouselChartmore.vue index 7640f3a..f731617 100644 --- a/src/views/components/carouselChartmore.vue +++ b/src/views/components/carouselChartmore.vue @@ -281,15 +281,18 @@ export default { //this.alarmList = this.fiveList[0].alarmlist; this.alarmList = this.fiveList[0].alarmlist; console.log(this.alarmList[0]); - this.$nextTick(() => { - this.handleBigpic(this.bigArr, 0); - setTimeout(() => { - this.$nextTick(() => { - this.drawlineBig(this.alarmList[0]); - }); - }, 100); - console.log("执行绘制"); - }); + if (this.alarmList !== undefined && this.alarmList.length !== 0) { + this.$nextTick(() => { + this.handleBigpic(this.bigArr, 0); + setTimeout(() => { + this.$nextTick(() => { + this.drawlineBig(this.alarmList[0]); + }); + }, 100); + console.log("执行绘制"); + }); + } + //获取points getCoordinate({ channelId: diff --git a/src/views/realTimeMonitor/index copy.vue b/src/views/realTimeMonitor/index copy.vue new file mode 100644 index 0000000..adc5087 --- /dev/null +++ b/src/views/realTimeMonitor/index copy.vue @@ -0,0 +1,1686 @@ + + + + + diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index 8f586a0..edc99e5 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -3,21 +3,6 @@
-
- - 全部 - 收藏 - -
- - - -
-
-
+
+ + + +
+
全部 在线 @@ -40,94 +34,58 @@ >刷新
-
- - - - - - {{ node.label }} - + + + + + {{ node.label }} - - - - - - {{ node.label }} - - - - - {{ node.label }} - - - - - {{ node.label }} + + - - - -
+ +
@@ -371,7 +329,6 @@ import setschedule from "./components/setschedule.vue"; import infoDialog from "./components/infoDialog.vue"; import gpsPosition from "./components/gpsPosition.vue"; import morePicPreveiw from "./components/morePicPreveiw.vue"; - import { number } from "echarts"; export default { components: { @@ -438,22 +395,10 @@ export default { selectTowerId: "", currentData: "", //保存选中的数据 zzradio: -1, - - favorVal: -1, //收藏夹默认选中 - showFavor: false, - collectFlag: false, - favorData: [ - { - id: 1, - name: "收藏夹", - list: [], - }, - ], + collectFlag: false, //收藏 }; }, watch: { - //增量刷新内容 - filterText(val) { console.log(val); this.$refs.tree.filter(val); @@ -491,22 +436,6 @@ export default { }, 300000); }, methods: { - //获取收藏 - getfavRadio() { - console.log("点击了收藏"); - console.log(this.showFavor); - console.log(this.favorVal); - if (this.favorVal == -1) { - console.log("全部"); - this.showFavor = false; - this.getLineTreeList(); - } else { - console.log("收藏"); - this.showFavor = true; - this.getFavorTreeList(); - } - }, - // //获取当前选中的radio getRadio() { console.log(this.zzradio); @@ -525,13 +454,12 @@ export default { // }, //点击当前选中的treenode handleNodeClick(data) { - console.log("我点击了收藏了在次回来了"); this.clearfun(); console.log(data); - - localStorage.setItem("currentData", JSON.stringify(data)); - data = JSON.parse(localStorage.getItem("currentData")); - + if (data.name == "收藏夹") { + // this.$refs.tree.setCurrentKey(this.selectData.id); + return; + } this.selectData = data; this.zztermId = data.id; this.zzprotocol = data.protocol; @@ -550,7 +478,7 @@ export default { //this.getPicList(data.id, this.type); this.$refs.previewRef.getPicList(data.id, this.type, this.page); - } else if (data.bsManufacturer) { + } else if (data.bsManufacturer && data.bsManufacturer !== "收藏夹") { this.LineFlag = true; this.towerFlag = false; console.log("线路"); @@ -625,7 +553,6 @@ export default { ) { console.log("aaa"); this.currentNodekey = this.currentData.id; - this.handleNodeClick(this.currentData); } else { console.log("diyici"); @@ -645,74 +572,52 @@ export default { this.$nextTick(() => { this.$refs.tree.setCurrentKey(this.currentNodekey); //一定要加这个选中了否则样式没有出来 }); + // } + // if (this.zzradio == -1) { + // this.lineTreeData = this.lineTreeData; + // } else if (this.zzradio == 1) { + // //在线 + // var data = JSON.parse(JSON.stringify(this.lineTreeData)); + // console.log(data); + // const filterId = (data, id) => { + // if (!Array.isArray(data)) { + // return data; + // } + // return data.filter((item) => { + // if ("list" in item) { + // item.list = filterId(item.list, id); + // } + // return item.onlinestatus !== 0; + // }); + // }; + // const filtredData = filterId(data); + // console.log(filtredData); + // this.lineTreeData = filtredData; + // } else if (this.zzradio == 0) { + // //离线 + // var data = JSON.parse(JSON.stringify(this.lineTreeData)); + // console.log(data); + // const filterId = (data, id) => { + // if (!Array.isArray(data)) { + // return data; + // } + // return data.filter((item) => { + // if ("list" in item) { + // item.list = filterId(item.list, id); + // } + // return item.onlinestatus !== 1; + // }); + // }; + // const filtredData = filterId(data); + // console.log(filtredData); + // this.lineTreeData = filtredData; + // } }) .catch((err) => { console.log(err); //代码错误、请求失败捕获 }); }, - //获取收藏夹结构数据 - getFavorTreeList() { - getdyTreeListJoggle({ type: this.zzradio }) - .then((res) => { - console.log(res); - this.favorData[0].list = res.data.favorlist; - console.log(this.favorData); - this.onlineNum = res.data.onlineNum; - this.totalNum = res.data.totalNum; - this.currentData = this.favorData[0].list[0]; - console.log(this.currentData); - this.handleFavorNodeClick(this.currentData); - this.$nextTick(() => { - this.$refs.favortree.setCurrentKey(this.currentData.id); //一定要加这个选中了否则样式没有出来 - }); - }) - .catch((err) => { - console.log(err); //代码错误、请求失败捕获 - }); - }, - getupdateFavorTreeList() { - getdyTreeListJoggle({ type: this.zzradio }) - .then((res) => { - console.log(res); - this.favorData[0].list = res.data.favorlist; - console.log(this.favorData); - }) - .catch((err) => { - console.log(err); //代码错误、请求失败捕获 - }); - }, - handleFavorNodeClick(data) { - this.clearfun(); - console.log(data, "11111111"); - this.selectData = data; - this.zztermId = data.id; - this.zzprotocol = data.protocol; - this.CurrentData = data; - //this.previewData = data; - if (data.isfavor == 0 || data.isfavor == null) { - this.collectFlag = false; - } else { - this.collectFlag = true; - } - console.log(this.collectFlag, "22222222"); - if (data.name == "收藏夹") { - return; - } else { - console.log("杆塔"); - this.LineFlag = false; - this.towerFlag = true; - this.towertitle = data.name; - this.zzCmdid = data.cmdid; - //this.previewData = data; - if (data.isfavor == 0 || data.isfavor == null) { - this.collectFlag = false; - } else { - this.collectFlag = true; - } - this.getChannelList(data.id); - // this.getTerminalPhotoList(id, date, data.id); - } - }, + //获取通道的接口 getChannelList(id) { getChannelByTermidJoggle({ termid: id }) @@ -825,13 +730,9 @@ export default { }).then(() => { this.collectFlag = true; addFavorList({ list: [this.zztermId], type: 1 }).then((res) => { - this.getfavRadio(); + this.getLineTreeStatus(); }); - this.currentData = JSON.parse(localStorage.getItem("currentData")); - console.log("我是添加收藏成功时的数据", this.currentData); - this.currentData.isfavor = 1; - console.log("我是改变了之后的只需要更新", this.currentData); - localStorage.setItem("currentData", JSON.stringify(this.currentData)); + this.$message({ type: "success", message: "添加成功!", @@ -845,14 +746,9 @@ export default { }).then(() => { this.collectFlag = false; addFavorList({ list: [this.zztermId], type: 0 }).then((res) => { - this.getfavRadio(); + this.getLineTreeStatus(); }); - this.currentData = JSON.parse(localStorage.getItem("currentData")); - console.log("我是添加收藏成功时的数据", this.currentData); - this.currentData.isfavor = 0; - console.log("我是改变了之后的只需要更新", this.currentData); - localStorage.setItem("currentData", JSON.stringify(this.currentData)); this.$message({ type: "success", message: "取消收藏!", @@ -1427,68 +1323,30 @@ export default { //border-right: 1px solid @border-color-base; display: flex; flex-direction: column; - // padding: 16px 0px; - .barHead { - width: calc(100% - 12px); - height: 32px; - background: linear-gradient(180deg, #4cdbc8 10%, #128071); - line-height: 32px; - display: flex; - align-items: center; - padding-left: 12px; + padding: 16px 0px; + .searchBar { + width: 94%; + margin: 0 auto; margin-bottom: 8px; - .el-divider--vertical { - width: 2px; - margin-left: 0px; - } - h2 { - color: #fff; - font-size: 16px; - font-weight: normal; - } } - .tabMenu { + .deviceNum { + width: 94%; + margin: 0 auto; margin-bottom: 8px; - padding-left: 12px; - display: flex; - align-items: center; - justify-content: space-between; - margin-top: 8px; - .el-radio-group { - .el-radio-button { - margin-right: 12px; - .el-radio-button__inner { - border-radius: 4px; - border: 1px solid #dcdfe6; - box-shadow: none; - } + height: 20px; + line-height: 20px; + font-size: 12px; + .el-statistic { + display: flex; + justify-content: center; + align-items: center; + .head { } - } - .deviceNum { - // width: 94%; - // margin: 0 auto; - // margin-bottom: 8px; - height: 20px; - line-height: 20px; - font-size: 12px; - .el-statistic { - display: flex; - justify-content: center; - align-items: center; - .head { - } - .con { - color: #169e8c; - } + .con { + color: #169e8c; } } } - .searchBar { - width: 94%; - margin: 0 auto; - margin-bottom: 8px; - } - .radioFilter { width: 94%; margin: 0 auto; @@ -1507,11 +1365,9 @@ export default { } } } - .treeboxAll { + .el-tree { overflow-y: auto; overflow-x: hidden; - } - .el-tree { .el-tree-node__content { height: 32px; font-size: 12px;