suojin
/
smartpark-front
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

顶部概况模式和监控模式导航栏宽度缩短,保持监控模式切回概况模式主视角；修正设备统计跳转监控模式参数

Browse Source
dev
zhangqun 3 years ago
parent 16be6d13b7
commit b0b434956d
6 changed files with 38 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/components/monitoring/light.vue
  2. 9
      src/util/bfHelper.js
  3. 9
      src/views/garden/home.vue
  4. 47
      src/views/garden/index.vue
  5. 44
      src/views/garden/monitoringPattern.vue
  6. 4
      vue.config.js

9
src/components/monitoring/light.vue
Unescape View File

@ -434,9 +434,7 @@ export default {
} else { } else {
bfHelper.lookEquipmentCop("照明"); bfHelper.lookEquipmentCop("照明");
bfHelper.setOpacityFun(); bfHelper.setOpacityFun();
setTimeout(() => { this.getNavigationMap();
this.getNavigationMap();
}, 300);
} }
} else { } else {
} }
@ -614,10 +612,7 @@ export default {
bfHelper.setColor("#a5bbe5", offList); bfHelper.setColor("#a5bbe5", offList);
}, },
getNavigationMap() { getNavigationMap() {
// bfHelper.mapDestroy(); commonValue.getNavigationMap("water");
setTimeout(() => {
commonValue.getNavigationMap("water");
});
}, },
// 接收子组件当前点击楼号 // 接收子组件当前点击楼号
setTowerLight(i, j) { setTowerLight(i, j) {

9
src/util/bfHelper.js
Unescape View File

@ -3154,7 +3154,7 @@ const labelClick = (fn) => {
// 设置相机视角 // 设置相机视角
const setCameraStatus = (status) => { const setCameraStatus = (status) => {
return new Promise((resolve) => { return new Promise((resolve) => {
viewer3D.setCameraStatus( viewer3D !=undefined && viewer3D && viewer3D.setCameraStatus(
{ {
...cameraState, ...cameraState,
...status, ...status,
@ -3458,6 +3458,8 @@ const zoomToSelectedComponents = (margin) => {
const navigationMap = (dom, img, build, floor) => { const navigationMap = (dom, img, build, floor) => {
let mapViewerConfig = let mapViewerConfig =
new Glodon.Bimface.Plugins.NavigationMap.MapViewerConfig(); new Glodon.Bimface.Plugins.NavigationMap.MapViewerConfig();
console.log('初始化导航地图');
document.querySelector(dom) && document.querySelector(dom).innerHTML == '';
mapViewerConfig.domElement = document.querySelector(dom); mapViewerConfig.domElement = document.querySelector(dom);
let mapViewer = new Glodon.Bimface.Plugins.NavigationMap.MapViewer( let mapViewer = new Glodon.Bimface.Plugins.NavigationMap.MapViewer(
mapViewerConfig mapViewerConfig
@ -3488,7 +3490,8 @@ const navigationMap = (dom, img, build, floor) => {
viewer3D.render(); viewer3D.render();
}; };
const mapUpdate = (img, mapAnchors, modelAnchors) => { const mapUpdate = (img, mapAnchors, modelAnchors) => {
if (navigationMap2) { console.log('mapUpdate', navigationMap2);
if (navigationMap2 != undefined && navigationMap2) {
navigationMap2.associateModel({ navigationMap2.associateModel({
url: img, url: img,
mapAnchors: mapAnchors, mapAnchors: mapAnchors,
@ -3499,7 +3502,7 @@ const mapUpdate = (img, mapAnchors, modelAnchors) => {
}; };
//销毁地图 //销毁地图
const mapDestroy = () => { const mapDestroy = () => {
if (navigationMap2) { if (navigationMap2 != undefined && navigationMap2) {
navigationMap2.destroy(); navigationMap2.destroy();
navigationMap2 = null; navigationMap2 = null;
} }

9
src/views/garden/home.vue
Unescape View File

@ -192,8 +192,10 @@ export default {
position: absolute; position: absolute;
top: 0; top: 0;
left: 50%; left: 50%;
margin-left: -3.1rem; // margin-left: -3.1rem;
width: 6.2rem; margin-left: -2.25rem;
// width: 6.2rem;
width: 4.5rem;
background-size: 100% 100%; background-size: 100% 100%;
padding: 0 0.32rem; padding: 0 0.32rem;
@ -201,7 +203,8 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
width: 6.2rem; // width: 6.2rem;
width: 4.5rem;
height: 0.57rem; height: 0.57rem;
} }

47
src/views/garden/index.vue
Unescape View File

@ -55,13 +55,6 @@
:style="{ 'top': topNav == 1 ? '1.25rem' : '1.938rem', 'left': topNav == 1 ? '1.25rem' : 'auto', 'right': topNav == 1 ? 'auto' : '7.625rem' }"> :style="{ 'top': topNav == 1 ? '1.25rem' : '1.938rem', 'left': topNav == 1 ? '1.25rem' : 'auto', 'right': topNav == 1 ? 'auto' : '7.625rem' }">
<img v-if="topNav == 1" src="../../../public/img/home-view.png" alt="" style="margin-right: 20px;" <img v-if="topNav == 1" src="../../../public/img/home-view.png" alt="" style="margin-right: 20px;"
@click="goBackHome"> @click="goBackHome">
<!-- <img v-else src="../../../public/img/home-view.png" alt="" style="margin-right: 20px;" @click="goBackHome"> -->
<!-- <div @click="selectBim(1)" :class="[bimModel==1?'active':'']" class="cut_select left"
:style="{'borderColor':topNav == 1?'rgb(16,208,164)':'#00BAFE','boxShadow':bimModel == 1&&topNav == 1?'rgb(11, 163, 166) 0px 0px 0.875rem inset':bimModel == 1&&topNav == 3?'rgb(7, 144, 235) 0px 0px 0.875rem inset':'none'}">
业务区</div>
<div @click="selectBim(2)" :class="[bimModel==2?'active':'']" class="cut_select right"
:style="{'borderColor':topNav == 1?'rgb(16,208,164)':'#00BAFE','boxShadow':bimModel == 2&&topNav == 1?'rgb(11, 163, 166) 0px 0px 0.875rem inset':bimModel == 2&&topNav == 3?'rgb(7, 144, 235) 0px 0px 0.875rem inset':'none'}">
塔台</div> -->
<div @click="selectBim(1)" :class="[bimModel == 1 ? 'active' : '']" class="cut_select left" <div @click="selectBim(1)" :class="[bimModel == 1 ? 'active' : '']" class="cut_select left"
:style="{ 'borderColor': topNav == 1 ? '#00bbff' : '#00BAFE', 'boxShadow': bimModel == 1 && topNav == 1 ? '#0790eb 0px 0px 0.875rem inset' : bimModel == 1 && topNav == 3 ? 'rgb(7, 144, 235) 0px 0px 0.875rem inset' : 'none' }"> :style="{ 'borderColor': topNav == 1 ? '#00bbff' : '#00BAFE', 'boxShadow': bimModel == 1 && topNav == 1 ? '#0790eb 0px 0px 0.875rem inset' : bimModel == 1 && topNav == 3 ? 'rgb(7, 144, 235) 0px 0px 0.875rem inset' : 'none' }">
业务区</div> 业务区</div>
@ -156,7 +149,6 @@ export default {
} else { } else {
if (newValue == 1) { if (newValue == 1) {
console.log(12222)
this.status = true; this.status = true;
bfHelper.resetStatus(1); //恢复全部状态 bfHelper.resetStatus(1); //恢复全部状态
} else { } else {
@ -220,7 +212,6 @@ export default {
}, },
// 顶部导航按钮 // 顶部导航按钮
topNavFun(i) { topNavFun(i) {
window.sessionStorage.removeItem('build'); window.sessionStorage.removeItem('build');
window.sessionStorage.removeItem('floor'); window.sessionStorage.removeItem('floor');
window.sessionStorage.removeItem('ttbuild'); window.sessionStorage.removeItem('ttbuild');
@ -235,7 +226,11 @@ export default {
} }
this.clickNum++; this.clickNum++;
} else { }else if(i == 1) {
this.clickNum = 1;
this.goBackHome();//回主视角
}
else {
this.clickNum = 1; this.clickNum = 1;
} }
}, },
@ -254,15 +249,15 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
if (name == '电') { if (name == '电') {
if (this.bimModel == 1) { if (this.bimModel == 1) {
this.$refs.monitoringPattern.clickMenu(1); this.$refs.monitoringPattern.clickMenu(1,name,true);
} else { } else {
this.$refs.monitoringPattern.clickMenu(1); this.$refs.monitoringPattern.clickMenu(1,name,true);
} }
} else if (name == '水') { } else if (name == '水') {
if (this.bimModel == 1) { if (this.bimModel == 1) {
this.$refs.monitoringPattern.clickMenu(2); this.$refs.monitoringPattern.clickMenu(2,name,true);
} else { } else {
this.$refs.monitoringPattern.clickMenu(2); this.$refs.monitoringPattern.clickMenu(2,name,true);
} }
} else if (name == '热') { } else if (name == '热') {
if (this.bimModel == 1) { if (this.bimModel == 1) {
@ -270,9 +265,9 @@ export default {
} }
} else if (name == '监控') { } else if (name == '监控') {
if (this.bimModel == 1) { if (this.bimModel == 1) {
this.$refs.monitoringPattern.clickMenu(4); this.$refs.monitoringPattern.clickMenu(4,name,true);
} else { } else {
this.$refs.monitoringPattern.clickMenu(3); this.$refs.monitoringPattern.clickMenu(3,name,true);
} }
} else if (name == '照明') { } else if (name == '照明') {
if (this.bimModel == 1) { if (this.bimModel == 1) {
@ -280,15 +275,15 @@ export default {
} }
} else if (name == '消防') { } else if (name == '消防') {
if (this.bimModel == 1) { if (this.bimModel == 1) {
this.$refs.monitoringPattern.clickMenu(6); this.$refs.monitoringPattern.clickMenu(6,name,true);
} else { } else {
this.$refs.monitoringPattern.clickMenu(4); this.$refs.monitoringPattern.clickMenu(4,name,true);
} }
} else if (name == '电梯') { } else if (name == '电梯') {
if (this.bimModel == 1) { if (this.bimModel == 1) {
this.$refs.monitoringPattern.clickMenu(7); this.$refs.monitoringPattern.clickMenu(7,name,true);
} else { } else {
this.$refs.monitoringPattern.clickMenu(5); this.$refs.monitoringPattern.clickMenu(5,name,true);
} }
} else if (name == '空调') { } else if (name == '空调') {
if (this.bimModel == 1) { if (this.bimModel == 1) {
@ -296,21 +291,21 @@ export default {
} }
} else if (name == '电子门禁') { } else if (name == '电子门禁') {
if (this.bimModel == 1) { if (this.bimModel == 1) {
this.$refs.monitoringPattern.clickMenu(9); this.$refs.monitoringPattern.clickMenu(9,name,true);
} else { } else {
this.$refs.monitoringPattern.clickMenu(6); this.$refs.monitoringPattern.clickMenu(6,name,true);
} }
} else if (name == '电子围界') { } else if (name == '电子围界') {
if (this.bimModel == 1) { if (this.bimModel == 1) {
this.$refs.monitoringPattern.clickMenu(10); this.$refs.monitoringPattern.clickMenu(10,name,true);
} else { } else {
this.$refs.monitoringPattern.clickMenu(7); this.$refs.monitoringPattern.clickMenu(7,name,true);
} }
} else { } else {
if (this.bimModel == 1) { if (this.bimModel == 1) {
this.$refs.monitoringPattern.clickMenu(9); this.$refs.monitoringPattern.clickMenu(9,name,true);
} else { } else {
this.$refs.monitoringPattern.clickMenu(6); this.$refs.monitoringPattern.clickMenu(6,name,true);
} }
} }
}) })

44
src/views/garden/monitoringPattern.vue
Unescape View File

@ -11,48 +11,6 @@
<img class="nav_img" :src="activeIndex == item.index?item.img1:item.img"> <img class="nav_img" :src="activeIndex == item.index?item.img1:item.img">
<p>{{item.name}}</p> <p>{{item.name}}</p>
</el-menu-item> </el-menu-item>
<!-- 电 -->
<!-- <el-menu-item index="1" @click="$emit('status-cut',true);electricityBox()">
<img class="nav_img" src="../../../public/img/monitoring/nav_1.png">
<p>电</p>
</el-menu-item>
<el-menu-item index="2" @click="$emit('status-cut',true);waterClick()">
<img class="nav_img" src="../../../public/img/monitoring/nav_2.png" style="width: 2rem;">
<p>水</p>
</el-menu-item>
<el-menu-item v-if="bimModel==1" @click="$emit('status-cut',false);warmClick()" index="3">
<img class="nav_img" src="../../../public/img/monitoring/nav_3.png">
<p>暖</p>
</el-menu-item>
<el-menu-item index="4" @click="$emit('status-cut',true);monitoring()">
<img class="nav_img" src="../../../public/img/monitoring/nav_4.png">
<p>监控</p>
</el-menu-item>
<el-menu-item v-if="bimModel==1" index="5" @click="$emit('status-cut',false);illumination()">
<img class="nav_img" src="../../../public/img/monitoring/nav_5.png">
<p>照明</p>
</el-menu-item>
<el-menu-item index="6" @click="$emit('status-cut',true);fireControl()">
<img class="nav_img" src="../../../public/img/monitoring/nav_6.png">
<p>消防</p>
</el-menu-item>
<el-menu-item index="7" @click="$emit('status-cut',true);lift()">
<img class="nav_img" src="../../../public/img/monitoring/nav_7.png">
<p>电梯</p>
</el-menu-item>
<el-menu-item v-if="bimModel==1" index="9" @click="$emit('status-cut',true);conditioner()">
<img class="nav_img" src="../../../public/img/monitoring/nav_9.png">
<p>空调</p>
</el-menu-item>
<el-menu-item index="10" @click="$emit('status-cut',true);entranceGuard()">
<img class="nav_img" src="../../../public/img/monitoring/nav_10.png">
<p>电子门禁</p>
</el-menu-item>
<el-menu-item index="11" @click="$emit('status-cut',true);setWall()">
<img class="nav_img" src="../../../public/img/monitoring/nav_11.png">
<p>电子围界</p>
</el-menu-item> -->
</el-menu> </el-menu>
<el-menu :default-active="activeIndex" menu-trigger="click" class="el-menu-vertical-demo" :collapse="true" <el-menu :default-active="activeIndex" menu-trigger="click" class="el-menu-vertical-demo" :collapse="true"
v-else> v-else>
@ -93,7 +51,7 @@
</template> </template>
<script> <script>
import * as bfHelper from '../../util/bfHelper'; // import * as bfHelper from '../../util/bfHelper';
import lift from '@/components/monitoring/lift' import lift from '@/components/monitoring/lift'
import monitoring from '@/components/monitoring/monitoring' import monitoring from '@/components/monitoring/monitoring'
import door from '@/components/monitoring/door' import door from '@/components/monitoring/door'

4
vue.config.js
Unescape View File

@ -45,8 +45,8 @@ module.exports = {
// target: 'http://180.76.231.175:8000', // target: 'http://180.76.231.175:8000',
// target: 'http://192.168.0.105:80', // target: 'http://192.168.0.105:80',
// target: "http://192.168.43.35", // target: "http://192.168.43.35",
target: 'http://192.168.1.106', // target: 'http://192.168.1.106',
// target: "http://192.168.1.3", target: "http://192.168.1.3",
// target: "http://10.90.100.204", // target: "http://10.90.100.204",
// target: "http://rsvz4t.natappfree.cc", // target: "http://rsvz4t.natappfree.cc",
//远程演示服务地址,可用于直接启动项目 //远程演示服务地址,可用于直接启动项目

Write Preview
Loading…
Cancel
Save