diff --git a/public/yj.png b/public/yj.png new file mode 100644 index 0000000..7433b05 Binary files /dev/null and b/public/yj.png differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 53599e4..5d1123e 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -248,6 +248,10 @@ aside { .el-table__inner-wrapper::after, .el-table__inner-wrapper::before { background-color: #00174b !important; - color: #fff !important + color: #fff !important; + + } + .el-table { + border: 1px solid #2E6099 !important; } } \ No newline at end of file diff --git a/src/views/bim/bimHome/components/CheckDetial.vue b/src/views/bim/bimHome/components/CheckDetial.vue index a4f6d6b..61c647d 100644 --- a/src/views/bim/bimHome/components/CheckDetial.vue +++ b/src/views/bim/bimHome/components/CheckDetial.vue @@ -1,16 +1,32 @@ \ No newline at end of file + + \ No newline at end of file diff --git a/src/views/bim/bimHome/components/DeviceInfoDialog.vue b/src/views/bim/bimHome/components/DeviceInfoDialog.vue index cf84546..b3645d5 100644 --- a/src/views/bim/bimHome/components/DeviceInfoDialog.vue +++ b/src/views/bim/bimHome/components/DeviceInfoDialog.vue @@ -13,7 +13,7 @@ style="width: 100%;height:100%">
- + @@ -460,7 +460,7 @@ const viewDetail = (val) => { .bottom-div { height: 74%; - border: 1px solid #2E6099; + // border: 1px solid #2E6099; } } } diff --git a/src/views/bim/bimHome/components/ThreeView2.vue b/src/views/bim/bimHome/components/ThreeView2.vue index 23742b4..a422762 100644 --- a/src/views/bim/bimHome/components/ThreeView2.vue +++ b/src/views/bim/bimHome/components/ThreeView2.vue @@ -177,6 +177,9 @@ const loadSence = () => { if (enableGroup.indexOf(e.name) != -1) { xfobj.push(e); } + if (yjGroup.indexOf(e.name) != -1) { + yjobj.push(e); + } }) // 设置漫游点位 const objname = ['start', 'middle1', 'middle2', 'end'] @@ -254,6 +257,10 @@ const enableGroup = [ 'T11',// 立仓 'T12' ] +// 预警设备 +const yjGroup = [ + 'T11', +] const isSelent = (obj) => { var o = obj while (true) { @@ -377,17 +384,18 @@ const cleanColor = () => { } // 预警 const warn = () => { - ['T3', 'T4', 'T5', 'T6', 'T7', 'T8', 'T9', 'T10', 'T11', 'T12'].forEach(item => { + ['T11'].forEach(item => { warnSets.push(scene.getObjectByName(item)); }) - warnSets[2].traverse(e => { + warnSets[0].traverse(e => { e.material = new THREE.MeshBasicMaterial({ transparent: true, opacity: 0.9, color: new THREE.Color('rgb( 237,33,2 )') }); }) + yjf(); // animateCamera(warnSets[0]); } @@ -591,12 +599,22 @@ const xiaof = () => { xfadd(o, Math.random() < 0.3); }) } +// 预警 +const yjf = () => { + yjobj.forEach((o) => { + xfadd(o, 'yj'); + }) +} let xfobj = []; +let yjobj = []; // 消防标签 const xfadd = (obj, state) => { const texLoader = new THREE.TextureLoader(); let texture = null; - if (state) { + if(state == 'yj') { + texture = texLoader.load("/yj.png"); + } + else if (state) { texture = texLoader.load("/ygr.png"); } else { texture = texLoader.load("/yg.png"); @@ -825,6 +843,9 @@ const checkComplete = () => { } .arrow_outer { display: flex; - + flex-direction: column; + >div { + line-height: 24px; + } } \ No newline at end of file