|
@@ -29,35 +29,39 @@
|
|
|
<el-button size="mini" type="primary" class="yatz_button" @click="showUpdateYjYuAn">预案调整
|
|
|
</el-button>
|
|
|
</div>
|
|
|
+ <!-- 左侧资源 -->
|
|
|
<div class="leftbar" style="width:fit-content !important;bottom:0rem;left: 1rem; top: unset;">
|
|
|
- <div class="forthis">
|
|
|
- <dv-border-box-7 backgroundColor="#040b1f" :color="['#0c4b53', '#18caca']" >
|
|
|
- <div class="i-list-con">
|
|
|
- <div class="d-l-con-icon" style="flex-direction:row;flex-wrap: nowrap; width:1080px">
|
|
|
- <div class="icon-con" style="width: fit-content !important;"
|
|
|
- v-for="(item,index) in resourcesList1" @click="fireControlViewPoint(item.type)">
|
|
|
- <div class="iconfont icon icon-normal" :class="item.icon"></div>
|
|
|
- <div class="icon-text">
|
|
|
- <h5>{{ item.resourceName }}</h5>
|
|
|
+ <div class="forthis" style="width:1320px; display: flex;">
|
|
|
+ <dv-border-box-7 backgroundColor="#040b1f" :color="['#25335d', '#5baffd']">
|
|
|
+ <div class="i-list-con" style="width: 100%;display: flex; align-items: center;justify-content: space-between">
|
|
|
+
|
|
|
+ <div class="d-l-con-icon" style="width: fit-content; flex-direction:row;flex-wrap: nowrap;" ref="thisWidthWH">
|
|
|
+ <leftRightSwiperScroll v-if="isLoading">
|
|
|
+ <div class="icon-con" style="width: fit-content !important;"
|
|
|
+ v-for="(item,index) in resourcesList1" @click="fireControlViewPoint(item.type)" :key="index">
|
|
|
+ <div class="iconfont icon icon-normal" :class="item.icon" :style="'background:' + item.bg"></div>
|
|
|
+ <div class="icon-text">
|
|
|
+ <h5 style="white-space: nowrap;">{{ item.resourceName }}</h5>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- <el-input type="number" v-model="radius" style="width: 80px;" placeholder="请输入搜索半径"/>
|
|
|
+ </leftRightSwiperScroll>
|
|
|
</div>
|
|
|
- </div>
|
|
|
|
|
|
+ <el-input type="number" v-model="radius" class="d-input-bottom" placeholder="请输入搜索半径"/>
|
|
|
+ </div>
|
|
|
</dv-border-box-7>
|
|
|
</div>
|
|
|
-
|
|
|
</div>
|
|
|
+ <!-- 左侧资源end -->
|
|
|
<!-- 应急预案end -->
|
|
|
- <div class="fire-m">
|
|
|
+ <div class="fire-m" style="bottom:5rem">
|
|
|
<el-button size="small" icon="el-icon-upload" @click="showEventdetailsdialog()">动态标绘</el-button>
|
|
|
<!-- <el-button size="small" icon="el-icon-upload" @click="showheatPlotting()">火灾蔓延</el-button>-->
|
|
|
</div>
|
|
|
<!-- 地图 -->
|
|
|
<supermapDialog1 ref="supermapDialog1"
|
|
|
style="position: absolute; top:0;left: 0;"
|
|
|
- :mapDiv="'forestWarmSuperMap'"
|
|
|
+ :mapDiv="'forestWarmSuperMap1'"
|
|
|
:mapSite="{zoom:16,doubleClickZoom:true,dragging:true,scrollWheelZoom:true}"
|
|
|
:codes="['9fa5']"
|
|
|
:isSideBySide="false"
|
|
@@ -967,6 +971,8 @@ import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部
|
|
|
import eventLogUpload from '@/views/eventLogUpload.vue' //日志上传文件
|
|
|
import areaSupermap from '@/components/supermap'//区域标记地图
|
|
|
import TcPlayer from '@/components/TcPlayer' //视频预览
|
|
|
+import leftRightSwiperScroll from '@/components/leftRightSwiperScroll.vue';//事件中心底部资源内容溢出组件
|
|
|
+import {getIconBg} from '@/api/components/sookaMapIcon';//资源底色控制文件
|
|
|
import {
|
|
|
getEventDetail,
|
|
|
sendEventLog,
|
|
@@ -1009,6 +1015,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
components: {
|
|
|
+ leftRightSwiperScroll,
|
|
|
vBottomMenu,
|
|
|
supermapDialog1,
|
|
|
eventLogUpload,
|
|
@@ -1017,6 +1024,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ isLoading:false,
|
|
|
//海康
|
|
|
cameraTitle: '',
|
|
|
cameraCode:'',
|
|
@@ -1278,7 +1286,7 @@ export default {
|
|
|
calendarDay: null//首页日历选择
|
|
|
},
|
|
|
created() {
|
|
|
-
|
|
|
+ this.isLoading = true;
|
|
|
/** ----------------------------------摄像头预览开始------------------------------------- */
|
|
|
const DHWsInstance = DHWs.getInstance()
|
|
|
this.ws = DHWsInstance
|
|
@@ -1331,18 +1339,23 @@ export default {
|
|
|
obj.type = data.type;
|
|
|
obj.count = data.num;
|
|
|
obj.icon = icon;
|
|
|
- if(resourceName != "重点场所"
|
|
|
- && resourceName != "基本联动力量"
|
|
|
- && resourceName != "其他联动力量"){
|
|
|
- _this.resourcesList1.push(obj);
|
|
|
- }
|
|
|
+ // if(resourceName != "重点场所"
|
|
|
+ // && resourceName != "基本联动力量"
|
|
|
+ // && resourceName != "其他联动力量"){
|
|
|
+ // _this.resourcesList1.push(obj);
|
|
|
+ // }
|
|
|
+ _this.resourcesList1.push(obj);
|
|
|
console.log("2222icon_" + (index + 1) + "=", icon);
|
|
|
+ //每个图标对应固定颜色
|
|
|
+ _this.$set(_this.resourcesList1[index], "bg", getIconBg(icon));
|
|
|
+
|
|
|
})
|
|
|
_this.resourcesList1.push({
|
|
|
resourceName: '摄像头',
|
|
|
type: 'sxt',
|
|
|
count: '1',
|
|
|
- icon: 'sj-icon-jkzx'
|
|
|
+ icon: 'sj-icon-jkzx',
|
|
|
+ bg:'#f5ad1b'
|
|
|
})
|
|
|
})
|
|
|
},
|
|
@@ -2203,9 +2216,9 @@ export default {
|
|
|
// 获取父标签,意思是这个标签内的 DOM 元素生成图片
|
|
|
// imageTofile是给截图范围内的父级元素自定义的ref名称
|
|
|
// let canvasBox = this.$refs.imageTofile
|
|
|
- let canvasBox = document.getElementById('forestWarmSuperMap')
|
|
|
- let toolbar = document.getElementById('toolbar')
|
|
|
- canvasBox.removeChild(toolbar)
|
|
|
+ let canvasBox = document.getElementById('forestWarmSuperMap1')
|
|
|
+ // let toolbar = document.getElementById('toolbar')
|
|
|
+ // canvasBox.removeChild(toolbar)
|
|
|
// 获取父级的宽高
|
|
|
const width = parseInt(window.getComputedStyle(canvasBox).width)
|
|
|
const height = parseInt(window.getComputedStyle(canvasBox).height)
|
|
@@ -2227,7 +2240,7 @@ export default {
|
|
|
let dataBase64 = canvas.toDataURL('image/png')
|
|
|
this.uploadBase64(dataBase64)
|
|
|
})
|
|
|
- canvasBox.appendChild(toolbar)
|
|
|
+ // canvasBox.appendChild(toolbar)
|
|
|
},
|
|
|
uploadBase64(dataBase64) {
|
|
|
//事件详情截图直接上传日志
|