|
|
@@ -163,7 +163,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="z-info-btm-input">
|
|
|
- <el-input type="textarea" v-model="eventLog" :autosize="{ minRows: 7, maxRows: 7}" :maxlength="500"
|
|
|
+ <el-input type="textarea" v-model="eventLog" :autosize="{ minRows: 7, maxRows: 7}"
|
|
|
placeholder="请输入反馈信息">
|
|
|
</el-input>
|
|
|
<div class="z-info-btm-input-btn" v-if="eventStatusValue=='forest_event_status_1'">
|
|
|
@@ -961,10 +961,10 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="联动标题" v-if="eventStatusButton=='ld'">
|
|
|
- <el-input v-model="sendTaskTitle" placeholder="请输入联动标题" :maxlength="50"/>
|
|
|
+ <el-input v-model="sendTaskTitle" placeholder="请输入联动标题" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="联动内容" v-if="eventStatusButton=='ld'">
|
|
|
- <el-input type="textarea" v-model="sendTaskContent" :autosize="{ minRows: 7, maxRows: 7}" :maxlength="500"
|
|
|
+ <el-input type="textarea" v-model="sendTaskContent" :autosize="{ minRows: 7, maxRows: 7}"
|
|
|
placeholder="请输入联动内容">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
@@ -1693,7 +1693,6 @@ import {
|
|
|
getIconBg
|
|
|
} from '@/api/components/sookaMapIcon'; //资源底色控制文件
|
|
|
import TVWall from '@/components/TVWall.vue' //电视墙弹窗
|
|
|
-import request from "../utils/request";
|
|
|
import {
|
|
|
getEventDetail,
|
|
|
sendEventLog,
|
|
|
@@ -1943,6 +1942,7 @@ export default {
|
|
|
isExamine: "0", //事件审核 1通过 0不通过
|
|
|
eventId: null, //事件ID
|
|
|
eventType: null, //事件类型-大类
|
|
|
+ eventTypeXl: null, //事件类型-小类
|
|
|
dataStatus: null, //事件流程按钮
|
|
|
deptId: null, //事件流程部门
|
|
|
eventCode: null,
|
|
|
@@ -2060,36 +2060,35 @@ export default {
|
|
|
fireControlViewList() {
|
|
|
this.resourcesList1 = [];
|
|
|
let _this = this;
|
|
|
- // {
|
|
|
- // resourceName: '取水口',
|
|
|
- // type: 'qsk',
|
|
|
- // count: '1',
|
|
|
- // icon: 'sj-icon-waterintake'
|
|
|
- // },
|
|
|
- fireControlViewList().then(function(res) {
|
|
|
+ fireControlViewList("xiaofang").then(function (res) {
|
|
|
// _this.resourcesList = res.data
|
|
|
//截取data.resourceTable字段中“_”分隔符最后一个作为关键字,重新拼接成前端需要的图标:class,格式sj-icon-xxxx,将其set回原数组
|
|
|
- res.data.forEach(function(data, index) {
|
|
|
+ res.data.forEach(function (data, index) {
|
|
|
let obj = {};
|
|
|
- let icon = 'sj' + '-' + 'icon' + '-' + data.type.replaceAll("_", "-").replaceAll("@", "-");
|
|
|
- obj.resourceName = data.name.replaceAll("(个)", "");
|
|
|
+ let icon =
|
|
|
+ "sj" +
|
|
|
+ "-" +
|
|
|
+ "icon" +
|
|
|
+ "-" +
|
|
|
+ data.type.replaceAll("_", "-").replaceAll("@", "-");
|
|
|
+ let resourceName = data.name.replaceAll("(个)", "");
|
|
|
+ obj.resourceName = resourceName;
|
|
|
obj.type = data.type;
|
|
|
obj.count = data.num;
|
|
|
obj.icon = icon;
|
|
|
- _this.resourcesList1.push(obj);
|
|
|
+ _this.resourcesList.push(obj);
|
|
|
console.log("icon_" + (index + 1) + "=", icon);
|
|
|
//每个图标对应固定颜色
|
|
|
- _this.$set(_this.resourcesList1[index], "bg", getIconBg(icon));
|
|
|
-
|
|
|
- })
|
|
|
- _this.resourcesList1.push({
|
|
|
- resourceName: '摄像头',
|
|
|
- type: 'sxt',
|
|
|
- count: '1',
|
|
|
- icon: 'sj-icon-jkzx',
|
|
|
- bg: '#f5ad1b'
|
|
|
- })
|
|
|
- })
|
|
|
+ _this.$set(_this.resourcesList[index], "bg", getIconBg(icon));
|
|
|
+ });
|
|
|
+ _this.resourcesList.push({
|
|
|
+ resourceName: "摄像头",
|
|
|
+ type: "sxt",
|
|
|
+ count: "1",
|
|
|
+ icon: "sj-icon-jkzx",
|
|
|
+ bg: "#f5ad1b",
|
|
|
+ });
|
|
|
+ });
|
|
|
},
|
|
|
fireControlViewPoint(type) {
|
|
|
// alert(type)
|
|
|
@@ -2115,48 +2114,85 @@ export default {
|
|
|
let markersMap = {
|
|
|
lng: 124.59,
|
|
|
lat: 43.02,
|
|
|
- icon: 'marker',
|
|
|
- bindPopupHtml: '',
|
|
|
- click: '',
|
|
|
- parameter: '',
|
|
|
+ icon: "marker",
|
|
|
+ bindPopupHtml: "",
|
|
|
+ click: "",
|
|
|
+ parameter: "",
|
|
|
keepBindPopup: false,
|
|
|
- isAggregation: true
|
|
|
- }
|
|
|
- markersMap.icon = 'sj-icon-map-' + type.replaceAll("_", "-");
|
|
|
+ isAggregation: true,
|
|
|
+ };
|
|
|
+ markersMap.icon = "sj-icon-map-" + type.replaceAll("_", "-");
|
|
|
markersMap.lng = res.data.pointList[i].longitude;
|
|
|
markersMap.lat = res.data.pointList[i].latitude;
|
|
|
- markersMap.bindPopupHtml = '<div class="map-tip">' +
|
|
|
- '<span>' +
|
|
|
+ markersMap.bindPopupHtml =
|
|
|
+ '<div class="map-tip">' +
|
|
|
+ "<span>" +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>资源名称：' + (res.data.pointList[i].name?res.data.pointList[i].name:'') + '</h4>' +
|
|
|
- ' </div>' +
|
|
|
- ' </div>' +
|
|
|
- ' </span>' +
|
|
|
- '<span>' +
|
|
|
+ " <h4>资源名称：" +
|
|
|
+ res.data.pointList[i].name +
|
|
|
+ "</h4>" +
|
|
|
+ " </div>" +
|
|
|
+ " </div>" +
|
|
|
+ " </span>" +
|
|
|
+ "<span>" +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>经纬度：' + res.data.pointList[i].longitude + ',' + res.data.pointList[i]
|
|
|
- .latitude + '</h4>' +
|
|
|
- ' </div>' +
|
|
|
- ' </div>' +
|
|
|
- ' </span>' +
|
|
|
- '<span>' +
|
|
|
+ " <h4>经纬度：" +
|
|
|
+ res.data.pointList[i].longitude +
|
|
|
+ "," +
|
|
|
+ res.data.pointList[i].latitude +
|
|
|
+ "</h4>" +
|
|
|
+ " </div>" +
|
|
|
+ " </div>" +
|
|
|
+ " </span>" +
|
|
|
+ "<span>" +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>联系人：' + (res.data.pointList[i].contacts?res.data.pointList[i].contacts:'') + '</h4>' +
|
|
|
- ' </div>' +
|
|
|
- ' </div>' +
|
|
|
- ' </span>' +
|
|
|
- '<span>' +
|
|
|
+ " <h4>名称：" +
|
|
|
+ (res.data.pointList[i].name?res.data.pointList[i].name:'无') +
|
|
|
+ "</h4>" +
|
|
|
+ " </div>" +
|
|
|
+ " </div>" +
|
|
|
+ " </span>" +
|
|
|
+ "<span>" +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>电话：' + (res.data.pointList[i].phone?res.data.pointList[i].phone:'') + '</h4>' +
|
|
|
- ' </div>' +
|
|
|
- ' </div>' +
|
|
|
- ' </span>' +
|
|
|
- '</div>'
|
|
|
- markersList.push(markersMap)
|
|
|
+ " <h4>地址：" +
|
|
|
+ (res.data.pointList[i].address?res.data.pointList[i].address:'无') +
|
|
|
+ "</h4>" +
|
|
|
+ " </div>" +
|
|
|
+ " </div>" +
|
|
|
+ " </span>" +
|
|
|
+ "<span>" +
|
|
|
+ ' <div class="d-l-con">' +
|
|
|
+ ' <div class="d-l-l-text">' +
|
|
|
+ " <h4>联系人：" +
|
|
|
+ (res.data.pointList[i].contacts?res.data.pointList[i].contacts:'无') +
|
|
|
+ "</h4>" +
|
|
|
+ " </div>" +
|
|
|
+ " </div>" +
|
|
|
+ " </span>" +
|
|
|
+ "<span>" +
|
|
|
+ ' <div class="d-l-con">' +
|
|
|
+ ' <div class="d-l-l-text">' +
|
|
|
+ " <h4>电话：" +
|
|
|
+ (res.data.pointList[i].phone?res.data.pointList[i].phone:'无') +
|
|
|
+ "</h4>" +
|
|
|
+ " </div>" +
|
|
|
+ " </div>" +
|
|
|
+ " </span>" +
|
|
|
+ "<span>" +
|
|
|
+ ' <div class="d-l-con">' +
|
|
|
+ ' <div class="d-l-l-text">' +
|
|
|
+ " <h4>距离事件距离：" +
|
|
|
+ (res.data.pointList[i].distance?res.data.pointList[i].distance+'米':'无') +
|
|
|
+ "</h4>" +
|
|
|
+ " </div>" +
|
|
|
+ " </div>" +
|
|
|
+ " </span>" +
|
|
|
+ "</div>";
|
|
|
+ markersList.push(markersMap);
|
|
|
}
|
|
|
setTimeout(() => {
|
|
|
this.$refs.supermapDialog1.setMarkersByType(markersList, type)
|
|
|
@@ -2280,11 +2316,11 @@ export default {
|
|
|
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.warning(`请输入正确姓名!`)
|
|
|
+ this.$message.error(`请输入正确姓名!`)
|
|
|
return;
|
|
|
}
|
|
|
if (!reg_tel.test(this.dutysystemTableData[i].telphone)) {
|
|
|
- this.$message.warning(`请输入正确手机号码!`)
|
|
|
+ this.$message.error(`请输入正确手机号码!`)
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -2323,7 +2359,7 @@ export default {
|
|
|
},
|
|
|
updateYjYuAn() {
|
|
|
if (this.eventStatusValue == 'forest_event_status_1') {
|
|
|
- this.$message.warning(`修改预案信息在签收后方可修改！`)
|
|
|
+ this.$message.error(`修改预案信息在签收后方可修改！`)
|
|
|
return
|
|
|
} else {
|
|
|
let param = {
|
|
|
@@ -2355,10 +2391,7 @@ export default {
|
|
|
type: type,
|
|
|
radius: this.radius
|
|
|
}
|
|
|
- request({
|
|
|
- url: `/center-monitor/camera/findNearbyCameras/${param.longitude}/${param.latitude}/${param.radius}`,
|
|
|
- method: 'get'
|
|
|
- }).then(res => {
|
|
|
+ listResourceByWz(param).then(res => {
|
|
|
if (res.data != null && res.data.length > 0) {
|
|
|
this.resourcesListCheck.push(type)
|
|
|
var markersList = []
|
|
|
@@ -2697,24 +2730,24 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (that.sendTaskSource == '' || that.sendTaskSource == null) {
|
|
|
- that.$message.warning(`请选择任务来源!`)
|
|
|
+ that.$message.error(`请选择任务来源!`)
|
|
|
return
|
|
|
}
|
|
|
if (that.sendTaskContent == '' || that.sendTaskContent == null) {
|
|
|
- that.$message.warning(`请输入任务内容!`)
|
|
|
+ that.$message.error(`请输入任务内容!`)
|
|
|
return
|
|
|
}
|
|
|
if (that.sendTaskTitle == '' || that.sendTaskTitle == null) {
|
|
|
- that.$message.warning(`请输入任务标题!`)
|
|
|
+ that.$message.error(`请输入任务标题!`)
|
|
|
return
|
|
|
}
|
|
|
if (that.sendLianDongDept == '' || that.sendLianDongDept == null) {
|
|
|
- that.$message.warning(`请选择任务联动部门!`)
|
|
|
+ that.$message.error(`请选择任务联动部门!`)
|
|
|
return
|
|
|
}
|
|
|
if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName ==
|
|
|
null) {
|
|
|
- that.$message.warning(`请选择任务发起部门!`)
|
|
|
+ that.$message.error(`请选择任务发起部门!`)
|
|
|
return
|
|
|
}
|
|
|
let eventState = "";
|
|
|
@@ -2758,23 +2791,23 @@ export default {
|
|
|
let number = /^[+]{0,1}(\d+)$/g; //正整数
|
|
|
|
|
|
if (!double.test(that.table2.areaTotal)) {
|
|
|
- that.$message.warning(`面积只能填写到小数后两位!`)
|
|
|
+ that.$message.error(`面积只能填写到小数后两位!`)
|
|
|
return
|
|
|
}
|
|
|
if (!number.test(that.table2.peopleTotal)) {
|
|
|
- that.$message.warning(`人员请填写正整数!`)
|
|
|
+ that.$message.error(`人员请填写正整数!`)
|
|
|
return
|
|
|
}
|
|
|
if (that.table2.forestComposition == '' || that.table2.forestComposition == null) {
|
|
|
- that.$message.warning(`林木组成不能为空!`)
|
|
|
+ that.$message.error(`林木组成不能为空!`)
|
|
|
return
|
|
|
}
|
|
|
if (that.table2.forestToken == '' || that.table2.forestToken == null) {
|
|
|
- that.$message.warning(`林令不能为空!`)
|
|
|
+ that.$message.error(`林令不能为空!`)
|
|
|
return
|
|
|
}
|
|
|
if (that.table2.porosities == '' || that.table2.porosities == null) {
|
|
|
- that.$message.warning(`疏密度不能为空!`)
|
|
|
+ that.$message.error(`疏密度不能为空!`)
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
@@ -2815,11 +2848,11 @@ export default {
|
|
|
} else if (eventStatus == 'shtg') {
|
|
|
that.eventStatusButton = 'sh'
|
|
|
if (that.eventDescription == '' || that.eventDescription == null) {
|
|
|
- that.$message.warning(`请填写审核意见!`)
|
|
|
+ that.$message.error(`请填写审核意见!`)
|
|
|
return
|
|
|
}
|
|
|
if (that.attachExamine.length == 0 || that.attachExamine == null) {
|
|
|
- that.$message.warning(`请上传审核图片！`)
|
|
|
+ that.$message.error(`请上传审核图片！`)
|
|
|
return
|
|
|
}
|
|
|
//事件处理流程--审核通过
|
|
|
@@ -2851,11 +2884,11 @@ export default {
|
|
|
} else if (eventStatus == 'shbtg') {
|
|
|
that.eventStatusButton = 'sh'
|
|
|
if (that.eventDescription == '' || that.eventDescription == null) {
|
|
|
- that.$message.warning(`请填写审核意见!`)
|
|
|
+ that.$message.error(`请填写审核意见!`)
|
|
|
return
|
|
|
}
|
|
|
if (that.attachExamine.length == 0 || that.attachExamine == null) {
|
|
|
- that.$message.warning(`请上传审核图片！`)
|
|
|
+ that.$message.error(`请上传审核图片！`)
|
|
|
return
|
|
|
}
|
|
|
//事件处理流程--审核不通过
|
|
|
@@ -2902,12 +2935,12 @@ export default {
|
|
|
if (eventStatus == 'qs') {
|
|
|
if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName ==
|
|
|
null) {
|
|
|
- that.$message.warning(`请选择部门!`)
|
|
|
+ that.$message.error(`请选择部门!`)
|
|
|
return
|
|
|
}
|
|
|
if (eventStatus == 'qs') {
|
|
|
if (that.sendEventType == '' || that.sendEventType == null) {
|
|
|
- that.$message.warning(`请选择事件类型!`)
|
|
|
+ that.$message.error(`请选择事件类型!`)
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
@@ -2961,7 +2994,7 @@ export default {
|
|
|
|
|
|
sendEventLog() {
|
|
|
if (this.eventLog == '' || this.eventLog == null) {
|
|
|
- this.$message.warning("请录入反馈信息!")
|
|
|
+
|
|
|
return;
|
|
|
}
|
|
|
//日志发送
|
|
|
@@ -3008,11 +3041,11 @@ export default {
|
|
|
that.deptId = res.data.catalogue.deptId
|
|
|
that.eventId = res.data.catalogue.id
|
|
|
that.longitude = res.data.catalogue.longitude
|
|
|
- that.isExamine = res.data.catalogue.isExamine
|
|
|
that.latitude = res.data.catalogue.latitude
|
|
|
that.eventName = res.data.catalogue.eventName
|
|
|
that.eventTypeXl = res.data.catalogue.eventTypeXl
|
|
|
that.version = res.data.catalogue.version
|
|
|
+ that.isExamine = res.data.catalogue.isExamine
|
|
|
let markersMap = {
|
|
|
lng: 124.59,
|
|
|
lat: 43.02,
|
|
|
@@ -3112,10 +3145,10 @@ export default {
|
|
|
that.eventId = res.data.catalogue.id
|
|
|
that.latitude = res.data.catalogue.latitude
|
|
|
that.longitude = res.data.catalogue.longitude
|
|
|
- that.isExamine = res.data.catalogue.isExamine
|
|
|
that.eventName = res.data.catalogue.eventName
|
|
|
that.eventTypeXl = res.data.catalogue.eventTypeXl
|
|
|
that.version = res.data.catalogue.version
|
|
|
+ that.isExamine = res.data.catalogue.isExamine
|
|
|
let markersMap = {
|
|
|
lng: 124.59,
|
|
|
lat: 43.02,
|
|
|
@@ -3471,11 +3504,11 @@ export default {
|
|
|
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.warning(`请输入正确姓名!`)
|
|
|
+ this.$message.error(`请输入正确姓名!`)
|
|
|
return;
|
|
|
}
|
|
|
if (!reg_tel.test(this.dutysystemTableData[i].telphone)) {
|
|
|
- this.$message.warning(`请输入正确手机号码!`)
|
|
|
+ this.$message.error(`请输入正确手机号码!`)
|
|
|
return;
|
|
|
}
|
|
|
|
qinhouyu