|
|
@@ -60,32 +60,32 @@
|
|
|
enter-active-class="animate__backInDown"
|
|
|
leave-active-class="animate__backOutUp"
|
|
|
>
|
|
|
- <!-- 应急预案 -->
|
|
|
- <div class="dia-left-top" v-show="mapToolCheckItem.includes('应急预案')"
|
|
|
- key="yingji" >
|
|
|
- <div class="dia-left-top-tit">应急预案</div>
|
|
|
- <div class="dia-left-top-carousel">
|
|
|
+ <!-- 应急预案 -->
|
|
|
+ <div class="dia-left-top" v-show="mapToolCheckItem.includes('应急预案')"
|
|
|
+ key="yingji" >
|
|
|
+ <div class="dia-left-top-tit">应急预案</div>
|
|
|
+ <div class="dia-left-top-carousel">
|
|
|
|
|
|
- <el-carousel height="30px" direction="vertical" :interval="2000">
|
|
|
- <el-carousel-item v-if="visuForestCloudYuAnBo!=null">
|
|
|
- <el-tooltip class="item" effect="dark" :content="visuForestCloudYuAnBo.reserveName"
|
|
|
- placement="top-start">
|
|
|
- <a :href="visuForestCloudYuAnBo.fileUrl"><span>
|
|
|
+ <el-carousel height="30px" direction="vertical" :interval="2000">
|
|
|
+ <el-carousel-item v-if="visuForestCloudYuAnBo!=null">
|
|
|
+ <el-tooltip class="item" effect="dark" :content="visuForestCloudYuAnBo.reserveName"
|
|
|
+ placement="top-start">
|
|
|
+ <a :href="visuForestCloudYuAnBo.fileUrl"><span>
|
|
|
<div
|
|
|
style=" width: 50px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;word-break: keep-all;">
|
|
|
{{ visuForestCloudYuAnBo.reserveName }}
|
|
|
</div>
|
|
|
</span></a>
|
|
|
- </el-tooltip>
|
|
|
- </el-carousel-item>
|
|
|
- <el-carousel-item v-else>
|
|
|
- <a href="#">暂未关联预案</a>
|
|
|
- </el-carousel-item>
|
|
|
- </el-carousel>
|
|
|
+ </el-tooltip>
|
|
|
+ </el-carousel-item>
|
|
|
+ <el-carousel-item v-else>
|
|
|
+ <a href="#">暂未关联预案</a>
|
|
|
+ </el-carousel-item>
|
|
|
+ </el-carousel>
|
|
|
+ </div>
|
|
|
+ <el-button size="mini" type="primary" class="yatz_button" @click="showUpdateYjYuAn">预案调整
|
|
|
+ </el-button>
|
|
|
</div>
|
|
|
- <el-button size="mini" type="primary" class="yatz_button" @click="showUpdateYjYuAn">预案调整
|
|
|
- </el-button>
|
|
|
- </div>
|
|
|
</transition-group>
|
|
|
<!-- 左侧资源 -->
|
|
|
<transition-group
|
|
|
@@ -94,45 +94,45 @@
|
|
|
enter-active-class="animate__backInUp"
|
|
|
leave-active-class="animate__backOutDown"
|
|
|
>
|
|
|
- <div class="leftbar" style="width:fit-content !important;bottom:0rem;left: 1rem; top: unset;" v-show="mapToolCheckItem.includes('资源与操作')"
|
|
|
- key="mapToolziyuan">
|
|
|
- <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="leftbar" style="width:fit-content !important;bottom:0rem;left: 1rem; top: unset;" v-show="mapToolCheckItem.includes('资源与操作')"
|
|
|
+ key="mapToolziyuan">
|
|
|
+ <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="mapToolCheckItem.includes('资源与操作')">
|
|
|
- <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 class="d-l-con-icon" style="width: fit-content; flex-direction:row;flex-wrap: nowrap;"
|
|
|
+ ref="thisWidthWH">
|
|
|
+ <leftRightSwiperScroll v-if="mapToolCheckItem.includes('资源与操作')">
|
|
|
+ <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>
|
|
|
- </leftRightSwiperScroll>
|
|
|
- </div>
|
|
|
+ </leftRightSwiperScroll>
|
|
|
+ </div>
|
|
|
|
|
|
- <el-input type="number" v-model="radius" class="d-input-bottom" placeholder="请输入搜索半径" />
|
|
|
- </div>
|
|
|
- </dv-border-box-7>
|
|
|
+ <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" style="bottom:5rem" v-show="mapToolCheckItem.includes('资源与操作')"
|
|
|
+ key="ziyuan">
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ icon="el-icon-s-grid"
|
|
|
+ @click="showTVWallDiaLog()"
|
|
|
+ >视频联动</el-button>
|
|
|
+ <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>
|
|
|
- </div>
|
|
|
- <!-- 左侧资源end -->
|
|
|
- <!-- 应急预案end -->
|
|
|
- <div class="fire-m" style="bottom:5rem" v-show="mapToolCheckItem.includes('资源与操作')"
|
|
|
- key="ziyuan">
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- icon="el-icon-s-grid"
|
|
|
- @click="showTVWallDiaLog()"
|
|
|
- >视频联动</el-button>
|
|
|
- <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>
|
|
|
</transition-group>
|
|
|
<!-- 地图 -->
|
|
|
<supermapDialog1 ref="supermapDialog1" style="position: absolute; top:0;left: 0;"
|
|
|
@@ -211,8 +211,8 @@
|
|
|
<div class="z-info-btm-grp-left">
|
|
|
<el-button size="small" icon="el-icon-upload" @click="showEventLogUpload()">上传
|
|
|
</el-button>
|
|
|
-<!-- <el-button size="small" icon="el-icon-download" @click="toImage()">截图上传-->
|
|
|
-<!-- </el-button>-->
|
|
|
+ <!-- <el-button size="small" icon="el-icon-download" @click="toImage()">截图上传-->
|
|
|
+ <!-- </el-button>-->
|
|
|
<el-button size="small" icon="el-icon-download" @click="showResponsibility()"
|
|
|
v-if="eventStatusValue!='forest_event_status_1'&&eventStatusValue!='forest_event_status_7'">责任制
|
|
|
</el-button>
|
|
|
@@ -1799,8 +1799,9 @@ import {
|
|
|
joinConferences
|
|
|
} from "@/api/meeting";
|
|
|
import findUserByDept from '@/views/findUserByDept'
|
|
|
-import Cookies from "js-cookie";
|
|
|
-import request from "@/utils/request"; //责任人选择弹框
|
|
|
+import Cookies from "js-cookie"; //责任人选择弹框
|
|
|
+import request from "@/utils/request";
|
|
|
+
|
|
|
export default {
|
|
|
dicts: ['task_source'],
|
|
|
watch: {
|
|
|
@@ -1820,6 +1821,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ centermonitorTCamera:null,
|
|
|
//地图tool开关
|
|
|
mapToolShow: false,
|
|
|
mapToolCheckAll: false,
|
|
|
@@ -2555,7 +2557,7 @@ export default {
|
|
|
method: 'get'
|
|
|
}).then(res => {
|
|
|
if(res.data!=null&&res.data.length==0){
|
|
|
- this.$message.warning("设定范围内无该资源信息！")
|
|
|
+ this.$message.warning("设定范围内无摄像头信息！")
|
|
|
}
|
|
|
if (res.data != null && res.data.length > 0) {
|
|
|
this.resourcesListCheck.push(type)
|
|
|
@@ -2586,63 +2588,53 @@ export default {
|
|
|
} else if (type == 'zdqy') {
|
|
|
markersMap.icon = 'sj-icon-keyAreas'
|
|
|
} else if (type == 'sxt') {
|
|
|
- if(res.data[i].cameraUse==1)
|
|
|
- {
|
|
|
- if(res.data[i].workingStatus==0)
|
|
|
- {
|
|
|
- markersMap.icon='sj-icon-map-centerdata-slmonitor'
|
|
|
+ if (res.data[i].cameraUse == 1) {
|
|
|
+ if (res.data[i].workingStatus == '0') {
|
|
|
+ markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
|
|
|
markersMap.click='preview'
|
|
|
- }else if (res.data[i].workingStatus==1)
|
|
|
- {
|
|
|
- markersMap.icon='sj-icon-map-not-centerdata-slmonitor'
|
|
|
+ } else {
|
|
|
+ markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor'
|
|
|
markersMap.click=''
|
|
|
}
|
|
|
-
|
|
|
- } else if (res.data[i].cameraUse == 2){
|
|
|
- if(res.data[i].workingStatus==0)
|
|
|
- {
|
|
|
- markersMap.icon = "camera";
|
|
|
- markersMap.click='preview'
|
|
|
- }else if (res.data[i].workingStatus==1)
|
|
|
- {
|
|
|
- markersMap.icon = "camera-not";
|
|
|
+ }
|
|
|
+ else if (res.data[i].cameraUse == 2) {
|
|
|
+ if (res.data[i].workingStatus == '0') {
|
|
|
+ markersMap.icon = 'camera'
|
|
|
+ markersMap.click=''
|
|
|
+ } else {
|
|
|
+ markersMap.icon = 'camera-not'
|
|
|
markersMap.click=''
|
|
|
}
|
|
|
- } else if (res.data[i].cameraUse == 3) {
|
|
|
- if(res.data[i].workingStatus==0)
|
|
|
- {
|
|
|
+ }
|
|
|
+ else if (res.data[i].cameraUse == 3) {
|
|
|
+ if (res.data[i].workingStatus == '0') {
|
|
|
markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
|
|
|
markersMap.click='preview'
|
|
|
- }else if (res.data[i].workingStatus==1)
|
|
|
- {
|
|
|
+ } else {
|
|
|
markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
|
|
|
markersMap.click=''
|
|
|
}
|
|
|
-
|
|
|
+ }
|
|
|
+ else if (res.data[i].cameraUse == 5) {
|
|
|
+ if (res.data[i].workingStatus == '0') {
|
|
|
+ markersMap.icon = 'sj-icon-map-centerdata-river_camera'
|
|
|
+ markersMap.click='preview'
|
|
|
+ } else {
|
|
|
+ markersMap.icon = 'sj-icon-map-not-centerdata-river_camera'
|
|
|
+ markersMap.click=''
|
|
|
+ }
|
|
|
}
|
|
|
else if (res.data[i].cameraUse == 4) {
|
|
|
- if(res.data[i].workingStatus==0)
|
|
|
- {
|
|
|
+ if (res.data[i].workingStatus == '0') {
|
|
|
markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
|
|
|
markersMap.click='preview'
|
|
|
- }else if (res.data[i].workingStatus==1)
|
|
|
- {
|
|
|
+ } else {
|
|
|
markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
|
|
|
markersMap.click=''
|
|
|
}
|
|
|
-
|
|
|
- }
|
|
|
- else if (res.data[i].cameraUse == 5) {
|
|
|
- if (res.data[i].workingStatus == 0) {
|
|
|
- markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
|
|
|
- markersMap.click = 'preview'
|
|
|
- } else if (res.data[i].workingStatus == 1) {
|
|
|
- markersMap.icon = 'sj-icon-map-not-centerdata-t-hydraulic-reservoir-camera'
|
|
|
- markersMap.click = ''
|
|
|
- }
|
|
|
}
|
|
|
if (res.data[i].cameraCode != null) {
|
|
|
- // markersMap.click = 'preview'
|
|
|
+ // markersMap.click = 'preview'
|
|
|
// markersMap.parameter = res.data[i].cameraCode
|
|
|
markersMap.parameter = {code:res.data[i].cameraCode,
|
|
|
type:res.data[i].cameraFactory?res.data[i].cameraFactory:1,name:res.data[i].cameraName}
|
|
|
@@ -3249,7 +3241,7 @@ export default {
|
|
|
this.mapToolCheckItem = [];
|
|
|
this.mapToolCheckAll=false
|
|
|
this.mapToolShowBH=false,
|
|
|
- this.dataStatus = null
|
|
|
+ this.dataStatus = null
|
|
|
this.deptId = null
|
|
|
console.log('关闭事件弹窗')
|
|
|
this.eventLogList = []
|
|
|
@@ -3259,7 +3251,7 @@ export default {
|
|
|
this.mapToolCheckItem = [];
|
|
|
this.mapToolCheckAll=false
|
|
|
this.mapToolShowBH=false,
|
|
|
- this.getNewDataByDate(this.calendarDay)
|
|
|
+ this.getNewDataByDate(this.calendarDay)
|
|
|
this.eventCode = eventCode
|
|
|
let that = this
|
|
|
//获取事件详情
|
|
|
@@ -3361,9 +3353,9 @@ export default {
|
|
|
res.data.catalogue.latitude,
|
|
|
res.data.catalogue.longitude
|
|
|
);
|
|
|
- that.$refs.supermapDialog1.clearM(false);
|
|
|
- that.$refs.supermapDialog1.clearM(true);
|
|
|
- that.$refs.supermapDialog1.setMarkersRadius(markersMapList);
|
|
|
+ that.$refs.supermapDialog1.clearM(false);
|
|
|
+ that.$refs.supermapDialog1.clearM(true);
|
|
|
+ that.$refs.supermapDialog1.setMarkersRadius(markersMapList);
|
|
|
}, 2000);
|
|
|
})
|
|
|
},
|
|
|
@@ -3461,9 +3453,9 @@ export default {
|
|
|
res.data.catalogue.latitude,
|
|
|
res.data.catalogue.longitude
|
|
|
);
|
|
|
- that.$refs.supermapDialog1.clearM(false);
|
|
|
- that.$refs.supermapDialog1.clearM(true);
|
|
|
- that.$refs.supermapDialog1.setMarkersRadius(markersMapList);
|
|
|
+ that.$refs.supermapDialog1.clearM(false);
|
|
|
+ that.$refs.supermapDialog1.clearM(true);
|
|
|
+ that.$refs.supermapDialog1.setMarkersRadius(markersMapList);
|
|
|
}, 2000);
|
|
|
})
|
|
|
},
|
qinhouyu