@@ -1039,13 +1045,11 @@ export default {
},
// 点击事件获取人员
loadUserList(event){
- console.log("event",event);
- let data = JSON.stringify(event.graphic.options.attr);
-
- // alert(argement);
- // $(".mars3d-popup-content-wrapper").append(`
编辑`);
-
- console.log("event222",event);
+ let url = event.layer.options.url;
+ this.editData = event.graphic.options.attr;
+ this.tableName = url.match(/shp_[0-9]+/)[0];
+ this.showFields = JSON.parse(event.layer.options.showFiled)
+ $(".mars3d-popup-content-wrapper").append(`
编辑`);
let layerName = event.layer.options.name;
// 如果是监控图层
if(layerName == '视频监控(86处)' || layerName == '林区监控' || layerName == '语音卡口'){
@@ -1079,9 +1083,8 @@ export default {
}
},
// 编辑图斑属性信息
- editlayerinfo(event){
- alert(event);
- console.log("editlayerinfo");
+ editlayerinfo(){
+ this.editorVisible = true;
},
// 获取监控
getMonitorList(lng,lat){
diff --git a/src/views/home/widget/editorbox.vue b/src/views/home/widget/editorbox.vue
index 61c0292..ac56243 100644
--- a/src/views/home/widget/editorbox.vue
+++ b/src/views/home/widget/editorbox.vue
@@ -3,8 +3,8 @@
属性编辑
-
-
+
+
@@ -21,7 +21,7 @@ import axios from "axios";
import { postMethodCommon,getMethodCommon } from '@/api/common.js';
import { isJson } from "../../../utils/index";
export default {
- props:['editData','tableName'],
+ props:['editData','tableName','showFields'],
name: 'monitorbox',
data(){
return{
@@ -38,6 +38,7 @@ import { isJson } from "../../../utils/index";
},
created(){
this.handleData();
+ console.log("showField",this.showFields)
},
mounted(){
@@ -55,17 +56,15 @@ import { isJson } from "../../../utils/index";
},
saveData(){
this.formData = this.editData;
- this.formData.tableName = "shp_1691551069";
+ this.formData.tableName = this.tableName;
this.formData.spaceType = "EPSG:4326";
axios({
method:"post",
url:"http://123.132.248.154:9236/geoserver/updateLayerData",
data:this.formData
}).then(res=>{
- if(res.code ==200){
- this.$message({type:"success",message:"修改成功"})
- this.$emit("close");
- }
+ this.$message({type:"success",message:"修改成功"});
+ this.$emit("close");
})
}
}
diff --git a/src/views/home/widget/rightclick.vue b/src/views/home/widget/rightclick.vue
index e5a721e..c69881f 100644
--- a/src/views/home/widget/rightclick.vue
+++ b/src/views/home/widget/rightclick.vue
@@ -134,6 +134,7 @@ export default {
addfireDetailReqLock:false
}
},
+ // 沂水县森林防火：1.灭火专班图标更换；
watch:{
type:{
handler(newVal,oldVal) {
@@ -147,12 +148,14 @@ export default {
this.markdialogFormVisible = true
}
if(newVal == 4){
+
this.firedialogFormVisible = false;
this.taskdialogFormVisible = false;
this.markdialogFormVisible = false;
this.markListDialogFormVisible = true;
}
- }
+ },
+ immediate:true
},
clickdata:{
handler(newVal,oldVal) {
diff --git a/src/views/home/widget/socketdiabox.vue b/src/views/home/widget/socketdiabox.vue
index 5cdaed9..30f61c0 100644
--- a/src/views/home/widget/socketdiabox.vue
+++ b/src/views/home/widget/socketdiabox.vue
@@ -38,7 +38,7 @@ export default {
websocket:state=>state.Emergency.listenWebSocket,
}),
},
- props:['globalmap'],
+ props:['globalmap',"showOnlineUser"],
data(){
return{
listDataInfo:[],
@@ -51,7 +51,14 @@ export default {
}
},
watch:{
-
+ showOnlineUser:{
+ handler(newVal,oldVal){
+ if(this.markGraphicLayer){
+ this.markGraphicLayer.show = newVal;
+ }
+ },
+ immediate:true
+ }
},
created(){
this.getOnLineInfo()
@@ -107,7 +114,7 @@ export default {
let userId = localStorage.getItem("userName") || ''
if(userId && phone){
// let wind = window.open("https://ssl.hopetrytech.com:9233/#/userID="+userId+"&callUserID="+phone, "视频通话", "location=no,toolbar=no,menubar=no,scrollbars=yes,resizable=yes,width=640,height=460");
- let wind = window.open("https://ssl.hopetrytech.com:9233/#/?userID="+userId+"&callUserID="+phone, "视频通话", "location=no,toolbar=no,menubar=no,scrollbars=yes,resizable=yes,width=640,height=460");
+ let wind = window.open("https://ssl.hopetrytech.com:9233?userID="+userId+"&callUserID="+phone, "视频通话", "location=no,toolbar=no,menubar=no,scrollbars=yes,resizable=yes,width=640,height=460");
wind.onload = function(){
wind.document.title = "视频通话";
}
diff --git a/src/views/home/widget/taskDelivery.vue b/src/views/home/widget/taskDelivery.vue
index 6c4e892..d855cdb 100644
--- a/src/views/home/widget/taskDelivery.vue
+++ b/src/views/home/widget/taskDelivery.vue
@@ -194,12 +194,16 @@
this.$emit('closeTask')
},
onSubmit() {
-
+ let users = [];
+ this.multipleSelection.forEach((item,index)=>{
+ users.push(item.id)
+ })
var querys = {
- content: this.content,
- lng: this.lng,
- lat: this.lat,
- }
+ content: this.content,
+ lng: this.lng,
+ lat: this.lat,
+ recipientUsers:users
+ }
if (this.lng == '') {
this.$message.warning("请选择位置");
return;
diff --git a/src/views/home/widget/userpoint.vue b/src/views/home/widget/userpoint.vue
index 805e090..17d6ea1 100644
--- a/src/views/home/widget/userpoint.vue
+++ b/src/views/home/widget/userpoint.vue
@@ -55,7 +55,6 @@ import { isJson } from "../../../utils/index";
},
methods:{
getSocketData(res){
- console.log("RESRES",res);
let _this = this;
if (!isJson(res.detail.data)) return;
let obj = JSON.parse(res.detail.data)
@@ -68,7 +67,7 @@ import { isJson } from "../../../utils/index";
videoCall(phone){
let userId = localStorage.getItem("userName") || ''
if(userId && phone){
- let wind = window.open("https://ssl.hopetrytech.com:9233/#/?userID="+userId+"&callUserID="+phone, "视频通话", "location=no,toolbar=no,menubar=no,scrollbars=yes,resizable=yes,width=640,height=460");
+ let wind = window.open("https://ssl.hopetrytech.com:9233?userID="+userId+"&callUserID="+phone, "视频通话", "location=no,toolbar=no,menubar=no,scrollbars=yes,resizable=yes,width=640,height=460");
wind.onload = function(){
wind.document.title = "视频通话";
}
@@ -101,6 +100,10 @@ import { isJson } from "../../../utils/index";
},
}
}
+
+ /*
+
+ */