xujingliang
/
Lin_Ye_Fang_Huo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

编辑功能优化、在线人员显示隐藏优化

master
徐景良 2023-09-22 09:01:46 +08:00
parent 78e3ef6a41
commit 165ba0fec3
7 changed files with 57 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/mars3d/Map.vue
View File

@ -88,6 +88,7 @@ export default {
item.children.forEach((it,idx)=>{
let attribute = JSON.parse(it.attribute);
attribute.pid = group.id;
attribute.showFiled = it.properties;
configLayers.unshift(attribute);
})
}

39
src/views/home/index.vue
View File

@ -43,7 +43,7 @@
<div class="quick-button" v-if="appTools['reportbox']" @click=" reportlistShow = !reportlistShow">线索上报</div>
<div class="quick-button" @click="socketBoxVisible = !socketBoxVisible">现场人员</div>
<div class="quick-button" @click="updatePersonalData">现场人员</div>
<div class="quick-button" @click="showHistoryLabel">历史标注</div>
@ -164,7 +164,7 @@
<!-- 图层信息编辑 -->
<div class="editor-box" v-drag v-if="editorVisible">
<editorbox></editorbox>
<editorbox :editData="editData" :tableName="tableName" :showFields="showFields" @close="editorVisible = false;"></editorbox>
</div>
<!-- -->
@ -181,12 +181,12 @@
<!-- 右键点击设置 -->
<div v-if="setVisibleShow">
<rightclicksetting v-if="setVisibleShow" :globalmap="globalmap" :type="rightType" :clickdata="setDatas" @close="rightType=0"></rightclicksetting>
<rightclicksetting :globalmap="globalmap" :type="rightType" :clickdata="setDatas" @close="rightType=0"></rightclicksetting>
</div>
<!-- socket -->
<!-- <div class="socket-container"> -->
<div class="">
<socketDiaBox v-if="socketBoxVisible" :globalmap="globalmap" @close="socketBoxVisible = false" @videoCall="videoCall"></socketDiaBox>
<socketDiaBox :globalmap="globalmap" :showOnlineUser="socketBoxVisible" @videoCall="videoCall"></socketDiaBox>
</div>
<!-- 火情上报 -->
@ -317,7 +317,10 @@ export default {
taskList:[],
taskGraphicLayer:null,
newworkstate:null,
editorVisible:false
editorVisible:false,
tableName:null,
editData:null,
showFields:null,
}
},
@ -370,10 +373,13 @@ export default {
window.editlayerinfo = this.editlayerinfo;
},
methods: {
updatePersonalData(){
this.socketBoxVisible = !this.socketBoxVisible;
},
// 查看历史标注
showHistoryLabel(){
this.setVisibleShow = true;
this.rightType = 4;
this.setVisibleShow = true;
},
// 获取网络状态
getNetWorkState() {
@ -464,8 +470,8 @@ export default {
<div class="data-label">任务内容：${item.content? item.content:'暂无任务内容'}</div>
</div>
<div class="data-li">
<div class="data-label">任务地址：</div>
<div class="data-value"><span id="lablYeWei" class="label-num">${item.address}</span><span class="label-unit"></span>
<div class="data-label">任务位置：</div>
<div class="data-value"><span id="lablYeWei" class="label-num">${item.lng},${item.lat}</span><span class="label-unit"></span>
</div>
</div>
<div class="data-li">
@ -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(`<el-button type='primary' size='mini' onclick='editlayerinfo("${data}")' style='background:#108eff;padding:4px 6px;color:#fff;border-radius:4px;margin-left:12px;'>编辑</el-button>`);
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(`<el-button type='primary' size='mini' onclick='editlayerinfo()' style='background:#108eff;padding:4px 6px;color:#fff;border-radius:4px;margin-left:12px;'>编辑</el-button>`);
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){

15
src/views/home/widget/editorbox.vue
View File

@ -3,8 +3,8 @@
<div class="box-title">属性编辑</div>
<div class="box-container">
<el-form ref="form" :inline="true" label-width="100px" size="small" >
<el-form-item v-for="(item,index) in list" :key="index" :label="item.name" >
<el-input v-model="editData[item.name]" style="min-width:240px;"></el-input>
<el-form-item v-for="(item,index) in showFields" :key="index" :label="item.name" >
<el-input v-model="editData[item.field]" style="min-width:240px;"></el-input>
</el-form-item>
</el-form>
</div>
@ -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");
})
}
}

5
src/views/home/widget/rightclick.vue
View File

@ -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) {

13
src/views/home/widget/socketdiabox.vue
View File

@ -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 = "视频通话";
}

14
src/views/home/widget/taskDelivery.vue
View File

@ -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;

7
src/views/home/widget/userpoint.vue
View File

@ -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";
},
}
}
/*
*/
</script>
<style scoped>