|
|
@@ -23,17 +23,17 @@
|
|
|
<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-tooltip
|
|
|
- placement="top"
|
|
|
- popper-class="js-tps"
|
|
|
- :visible-arrow="visuForestCloudYuAnBo.reserveName.length>6"
|
|
|
- >
|
|
|
- <div slot="content" class="leader-info-container">
|
|
|
- <div class="leader-info-list-con" v-show="visuForestCloudYuAnBo.reserveName.length>6">
|
|
|
- <h4>{{ visuForestCloudYuAnBo.reserveName }}</h4>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <a :href="visuForestCloudYuAnBo.fileUrl">{{ visuForestCloudYuAnBo.reserveName | ellipsisFont6 }}</a>
|
|
|
- </el-tooltip>
|
|
|
+ placement="top"
|
|
|
+ popper-class="js-tps"
|
|
|
+ :visible-arrow="visuForestCloudYuAnBo.reserveName.length>6"
|
|
|
+ >
|
|
|
+ <div slot="content" class="leader-info-container">
|
|
|
+ <div class="leader-info-list-con" v-show="visuForestCloudYuAnBo.reserveName.length>6">
|
|
|
+ <h4>{{ visuForestCloudYuAnBo.reserveName }}</h4>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <a :href="visuForestCloudYuAnBo.fileUrl">{{ visuForestCloudYuAnBo.reserveName | ellipsisFont6 }}</a>
|
|
|
+ </el-tooltip>
|
|
|
</el-carousel-item>
|
|
|
<el-carousel-item v-else>
|
|
|
<a href="#">暂未关联预案</a>
|
|
|
@@ -86,6 +86,8 @@
|
|
|
:isSideBySide="false"
|
|
|
:isdynamicPlotting="true"
|
|
|
@preview="preview"/>
|
|
|
+ <!-- <supermapDialog ref="supermapDialog" -->
|
|
|
+ <!-- @preview="preview"/> -->
|
|
|
<!-- 地图end -->
|
|
|
</div>
|
|
|
</el-col>
|
|
|
@@ -94,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" :color="['#0c4b53', '#18caca']"
|
|
|
style="padding-bottom:1rem ;">
|
|
|
<div class="i-list-con">
|
|
|
<div class="this-con">
|
|
|
@@ -156,23 +158,21 @@
|
|
|
</dv-border-box-7>
|
|
|
</div>
|
|
|
<div class="forthis2">
|
|
|
- <dv-border-box-7 backgroundColor="#040b1f" :color="['#25335d', '#5baffd']">
|
|
|
+ <dv-border-box-7 backgroundColor="#040b1f" :color="['#0c4b53', '#18caca']" >
|
|
|
<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)">处置
|
|
|
+ size="small" icon="el-icon-download" @click="updateCentereventTEventcatalogueStatus('cz',true)">处置
|
|
|
</el-button>
|
|
|
</div>
|
|
|
<div class="z-info-btm-grp-right">
|
|
|
@@ -213,14 +213,14 @@
|
|
|
签收
|
|
|
</el-button>
|
|
|
<!--<el-button size="small"-->
|
|
|
- <!--icon="el-icon-question"-->
|
|
|
- <!--@click="updateCentereventTEventcatalogueStatus('wb',false)">-->
|
|
|
- <!--误报-->
|
|
|
+ <!--icon="el-icon-question"-->
|
|
|
+ <!--@click="updateCentereventTEventcatalogueStatus('wb',false)">-->
|
|
|
+ <!--误报-->
|
|
|
<!--</el-button>-->
|
|
|
<!--<el-button size="small"-->
|
|
|
- <!--icon="el-icon-warning"-->
|
|
|
- <!--@click="updateCentereventTEventcatalogueStatus('cf',false)">-->
|
|
|
- <!--重复-->
|
|
|
+ <!--icon="el-icon-warning"-->
|
|
|
+ <!--@click="updateCentereventTEventcatalogueStatus('cf',false)">-->
|
|
|
+ <!--重复-->
|
|
|
<!--</el-button>-->
|
|
|
</div>
|
|
|
<el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
|
|
|
@@ -229,14 +229,14 @@
|
|
|
<div class="z-info-btm-input-btn" v-else-if="eventStatusValue=='forest_event_status_2'">
|
|
|
<div>
|
|
|
<!--<el-button size="small"-->
|
|
|
- <!--icon="el-icon-question"-->
|
|
|
- <!--@click="updateCentereventTEventcatalogueStatus('wb',false)">-->
|
|
|
- <!--误报-->
|
|
|
+ <!--icon="el-icon-question"-->
|
|
|
+ <!--@click="updateCentereventTEventcatalogueStatus('wb',false)">-->
|
|
|
+ <!--误报-->
|
|
|
<!--</el-button>-->
|
|
|
<!--<el-button size="small"-->
|
|
|
- <!--icon="el-icon-warning"-->
|
|
|
- <!--@click="updateCentereventTEventcatalogueStatus('cf',false)">-->
|
|
|
- <!--重复-->
|
|
|
+ <!--icon="el-icon-warning"-->
|
|
|
+ <!--@click="updateCentereventTEventcatalogueStatus('cf',false)">-->
|
|
|
+ <!--重复-->
|
|
|
<!--</el-button>-->
|
|
|
<el-button size="small"
|
|
|
icon="el-icon-phone" style="text-align:left"
|
|
|
@@ -255,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>
|
|
|
@@ -367,13 +367,13 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<!--<el-form-item label="联系人" v-if="eventStatusButton=='qs'">-->
|
|
|
- <!--<el-select multiple collapse-tags v-model='sendUserFegin' placeholder='请选择联系人！' clearable filterable>-->
|
|
|
- <!--<el-option-->
|
|
|
- <!--v-for="item in userFeginList"-->
|
|
|
- <!--:label="item.nickName"-->
|
|
|
- <!--:value="item.phonenumber"-->
|
|
|
- <!--/>-->
|
|
|
- <!--</el-select>-->
|
|
|
+ <!--<el-select multiple collapse-tags v-model='sendUserFegin' placeholder='请选择联系人！' clearable filterable>-->
|
|
|
+ <!--<el-option-->
|
|
|
+ <!--v-for="item in userFeginList"-->
|
|
|
+ <!--:label="item.nickName"-->
|
|
|
+ <!--:value="item.phonenumber"-->
|
|
|
+ <!--/>-->
|
|
|
+ <!--</el-select>-->
|
|
|
<!--</el-form-item>-->
|
|
|
<el-button size="mini" type="primary" v-if="eventStatusButton=='qr'"
|
|
|
@click="updateCentereventTEventcatalogueStatus('qr',false)">确认
|
|
|
@@ -471,10 +471,10 @@
|
|
|
@click="handleDelete(scope.$index, scope.row)">删除
|
|
|
</el-button>
|
|
|
<!--<el-button-->
|
|
|
- <!--size="mini"-->
|
|
|
- <!--type="danger"-->
|
|
|
- <!--icon="el-icon-save"-->
|
|
|
- <!--@click="handleSave(scope.$index, scope.row)">保存-->
|
|
|
+ <!--size="mini"-->
|
|
|
+ <!--type="danger"-->
|
|
|
+ <!--icon="el-icon-save"-->
|
|
|
+ <!--@click="handleSave(scope.$index, scope.row)">保存-->
|
|
|
<!--</el-button>-->
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -578,8 +578,8 @@
|
|
|
<th rowspan="1" colspan="6" align="left"><input type="text" style="width:3rem;text-align: center;"
|
|
|
v-model="table1.reportTimeY"/>年<input
|
|
|
type="text" style="width:4rem;text-align: center;" v-model="table1.reportTimeM"/>月<input type="text"
|
|
|
- style="width:3rem;text-align: center;"
|
|
|
- v-model="table1.reportTimeD"/>日
|
|
|
+ style="width:3rem;text-align: center;"
|
|
|
+ v-model="table1.reportTimeD"/>日
|
|
|
</th>
|
|
|
<th rowspan="1" colspan="8" style="text-align: right;">吉林省人民政府森林防火指挥部办公室制</th>
|
|
|
</thead>
|
|
|
@@ -1063,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">
|
|
|
@@ -1085,6 +1086,7 @@
|
|
|
<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'//区域标记地图
|
|
|
@@ -1109,11 +1111,12 @@ import {
|
|
|
dutysystemList,
|
|
|
dutysystemAdd,
|
|
|
dutysystemRemove,
|
|
|
- userFeginlist,
|
|
|
sendMessage,
|
|
|
+ userFeginlist,
|
|
|
eventHandling,
|
|
|
initByCameras
|
|
|
} from '@/api/forest'
|
|
|
+import {joinConferences} from "@/api/meeting";
|
|
|
import {
|
|
|
treeselectAll as deptTreeselect
|
|
|
} from '@/api/system/dept'
|
|
|
@@ -1129,9 +1132,7 @@ import {
|
|
|
} from '@/api/dahua/dahua'
|
|
|
import DHWs from '@/dahua/lib/DHWs'
|
|
|
import { selectConfigKey } from "@/api/system/config";
|
|
|
-import TVWall from '@/components/TVWall.vue' //电视墙弹窗
|
|
|
import Cookies from 'js-cookie';
|
|
|
-import {joinConferences} from "@/api/meeting";
|
|
|
export default {
|
|
|
dicts: ['task_source'],
|
|
|
watch: {
|
|
|
@@ -1174,7 +1175,7 @@ export default {
|
|
|
sendDeptId: null,//签收部门/发起部门
|
|
|
sendDeptName: null,//签收部门/发起部门
|
|
|
sendEventType: null,//事件类型
|
|
|
- sendHuoZaiBanJing: 0,//火灾半径
|
|
|
+ sendHuoZaiBanJing: 0,//火灾报告
|
|
|
sendGuanLianYuAn: null,//关联预案
|
|
|
sendUserFegin: [],//联系人
|
|
|
sendTaskSource: null,//任务来源
|
|
|
@@ -1373,10 +1374,6 @@ export default {
|
|
|
this.ws = DHWsInstance
|
|
|
/** ----------------------------------摄像头预览结束------------------------------------- */
|
|
|
},
|
|
|
- mounted() {
|
|
|
- // 获取消防左侧菜单列表
|
|
|
- // this.fireControlViewList();
|
|
|
- },
|
|
|
methods: {
|
|
|
// 获取消防左侧菜单列表
|
|
|
fireControlViewList() {
|
|
|
@@ -1420,10 +1417,6 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
/************************************责任制-开始****************************************/
|
|
|
- //初始化责任制数据列表
|
|
|
- initDutysystemTableData(){
|
|
|
- this.dutysystemTableData = [];
|
|
|
- },
|
|
|
addLine: function() {//添加负责人行数
|
|
|
var newValue = {
|
|
|
id: '',//主键
|
|
|
@@ -1431,7 +1424,7 @@ export default {
|
|
|
depteventId: '',//事件部门关联责任人
|
|
|
name: '',//姓名
|
|
|
post: '',//岗位
|
|
|
- telphone: ''//手机号
|
|
|
+ telphone: ''//手机号addSelection
|
|
|
}
|
|
|
//添加新的行数
|
|
|
this.dutysystemTableData.push(newValue)
|
|
|
@@ -1491,6 +1484,8 @@ export default {
|
|
|
},
|
|
|
|
|
|
showResponsibility() {//弹出责任制弹窗
|
|
|
+ //初始化责任制数据列表
|
|
|
+ this.dutysystemTableData = [];
|
|
|
let param = { eventCode: this.eventCode }
|
|
|
centereventtdepteventList(param).then(res => {
|
|
|
this.depteventList = res.data
|
|
|
@@ -1512,9 +1507,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;
|
|
|
@@ -1545,8 +1542,68 @@ export default {
|
|
|
// }
|
|
|
// this.cancelEventShow();
|
|
|
this.eventDialog = false;
|
|
|
+
|
|
|
this.$emit('getFirespread', this.eventCode);
|
|
|
},
|
|
|
+ showTVWallDiaLog() {
|
|
|
+ this.initByCameras()
|
|
|
+ // 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='8'
|
|
|
+ initByCameras(params).then(res=>
|
|
|
+ {
|
|
|
+ this.$refs.TVWall.showTVWall1(this.longitude,this.latitude,res.data);
|
|
|
+ this.$refs.bottomMenu.showMeasure = false
|
|
|
+ this.$refs.bottomMenu.showChild = false
|
|
|
+ this.$refs.bottomMenu.showBanChild = false
|
|
|
+ this.$refs.bottomMenu.showChangChild = false
|
|
|
+ })
|
|
|
+
|
|
|
+ },
|
|
|
showUpdateYjYuAn() {
|
|
|
listYuAn().then(res => {
|
|
|
//关联预案列表
|
|
|
@@ -1557,8 +1614,11 @@ 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 }
|
|
|
@@ -1654,7 +1714,6 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
-
|
|
|
listResourceByWz(type) {
|
|
|
if (this.resourcesListCheck.indexOf(type) > -1) {
|
|
|
this.resourcesListCheck.splice(this.resourcesListCheck.indexOf(type), 1)
|
|
|
@@ -1683,11 +1742,11 @@ export default {
|
|
|
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') {
|
|
|
@@ -1702,7 +1761,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
|
|
|
@@ -1901,33 +1960,11 @@ export default {
|
|
|
cityAudit: null
|
|
|
}
|
|
|
},
|
|
|
-
|
|
|
- showTVWallDiaLog() {
|
|
|
- this.initByCameras()
|
|
|
- // this.$refs.TVWall.showTVWall();
|
|
|
-
|
|
|
- },
|
|
|
- initByCameras()
|
|
|
- {
|
|
|
- const params=Object.assign({})
|
|
|
- params.longitude=this.longitude;
|
|
|
- params.latitude=this.latitude;
|
|
|
- params.type='4'
|
|
|
- initByCameras(params).then(res=>
|
|
|
- {
|
|
|
- this.$refs.TVWall.showTVWall1(this.longitude,this.latitude,res.data);
|
|
|
- this.$refs.supermap.isEditableLayers = false
|
|
|
- this.$refs.bottomMenu.showChild = false
|
|
|
- this.$refs.bottomMenu.showBanChild = false
|
|
|
- this.$refs.bottomMenu.showChangChild = false
|
|
|
- })
|
|
|
-
|
|
|
- },
|
|
|
-
|
|
|
/**
|
|
|
* eventStatusValue 事件状态
|
|
|
* isSend 是否办理
|
|
|
* */
|
|
|
+
|
|
|
async updateCentereventTEventcatalogueStatus(eventStatus, isSend) {
|
|
|
this.eventStatusButton = eventStatus
|
|
|
let that=this
|
|
|
@@ -2046,15 +2083,7 @@ export default {
|
|
|
that.showEventConfirm = false
|
|
|
}
|
|
|
})
|
|
|
- } else if(eventStatus == 'cz'){
|
|
|
- eventHandling(that.eventId,that.eventCode).then(res => {
|
|
|
- if (res.code == 200) {
|
|
|
- that.$message.success(`处理成功!`)
|
|
|
- that.refreshEvent(that.eventCode)
|
|
|
- that.cancelEventConfirm_send()
|
|
|
- that.showEventConfirm = false
|
|
|
- }
|
|
|
- })
|
|
|
+
|
|
|
} else if (eventStatus == 'gd') {
|
|
|
if(that.eventType == 1){
|
|
|
let double = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/; //数字和两位小数
|
|
|
@@ -2082,7 +2111,6 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
//事件处理流程--归档
|
|
|
let param = {
|
|
|
deptId: that.deptId,
|
|
|
@@ -2104,8 +2132,17 @@ export default {
|
|
|
that.$emit('getSupermap', that.calendarDay)
|
|
|
}
|
|
|
})
|
|
|
+ } else if(eventStatus == 'cz'){
|
|
|
+ eventHandling(that.eventId,that.eventCode).then(res => {
|
|
|
+ if (res.code == 200) {
|
|
|
+ that.$message.success(`处理成功!`)
|
|
|
+ that.refreshEvent(that.eventCode)
|
|
|
+ that.cancelEventConfirm_send()
|
|
|
+ that.showEventConfirm = false
|
|
|
+ }
|
|
|
+ })
|
|
|
} else {
|
|
|
- if (eventStatus == 'qs') {
|
|
|
+ if (eventStatus == 'qs' ) {
|
|
|
if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName == null) {
|
|
|
that.$message.error(`请选择部门!`)
|
|
|
return
|
|
|
@@ -2131,8 +2168,7 @@ export default {
|
|
|
czlx: '',
|
|
|
cameraCode: that.cameraCode,
|
|
|
fireRadius: that.sendHuoZaiBanJing,
|
|
|
- reserve: that.sendGuanLianYuAn,
|
|
|
- fileList:eventStatus == 'qs'?this.eventLogList[this.eventLogList.length-1].fileVOs:[]
|
|
|
+ reserve: that.sendGuanLianYuAn
|
|
|
}
|
|
|
updateCentereventTEventcatalogueStatus(param).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
@@ -2176,13 +2212,11 @@ export default {
|
|
|
this.eventLogList = []
|
|
|
},
|
|
|
showEventDialog(eventCode) {
|
|
|
- // 获取消防左侧菜单列表
|
|
|
- this.fireControlViewList();
|
|
|
+ this.fireControlViewList()
|
|
|
this.eventCode = eventCode
|
|
|
let that = this
|
|
|
//获取事件详情
|
|
|
getEventDetail({ eventCode: eventCode }).then(res => {
|
|
|
- debugger
|
|
|
that.eventDialog = true
|
|
|
that.eventLogList = res.data.eventlog//日志列表
|
|
|
that.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案
|
|
|
@@ -2322,8 +2356,6 @@ export default {
|
|
|
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 {
|
|
|
- that.$refs.supermapDialog.clearM(false)
|
|
|
- that.$refs.supermapDialog.clearM(true)
|
|
|
that.$refs.supermapDialog.setMarkers([markersMap])
|
|
|
}
|
|
|
that.$refs.supermapDialog.dropLocation10(res.data.catalogue.latitude, res.data.catalogue.longitude)
|
|
|
@@ -2443,98 +2475,56 @@ export default {
|
|
|
/** 预览按钮操作 */
|
|
|
preview(cameraParam) {
|
|
|
if(cameraParam.type=='1'){
|
|
|
- this.showTVWall(cameraParam.code,cameraParam.name)
|
|
|
+ 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
|
|
|
+ getHaiKangVideoServer({cameraCode:cameraParam.code}).then(newResponse => {
|
|
|
+ that.cameraTitle = '摄像头-'+newResponse.data.cameraName
|
|
|
+ that.initPlugin(newResponse.data.appkey,newResponse.data.loginIp,newResponse.data.secret,newResponse.data.loginPort)
|
|
|
+ setTimeout(function() {
|
|
|
+ that.playhk(newResponse.data.channelCode)
|
|
|
+ }, 5000)
|
|
|
+ })
|
|
|
}
|
|
|
- // 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)
|
|
|
- // console.log(cameraParam)
|
|
|
- // this.showTVWall(cameraParam.code,cameraParam.cameraName)
|
|
|
- // } else {
|
|
|
- // this.alertLoginFailed()
|
|
|
- // }
|
|
|
- // })
|
|
|
- // } else { // 连接客户端失败
|
|
|
- // this.alertReinstall()
|
|
|
- // }
|
|
|
- // })
|
|
|
- // })
|
|
|
- // }else if(cameraParam.type=='0'){
|
|
|
- // let that = this
|
|
|
- // that.cameraVisible = true
|
|
|
- // getHaiKangVideoServer({cameraCode:cameraParam.code}).then(newResponse => {
|
|
|
- // that.cameraTitle = '摄像头-'+newResponse.data.cameraName
|
|
|
- // that.initPlugin(newResponse.data.appkey,newResponse.data.loginIp,newResponse.data.secret,newResponse.data.loginPort)
|
|
|
- // setTimeout(function() {
|
|
|
- // //that.playhk(newResponse.data.channelCode)
|
|
|
- // this.showTVWall(newResponse.data.channelCode,newResponse.data.cameraName)
|
|
|
- // }, 5000)
|
|
|
- // })
|
|
|
- // }
|
|
|
-
|
|
|
- },
|
|
|
|
|
|
- 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;
|
|
|
},
|
|
|
realTimeVideoDialog(cameraParams) { // 调用弹窗实时播放接口
|
|
|
if (!this.isLogin) {
|
|
|
this.$Message.info('正在登陆客户端，请稍等......')
|
|
|
return false
|
|
|
}
|
|
|
- this.ws.openVideo([cameraParams])
|
|
|
+ const param = [cameraParams]
|
|
|
+ this.ws.openVideo(param)
|
|
|
},
|
|
|
/** ----------------------------------摄像头预览结束------------------------------------- */
|
|
|
|
王通