|
|
@@ -158,7 +158,7 @@
|
|
|
</el-button>
|
|
|
</div>
|
|
|
<div class="z-info-btm-grp-right">
|
|
|
- <el-button size="small" icon="el-icon-mic">会议
|
|
|
+ <el-button size="small" icon="el-icon-mic" @click="joinMeeting()">会议
|
|
|
</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -170,6 +170,27 @@
|
|
|
<div style="text-align:left">
|
|
|
<el-button size="small"
|
|
|
icon="el-icon-s-flag"
|
|
|
+ @click="updateCentereventTEventcatalogueStatus('qr',true)">
|
|
|
+ 确认
|
|
|
+ </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>
|
|
|
+ </div>
|
|
|
+ <div class="z-info-btm-input-btn" v-else-if="eventStatusValue=='forest_event_status_7'">
|
|
|
+ <div style="text-align:left">
|
|
|
+ <el-button size="small"
|
|
|
+ icon="el-icon-s-flag"
|
|
|
@click="updateCentereventTEventcatalogueStatus('qs',false)">
|
|
|
签收
|
|
|
</el-button>
|
|
|
@@ -215,16 +236,11 @@
|
|
|
</div>
|
|
|
<div class="z-info-btm-input-btn"
|
|
|
v-else-if="eventStatusValue=='forest_event_status_5'&&dataStatus=='1'">
|
|
|
- <el-button size="small" v-if="eventType=='1'"
|
|
|
+ <el-button size="small"
|
|
|
icon="el-icon-success" style="text-align:left"
|
|
|
@click="updateCentereventTEventcatalogueStatus('gd',false)">
|
|
|
填报
|
|
|
</el-button>
|
|
|
- <el-button size="small" v-else
|
|
|
- icon="el-icon-success" style="text-align:left"
|
|
|
- @click="updateCentereventTEventcatalogueStatus('gd',true)">
|
|
|
- 归档
|
|
|
- </el-button>
|
|
|
<el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
|
|
|
</el-button>
|
|
|
</div>
|
|
|
@@ -253,7 +269,7 @@
|
|
|
class="top-dialog"
|
|
|
@close="cancelEventConfirm()">
|
|
|
<el-form label-width="80px">
|
|
|
- <el-form-item label="火灾半径" v-if="eventStatusButton=='qs'&&eventType=='1'">
|
|
|
+ <el-form-item label="火灾半径" v-if="eventStatusButton=='qs'">
|
|
|
<el-input type="number" v-model="sendHuoZaiBanJing" placeholder="请输入火灾半径"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item :label="deptNameitem">
|
|
|
@@ -269,7 +285,7 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="事件类型" v-if="eventStatusButton=='qs'&&eventType=='1'">
|
|
|
+ <el-form-item label="事件类型" v-if="eventStatusButton=='qs'">
|
|
|
<el-select v-model="sendEventType" placeholder="请选择事件类型！" clearable>
|
|
|
<el-option
|
|
|
v-for="item in eventTypeList"
|
|
|
@@ -317,7 +333,7 @@
|
|
|
></el-tree>
|
|
|
<!-- default-expand-all-->
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="关联预案" v-if="eventStatusButton=='qs'&&eventType=='1'">
|
|
|
+ <el-form-item label="关联预案" v-if="eventStatusButton=='qs'">
|
|
|
<el-select v-model="sendGuanLianYuAn" placeholder="请选择关联预案！" clearable>
|
|
|
<el-option
|
|
|
v-for="item in guanLianYuAnList"
|
|
|
@@ -327,15 +343,18 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="联系人" v-if="eventStatusButton=='qs'">
|
|
|
- <el-select multiple collapse-tags v-model='sendUserFegin' placeholder='请选择联系人！' clearable>
|
|
|
- <el-option
|
|
|
- v-for="item in userFeginList"
|
|
|
- :label="item.nickName"
|
|
|
- :value="item.phonenumber"
|
|
|
- />
|
|
|
- </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-form-item>-->
|
|
|
+ <el-button size="mini" type="primary" v-if="eventStatusButton=='qr'"
|
|
|
+ @click="updateCentereventTEventcatalogueStatus('qr',false)">确认
|
|
|
+ </el-button>
|
|
|
<el-button size="mini" type="primary" v-if="eventStatusButton=='qs'"
|
|
|
@click="updateCentereventTEventcatalogueStatus('qs',true)">签收
|
|
|
</el-button>
|
|
|
@@ -390,9 +409,16 @@
|
|
|
v-if="depteventId!=null&&depteventId!=''"
|
|
|
@click="addLine">添加
|
|
|
</el-button>
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="danger"
|
|
|
+ v-if="depteventId!=null&&depteventId!=''"
|
|
|
+ @click="finUserByDept">选择
|
|
|
+ </el-button>
|
|
|
<el-table
|
|
|
:data="dutysystemTableData"
|
|
|
- style="width: 100%">
|
|
|
+ style="width: 100%"
|
|
|
+ :rules="rules">
|
|
|
<el-table-column prop="id" label="主键" v-if="false">
|
|
|
<template slot-scope="scope" hidden>
|
|
|
<el-input v-model="scope.row.id" readonly placeholder="主键"></el-input>
|
|
|
@@ -400,7 +426,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="name" label="姓名">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.name" placeholder="姓名"></el-input>
|
|
|
+ <el-input v-model="scope.row.name" placeholder="姓名" οninput="value=value.replace(/^[\u4e00-\u9fa5]{2,4}$/,'')"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="post" label="岗位">
|
|
|
@@ -410,7 +436,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="telphone" label="手机号码">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.telphone" placeholder="手机号码"></el-input>
|
|
|
+ <el-input v-model="scope.row.telphone" placeholder="手机号码" οninput="value=value.replace(/^((13[0-9])|(14[5-9])|(15([0-3]|[5-9]))|(16[6-7])|(17[1-8])|(18[0-9])|(19[1|3])|(19[5|6])|(19[8|9]))\d{8}$/,'')"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="bookbuytime" label="操作">
|
|
|
@@ -421,18 +447,18 @@
|
|
|
icon="el-icon-delete"
|
|
|
@click="handleDelete(scope.$index, scope.row)">删除
|
|
|
</el-button>
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="danger"
|
|
|
- icon="el-icon-save"
|
|
|
- @click="handleSave(scope.$index, scope.row)">保存
|
|
|
- </el-button>
|
|
|
+ <!--<el-button-->
|
|
|
+ <!--size="mini"-->
|
|
|
+ <!--type="danger"-->
|
|
|
+ <!--icon="el-icon-save"-->
|
|
|
+ <!--@click="handleSave(scope.$index, scope.row)">保存-->
|
|
|
+ <!--</el-button>-->
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-button size="mini" type="primary" class="fr_button" @click="closeResponsibilityDialog">确定
|
|
|
+ <el-button size="mini" type="primary" class="fr_button" @click="addResponsibilityDialog">确定
|
|
|
</el-button>
|
|
|
<div style="clear: both;"></div>
|
|
|
</el-form>
|
|
|
@@ -948,6 +974,9 @@
|
|
|
<div id="playWnd" class="playWnd" style="left: 0px; top: 0px;"></div>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
+ <el-dialog title="人员选择" :visible.sync="showFindUserByDept" width="40%">
|
|
|
+ <findUserByDept v-if="showFindUserByDept" ref="findUserByDept" :deptId="iconCurrentIndex" @addSelection="addSelection"></findUserByDept>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -959,6 +988,7 @@ import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部
|
|
|
import eventLogUpload from '@/views/eventLogUpload.vue' //日志上传文件
|
|
|
import areaSupermap from '@/components/supermap'//区域标记地图
|
|
|
import TcPlayer from '@/components/TcPlayer' //视频预览
|
|
|
+import findUserByDept from '@/views/findUserByDept' //责任人选择弹框
|
|
|
import {
|
|
|
getEventDetail,
|
|
|
sendEventLog,
|
|
|
@@ -982,7 +1012,14 @@ import {
|
|
|
import {
|
|
|
getHaiKangVideoServer
|
|
|
} from '@/api/haikang/haikang'
|
|
|
-
|
|
|
+import {
|
|
|
+ hasConferences,
|
|
|
+ createConferences, getUserInfo
|
|
|
+} from "@/api/meeting"
|
|
|
+import {
|
|
|
+ getDahuaVideoServer
|
|
|
+} from '@/api/dahua/dahua'
|
|
|
+import DHWs from '@/dahua/lib/DHWs'
|
|
|
export default {
|
|
|
dicts: ['task_source'],
|
|
|
watch: {
|
|
|
@@ -996,12 +1033,15 @@ export default {
|
|
|
supermapDialog,
|
|
|
eventLogUpload,
|
|
|
areaSupermap,
|
|
|
- TcPlayer
|
|
|
+ TcPlayer,
|
|
|
+ findUserByDept
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ showFindUserByDept: false,//责任人选择框
|
|
|
//海康
|
|
|
cameraTitle: '',
|
|
|
+ cameraCode:'',
|
|
|
cameraVisible: false,
|
|
|
initCount: 0,
|
|
|
pubKey: '',
|
|
|
@@ -1029,9 +1069,9 @@ export default {
|
|
|
sendLianDongDept: [],//联动部门
|
|
|
eventTypeList: [],//事件类型列表
|
|
|
guanLianYuAnList: [],//关联预案列表
|
|
|
+ userFeginList: [],//联系人列表
|
|
|
deptOptions: [],//签收部门
|
|
|
deptOptionsLiandong: [],//联动部门
|
|
|
- userFeginList: [],//联系人列表
|
|
|
eventStatusButton: null,//流程按钮标识
|
|
|
eventConfirmTitle: null,//弹窗标题 ---签收 误报 重复
|
|
|
defaultProps: {
|
|
|
@@ -1134,9 +1174,10 @@ export default {
|
|
|
eventStatusValue: null,//事件状态
|
|
|
eventId: null,//事件ID
|
|
|
eventType: null,//事件类型-大类
|
|
|
- dataStatus: null,//事件处理流程按钮
|
|
|
- deptId: null,//事件处理流程部门
|
|
|
+ dataStatus: null,//事件流程按钮
|
|
|
+ deptId: null,//事件流程部门
|
|
|
eventCode: null,
|
|
|
+ eventName: null,
|
|
|
longitude: null,
|
|
|
latitude: null,
|
|
|
eventLog: null,
|
|
|
@@ -1150,58 +1191,58 @@ export default {
|
|
|
depteventId: '',
|
|
|
dutysystemTableData: [],
|
|
|
radius: 50,//资源搜索半径
|
|
|
- // resourcesList: [
|
|
|
- // {
|
|
|
- // resourceName: '取水口',
|
|
|
- // type: 'qsk',
|
|
|
- // count: '1',
|
|
|
- // icon: 'sj-icon-waterintake'
|
|
|
- // },
|
|
|
- // {
|
|
|
- // resourceName: '水鹤',
|
|
|
- // type: 'sh',
|
|
|
- // icon: 'sj-icon-watercrane'
|
|
|
- // },
|
|
|
- // {
|
|
|
- // resourceName: '消防栓',
|
|
|
- // type: 'xfs',
|
|
|
- // count: '1',
|
|
|
- // icon: 'sj-icon-firehydrant'
|
|
|
- // },
|
|
|
- // {
|
|
|
- // resourceName: '起降点',
|
|
|
- // type: 'qjd',
|
|
|
- // count: '1',
|
|
|
- // icon: 'sj-icon-landing'
|
|
|
- // },
|
|
|
- // {
|
|
|
- // resourceName: '检查站',
|
|
|
- // type: 'jcz',
|
|
|
- // count: '1',
|
|
|
- // icon: 'sj-icon-checkpoint'
|
|
|
- // },
|
|
|
- // {
|
|
|
- // resourceName: '防火队',
|
|
|
- // type: 'fhd',
|
|
|
- // count: '1',
|
|
|
- // icon: 'sj-icon-fireteam'
|
|
|
- // },
|
|
|
- // {
|
|
|
- // resourceName: '重点区域',
|
|
|
- // type: 'zdqy',
|
|
|
- // count: '1',
|
|
|
- // icon: 'sj-icon-tcqh'
|
|
|
- // },
|
|
|
- // {
|
|
|
- // resourceName: '摄像头',
|
|
|
- // type: 'sxt',
|
|
|
- // count: '1',
|
|
|
- // icon: 'camera'
|
|
|
- // }
|
|
|
- // ],
|
|
|
+ resourcesList: [
|
|
|
+ {
|
|
|
+ resourceName: '取水口',
|
|
|
+ type: 'qsk',
|
|
|
+ count: '1',
|
|
|
+ icon: 'sj-icon-waterintake'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ resourceName: '水鹤',
|
|
|
+ type: 'sh',
|
|
|
+ icon: 'sj-icon-watercrane'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ resourceName: '消防栓',
|
|
|
+ type: 'xfs',
|
|
|
+ count: '1',
|
|
|
+ icon: 'sj-icon-firehydrant'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ resourceName: '起降点',
|
|
|
+ type: 'qjd',
|
|
|
+ count: '1',
|
|
|
+ icon: 'sj-icon-landing'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ resourceName: '检查站',
|
|
|
+ type: 'jcz',
|
|
|
+ count: '1',
|
|
|
+ icon: 'sj-icon-checkpoint'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ resourceName: '防火队',
|
|
|
+ type: 'fhd',
|
|
|
+ count: '1',
|
|
|
+ icon: 'sj-icon-fireteam'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ resourceName: '重点区域',
|
|
|
+ type: 'zdqy',
|
|
|
+ count: '1',
|
|
|
+ icon: 'sj-icon-keyAreas'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ resourceName: '摄像头',
|
|
|
+ type: 'sxt',
|
|
|
+ count: '1',
|
|
|
+ icon: 'sj-icon-jkzx'
|
|
|
+ }
|
|
|
+ ],
|
|
|
resourcesListCheck: [],
|
|
|
//文本域
|
|
|
- feedback: ''
|
|
|
+ feedback: '',
|
|
|
|
|
|
}
|
|
|
},
|
|
|
@@ -1210,6 +1251,12 @@ export default {
|
|
|
bigEventTypeId: null,//事件大类
|
|
|
smallEventTypeId: null//事件小类
|
|
|
},
|
|
|
+ created() {
|
|
|
+ /** ----------------------------------摄像头预览开始------------------------------------- */
|
|
|
+ const DHWsInstance = DHWs.getInstance()
|
|
|
+ this.ws = DHWsInstance
|
|
|
+ /** ----------------------------------摄像头预览结束------------------------------------- */
|
|
|
+ },
|
|
|
methods: {
|
|
|
/************************************责任制-开始****************************************/
|
|
|
addLine: function() {//添加负责人行数
|
|
|
@@ -1224,6 +1271,20 @@ export default {
|
|
|
//添加新的行数
|
|
|
this.dutysystemTableData.push(newValue)
|
|
|
},
|
|
|
+ finUserByDept: function(){ //根据部门选择责任人
|
|
|
+ this.showFindUserByDept=true;
|
|
|
+ },
|
|
|
+ addSelection: function(userList){
|
|
|
+ for (let i in this.dutysystemTableData) {
|
|
|
+ for (let j in userList) {
|
|
|
+ if(this.dutysystemTableData[i].name == userList[j].name && this.dutysystemTableData[i].telphone == userList[j].telphone){
|
|
|
+ userList.splice(j, 1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.dutysystemTableData = this.dutysystemTableData.concat(userList);
|
|
|
+ this.showFindUserByDept=false;
|
|
|
+ },
|
|
|
handleDelete: function(index, row) {//删除负责人行数
|
|
|
if (row.id != null && row.id != '') {
|
|
|
let param = { ids: row.id }
|
|
|
@@ -1262,8 +1323,8 @@ export default {
|
|
|
}]
|
|
|
}
|
|
|
})
|
|
|
-
|
|
|
},
|
|
|
+
|
|
|
showResponsibility() {//弹出责任制弹窗
|
|
|
let param = { eventCode: this.eventCode }
|
|
|
centereventtdepteventList(param).then(res => {
|
|
|
@@ -1278,8 +1339,39 @@ export default {
|
|
|
this.iconCurrentIndex = ''
|
|
|
this.showResponsibilityDialog = false
|
|
|
},
|
|
|
+ addResponsibilityDialog() {//责任制保存
|
|
|
+ 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;
|
|
|
+ }
|
|
|
+ if(!reg_tel.test(this.dutysystemTableData[i].telphone)){
|
|
|
+ this.$message.error(`请输入正确手机号码!`)
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(this.dutysystemTableData[i].id==null || this.dutysystemTableData[i].id==''){
|
|
|
+ this.dutysystemTableData[i].dept = this.dutysystemDeptName;
|
|
|
+ this.dutysystemTableData[i].depteventId = this.depteventId;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ const param = {centereventTDutySystemList:this.dutysystemTableData,eventCode:this.eventCode,eventName:this.eventName}
|
|
|
+ dutysystemAdd(param).then(res => {
|
|
|
+ this.$message.success(`保存成功!`)
|
|
|
+ this.dutysystemSelect(this.iconCurrentIndex, this.dutysystemDeptName, this.depteventId);
|
|
|
+ this.closeResponsibilityDialog();
|
|
|
+ })
|
|
|
+ },
|
|
|
/************************************责任制-结束****************************************/
|
|
|
showheatPlotting() {
|
|
|
+ // if (!this.$refs.supermapDialog.isheatPlotting) {
|
|
|
+ // this.$refs.supermapDialog.showheatPlotting(this.latitude, this.longitude)
|
|
|
+ // } else {
|
|
|
+ // this.$refs.supermapDialog.isheatPlotting = false
|
|
|
+ // }
|
|
|
+ // this.cancelEventShow();
|
|
|
this.eventDialog = false;
|
|
|
this.$emit('getFirespread', this.eventCode);
|
|
|
},
|
|
|
@@ -1293,16 +1385,21 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
updateYjYuAn() {
|
|
|
- let param = { eventCode: this.eventCode, reserve: this.sendGuanLianYuAn }
|
|
|
- updateYjYuAn(param).then(res => {
|
|
|
- //事件调整关联预案
|
|
|
- if (res.code == 200) {
|
|
|
- this.$message.success(`预案调整成功!`)
|
|
|
- this.refreshEventDialog(this.eventCode)
|
|
|
- this.sendGuanLianYuAn = null
|
|
|
- this.showGuanLianYuAnConfirm = false
|
|
|
- }
|
|
|
- })
|
|
|
+ if(this.eventStatusValue=='forest_event_status_1'){
|
|
|
+ this.$message.error(`未签收事件无法修改预案信息，请先签收！`)
|
|
|
+ return
|
|
|
+ }else{
|
|
|
+ let param = { eventCode: this.eventCode, reserve: this.sendGuanLianYuAn }
|
|
|
+ updateYjYuAn(param).then(res => {
|
|
|
+ //事件调整关联预案
|
|
|
+ if (res.code == 200) {
|
|
|
+ this.$message.success(`预案调整成功!`)
|
|
|
+ this.refreshEventDialog(this.eventCode)
|
|
|
+ this.sendGuanLianYuAn = null
|
|
|
+ this.showGuanLianYuAnConfirm = false
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
},
|
|
|
listResourceByWz(type) {
|
|
|
if (this.resourcesListCheck.indexOf(type) > -1) {
|
|
|
@@ -1311,11 +1408,11 @@ export default {
|
|
|
this.$refs.supermapDialog.clearMByType(type)
|
|
|
}, 1000)
|
|
|
} else {
|
|
|
- this.resourcesListCheck.push(type)
|
|
|
//搜索物资
|
|
|
let param = { longitude: this.longitude, latitude: this.latitude, type: type, radius: this.radius }
|
|
|
listResourceByWz(param).then(res => {
|
|
|
if (res.data != null && res.data.length > 0) {
|
|
|
+ this.resourcesListCheck.push(type)
|
|
|
var markersList = []
|
|
|
for (let i = 0; i < res.data.length; i++) {
|
|
|
let markersMap = {
|
|
|
@@ -1344,9 +1441,15 @@ export default {
|
|
|
} else if (type == 'fhd') {
|
|
|
markersMap.icon = 'sj-icon-fireteam'
|
|
|
} else if (type == 'zdqy') {
|
|
|
- markersMap.icon = 'sj-icon-tcqh'
|
|
|
+ markersMap.icon = 'sj-icon-keyAreas'
|
|
|
} else if (type == 'sxt') {
|
|
|
- markersMap.icon = 'sj-icon-jkzx'
|
|
|
+ markersMap.icon = 'camera'
|
|
|
+ if (res.data[i].cameraCode != null) {
|
|
|
+ markersMap.click = 'preview'
|
|
|
+ // markersMap.parameter = res.data[i].cameraCode
|
|
|
+ markersMap.parameter = {code:res.data.data[i].cameraCode,
|
|
|
+ type:res.data.data[i].cameraFactory}
|
|
|
+ }
|
|
|
}
|
|
|
markersMap.lng = res.data[i].longitude
|
|
|
markersMap.lat = res.data[i].latitude
|
|
|
@@ -1405,10 +1508,10 @@ export default {
|
|
|
//关闭事件签收弹窗
|
|
|
this.sendDeptId = null
|
|
|
this.sendDeptName = null
|
|
|
+ this.sendUserFegin = []
|
|
|
this.sendEventType = null
|
|
|
this.sendHuoZaiBanJing = null
|
|
|
this.sendGuanLianYuAn = null
|
|
|
- this.sendUserFegin = []
|
|
|
this.longitude = null
|
|
|
this.latitude = null
|
|
|
this.sendTaskTitle = null
|
|
|
@@ -1428,10 +1531,10 @@ export default {
|
|
|
//清空表单数据
|
|
|
this.sendDeptId = null
|
|
|
this.sendDeptName = null
|
|
|
+ this.sendUserFegin = []
|
|
|
this.sendEventType = null
|
|
|
this.sendHuoZaiBanJing = null
|
|
|
this.sendGuanLianYuAn = null
|
|
|
- this.sendUserFegin = []
|
|
|
this.sendTaskTitle = null
|
|
|
this.sendTaskSource = null
|
|
|
this.sendTaskContent = null
|
|
|
@@ -1550,7 +1653,7 @@ export default {
|
|
|
* */
|
|
|
async updateCentereventTEventcatalogueStatus(eventStatus, isSend) {
|
|
|
this.eventStatusButton = eventStatus
|
|
|
- let that = this
|
|
|
+ let that=this
|
|
|
if (!isSend) {//事件弹窗
|
|
|
if (eventStatus == 'qs') {//签收
|
|
|
that.eventConfirmTitle = '事件签收'
|
|
|
@@ -1567,12 +1670,6 @@ export default {
|
|
|
that.guanLianYuAnList = res.data
|
|
|
}
|
|
|
})
|
|
|
- await userFeginlist().then(res => {
|
|
|
- //联系人列表
|
|
|
- if (res.code == 200) {
|
|
|
- that.userFeginList = res.data
|
|
|
- }
|
|
|
- })
|
|
|
await selectByeventCode(that.eventCode).then(res => {
|
|
|
//签收部门
|
|
|
if (res.code == 200) {
|
|
|
@@ -1581,6 +1678,8 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
that.showEventConfirm = true
|
|
|
+ } else if (eventStatus == 'qr') {//确认
|
|
|
+ that.eventConfirmTitle = '事件确认'
|
|
|
} else if (eventStatus == 'wb') {//误报
|
|
|
that.eventConfirmTitle = '事件误报'
|
|
|
await selectByeventCode(that.eventCode).then(res => {
|
|
|
@@ -1668,28 +1767,40 @@ export default {
|
|
|
})
|
|
|
|
|
|
} else if (eventStatus == 'gd') {
|
|
|
+ let double = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/; //数字和两位小数
|
|
|
+ let number = /^[+]{0,1}(\d+)$/g; //正整数
|
|
|
+
|
|
|
+ if(!double.test(that.table2.areaTotal)){
|
|
|
+ that.$message.error(`面积只能填写到小数后两位!`)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if(!number.test(that.table2.peopleTotal)){
|
|
|
+ that.$message.error(`人员请填写正整数!`)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if(that.table2.forestComposition == '' || that.table2.forestComposition==null){
|
|
|
+ that.$message.error(`林木组成不能为空!`)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if(that.table2.forestToken == '' || that.table2.forestToken==null){
|
|
|
+ that.$message.error(`林令不能为空!`)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if(that.table2.porosities == '' || that.table2.porosities==null){
|
|
|
+ that.$message.error(`疏密度不能为空!`)
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
//事件处理流程--归档
|
|
|
- let param = {}
|
|
|
- if (that.eventType != '1') {
|
|
|
- param = {
|
|
|
- deptId: that.deptId,
|
|
|
- eventCode: that.eventCode,
|
|
|
- eventStatus: eventStatus,
|
|
|
- id: that.eventId,
|
|
|
- czlx: '',
|
|
|
- array: that.regionalFlagObj.array
|
|
|
- }
|
|
|
- } else {
|
|
|
- param = {
|
|
|
- deptId: that.deptId,
|
|
|
- eventCode: that.eventCode,
|
|
|
- eventStatus: eventStatus,
|
|
|
- id: that.eventId,
|
|
|
- czlx: '',
|
|
|
- forestFireLoss: { eventId: that.eventCode, table1: that.table1 },
|
|
|
- fireInformation: { eventId: that.eventCode, table2: that.table2 },
|
|
|
- array: that.regionalFlagObj.array
|
|
|
- }
|
|
|
+ let param = {
|
|
|
+ deptId: that.deptId,
|
|
|
+ eventCode: that.eventCode,
|
|
|
+ eventStatus: eventStatus,
|
|
|
+ id: that.eventId,
|
|
|
+ czlx: '',
|
|
|
+ forestFireLoss: { eventId: that.eventCode, table1: that.table1 },
|
|
|
+ fireInformation: { eventId: that.eventCode, table2: that.table2 },
|
|
|
+ array: that.regionalFlagObj.array
|
|
|
}
|
|
|
updateCentereventTEventcatalogueStatus(param).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
@@ -1697,7 +1808,8 @@ export default {
|
|
|
that.refreshEvent(that.eventCode)
|
|
|
that.cancelEventConfirm_send()
|
|
|
that.showEventConfirm_gd = false
|
|
|
- that.$emit('getEventList', that.calendarDay, that.bigEventTypeId, that.smallEventTypeId)
|
|
|
+ that.$emit('getEventList', that.calendarDay, that.bigEventTypeId, that.smallEventTypeId,10,1)
|
|
|
+ that.$emit('getSupermap', that.calendarDay)
|
|
|
}
|
|
|
})
|
|
|
} else {
|
|
|
@@ -1706,15 +1818,22 @@ export default {
|
|
|
that.$message.error(`请选择部门!`)
|
|
|
return
|
|
|
}
|
|
|
- if (that.eventType != '1') {
|
|
|
- that.sendEventType = that.smallEventTypeId
|
|
|
+ if (eventStatus == 'qs') {
|
|
|
+ if (that.sendHuoZaiBanJing == '' || that.sendHuoZaiBanJing == null) {
|
|
|
+ that.$message.error(`请输入火灾半径!`)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (that.sendEventType == '' || that.sendEventType == null) {
|
|
|
+ that.$message.error(`请选择事件类型!`)
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
} else {
|
|
|
that.sendDeptId = that.deptId
|
|
|
}
|
|
|
//事件处理流程
|
|
|
let param = {
|
|
|
- phones: that.sendUserFegin,
|
|
|
+ phones:that.sendUserFegin,
|
|
|
eventCode: that.eventCode,
|
|
|
deptId: that.sendDeptId,
|
|
|
deptName: that.sendDeptName,
|
|
|
@@ -1722,6 +1841,7 @@ export default {
|
|
|
eventType: that.sendEventType,
|
|
|
id: that.eventId,
|
|
|
czlx: '',
|
|
|
+ cameraCode: that.cameraCode,
|
|
|
fireRadius: that.sendHuoZaiBanJing,
|
|
|
reserve: that.sendGuanLianYuAn
|
|
|
}
|
|
|
@@ -1731,7 +1851,8 @@ export default {
|
|
|
that.refreshEvent(that.eventCode)
|
|
|
that.cancelEventConfirm_send()
|
|
|
that.showEventConfirm = false
|
|
|
- that.$emit('getEventList', that.calendarDay, that.bigEventTypeId, that.smallEventTypeId)
|
|
|
+ that.$emit('getEventList', that.calendarDay, that.bigEventTypeId, that.smallEventTypeId,10,1)
|
|
|
+ that.$emit('getSupermap', that.calendarDay)
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
@@ -1744,12 +1865,7 @@ export default {
|
|
|
},
|
|
|
sendEventLog() {
|
|
|
//日志发送
|
|
|
- let param = {
|
|
|
- eventCode: this.eventCode,
|
|
|
- logContent: this.eventLog,
|
|
|
- operation: 'bus_oper_type_2',
|
|
|
- operationType: 'log_oper_type_1'
|
|
|
- }
|
|
|
+ let param = { eventCode: this.eventCode, logContent: this.eventLog,operation:"bus_oper_type_2",operationType:"log_oper_type_1"}
|
|
|
sendEventLog(param).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.$message.success(`发送成功!`)
|
|
|
@@ -1762,8 +1878,8 @@ export default {
|
|
|
this.$refs.eventLogUpload.eventLogUpload(this.eventCode)
|
|
|
},
|
|
|
cancelEventShow() {
|
|
|
- this.deptId = null
|
|
|
this.dataStatus = null
|
|
|
+ this.deptId = null
|
|
|
console.log('关闭事件弹窗')
|
|
|
this.eventLogList = []
|
|
|
},
|
|
|
@@ -1783,6 +1899,7 @@ export default {
|
|
|
that.eventId = res.data.catalogue.id
|
|
|
that.longitude = res.data.catalogue.longitude
|
|
|
that.latitude = res.data.catalogue.latitude
|
|
|
+ that.eventName = res.data.catalogue.eventName
|
|
|
let markersMap = {
|
|
|
lng: 124.59,
|
|
|
lat: 43.02,
|
|
|
@@ -1805,6 +1922,8 @@ export default {
|
|
|
markersMap.icon = 'sj-icon-map-banjie'
|
|
|
} else if (res.data.catalogue.eventStatusValue == 'forest_event_status_6') {
|
|
|
markersMap.icon = 'sj-icon-map-guidang'
|
|
|
+ } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_7') {
|
|
|
+ markersMap.icon = 'sj-icon-map-queren'
|
|
|
}
|
|
|
markersMap.lng = res.data.catalogue.longitude
|
|
|
markersMap.lat = res.data.catalogue.latitude
|
|
|
@@ -1818,13 +1937,14 @@ export default {
|
|
|
that.$refs.supermapDialog.dropLocation10(res.data.catalogue.latitude, res.data.catalogue.longitude)
|
|
|
}, 2000)
|
|
|
if (res.data.centermonitorTCamera != null) {
|
|
|
+ that.cameraCode = res.data.centermonitorTCamera.cameraCode;
|
|
|
let markersMap = {
|
|
|
lng: 124.59,
|
|
|
lat: 43.02,
|
|
|
icon: 'camera',
|
|
|
bindPopupHtml: '',
|
|
|
click: 'preview',
|
|
|
- parameter: res.data.centermonitorTCamera.cameraCode,
|
|
|
+ parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
|
|
|
keepBindPopup: false,
|
|
|
isAggregation: false,
|
|
|
radius: 0
|
|
|
@@ -1863,6 +1983,7 @@ export default {
|
|
|
that.eventId = res.data.catalogue.id
|
|
|
that.latitude = res.data.catalogue.latitude
|
|
|
that.longitude = res.data.catalogue.longitude
|
|
|
+ that.eventName = res.data.catalogue.eventName
|
|
|
let markersMap = {
|
|
|
lng: 124.59,
|
|
|
lat: 43.02,
|
|
|
@@ -1885,6 +2006,8 @@ export default {
|
|
|
markersMap.icon = 'sj-icon-map-banjie'
|
|
|
} else if (res.data.catalogue.eventStatusValue == 'forest_event_status_6') {
|
|
|
markersMap.icon = 'sj-icon-map-guidang'
|
|
|
+ } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_7') {
|
|
|
+ markersMap.icon = 'sj-icon-map-queren'
|
|
|
}
|
|
|
markersMap.lng = res.data.catalogue.longitude
|
|
|
markersMap.lat = res.data.catalogue.latitude
|
|
|
@@ -1907,7 +2030,7 @@ export default {
|
|
|
icon: 'camera',
|
|
|
bindPopupHtml: '',
|
|
|
click: 'preview',
|
|
|
- parameter: res.data.centermonitorTCamera.cameraCode,
|
|
|
+ parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
|
|
|
keepBindPopup: false,
|
|
|
isAggregation: false,
|
|
|
radius: 0
|
|
|
@@ -1939,6 +2062,7 @@ export default {
|
|
|
},
|
|
|
// 页面元素转图片
|
|
|
toImage() {
|
|
|
+ this.$message.success(`正在上传!请稍后...`)
|
|
|
// 手动创建一个 canvas 标签
|
|
|
const canvas = document.createElement('canvas')
|
|
|
// 获取父标签，意思是这个标签内的 DOM 元素生成图片
|
|
|
@@ -1966,7 +2090,6 @@ export default {
|
|
|
html2canvas(canvasBox, options).then((canvas) => {
|
|
|
// toDataURL 图片格式转成 base64
|
|
|
let dataBase64 = canvas.toDataURL('image/png')
|
|
|
- console.log(dataBase64)
|
|
|
this.uploadBase64(dataBase64)
|
|
|
})
|
|
|
canvasBox.appendChild(toolbar)
|
|
|
@@ -1985,7 +2108,6 @@ export default {
|
|
|
this.regionalFlagOpen = true
|
|
|
},
|
|
|
showAreaLatLng: function(latlng) {//获取火灾区域经纬度
|
|
|
- console.log(latlng)
|
|
|
this.regionalFlagObj.array = latlng
|
|
|
this.$modal.msgSuccess('获取坐标成功！')
|
|
|
},
|
|
|
@@ -2012,45 +2134,48 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
/** 预览按钮操作 */
|
|
|
- preview(cameraCode) {
|
|
|
- let that = this
|
|
|
- // 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(channelCode)
|
|
|
- // } else {
|
|
|
- // this.alertLoginFailed()
|
|
|
- // }
|
|
|
- // })
|
|
|
- // } else { // 连接客户端失败
|
|
|
- // this.alertReinstall()
|
|
|
- // }
|
|
|
- // })
|
|
|
- // })
|
|
|
- that.cameraVisible = true
|
|
|
- getHaiKangVideoServer({ cameraCode: cameraCode }).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)
|
|
|
- })
|
|
|
+ preview(cameraParam) {
|
|
|
+ if(cameraParam.type=='大华'){
|
|
|
+ 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: 0
|
|
|
+ })
|
|
|
+ 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=='海康'){
|
|
|
+ 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)
|
|
|
+ })
|
|
|
+ }
|
|
|
|
|
|
},
|
|
|
realTimeVideoDialog(cameraParams) { // 调用弹窗实时播放接口
|
|
|
@@ -2088,21 +2213,20 @@ export default {
|
|
|
},
|
|
|
cbConnectError: function() { // 创建WebControl实例失败
|
|
|
that.oWebControl = null
|
|
|
- $('#playWnd').html('插件未启动，正在尝试启动，请稍候...')
|
|
|
+ $('#playWnd').html('插件未启动，正在尝试启动，请稍候...<a href="./hk/VideoWebPlugin.exe">点击下载插件</a>')
|
|
|
WebControl.JS_WakeUp('VideoWebPlugin://') // 程序未启动时执行error函数，采用wakeup来启动程序
|
|
|
- initCount++
|
|
|
- if (initCount < 3) {
|
|
|
+ that.initCount++
|
|
|
+ if (that.initCount < 3) {
|
|
|
setTimeout(function() {
|
|
|
that.initPlugin(newappkey, newloginIp, newsecret, newloginPort)
|
|
|
}, 3000)
|
|
|
} else {
|
|
|
- $('#playWnd').html('插件启动失败，请检查插件是否安装！<a href="./public/hk/VideoWebPlugin.exe">点击下载插件</a>')
|
|
|
+ $('#playWnd').html('插件启动失败，请检查插件是否安装！<a href="./hk/VideoWebPlugin.exe">点击下载插件</a>')
|
|
|
}
|
|
|
},
|
|
|
cbConnectClose: function(bNormalClose) {
|
|
|
// 异常断开：bNormalClose = false
|
|
|
// JS_Disconnect正常断开：bNormalClose = true
|
|
|
- console.log('cbConnectClose')
|
|
|
that.oWebControl = null
|
|
|
}
|
|
|
})
|
|
|
@@ -2187,11 +2311,34 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
-//RSA加密
|
|
|
+ //RSA加密
|
|
|
setEncrypt(value) {
|
|
|
var encrypt = new JSEncrypt()
|
|
|
encrypt.setPublicKey(this.pubKey)
|
|
|
return encrypt.encrypt(value)
|
|
|
+ },
|
|
|
+ //加入华为视频会议方法
|
|
|
+ joinMeeting(){
|
|
|
+ let eventId = this.eventId;
|
|
|
+ let subject = "视频会议";
|
|
|
+ let nickName;
|
|
|
+ getUserInfo().then(res => {
|
|
|
+ nickName = res.data.nickName;
|
|
|
+ });
|
|
|
+ hasConferences(eventId).then(res => {
|
|
|
+ let data = res.data;
|
|
|
+ /**如果没有正在开启的会议会返回空对象**/
|
|
|
+ if(res.code == 200 && Object.keys(data).length === 0){
|
|
|
+ createConferences(eventId,subject).then(res => {
|
|
|
+ let data = res.data;
|
|
|
+ if(res.code == 200){
|
|
|
+ window.open("/hwMeeting/meeting.html?nickName="+encodeURI(encodeURI(nickName))+"&conferenceID="+data.conferenceID+"&password="+data.password);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }else{
|
|
|
+ window.open("/hwMeeting/meeting.html?nickName="+encodeURI(encodeURI(nickName))+"&conferenceID="+data.conferenceID+"&password="+data.password);
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
/** ----------------------------------海康摄像头预览结束------------------------------------- */
|
|
|
}
|
|
|
@@ -2203,6 +2350,7 @@ function cbIntegrationCallBack(oData) {
|
|
|
}
|
|
|
</script>
|
|
|
|
|
|
+
|
|
|
<style lang="scss" scoped>
|
|
|
@import '@/assets/styles/base.scss';
|
|
|
|
