diff --git a/public/img/cad/1-1F.jpg b/public/img/cad/1-1F.jpg new file mode 100644 index 0000000..770d013 Binary files /dev/null and b/public/img/cad/1-1F.jpg differ diff --git a/public/img/cad/2-1F.jpg b/public/img/cad/2-1F.jpg new file mode 100644 index 0000000..e375101 Binary files /dev/null and b/public/img/cad/2-1F.jpg differ diff --git a/public/img/cad/3-1F.jpg b/public/img/cad/3-1F.jpg new file mode 100644 index 0000000..f27317d Binary files /dev/null and b/public/img/cad/3-1F.jpg differ diff --git a/public/img/cad/4-1F.jpg b/public/img/cad/4-1F.jpg new file mode 100644 index 0000000..ab11310 Binary files /dev/null and b/public/img/cad/4-1F.jpg differ diff --git a/public/img/cad/5-1F.jpg b/public/img/cad/5-1F.jpg new file mode 100644 index 0000000..5c308c0 Binary files /dev/null and b/public/img/cad/5-1F.jpg differ diff --git a/public/img/cad/6-1F.jpg b/public/img/cad/6-1F.jpg new file mode 100644 index 0000000..f53549d Binary files /dev/null and b/public/img/cad/6-1F.jpg differ diff --git a/src/api/equipment/drawClassify.js b/src/api/equipment/drawClassify.js new file mode 100644 index 0000000..7287512 --- /dev/null +++ b/src/api/equipment/drawClassify.js @@ -0,0 +1,39 @@ +import request from "@/router/axios"; + +// 获取图纸分类列表 +export const getList = (query) => { + return request({ + url: "/api/blade-desk/drawe/class/list", + method: "get", + params: query, + }); +}; + +// 新增图纸分类 +export const addClassify = (data) =>{ + return request({ + url:'/api/blade-desk/drawe/class/save', + method:'post', + data + }) +} + +// 编制图纸分类 +export const editClassify = (data) =>{ + return request({ + url:"/api/blade-desk/drawe/class/update", + method:'post', + data + }) +} + +// 删除图纸分类 +export const deleteClassify = (ids) =>{ + return request({ + url:'/api/blade-desk/drawe/class/remove', + method:'post', + params:{ + ids + } + }) +} \ No newline at end of file diff --git a/src/api/equipment/drawManage.js b/src/api/equipment/drawManage.js new file mode 100644 index 0000000..c6e971d --- /dev/null +++ b/src/api/equipment/drawManage.js @@ -0,0 +1,57 @@ +import request from "@/router/axios"; + +// 获取字典数据 +export const getDict = (query) =>{ + return request({ + url:'/api/blade-system/dict-biz/child-list', + method:'get', + params:query + }) +} + +// 获取图纸列表 +export const getDrawList = (query) => { + return request({ + url: "/api/blade-desk/drawe/list", + method: "get", + params: query, + }); +}; + +// 上传图纸 +export const addDraw = (data) =>{ + return request({ + url:"/api/blade-desk/drawe/save", + method:'post', + data + }) +} + +// 编辑图纸 +export const editDraw = (data) =>{ + return request({ + url:'/api/blade-desk/drawe/update', + method:'post', + data + }) +} + +// 图纸删除 +export const deleteDraw = (ids) =>{ + return request({ + url:'/api/blade-desk/drawe/remove', + method:'post', + params:{ + ids + } + }) +} + +// 树状结构数据 +export const getTerrData = (query) =>{ + return request({ + url:'/api/blade-desk/drawe/class/tree', + method:'get', + params:query + }) +} \ No newline at end of file diff --git a/src/components/monitoring/backHome.vue b/src/components/monitoring/backHome.vue index 94c7b73..9856123 100644 --- a/src/components/monitoring/backHome.vue +++ b/src/components/monitoring/backHome.vue @@ -94,6 +94,8 @@ // if(this.type != '监控'){ bfHelper.clearTags() // } + + console.log('返回') if (this.bimModel == 1) { window.sessionStorage.removeItem('build'); diff --git a/src/components/monitoring/clickCp.vue b/src/components/monitoring/clickCp.vue index c732524..d0aaef5 100644 --- a/src/components/monitoring/clickCp.vue +++ b/src/components/monitoring/clickCp.vue @@ -4,87 +4,87 @@
1# + @click="clickBtn(1, 0,null,'build')">1#
2# + @click="clickBtn(2, 1,null,'build')">2#
3# + @click="clickBtn(3, 2,null,'build')">3#
4# + @click="clickBtn(4, 3,null,'build')">4#
5# + @click="clickBtn(5, 4,null,'build')">5#
6# + @click="clickBtn(6, 5,null,'build')">6#
1F + @click="clickBtn(7, 0, 1,'floor')">1F
1F + @click="clickBtn(8, 1, 1,'floor')">1F
1F + @click="clickBtn(9, 2, 1,'floor')">1F
1F + @click="clickBtn(10, 3, 1,'floor')">1F
1F + @click="clickBtn(11, 4, 1,'floor')">1F
1F + @click="clickBtn(12, 5, 1,'floor')">1F
2F + @click="clickBtn(13, 0, 2,'floor')">2F
2F + @click="clickBtn(14, 1, 2,'floor')">2F
2F + @click="clickBtn(15, 2, 2,'floor')">2F
2F + @click="clickBtn(16, 3, 2,'floor')">2F
2F + @click="clickBtn(17, 4, 2,'floor')">2F
2F + @click="clickBtn(18, 5, 2,'floor')">2F
3F + @click="clickBtn(19, 0, 3,'floor')">3F
3F + @click="clickBtn(20, 1, 3,'floor')">3F
3F + @click="clickBtn(21, 2, 3,'floor')">3F
3F + @click="clickBtn(22, 3, 3,'floor')">3F
3F + @click="clickBtn(23, 4, 3,'floor')">3F
3F + @click="clickBtn(24, 5, 3,'floor')">3F
-
+
园区
-
+
地下室
@@ -96,25 +96,25 @@ --> - 辅楼 - 1F - 2F + 辅楼 + 1F + 2F
- 塔楼 + 塔楼
- 园区 + 园区
-
+ +
+ 图纸预览
+
+ {{item.draweClassName}} +
+ import * as bfHelper from '../../util/bfHelper'; import ElImageViewer from 'element-ui/packages/image/src/image-viewer' +import {getDrawList} from '@/api/equipment/drawManage' export default { components: { ElImageViewer }, props: { @@ -197,6 +228,8 @@ export default { wuding: ['../../../img/cad/7Q/7QP010.png','../../../img/cad/7Q/7QP011.png','../../../img/cad/7Q/7QP012.png'], qita: ['../../../img/cad/5C/5CS001.png','../../../img/cad/5C/5CS002.png','../../../img/cad/5C/5CS003.png','../../../img/cad/5C/5CS004.png','../../../img/cad/5C/5CS005.png','../../../img/cad/peidianxaing/8LS001.png','../../../img/cad/peidianxaing/qiangdian.png','../../../img/cad/7Q/7QP012.png'], }, + imgType:'', + isShowType:false, //使用el-image-viewer图纸路径写法 // cardImg: { // peidian: ['/img/cad/peidian/4DS001.png','/img/cad/peidian/4DS002.png','/img/cad/peidian/4DS003.png','/img/cad/peidian/4DS004.png','/img/cad/peidian/4DS005.png'], @@ -211,10 +244,10 @@ export default { showViewer: false, url: '', srcList: [], - active: 25, + active: '', tower: null, layer: null, - ttActive: 20, + ttActive: '', num: 0, cameraPosition: bfHelper.cameraPosition, ttCameraPosition: [ @@ -270,17 +303,97 @@ export default { version: 1, zoom: 1 } - ] + ], + type:'', // isMapViewer:0 + typeList:[], + area:'' } }, + // watch:{ + // active: { + // handler(newVal, oldVal) { + // console.log('进入此监听') + // this.getTypeList(newVal,'build',1) + // } + // } + // }, + mounted(){ + setTimeout(() =>{ + this.active = this.active == '' ? 25 : this.active + this.ttActive = this.ttActive == '' ? 20 : this.ttActive + this.type = this.type == '' ? 'build' : this.type + this.area = this.area == '' ? 1 : this.area + console.log('进入此方法111111111111111',this.active) + if(this.area == 1){ + this.getTypeList(this.active,this.type,this.area) + }else{ + this.getTypeList(this.ttActive,this.type,this.area) + } + },500) + + }, methods: { + // 根据楼号获取分类列表 + getTypeList(activeNum,type,area){ + console.log('activeNum ====>',activeNum,'type =====>',type,'area ====>',area,'active ====>',this.active,'ttActive ===>',this.ttActive,'build ======>',this.build) + this.area = area + // this.active = active + if(type == 'build'){ + this.typeList = []; + let val = (activeNum == '' && area == 1) ? this.active : (activeNum == '' && area == 2) ? this.ttActive : activeNum + getDrawList({current:1,size:200,type:area,build:val}).then(res =>{ + console.log('res ======>',res) + let arr = this.removeDup(res.data.data.records) + console.log('arr ============>',arr) + if(arr.length == 0){ + this.typeList = [] + }else{ + arr.map(item =>{ + this.typeList.push(item) + }) + } + console.log('typeList ====>',this.typeList) + }) + }else if(type == 'floor'){ + this.typeList = []; + let val = (activeNum == '' && area == 1) ? this.active : (activeNum == '' && area == 2) ? this.ttActive : activeNum + getDrawList({current:1,size:200,type:area,floor:val}).then(res =>{ + console.log('res ======>',res) + let arr = this.removeDup(res.data.data.records) + arr.map(item =>{ + this.typeList.push(item) + }) + console.log('typeList ====>',this.typeList) + }) + } + console.log('active ====>',this.active) + + }, + // 数组去重 + removeDup(tempArr) { + let newArr = [] + for (let i = 0; i < tempArr.length; i++) { + if (newArr.indexOf(tempArr[i].draweClassName) == -1) { + newArr.push(tempArr[i].draweClassName) + } else { + tempArr.splice(i, 1) + i-- // 这个别忘咯 + } + } + return tempArr + }, + previewImg(){ + this.isShowType = !this.isShowType + }, //图纸 openPreview(key) { if([7,8,9,10,11,12].indexOf(key) > -1) { //1F - this.url = this.cardImg[1][0]; - this.srcList = this.cardImg[1]; + // this.url = this.cardImg[1][0]; + // this.srcList = this.cardImg[1]; + this.url = key == 7 ? '../../../img/cad/1-1F.jpg' : key == 8 ? '../../../img/cad/2-1F.jpg' : key == 9 ? '../../../img/cad/3-1F.jpg' : key == 10 ? '../../../img/cad/4-1F.jpg' : key == 11 ? '../../../img/cad/5-1F.jpg' : key == 12 ? '../../../img/cad/6-1F.jpg' : '../../../img/cad/6-1F.jpg'; + this.srcList = [this.url]; } else if([13,14,15,16,17,18].indexOf(key) > -1) { //2F this.url = this.cardImg[2][0]; @@ -304,16 +417,53 @@ export default { this.$refs.preview.clickHandler(); }, 500) }, + // 点击分类按钮获取图纸 + clickPreview(item){ + console.log('item ====>',item) + if(this.type == 'build'){ + getDrawList({current:1,size:200,type:this.area,build:item.build,draweClassId:item.draweClassId}).then(res =>{ + console.log('图纸res ======>',res) + let str = res.data.data.records.map((item) => { + return item.url + }).join(',') + let arr = str.split(',') + this.srcList = arr; + this.url = this.srcList[0] + setTimeout(() =>{ + this.$refs.preview.clickHandler(); + this.isShowType = false + },500) + }) + }else if(this.type == 'floor'){ + getDrawList({current:1,size:200,type:this.area,build:item.build,floor:item.floor,draweClassId:item.draweClassId}).then(res =>{ + console.log('图纸res1 ======>',res) + let str = res.data.data.records.map((item) => { + return item.url + }).join(',') + let arr = str.split(',') + this.srcList = arr; + this.url = this.srcList[0] + setTimeout(() =>{ + this.$refs.preview.clickHandler(); + this.isShowType = false + },500) + }) + } + }, closeViewer() { this.showViewer = false; }, - clickBtn(activeNum, tower, layer) { + clickBtn(activeNum, tower, layer,type) { + console.log('进入此方法') + this.isShowType = false; + this.getTypeList(activeNum,type,1) if (this.sbType == '空调' && activeNum <= 6) { return false; } this.num++; let build = window.sessionStorage.getItem('build'); let floor = window.sessionStorage.getItem('floor'); + // if(build){ // // window.sessionStorage.setItem('camera',JSON.stringify(bfHelper.getCameraStatus())); // }else{ @@ -323,6 +473,8 @@ export default { // } window.sessionStorage.setItem('build', tower != null ? tower + 1 : '26'); window.sessionStorage.setItem('floor', layer); + window.sessionStorage.setItem('type', type); + bfHelper.setOpacityFun(); this.$parent.isControl = false; @@ -338,6 +490,7 @@ export default { this.active = activeNum; this.tower = tower; + this.type = type if (this.sbType == '空开' && activeNum != 25) { bfHelper.lookPipeline2(null, null, tower, @@ -601,13 +754,18 @@ export default { } } + + }, - clickTt(num) { + clickTt(num,type) { this.ttActive = num; + this.isShowType = false; + this.getTypeList(num,type,2) let camera = this.ttCameraPosition[num] window.sessionStorage.setItem('ttcamera', JSON.stringify(camera)); window.sessionStorage.setItem('ttbuild', num); + window.sessionStorage.setItem('tttype', type); if (num == 20) { bfHelper.resetStatus(2); bfHelper.TtLookEquipmentCop(this.sbType, this.checkList); @@ -676,7 +834,11 @@ export default { // } } - } + }, + beforeDestroy(){ + window.sessionStorage.removeItem('tttype'); + window.sessionStorage.removeItem('type'); + }, } diff --git a/src/components/monitoring/conditioner.vue b/src/components/monitoring/conditioner.vue index ef20362..b01133a 100644 --- a/src/components/monitoring/conditioner.vue +++ b/src/components/monitoring/conditioner.vue @@ -477,12 +477,17 @@ export default { this.setTowerKT("07"); this.$refs.clickcp.active = 26; this.$refs.clickcp.tower = 9; + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; }, 300); bfHelper.lookPipeline2(null, null, build - 1, null, "空调"); // bfHelper.setCameraStatus(bfHelper.lightCamera[6]); } else if (build == 26) { // bfHelper.resetStatus(2); bfHelper.lookEquipmentCop("空调"); + this.$refs.clickcp.active = 26; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.area = 1; setTimeout(() => { this.setTowerKT(); this.initial(); @@ -490,13 +495,15 @@ export default { bfHelper.setOpacityFun(); } else { console.log(build, floor, "=======================") - if (floor.indexOf("undefined") == -1) { + if (floor.indexOf("null") == -1) { setTimeout(() => { this.setTowerKT("0" + build, "0" + floor); this.$refs.clickcp.active = commonValue.activeValue( Number(build), Number(floor) ); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'floor'; this.$refs.clickcp.tower = commonValue.towerValue(build); }, 300); bfHelper.lookPipeline2( @@ -513,6 +520,8 @@ export default { Number(build), null ); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; this.$refs.clickcp.tower = commonValue.towerValue(build); }, 300); bfHelper.lookPipeline2(null, null, build - 1, null, "空调"); @@ -523,6 +532,10 @@ export default { bfHelper.lookEquipmentCop("空调"); this.getNavigationMap(); bfHelper.setOpacityFun(); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.active = 25; + this.$refs.clickcp.getTypeList(25,'build',1) // setTimeout(() => { this.initial(); // },300) diff --git a/src/components/monitoring/door.vue b/src/components/monitoring/door.vue index 80ef3db..88ca5a3 100644 --- a/src/components/monitoring/door.vue +++ b/src/components/monitoring/door.vue @@ -464,6 +464,8 @@ export default { setTimeout(() => { this.setTowerDoor("07"); this.$refs.clickcp.active = 26; + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; this.$refs.clickcp.tower = 9; }, 300); bfHelper.lookPipeline2( @@ -475,18 +477,23 @@ export default { ); } else if (build == 26) { bfHelper.lookPipeline(null, null, this.condition, "电子门禁"); + this.$refs.clickcp.active = 26; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.area = 1; bfHelper.setOpacityFun(); setTimeout(() => { this.setTowerDoor(); }, 300); } else { - if (floor.indexOf("undefined") == -1) { + if (floor.indexOf("null") == -1) { setTimeout(() => { this.setTowerDoor("0" + build, "0" + floor); this.$refs.clickcp.active = commonValue.activeValue( Number(build), Number(floor) ); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'floor'; this.$refs.clickcp.tower = commonValue.towerValue(build); }, 300); bfHelper.lookPipeline2( @@ -503,6 +510,8 @@ export default { Number(build), null ); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; this.$refs.clickcp.tower = commonValue.towerValue(build); }, 300); bfHelper.lookPipeline2( @@ -518,6 +527,10 @@ export default { // 查看管线 bfHelper.lookPipeline(null, null, this.condition, "电子门禁"); bfHelper.setOpacityFun(); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.active = 25; + this.$refs.clickcp.getTypeList(25,'build',1) this.getNavigationMap(); // this.initial() } @@ -534,12 +547,16 @@ export default { bfHelper.TtLookEquipmentCop("电子门禁"); setTimeout(() => { this.setTowerDoor(); + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; }, 300); } else if (ttbuild == 0) { //塔楼 setTimeout(() => { this.setTowerDoor("08"); this.$refs.clickcp.ttActive = 0; + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; }, 300); bfHelper.ttLookPipeline2( null, @@ -553,6 +570,8 @@ export default { setTimeout(() => { this.setTowerDoor("09", "01"); this.$refs.clickcp.ttActive = 1; + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'floor'; }, 300); bfHelper.ttLookPipeline2( null, @@ -566,6 +585,8 @@ export default { setTimeout(() => { this.setTowerDoor("09", "02"); this.$refs.clickcp.ttActive = 2; + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'floor'; }, 300); bfHelper.ttLookPipeline2( null, @@ -579,6 +600,8 @@ export default { setTimeout(() => { this.setTowerDoor("09"); this.$refs.clickcp.ttActive = 3; + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; }, 300); bfHelper.ttLookPipeline2( null, @@ -591,6 +614,9 @@ export default { } else { // 查看管线 bfHelper.TtLookEquipmentCop("电子门禁"); + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.getTypeList(20,'build',2); bfHelper.setOpacityFun1(); } } diff --git a/src/components/monitoring/electricity.vue b/src/components/monitoring/electricity.vue index f9b3298..fbf5f2e 100644 --- a/src/components/monitoring/electricity.vue +++ b/src/components/monitoring/electricity.vue @@ -538,6 +538,8 @@ export default { //build,floor 浏览器存储是否是单层加载 let build = sessionStorage.getItem("build"); let floor = sessionStorage.getItem("floor"); + let type = sessionStorage.getItem('type') ? sessionStorage.getItem('type') : 'build' + console.log('build =====>',build) //如果点击了楼 if (build) { if (build == 10) { @@ -545,6 +547,8 @@ export default { setTimeout(() => { this.setTower("07"); this.$refs.clickcp.active = 26; + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; this.$refs.clickcp.tower = 9; }, 300); lookPipeline2( @@ -559,6 +563,8 @@ export default { //如果点击的是园区 lookEquipmentCop("电"); this.$refs.clickcp.active = 26; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.area = 1; this.$refs.clickcp.tower = null; setTimeout(() => { this.setTower(); @@ -566,7 +572,7 @@ export default { setOpacityFun(); } else { - if (floor.indexOf("undefined") == -1) { + if (floor.indexOf("null") == -1) { //如果点击了层 setTimeout(() => { this.setTower("0" + build, "0" + floor); @@ -574,6 +580,8 @@ export default { Number(build), Number(floor) ); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'floor'; this.$refs.clickcp.tower = commonValue.towerValue(build); }, 300); @@ -593,6 +601,8 @@ export default { Number(build), null ); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; this.$refs.clickcp.tower = commonValue.towerValue(build); }, 300); lookPipeline2( @@ -607,6 +617,10 @@ export default { } } else { lookEquipmentCop("电"); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.active = 25; + this.$refs.clickcp.getTypeList(25,'build',1) setOpacityFun(false,0.3); this.getNavigationMap(); } @@ -617,18 +631,23 @@ export default { JSON.stringify(getCameraStatus()) ); let ttbuild = sessionStorage.getItem("ttbuild"); + let tttype = sessionStorage.getItem('tttype') ? sessionStorage.getItem('tttype') : 'build' if (ttbuild) { if (ttbuild == 20) { //园区 TtLookEquipmentCop("电"); setTimeout(() => { this.setTower(); + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; }, 300); } else if (ttbuild == 0) { //塔楼 setTimeout(() => { this.setTower("08"); this.$refs.clickcp.ttActive = 0; + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; }, 300); ttLookPipeline2( equipmentCondition[0], @@ -642,6 +661,8 @@ export default { setTimeout(() => { this.setTower("09", "01"); this.$refs.clickcp.ttActive = 1; + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'floor'; }, 300); ttLookPipeline2( equipmentCondition[0], @@ -655,6 +676,8 @@ export default { setTimeout(() => { this.setTower("09", "02"); this.$refs.clickcp.ttActive = 2; + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'floor'; }, 300); ttLookPipeline2( equipmentCondition[0], @@ -668,6 +691,8 @@ export default { setTimeout(() => { this.setTower("09"); this.$refs.clickcp.ttActive = 3; + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; }, 300); ttLookPipeline2( equipmentCondition[0], @@ -679,6 +704,10 @@ export default { } } else { TtLookEquipmentCop("电"); + this.$refs.clickcp.active = 20 + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.getTypeList(20,'build',2); setOpacityFun1(); } } diff --git a/src/components/monitoring/firefighting.vue b/src/components/monitoring/firefighting.vue index 2c1aa5c..ddb02df 100644 --- a/src/components/monitoring/firefighting.vue +++ b/src/components/monitoring/firefighting.vue @@ -363,12 +363,15 @@ export default { ); let build = sessionStorage.getItem("build"); let floor = sessionStorage.getItem("floor"); + let type = sessionStorage.getItem('type') ? sessionStorage.getItem('type') : 'build' if (build) { if (build == 10) { setTimeout(() => { this.setTowerFire("07"); this.$refs.clickcp.active = 26; this.$refs.clickcp.tower = 9; + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; }, 300); // console.log(this.checkList) bfHelper.lookPipeline2( @@ -382,19 +385,23 @@ export default { ); } else if (build == 26) { bfHelper.lookEquipmentCop("消防", this.checkList); + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.area = 1; setTimeout(() => { this.setTowerFire(); }, 300); bfHelper.setOpacityFun(); } else { - if (floor.indexOf("undefined") == -1) { + if (floor.indexOf("null") == -1) { setTimeout(() => { this.setTowerFire("0" + build, "0" + floor); this.$refs.clickcp.active = commonValue.activeValue( Number(build), Number(floor) ); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'floor'; this.$refs.clickcp.tower = commonValue.towerValue(build); }, 300); bfHelper.lookPipeline2( @@ -413,6 +420,8 @@ export default { Number(build), null ); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; this.$refs.clickcp.tower = commonValue.towerValue(build); }, 300); bfHelper.lookPipeline2( @@ -429,6 +438,10 @@ export default { } else { bfHelper.lookEquipmentCop("消防", this.checkList); bfHelper.setOpacityFun(); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.active = 25; + this.$refs.clickcp.getTypeList(25,'build',1) this.getNavigationMap(); } } else { @@ -438,18 +451,23 @@ export default { JSON.stringify(bfHelper.getCameraStatus()) ); let ttbuild = sessionStorage.getItem("ttbuild"); + let tttype = sessionStorage.getItem('tttype') ? sessionStorage.getItem('tttype') : 'build' if (ttbuild) { if (ttbuild == 20) { //园区 bfHelper.TtLookEquipmentCop("消防", this.checkList); setTimeout(() => { this.setTowerFire(); + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; }, 300); } else if (ttbuild == 0) { //塔楼 setTimeout(() => { this.setTowerFire("08"); this.$refs.clickcp.ttActive = 0; + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; }, 300); bfHelper.ttLookPipeline2( null, @@ -464,6 +482,8 @@ export default { setTimeout(() => { this.setTowerFire("09", "01"); this.$refs.clickcp.ttActive = 1; + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'floor'; }, 300); bfHelper.ttLookPipeline2( null, @@ -478,6 +498,8 @@ export default { setTimeout(() => { this.setTowerFire("09", "02"); this.$refs.clickcp.ttActive = 2; + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'floor'; }, 300); bfHelper.ttLookPipeline2( null, @@ -492,6 +514,8 @@ export default { setTimeout(() => { this.setTowerFire("09"); this.$refs.clickcp.ttActive = 3; + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; }, 300); bfHelper.ttLookPipeline2( null, @@ -505,6 +529,10 @@ export default { } else { // 查看管线 bfHelper.TtLookEquipmentCop("消防", this.checkList); + this.$refs.clickcp.active = 20 + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.getTypeList(20,'build',2); bfHelper.setOpacityFun1(); } } diff --git a/src/components/monitoring/light.vue b/src/components/monitoring/light.vue index 8d337ad..204e4d8 100644 --- a/src/components/monitoring/light.vue +++ b/src/components/monitoring/light.vue @@ -345,12 +345,15 @@ export default { ); let build = sessionStorage.getItem("build"); let floor = sessionStorage.getItem("floor"); + let type = sessionStorage.getItem('type') ? sessionStorage.getItem('type') : 'build' if (build) { if (build == 10) { //如果点击的是地下室 setTimeout(() => { this.setTowerLight("07"); this.$refs.clickcp.active = 26; + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; this.$refs.clickcp.tower = 9; }, 300); bfHelper.lookPipeline2( @@ -365,17 +368,22 @@ export default { //如果点击的是园区 bfHelper.resetStatus(2, null, "照明"); bfHelper.lookEquipmentCop("照明"); + this.$refs.clickcp.active = 26; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.area = 1; setTimeout(() => { this.setTowerLight("00"); }, 300); } else { - if (floor.indexOf("undefined") == -1) { + if (floor.indexOf("null") == -1) { setTimeout(() => { this.setTowerLight("0" + build, "0" + floor); this.$refs.clickcp.active = commonValue.activeValue( Number(build), Number(floor) ); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'floor'; this.$refs.clickcp.tower = commonValue.towerValue(build); }, 300); bfHelper.lookPipeline2( @@ -393,6 +401,8 @@ export default { Number(build), null ); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; this.$refs.clickcp.tower = commonValue.towerValue(build); }, 300); bfHelper.lookPipeline2( @@ -408,6 +418,10 @@ export default { } else { bfHelper.lookEquipmentCop("照明"); bfHelper.setOpacityFun(); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.active = 25; + this.$refs.clickcp.getTypeList(25,'build',1) this.getNavigationMap(); } } else { diff --git a/src/components/monitoring/monitoring.vue b/src/components/monitoring/monitoring.vue index 94628ae..4fd3901 100644 --- a/src/components/monitoring/monitoring.vue +++ b/src/components/monitoring/monitoring.vue @@ -390,12 +390,15 @@ export default { ); let build = sessionStorage.getItem("build"); let floor = sessionStorage.getItem("floor"); + let type = sessionStorage.getItem('type') ? sessionStorage.getItem('type') : 'build' this.getCameraPosi(); if (build) { if (build == 10) { setTimeout(() => { this.setTowerMonitor("07"); this.$refs.clickcp.active = 26; + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; this.$refs.clickcp.tower = 9; }, 300); bfHelper.lookPipeline2( @@ -406,6 +409,9 @@ export default { "监控" ); } else if (build == 26) { + this.$refs.clickcp.active = 26; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.area = 1; bfHelper.lookPipeline(null, null, this.condition, "监控"); bfHelper.setOpacityFun(); setTimeout(() => { @@ -413,13 +419,15 @@ export default { }, 300); this.initial(); } else { - if (floor.indexOf("undefined") == -1) { + if (floor.indexOf("null") == -1) { setTimeout(() => { this.setTowerMonitor("0" + build, "0" + floor); this.$refs.clickcp.active = commonValue.activeValue( Number(build), Number(floor) ); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'floor'; this.$refs.clickcp.tower = commonValue.towerValue(build); }, 300); bfHelper.lookPipeline2( @@ -436,6 +444,8 @@ export default { Number(build), null ); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; this.$refs.clickcp.tower = commonValue.towerValue(build); }, 300); bfHelper.lookPipeline2( @@ -454,7 +464,10 @@ export default { setTimeout(() => { this.getNavigationMap(); this.buildMessage = "园区"; + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; this.$refs.clickcp.active = 25; + this.$refs.clickcp.getTypeList(25,'build',1) this.$refs.clickcp.tower = null; }, 300); this.initial(); @@ -466,6 +479,7 @@ export default { JSON.stringify(bfHelper.getCameraStatus()) ); let ttbuild = sessionStorage.getItem("ttbuild"); + let tttype = sessionStorage.getItem('tttype') ? sessionStorage.getItem('tttype') : 'build' if (ttbuild) { if (ttbuild == 20) { //园区 @@ -473,12 +487,16 @@ export default { // bfHelper.setCameraStatus(this.startCamera) setTimeout(() => { this.setTowerMonitor(); + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; }, 300); } else if (ttbuild == 0) { //塔楼 setTimeout(() => { this.setTowerMonitor("08"); this.$refs.clickcp.ttActive = 0; + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; }, 300); bfHelper.ttLookPipeline2( null, @@ -492,6 +510,8 @@ export default { setTimeout(() => { this.setTowerMonitor("09", "01"); this.$refs.clickcp.ttActive = 1; + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'floor'; }, 300); bfHelper.ttLookPipeline2( null, @@ -505,6 +525,8 @@ export default { setTimeout(() => { this.setTowerMonitor("09", "02"); this.$refs.clickcp.ttActive = 2; + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'floor'; }, 300); bfHelper.ttLookPipeline2( null, @@ -518,6 +540,8 @@ export default { setTimeout(() => { this.setTowerMonitor("09"); this.$refs.clickcp.ttActive = 3; + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; }, 300); bfHelper.ttLookPipeline2( null, @@ -532,6 +556,10 @@ export default { bfHelper.TtLookEquipmentCop("监控", null, this.condition); // bfHelper.setCameraStatus(this.startCamera) bfHelper.setOpacityFun1(); + this.$refs.clickcp.active = 20 + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.getTypeList(20,'build',2); this.initial(); } } diff --git a/src/components/monitoring/warm.vue b/src/components/monitoring/warm.vue index f9c924c..fd09d6d 100644 --- a/src/components/monitoring/warm.vue +++ b/src/components/monitoring/warm.vue @@ -470,6 +470,8 @@ export default { // 查看管线 let build = sessionStorage.getItem("build"); let floor = sessionStorage.getItem("floor"); + let type = sessionStorage.getItem('type') ? sessionStorage.getItem('type') : 'build' + console.log('warmbuild =====>',build) if (build) { //如果是单楼层加载 if (build == 10) { @@ -478,6 +480,8 @@ export default { this.setTowerWarm("07"); this.$refs.clickcp.active = 26; this.$refs.clickcp.tower = 9; + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; }, 300); bfHelper.lookPipeline2( @@ -491,6 +495,9 @@ export default { // bfHelper.setCameraStatus(bfHelper.cameraPosition[6]); } else if (build == 26) { //园区 + this.$refs.clickcp.active = 26; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.area = 1; setTimeout(() => { this.setTowerWarm(); }, 300); @@ -522,7 +529,8 @@ export default { zoom: 1 });//回标准视角 } else { - if (floor.indexOf("undefined") == -1) { + if (floor.indexOf("null") == -1) { + console.log('进入次循环11111') //如果是单楼加载 setTimeout(() => { this.setTowerWarm("0" + build, "0" + floor); @@ -530,6 +538,8 @@ export default { Number(build), Number(floor) ); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'floor'; this.$refs.clickcp.tower = commonValue.towerValue(build); }, 300); bfHelper.lookPipeline2( @@ -542,12 +552,15 @@ export default { ); } else { //单层加载 + console.log('进入次循环22222') setTimeout(() => { this.setTowerWarm("0" + build); this.$refs.clickcp.active = commonValue.activeValue( Number(build), null ); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; this.$refs.clickcp.tower = commonValue.towerValue(build); }, 300); bfHelper.lookPipeline2( @@ -566,6 +579,10 @@ export default { bfHelper.lookEquipmentCop("暖"); bfHelper.setOpacityFun(); this.getNavigationMap(); + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.active = 25; + this.$refs.clickcp.getTypeList(25,'build',1) } } else { } diff --git a/src/router/axios.js b/src/router/axios.js index b5c7b8f..512d719 100644 --- a/src/router/axios.js +++ b/src/router/axios.js @@ -70,10 +70,10 @@ axios.interceptors.response.use(res => { if (status === 401) store.dispatch('FedLogOut').then(() => router.push({path: '/login'})); // 如果请求为非200否者默认统一处理 if (status !== 200) { - Message({ - message: message, - type: 'error' - }); + // Message({ + // message: message, + // type: 'error' + // }); return Promise.reject(new Error(message)) } return res; diff --git a/src/views/equipment/drawClassify.vue b/src/views/equipment/drawClassify.vue new file mode 100644 index 0000000..0356f58 --- /dev/null +++ b/src/views/equipment/drawClassify.vue @@ -0,0 +1,246 @@ + + + + + \ No newline at end of file diff --git a/src/views/equipment/drawManage.vue b/src/views/equipment/drawManage.vue new file mode 100644 index 0000000..6c950c5 --- /dev/null +++ b/src/views/equipment/drawManage.vue @@ -0,0 +1,682 @@ + + + + + + \ No newline at end of file diff --git a/src/views/garden/index.vue b/src/views/garden/index.vue index cf2f5a9..4d2ffa7 100644 --- a/src/views/garden/index.vue +++ b/src/views/garden/index.vue @@ -193,6 +193,7 @@ export default { // bfHelper.mapDestroy(); // } + console.log('模型切换') window.sessionStorage.removeItem('build'); window.sessionStorage.removeItem('floor'); window.sessionStorage.removeItem('ttbuild'); @@ -215,6 +216,8 @@ export default { window.sessionStorage.removeItem('build'); window.sessionStorage.removeItem('floor'); window.sessionStorage.removeItem('ttbuild'); + window.sessionStorage.removeItem('tttype'); + window.sessionStorage.removeItem('type'); this.topNav = i; if (i == 3) { if (this.clickNum == 1) { diff --git a/vue.config.js b/vue.config.js index 2d85df0..8d74d9b 100644 --- a/vue.config.js +++ b/vue.config.js @@ -28,7 +28,11 @@ module.exports = { proxy: { "/bimfaceApi": { // target: 'http://192.168.3.58:8001', - target: 'http://192.168.1.106:8001', + // target: 'http://192.168.1.105:8001', + // target: 'http://192.168.1.34:8001', + target: 'http://192.168.1.102:8001', + // target: 'http://192.168.1.106:8001', + // target: 'http://192.168.0.115:8001', ws: true, pathRewrite: { "^/bimfaceApi": "/bimface", @@ -48,7 +52,10 @@ module.exports = { // target: "http://192.168.43.35", // target: 'http://192.168.79.129', // target: "http://192.168.1.106", - target: "http://192.168.1.106", + // target: "http://192.168.1.105:80", + target: "http://192.168.1.102:80", + // target: "http://192.168.1.34:80", + // target: "http://192.168.0.115", // target: "http://10.90.100.204", // target: "http://rsvz4t.natappfree.cc", //远程演示服务地址,可用于直接启动项目