|
@@ -34,7 +34,6 @@
|
|
|
</div>
|
|
|
<a :href="visuForestCloudYuAnBo.fileUrl">{{ visuForestCloudYuAnBo.reserveName | ellipsisFont6 }}</a>
|
|
|
</el-tooltip>
|
|
|
-
|
|
|
</el-carousel-item>
|
|
|
<el-carousel-item v-else>
|
|
|
<a href="#">暂未关联预案</a>
|
|
@@ -87,6 +86,8 @@
|
|
|
:isSideBySide="false"
|
|
|
:isdynamicPlotting="true"
|
|
|
@preview="preview"/>
|
|
|
+ <!-- <supermapDialog ref="supermapDialog" -->
|
|
|
+ <!-- @preview="preview"/> -->
|
|
|
<!-- 地图end -->
|
|
|
</div>
|
|
|
</el-col>
|
|
@@ -95,7 +96,7 @@
|
|
|
<el-col :span="6" class="dia-right">
|
|
|
<div class="e-right">
|
|
|
<div class="forthis1">
|
|
|
- <dv-border-box-7 backgroundColor="#040b1f" :color="['#25335d', '#5baffd']"
|
|
|
+ <dv-border-box-7 backgroundColor="#040b1f"
|
|
|
style="padding-bottom:1rem ;">
|
|
|
<div class="i-list-con">
|
|
|
<div class="this-con">
|
|
@@ -157,20 +158,18 @@
|
|
|
</dv-border-box-7>
|
|
|
</div>
|
|
|
<div class="forthis2">
|
|
|
- <dv-border-box-7 backgroundColor="#040b1f" :color="['#25335d', '#5baffd']">
|
|
|
+ <dv-border-box-7 backgroundColor="#040b1f" >
|
|
|
<div class="i-list-con">
|
|
|
<div class="this-con h-25 no-padding">
|
|
|
<div class="z-info-list" style="margin-top: 0;">
|
|
|
<div class="z-info-btm-grp">
|
|
|
<div class="z-info-btm-grp-top">
|
|
|
<div class="z-info-btm-grp-left">
|
|
|
- <!-- <el-button size="small" icon="el-icon-s-flag">责任制-->
|
|
|
- <!-- </el-button>-->
|
|
|
<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="showResponsibility()">责任制
|
|
|
+ <el-button size="small" icon="el-icon-download" @click="showResponsibility()" v-if="eventStatusValue!='forest_event_status_1'&&eventStatusValue!='forest_event_status_7'">责任制
|
|
|
</el-button>
|
|
|
<el-button v-if="eventStatusValue=='forest_event_status_2' && statusFlag=='1' && dataStatus=='0'"
|
|
|
size="small" icon="el-icon-download" @click="updateCentereventTEventcatalogueStatus('cz',true)">处置
|
|
@@ -213,16 +212,16 @@
|
|
|
@click="updateCentereventTEventcatalogueStatus('qs',false)">
|
|
|
签收
|
|
|
</el-button>
|
|
|
- <!--<el-button size="small"-->
|
|
|
- <!--icon="el-icon-question"-->
|
|
|
- <!--@click="updateCentereventTEventcatalogueStatus('wb',false)">-->
|
|
|
- <!--误报-->
|
|
|
- <!--</el-button>-->
|
|
|
- <!--<el-button size="small"-->
|
|
|
- <!--icon="el-icon-warning"-->
|
|
|
- <!--@click="updateCentereventTEventcatalogueStatus('cf',false)">-->
|
|
|
- <!--重复-->
|
|
|
- <!--</el-button>-->
|
|
|
+ <el-button size="small"
|
|
|
+ icon="el-icon-question"
|
|
|
+ @click="updateCentereventTEventcatalogueStatus('wb',false)">
|
|
|
+ 误报
|
|
|
+ </el-button>
|
|
|
+ <el-button size="small"
|
|
|
+ icon="el-icon-warning"
|
|
|
+ @click="updateCentereventTEventcatalogueStatus('cf',false)">
|
|
|
+ 重复
|
|
|
+ </el-button>
|
|
|
</div>
|
|
|
<el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
|
|
|
</el-button>
|
|
@@ -256,12 +255,12 @@
|
|
|
<div class="z-info-btm-input-btn"
|
|
|
v-else-if="eventStatusValue=='forest_event_status_5'&&statusFlag=='1'">
|
|
|
<el-button size="small"
|
|
|
- icon="el-icon-success" style="text-align:left" v-if="eventType == 1"
|
|
|
+ icon="el-icon-success" style="text-align:left" v-if="eventTypeXl == 101"
|
|
|
@click="updateCentereventTEventcatalogueStatus('gd',false)">
|
|
|
填报
|
|
|
</el-button>
|
|
|
<el-button size="small"
|
|
|
- icon="el-icon-success" style="text-align:left" v-if="eventType != 1"
|
|
|
+ icon="el-icon-success" style="text-align:left" v-if="eventTypeXl != 101"
|
|
|
@click="updateCentereventTEventcatalogueStatus('gd',true)">
|
|
|
归档
|
|
|
</el-button>
|
|
@@ -293,7 +292,7 @@
|
|
|
class="top-dialog"
|
|
|
@close="cancelEventConfirm()">
|
|
|
<el-form label-width="80px">
|
|
|
- <el-form-item label="火灾半径" v-if="eventStatusButton=='qs' && eventTypeXl==null">
|
|
|
+ <el-form-item label="火灾半径" v-if="eventStatusButton=='qs'&&eventTypeXl==null">
|
|
|
<el-input type="number" v-model="sendHuoZaiBanJing" placeholder="请输入火灾半径"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item :label="deptNameitem">
|
|
@@ -309,7 +308,7 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="事件类型" v-if="eventStatusButton=='qs' && eventTypeXl == null">
|
|
|
+ <el-form-item label="事件类型" v-if="eventStatusButton=='qs'&& eventTypeXl == null">
|
|
|
<el-select v-model="sendEventType" placeholder="请选择事件类型!" clearable>
|
|
|
<el-option
|
|
|
v-for="item in eventTypeList"
|
|
@@ -1064,6 +1063,7 @@
|
|
|
<areaSupermap ref="fireAreaSupermap" v-if="regionalFlagOpen" style="width: 100%;height:74vh"
|
|
|
:mapDiv="'fireAreaSuperMap'" :mapSite="{doubleClickZoom:false}" :codes="['9fa5']"
|
|
|
:isSideBySide="false" :showAreaLatLng="showAreaLatLng"></areaSupermap>
|
|
|
+ <!-- <areaSupermap ref="fireAreaSupermap" v-if="regionalFlagOpen" :showAreaLatLng="showAreaLatLng"></areaSupermap> -->
|
|
|
</el-dialog>
|
|
|
<!-- 图片,视频预览 -->
|
|
|
<el-dialog title="视频预览" :visible.sync="showTcPlayer" width="40%" customClass="customWidthMp4">
|
|
@@ -1086,15 +1086,14 @@
|
|
|
<script>
|
|
|
import html2canvas from 'html2canvas'//截图组件
|
|
|
import supermapDialog from '@/components/supermap' //超图
|
|
|
+import TVWall from '@/components/TVWall.vue' //电视墙弹窗
|
|
|
import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部菜单
|
|
|
import eventLogUpload from '@/views/eventLogUpload.vue' //日志上传文件
|
|
|
import areaSupermap from '@/components/supermap'//区域标记地图
|
|
|
import TcPlayer from '@/components/TcPlayer' //视频预览
|
|
|
-import TVWall from '@/components/TVWall.vue' //电视墙弹窗
|
|
|
import findUserByDept from '@/views/findUserByDept' //责任人选择弹框
|
|
|
import leftRightSwiperScroll from '@/components/leftRightSwiperScroll.vue';//事件中心底部资源内容溢出组件
|
|
|
import {getIconBg} from '@/api/components/sookaMapIcon';//资源底色控制文件
|
|
|
-import {joinConferences} from "@/api/meeting";
|
|
|
import {
|
|
|
fireControlViewPoint,
|
|
|
fireControlViewList,
|
|
@@ -1113,10 +1112,11 @@ import {
|
|
|
dutysystemAdd,
|
|
|
dutysystemRemove,
|
|
|
sendMessage,
|
|
|
+ userFeginlist,
|
|
|
eventHandling,
|
|
|
- initByCameras,
|
|
|
- userFeginlist
|
|
|
+ initByCameras
|
|
|
} from '@/api/forest'
|
|
|
+import {joinConferences} from "@/api/meeting";
|
|
|
import {
|
|
|
treeselectAll as deptTreeselect
|
|
|
} from '@/api/system/dept'
|
|
@@ -1142,59 +1142,17 @@ export default {
|
|
|
},
|
|
|
components: {
|
|
|
leftRightSwiperScroll,
|
|
|
+ TVWall,
|
|
|
vBottomMenu,
|
|
|
supermapDialog,
|
|
|
eventLogUpload,
|
|
|
areaSupermap,
|
|
|
- TVWall,
|
|
|
TcPlayer,
|
|
|
findUserByDept
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
isLoading:false,
|
|
|
- aa:[
|
|
|
- {
|
|
|
- "switchTab":"2",
|
|
|
- "treeLabels":[
|
|
|
- {
|
|
|
- "id":null,
|
|
|
- "labelCode":"999",
|
|
|
- "labelName":"电视墙",
|
|
|
- "parentLabelCode":""
|
|
|
- },
|
|
|
- {
|
|
|
- "id":"spcamera00288",
|
|
|
- "labelCode":"22030300001321100289",
|
|
|
- "labelName":"四平市伊通县西苇椽子沟村",
|
|
|
- "parentLabelCode":"999"
|
|
|
- }
|
|
|
- ],
|
|
|
- "labelChannels":[
|
|
|
- {
|
|
|
- "labelCode":"22030300001321100289",
|
|
|
- "channelDates":[
|
|
|
- {
|
|
|
- "channelCode":"22030300001321100289",
|
|
|
- "channelName":"四平市伊通县西苇椽子沟村可见光",
|
|
|
- "channelSn":null,
|
|
|
- "cameraType":null,
|
|
|
- "online":"1",
|
|
|
- "cameraCode":null
|
|
|
- },
|
|
|
- {
|
|
|
- "channelCode":"22030300001321100290",
|
|
|
- "channelName":"四平市伊通县西苇椽子沟村热成像",
|
|
|
- "channelSn":null,
|
|
|
- "cameraType":null,
|
|
|
- "online":"1",
|
|
|
- "cameraCode":null
|
|
|
- }
|
|
|
- ]
|
|
|
- }
|
|
|
- ]
|
|
|
- }
|
|
|
- ],
|
|
|
showFindUserByDept: false,//责任人选择框
|
|
|
//海康
|
|
|
cameraTitle: '',
|
|
@@ -1416,10 +1374,6 @@ export default {
|
|
|
this.ws = DHWsInstance
|
|
|
/** ----------------------------------摄像头预览结束------------------------------------- */
|
|
|
},
|
|
|
- mounted() {
|
|
|
- // 获取消防左侧菜单列表
|
|
|
- // this.fireControlViewList();
|
|
|
- },
|
|
|
methods: {
|
|
|
// 获取消防左侧菜单列表
|
|
|
fireControlViewList() {
|
|
@@ -1463,10 +1417,6 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
/************************************责任制-开始****************************************/
|
|
|
- //初始化责任制数据列表
|
|
|
- initDutysystemTableData(){
|
|
|
- this.dutysystemTableData = [];
|
|
|
- },
|
|
|
addLine: function() {//添加负责人行数
|
|
|
var newValue = {
|
|
|
id: '',//主键
|
|
@@ -1474,7 +1424,7 @@ export default {
|
|
|
depteventId: '',//事件部门关联责任人
|
|
|
name: '',//姓名
|
|
|
post: '',//岗位
|
|
|
- telphone: ''//手机号
|
|
|
+ telphone: ''//手机号addSelection
|
|
|
}
|
|
|
//添加新的行数
|
|
|
this.dutysystemTableData.push(newValue)
|
|
@@ -1535,6 +1485,8 @@ export default {
|
|
|
},
|
|
|
|
|
|
showResponsibility() {//弹出责任制弹窗
|
|
|
+ //初始化责任制数据列表
|
|
|
+ this.dutysystemTableData = [];
|
|
|
let param = { eventCode: this.eventCode }
|
|
|
centereventtdepteventList(param).then(res => {
|
|
|
this.depteventList = res.data
|
|
@@ -1556,9 +1508,11 @@ export default {
|
|
|
this.showMeetingMsgDialog = false
|
|
|
},
|
|
|
addResponsibilityDialog() {//责任制保存
|
|
|
+console.log(this.dutysystemTableData)
|
|
|
let reg_user = /^[\u4e00-\u9fa5]{2,4}$/; //2-4个中文字符正则
|
|
|
let reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/; //11位手机号码正则
|
|
|
for(let i in this.dutysystemTableData){
|
|
|
+
|
|
|
if(!reg_user.test(this.dutysystemTableData[i].name)){
|
|
|
this.$message.error(`请输入正确姓名!`)
|
|
|
return;
|
|
@@ -1589,6 +1543,7 @@ export default {
|
|
|
// }
|
|
|
// this.cancelEventShow();
|
|
|
this.eventDialog = false;
|
|
|
+
|
|
|
this.$emit('getFirespread', this.eventCode);
|
|
|
},
|
|
|
showTVWallDiaLog() {
|
|
@@ -1596,12 +1551,50 @@ export default {
|
|
|
// this.$refs.TVWall.showTVWall();
|
|
|
|
|
|
},
|
|
|
+ showTVWall(channelCode, channelName) {
|
|
|
+ let tvListJson = [{
|
|
|
+ "switchTab": "2",
|
|
|
+ "treeLabels": [{
|
|
|
+ "id": null,
|
|
|
+ "labelCode": "999",
|
|
|
+ "labelName": "电视墙",
|
|
|
+ "cameraType": null,
|
|
|
+ "parentLabelCode": ""
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "id": "spcamera00010",
|
|
|
+ "labelCode": channelCode,
|
|
|
+ "labelName": channelName,
|
|
|
+ "cameraType": "1",
|
|
|
+ "parentLabelCode": "999"
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ "labelChannels": [{
|
|
|
+ "labelCode": channelCode,
|
|
|
+ "channelDates": [{
|
|
|
+ "channelCode": channelCode,
|
|
|
+ "channelName": channelName,
|
|
|
+ "channelSn": null,
|
|
|
+ "cameraType": "1",
|
|
|
+ "online": "1",
|
|
|
+ "cameraCode": "1"
|
|
|
+ }]
|
|
|
+ }]
|
|
|
+ }]
|
|
|
+ this.$refs.TVWall.showTVWall(tvListJson, [{
|
|
|
+ "channelId": channelCode
|
|
|
+ }]);
|
|
|
+ this.$refs.bottomMenu.showMeasure = false;
|
|
|
+ this.$refs.bottomMenu.showChild = false;
|
|
|
+ this.$refs.bottomMenu.showBanChild = false;
|
|
|
+ this.$refs.bottomMenu.showChangChild = false;
|
|
|
+ },
|
|
|
initByCameras()
|
|
|
{
|
|
|
const params=Object.assign({})
|
|
|
params.longitude=this.longitude;
|
|
|
params.latitude=this.latitude;
|
|
|
- params.type='7'
|
|
|
+ params.type='8'
|
|
|
initByCameras(params).then(res=>
|
|
|
{
|
|
|
this.$refs.TVWall.showTVWall1(this.longitude,this.latitude,res.data);
|
|
@@ -1622,9 +1615,12 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
updateYjYuAn() {
|
|
|
- if(this.eventStatusValue=='forest_event_status_1'){
|
|
|
- this.$message.error(`未签收事件无法修改预案信息,请先签收!`)
|
|
|
+ if(this.eventStatusValue=='forest_event_status_1'||this.eventStatusValue=='forest_event_status_7') {
|
|
|
+ this.$message.error(`修改预案信息在签收后方可修改!`)
|
|
|
return
|
|
|
+ }else if(this.eventStatusValue=='forest_event_status_3'){
|
|
|
+ this.$message.error(`误报事件无法修改预案信息!`)
|
|
|
+ return
|
|
|
}else{
|
|
|
let param = { eventCode: this.eventCode, reserve: this.sendGuanLianYuAn }
|
|
|
if(this.sendGuanLianYuAn==''||this.sendGuanLianYuAn==null){
|
|
@@ -1650,7 +1646,6 @@ export default {
|
|
|
this.$refs.supermapDialog.clearMByType(type)
|
|
|
}, 1000)
|
|
|
} else {
|
|
|
- console.log("消防资源落点")
|
|
|
// 消防资源落点
|
|
|
let param = { longitude: this.longitude, latitude: this.latitude, type: type, radius: this.radius }
|
|
|
if (type != 'sxt') {
|
|
@@ -1669,13 +1664,7 @@ export default {
|
|
|
keepBindPopup: false,
|
|
|
isAggregation: true
|
|
|
}
|
|
|
- if (res.data.pointList.length > 50) {
|
|
|
- markersMap.isAggregation = true
|
|
|
- }
|
|
|
- // centerdata_t_firecontrol_basic_linkage_force
|
|
|
- // sj-icon-map-centerdata-t-firecontrol-basic-linkage-force
|
|
|
markersMap.icon = 'sj-icon-map-' + type.replaceAll("_", "-");
|
|
|
- // alert(res.data.pointList[i].longitude)
|
|
|
markersMap.lng = res.data.pointList[i].longitude;
|
|
|
markersMap.lat = res.data.pointList[i].latitude;
|
|
|
markersMap.bindPopupHtml = '<div class="map-tip">' +
|
|
@@ -1744,15 +1733,12 @@ export default {
|
|
|
keepBindPopup: false,
|
|
|
isAggregation: true
|
|
|
}
|
|
|
- if (res.data.length > 50) {
|
|
|
- markersMap.isAggregation = true
|
|
|
- }
|
|
|
if (type == 'qsk') {
|
|
|
- markersMap.icon = 'sj-icon-waterintake'
|
|
|
+ markersMap.icon = 'sj-icon-centerdata-t-forest-waterintake'
|
|
|
} else if (type == 'sh') {
|
|
|
- markersMap.icon = 'sj-icon-watercrane'
|
|
|
+ markersMap.icon = 'sj-icon-centerdata-t-forest-watercrane'
|
|
|
} else if (type == 'xfs') {
|
|
|
- markersMap.icon = 'sj-icon-firehydrant'
|
|
|
+ markersMap.icon = 'sj-icon-centerdata-t-forest-firehydrant'
|
|
|
} else if (type == 'qjd') {
|
|
|
markersMap.icon = 'sj-icon-landing'
|
|
|
} else if (type == 'jcz') {
|
|
@@ -1767,7 +1753,7 @@ export default {
|
|
|
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}
|
|
|
+ type:res.data[i].cameraFactory?res.data[i].cameraFactory:1,name:res.data[i].name}
|
|
|
}
|
|
|
}
|
|
|
markersMap.lng = res.data[i].longitude
|
|
@@ -1970,6 +1956,7 @@ export default {
|
|
|
* eventStatusValue 事件状态
|
|
|
* isSend 是否办理
|
|
|
* */
|
|
|
+
|
|
|
async updateCentereventTEventcatalogueStatus(eventStatus, isSend) {
|
|
|
this.eventStatusButton = eventStatus
|
|
|
let that=this
|
|
@@ -2042,7 +2029,7 @@ export default {
|
|
|
}
|
|
|
} else {//事件提交后台
|
|
|
if (eventStatus == 'ld') {
|
|
|
- //事件处理流程--联动
|
|
|
+ //事件处理流程--联动1
|
|
|
let array = that.$refs.LiandongDept.getCheckedNodes()
|
|
|
if (array != null && array.length > 0) {
|
|
|
for (let i = 0; i < array.length; i++) {
|
|
@@ -2069,23 +2056,36 @@ export default {
|
|
|
that.$message.error(`请选择任务发起部门!`)
|
|
|
return
|
|
|
}
|
|
|
- let param = {
|
|
|
- sendDeptId: that.sendDeptId,
|
|
|
- sendDept: that.sendDeptName,
|
|
|
- eventCode: that.eventCode,
|
|
|
- longitude: that.longitude,
|
|
|
- latitude: that.latitude,
|
|
|
- taskTitle: that.sendTaskTitle,
|
|
|
- taskSource: that.sendTaskSource,
|
|
|
- taskContent: that.sendTaskContent,
|
|
|
- taskDept: that.sendLianDongDept
|
|
|
- }
|
|
|
- sendTask(param).then(res => {
|
|
|
+ let eventState = "";
|
|
|
+ listSJfl({ parentId: that.eventType }).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
- that.$message.success(`联动发起成功!`)
|
|
|
- that.refreshEventDialog(that.eventCode)
|
|
|
- that.cancelEventConfirm_send()
|
|
|
- that.showEventConfirm = false
|
|
|
+ for(let i in res.data){
|
|
|
+ if(res.data[i].id = that.eventTypeXl){
|
|
|
+ eventState = res.data[i].eventTypeName;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ let param = {
|
|
|
+ sendDeptId: that.sendDeptId,
|
|
|
+ sendDept: that.sendDeptName,
|
|
|
+ eventCode: that.eventCode,
|
|
|
+ longitude: that.longitude,
|
|
|
+ latitude: that.latitude,
|
|
|
+ taskTitle: that.sendTaskTitle,
|
|
|
+ taskSource: that.sendTaskSource,
|
|
|
+ taskContent: that.sendTaskContent,
|
|
|
+ taskDept: that.sendLianDongDept,
|
|
|
+ eventAddress:that.address,
|
|
|
+ eventState:eventState,
|
|
|
+ eventName:that.eventName
|
|
|
+ }
|
|
|
+ sendTask(param).then(res => {
|
|
|
+ if (res.code == 200) {
|
|
|
+ that.$message.success(`联动发起成功!`)
|
|
|
+ that.refreshEventDialog(that.eventCode)
|
|
|
+ that.cancelEventConfirm_send()
|
|
|
+ that.showEventConfirm = false
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
})
|
|
|
|
|
@@ -2116,7 +2116,6 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
//事件处理流程--归档
|
|
|
let param = {
|
|
|
deptId: that.deptId,
|
|
@@ -2148,7 +2147,7 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
} else {
|
|
|
- if (eventStatus == 'qs') {
|
|
|
+ if (eventStatus == 'qs' ) {
|
|
|
if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName == null) {
|
|
|
that.$message.error(`请选择部门!`)
|
|
|
return
|
|
@@ -2175,7 +2174,7 @@ export default {
|
|
|
cameraCode: that.cameraCode,
|
|
|
fireRadius: that.sendHuoZaiBanJing,
|
|
|
reserve: that.sendGuanLianYuAn,
|
|
|
- fileList:eventStatus == 'qs'?this.eventLogList[this.eventLogList.length-1].fileVOs:[]
|
|
|
+ address:that.address,
|
|
|
}
|
|
|
updateCentereventTEventcatalogueStatus(param).then(res => {
|
|
|
if (res.code == 200) {
|
|
@@ -2223,8 +2222,7 @@ export default {
|
|
|
this.eventLogList = []
|
|
|
},
|
|
|
showEventDialog(eventCode) {
|
|
|
- // 获取消防左侧菜单列表
|
|
|
- this.fireControlViewList();
|
|
|
+ this.fireControlViewList()
|
|
|
this.eventCode = eventCode
|
|
|
let that = this
|
|
|
//获取事件详情
|
|
@@ -2274,9 +2272,9 @@ export default {
|
|
|
markersMap.radius = res.data.eventdetail[0].fireRadius
|
|
|
}
|
|
|
setTimeout(() => {
|
|
|
- that.$refs.supermapDialog.dynamicPlotting()//弹出动态绘制窗口,防止截图位置改变
|
|
|
+ that.$refs.supermapDialog.dynamicPlotting()//弹出动态绘制窗口,防止截图位置改变
|
|
|
+ that.$refs.supermapDialog.clearM(false)
|
|
|
that.$refs.supermapDialog.clearM(true)
|
|
|
- that.$refs.supermapDialog.clearM(false)
|
|
|
that.$refs.supermapDialog.setMarkersRadius([markersMap])
|
|
|
that.$refs.supermapDialog.dropLocation10(res.data.catalogue.latitude, res.data.catalogue.longitude)
|
|
|
}, 2000)
|
|
@@ -2288,7 +2286,7 @@ export default {
|
|
|
icon: 'camera',
|
|
|
bindPopupHtml: '',
|
|
|
click: 'preview',
|
|
|
- parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
|
|
|
+ parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory,name:res.data.centermonitorTCamera.cameraName},
|
|
|
keepBindPopup: false,
|
|
|
isAggregation: true,
|
|
|
radius: 0
|
|
@@ -2306,8 +2304,8 @@ export default {
|
|
|
markersMap.lng = res.data.centermonitorTCamera.longitude
|
|
|
markersMap.lat = res.data.centermonitorTCamera.latitude
|
|
|
setTimeout(() => {
|
|
|
- that.$refs.supermapDialog.clearM(true)
|
|
|
that.$refs.supermapDialog.clearM(false)
|
|
|
+ that.$refs.supermapDialog.clearM(true)
|
|
|
that.$refs.supermapDialog.setMarkers([markersMap])
|
|
|
}, 2000)
|
|
|
}
|
|
@@ -2363,8 +2361,8 @@ export default {
|
|
|
markersMap.radius = res.data.eventdetail[0].fireRadius
|
|
|
}
|
|
|
setTimeout(() => {
|
|
|
- that.$refs.supermapDialog.clearM(true)
|
|
|
that.$refs.supermapDialog.clearM(false)
|
|
|
+ that.$refs.supermapDialog.clearM(true)
|
|
|
if (res.data.eventdetail != null && res.data.eventdetail.length > 0 && res.data.eventdetail[0].fireRadius != null && res.data.eventdetail[0].fireRadius != '' && res.data.eventdetail[0].fireRadius > 0) {
|
|
|
that.$refs.supermapDialog.setMarkersRadius([markersMap])
|
|
|
} else {
|
|
@@ -2379,7 +2377,7 @@ export default {
|
|
|
icon: 'camera',
|
|
|
bindPopupHtml: '',
|
|
|
click: 'preview',
|
|
|
- parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
|
|
|
+ parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory,name:res.data.centermonitorTCamera.cameraName},
|
|
|
keepBindPopup: false,
|
|
|
isAggregation: true,
|
|
|
radius: 0
|
|
@@ -2397,8 +2395,8 @@ export default {
|
|
|
markersMap.lng = res.data.centermonitorTCamera.longitude
|
|
|
markersMap.lat = res.data.centermonitorTCamera.latitude
|
|
|
setTimeout(() => {
|
|
|
- that.$refs.supermapDialog.clearM(true)
|
|
|
that.$refs.supermapDialog.clearM(false)
|
|
|
+ that.$refs.supermapDialog.clearM(true)
|
|
|
that.$refs.supermapDialog.setMarkers([markersMap])
|
|
|
}, 2000)
|
|
|
}
|
|
@@ -2487,35 +2485,36 @@ export default {
|
|
|
/** 预览按钮操作 */
|
|
|
preview(cameraParam) {
|
|
|
if(cameraParam.type=='1'){
|
|
|
- getDahuaVideoServer().then(newResponse => {
|
|
|
- console.log(newResponse)
|
|
|
- this.ws.detectConnectQt().then(res => {
|
|
|
- if (res) { // 连接客户端成功
|
|
|
- this.alertLogin()
|
|
|
- this.ws.login({
|
|
|
- loginIp: newResponse.loginIp,
|
|
|
- loginPort: newResponse.loginPort,
|
|
|
- userName: newResponse.userName,
|
|
|
- userPwd: newResponse.userPwd,
|
|
|
- token: '',
|
|
|
- https: 1
|
|
|
- })
|
|
|
- this.ws.on('loginState', (res) => {
|
|
|
- this.isLogin = res
|
|
|
- console.log('---res-----', res)
|
|
|
- if (res) {
|
|
|
- this.alertLoginSuccess()
|
|
|
- this.activePanel = 'key2'
|
|
|
- this.realTimeVideoDialog(cameraParam.code)
|
|
|
- } else {
|
|
|
- this.alertLoginFailed()
|
|
|
- }
|
|
|
- })
|
|
|
- } else { // 连接客户端失败
|
|
|
- this.alertReinstall()
|
|
|
- }
|
|
|
- })
|
|
|
- })
|
|
|
+ this.showTVWall(cameraParam.code,cameraParam.name)
|
|
|
+ // getDahuaVideoServer().then(newResponse => {
|
|
|
+ // console.log(newResponse)
|
|
|
+ // this.ws.detectConnectQt().then(res => {
|
|
|
+ // if (res) { // 连接客户端成功
|
|
|
+ // this.alertLogin()
|
|
|
+ // this.ws.login({
|
|
|
+ // loginIp: newResponse.loginIp,
|
|
|
+ // loginPort: newResponse.loginPort,
|
|
|
+ // userName: newResponse.userName,
|
|
|
+ // userPwd: newResponse.userPwd,
|
|
|
+ // token: '',
|
|
|
+ // https: 1
|
|
|
+ // })
|
|
|
+ // this.ws.on('loginState', (res) => {
|
|
|
+ // this.isLogin = res
|
|
|
+ // console.log('---res-----', res)
|
|
|
+ // if (res) {
|
|
|
+ // this.alertLoginSuccess()
|
|
|
+ // this.activePanel = 'key2'
|
|
|
+ // this.realTimeVideoDialog(cameraParam.code)
|
|
|
+ // } else {
|
|
|
+ // this.alertLoginFailed()
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // } else { // 连接客户端失败
|
|
|
+ // this.alertReinstall()
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // })
|
|
|
}else if(cameraParam.type=='0'){
|
|
|
let that = this
|
|
|
that.cameraVisible = true
|