历史标注
parent
d7855eee36
commit
aa0ab357b4
3
.env.dev
3
.env.dev
|
|
@ -20,9 +20,12 @@ VUE_APP_OIDC_SILENTREDIRECTURI = http://112.233.241.108:1803/silent-renew-oidc.h
|
|||
|
||||
VUE_APP_BASE_API = http://123.132.248.154:9231/api
|
||||
VUE_APP_BASE_IMG_URL = http://123.132.248.154:9231
|
||||
VUE_APP_WEBSOCKET_URL = ws://123.132.248.154:9225/ws
|
||||
|
||||
|
||||
#VUE_APP_BASE_API = http://221.2.83.254:7001/api
|
||||
#VUE_APP_BASE_IMG_URL = http://221.2.83.254:7001
|
||||
#VUE_APP_WEBSOCKET_URL = ws://221.2.83.254:9002/ws
|
||||
|
||||
#VUE_APP_BASE_API = http://123.132.248.154:9224/api
|
||||
#VUE_APP_BASE_IMG_URL = http://123.132.248.154:9224
|
||||
|
|
|
|||
|
|
@ -15,8 +15,9 @@ VUE_APP_OIDC_SILENTREDIRECTURI = http://demo.openauth.me:1803/silent-renew-oidc.
|
|||
#VUE_APP_BASE_API = http://123.132.248.154:9224/api
|
||||
#VUE_APP_BASE_IMG_URL = http://123.132.248.154:9224
|
||||
|
||||
#VUE_APP_BASE_API = http://123.132.248.154:9231/api
|
||||
#VUE_APP_BASE_IMG_URL = http://123.132.248.154:9231
|
||||
VUE_APP_BASE_API = http://123.132.248.154:9231/api
|
||||
VUE_APP_BASE_IMG_URL = http://123.132.248.154:9231
|
||||
VUE_APP_WEBSOCKET_URL = ws://123.132.248.154:9225/ws
|
||||
|
||||
VUE_APP_BASE_API = http://221.2.83.254:7001/api
|
||||
VUE_APP_BASE_IMG_URL = http://221.2.83.254:7001
|
||||
#VUE_APP_BASE_API = http://221.2.83.254:7001/api
|
||||
#VUE_APP_BASE_IMG_URL = http://221.2.83.254:7001
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
<script>
|
||||
import { mapGetters } from 'vuex'
|
||||
import {setToken} from "./utils/auth";
|
||||
|
||||
let Socket_Url = process.env.VUE_APP_WEBSOCKET_URL
|
||||
export default {
|
||||
name: 'App',
|
||||
computed: {
|
||||
|
|
@ -49,9 +49,8 @@ export default {
|
|||
},
|
||||
initWebSocket() {
|
||||
// WebSocket与普通的请求所用协议有所不同，ws等同于http，wss等同于https
|
||||
let wsUrl = "ws://123.132.248.154:9225/ws";
|
||||
// let wsUrl = "ws://221.2.83.254:9002/ws";
|
||||
window.websocket = new WebSocket(wsUrl);
|
||||
// let wsUrl = "";
|
||||
window.websocket = new WebSocket(Socket_Url);
|
||||
window.websocket.onopen = this.websocketonopen;
|
||||
window.websocket.onerror = this.websocketonerror;
|
||||
window.websocket.onmessage = this.setOnmessageMessage;
|
||||
|
|
@ -64,6 +63,7 @@ export default {
|
|||
//清除延时器
|
||||
this.timeoutObj && clearTimeout(this.timeoutObj);
|
||||
this.serverTimeoutObj && clearTimeout(this.serverTimeoutObj);
|
||||
|
||||
this.timeoutObj = setTimeout(() => {
|
||||
if (window.websocket && window.websocket.readyState == 1) {
|
||||
//发送消息，服务端返回信息，即表示连接良好，可以在socket的onmessage事件重置心跳机制函数
|
||||
|
|
|
|||
|
|
@ -43,7 +43,9 @@
|
|||
|
||||
<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="socketBoxVisible = !socketBoxVisible">现场人员</div> -->
|
||||
|
||||
<div class="quick-button" @click="showHistoryLabel">历史标注</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
|
@ -297,7 +299,7 @@ export default {
|
|||
checkNumber:[],
|
||||
mergeboxShow:false,
|
||||
mergeSuccessRandom:1,
|
||||
rightType: 0,
|
||||
rightType: 5,
|
||||
setDatas:{},
|
||||
setVisibleShow: false,
|
||||
videoCallShow:false,
|
||||
|
|
@ -359,6 +361,11 @@ export default {
|
|||
window.delTaskPoint = this.delTaskPoint;
|
||||
},
|
||||
methods: {
|
||||
// 查看历史标注
|
||||
showHistoryLabel(){
|
||||
this.setVisibleShow = true;
|
||||
this.rightType = 4;
|
||||
},
|
||||
// 获取网络状态
|
||||
getNetWorkState() {
|
||||
if (window.navigator.onLine) {
|
||||
|
|
@ -368,9 +375,11 @@ export default {
|
|||
}
|
||||
|
||||
let _this = this;
|
||||
|
||||
window.addEventListener("online", function (e) {
|
||||
_this.newworkstate = "网络正常";
|
||||
});
|
||||
|
||||
window.addEventListener("offline", function (e) {
|
||||
_this.newworkstate = "网络断开";
|
||||
_this.$message({
|
||||
|
|
@ -378,6 +387,7 @@ export default {
|
|||
message: "网络已断开！",
|
||||
});
|
||||
});
|
||||
|
||||
},
|
||||
closeWaterlayer(){
|
||||
this.waterVisible = false
|
||||
|
|
@ -850,7 +860,6 @@ export default {
|
|||
{
|
||||
text: "火点",
|
||||
callback: (e) => {
|
||||
console.log('2222222222222')
|
||||
const mpt = mars3d.LngLatPoint.fromCartesian(e.cartesian)
|
||||
this.setDatas = {
|
||||
title: '',
|
||||
|
|
@ -861,7 +870,6 @@ export default {
|
|||
}
|
||||
this.rightType = 3
|
||||
this.setVisibleShow = true
|
||||
console.log('1111111111111')
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -1043,7 +1051,7 @@ export default {
|
|||
},
|
||||
url:BASE_URL+url,
|
||||
}).then(data=>{
|
||||
console.log("data111",data);
|
||||
|
||||
if(data.data.code == 200){
|
||||
data.data.data.forEach((item,index)=>{
|
||||
$(".popup-container").append("<div class='popup-item'>"+item.username+" <span data-phone='"+item.phone+"' onmouseenter='showReadData(this);' onmouseleave='hiddenReadData(this);'>"+item.phone.replace(/(\d{3})\d*(\d{4})/, '$1****$2')+"</span> "+item.area+" "+item.usertype+"</div>");
|
||||
|
|
|
|||
|
|
@ -146,6 +146,12 @@ export default {
|
|||
if(newVal == 3){
|
||||
this.markdialogFormVisible = true
|
||||
}
|
||||
if(newVal == 4){
|
||||
this.firedialogFormVisible = false;
|
||||
this.taskdialogFormVisible = false;
|
||||
this.markdialogFormVisible = false;
|
||||
this.markListDialogFormVisible = true;
|
||||
}
|
||||
}
|
||||
},
|
||||
clickdata:{
|
||||
|
|
@ -293,9 +299,9 @@ export default {
|
|||
message: '操作成功',
|
||||
type: 'success'
|
||||
});
|
||||
this.markList = []
|
||||
this.setUpData = {}
|
||||
this.markListDialogFormVisible = false
|
||||
this.markList = [];
|
||||
this.setUpData = {};
|
||||
this.markListDialogFormVisible = false;
|
||||
}
|
||||
})
|
||||
},
|
||||
|
|
@ -317,6 +323,8 @@ export default {
|
|||
if(this.historyMarkGraphicLayer == null){
|
||||
this.historyMarkGraphicLayer = new mars3d.layer.GraphicLayer();
|
||||
this.globalmap.addLayer(this.historyMarkGraphicLayer);
|
||||
}else{
|
||||
this.historyMarkGraphicLayer.clear();
|
||||
}
|
||||
|
||||
this.historyMarkGraphicLayerArr = []
|
||||
|
|
|
|||
|
|
@ -43,8 +43,7 @@ import { isJson } from "../../../utils/index";
|
|||
// this.getMonitorList();
|
||||
},
|
||||
mounted(){
|
||||
|
||||
// this.initWebSocket();
|
||||
// 通过监听WebSocket 获取在新人员信息
|
||||
window.addEventListener("onmessageWS", this.getSocketData);
|
||||
},
|
||||
methods:{
|
||||
|
|
|
|||
|
|
@ -263,7 +263,7 @@ import axios from "axios";
|
|||
const pointArr = []
|
||||
const pathArr = [];
|
||||
console.log("nestWaterPoints",nestWaterPoints)
|
||||
for(let i=0;i<10;i++){
|
||||
for(let i=0;i<15;i++){
|
||||
pointArr.push({
|
||||
name: nestWaterPoints[i].distance+"km",
|
||||
value: nestWaterPoints[i].lngLat,
|
||||
|
|
|
|||
Loading…
Reference in New Issue