|
|
@@ -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>
|
|
|
@@ -322,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>
|
|
|
@@ -387,7 +411,8 @@
|
|
|
</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>
|
|
|
@@ -395,7 +420,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="岗位">
|
|
|
@@ -405,7 +430,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="操作">
|
|
|
@@ -416,18 +441,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>
|
|
|
@@ -981,6 +1006,10 @@ 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: {
|
|
|
@@ -1000,6 +1029,7 @@ export default {
|
|
|
return {
|
|
|
//海康
|
|
|
cameraTitle: '',
|
|
|
+ cameraCode:'',
|
|
|
cameraVisible: false,
|
|
|
initCount: 0,
|
|
|
pubKey: '',
|
|
|
@@ -1135,6 +1165,7 @@ export default {
|
|
|
dataStatus: null,//事件流程按钮
|
|
|
deptId: null,//事件流程部门
|
|
|
eventCode: null,
|
|
|
+ eventName: null,
|
|
|
longitude: null,
|
|
|
latitude: null,
|
|
|
eventLog: null,
|
|
|
@@ -1199,13 +1230,19 @@ export default {
|
|
|
],
|
|
|
resourcesListCheck: [],
|
|
|
//文本域
|
|
|
- feedback: ''
|
|
|
+ feedback: '',
|
|
|
|
|
|
}
|
|
|
},
|
|
|
props: {
|
|
|
calendarDay: null//首页日历选择
|
|
|
},
|
|
|
+ created() {
|
|
|
+ /** ----------------------------------摄像头预览开始------------------------------------- */
|
|
|
+ const DHWsInstance = DHWs.getInstance()
|
|
|
+ this.ws = DHWsInstance
|
|
|
+ /** ----------------------------------摄像头预览结束------------------------------------- */
|
|
|
+ },
|
|
|
methods: {
|
|
|
/************************************责任制-开始****************************************/
|
|
|
addLine: function() {//添加负责人行数
|
|
|
@@ -1258,8 +1295,8 @@ export default {
|
|
|
}]
|
|
|
}
|
|
|
})
|
|
|
-
|
|
|
},
|
|
|
+
|
|
|
showResponsibility() {//弹出责任制弹窗
|
|
|
let param = { eventCode: this.eventCode }
|
|
|
centereventtdepteventList(param).then(res => {
|
|
|
@@ -1274,6 +1311,31 @@ 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) {
|
|
|
@@ -1356,7 +1418,9 @@ export default {
|
|
|
markersMap.icon = 'camera'
|
|
|
if (res.data[i].cameraCode != null) {
|
|
|
markersMap.click = 'preview'
|
|
|
- markersMap.parameter = res.data[i].cameraCode
|
|
|
+ // 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
|
|
|
@@ -1578,12 +1642,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) {
|
|
|
@@ -1592,6 +1650,8 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
that.showEventConfirm = true
|
|
|
+ } else if (eventStatus == 'qr') {//确认
|
|
|
+ that.eventConfirmTitle = '事件确认'
|
|
|
} else if (eventStatus == 'wb') {//误报
|
|
|
that.eventConfirmTitle = '事件误报'
|
|
|
await selectByeventCode(that.eventCode).then(res => {
|
|
|
@@ -1679,6 +1739,30 @@ 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 = {
|
|
|
deptId: that.deptId,
|
|
|
@@ -1697,6 +1781,7 @@ export default {
|
|
|
that.cancelEventConfirm_send()
|
|
|
that.showEventConfirm_gd = false
|
|
|
that.$emit('getEventList', that.calendarDay,10,1)
|
|
|
+ that.$emit('getSupermap', that.calendarDay)
|
|
|
}
|
|
|
})
|
|
|
} else {
|
|
|
@@ -1728,6 +1813,7 @@ export default {
|
|
|
eventType: that.sendEventType,
|
|
|
id: that.eventId,
|
|
|
czlx: '',
|
|
|
+ cameraCode: that.cameraCode,
|
|
|
fireRadius: that.sendHuoZaiBanJing,
|
|
|
reserve: that.sendGuanLianYuAn
|
|
|
}
|
|
|
@@ -1738,6 +1824,7 @@ export default {
|
|
|
that.cancelEventConfirm_send()
|
|
|
that.showEventConfirm = false
|
|
|
that.$emit('getEventList', that.calendarDay,10,1)
|
|
|
+ that.$emit('getSupermap', that.calendarDay)
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
@@ -1784,6 +1871,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,
|
|
|
@@ -1806,6 +1894,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
|
|
|
@@ -1819,13 +1909,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
|
|
|
@@ -1864,6 +1955,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,
|
|
|
@@ -1886,6 +1978,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
|
|
|
@@ -1908,7 +2002,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
|
|
|
@@ -2012,49 +2106,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)
|
|
|
- that.$nextTick(()=>{
|
|
|
- console.log(that.oWebControl)
|
|
|
+ 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() {
|
|
|
- console.log(that.oWebControl)
|
|
|
that.playhk(newResponse.data.channelCode)
|
|
|
}, 5000)
|
|
|
})
|
|
|
- })
|
|
|
+ }
|
|
|
|
|
|
},
|
|
|
realTimeVideoDialog(cameraParams) { // 调用弹窗实时播放接口
|
