提交

ebc-middle-platform/src/assets/styles/_reset.scss

@@ -18,4 +18,25 @@ html,
.form--lg .form-checkbox .form-checkbox__inner {
  padding-left: 26px;
}
.menu--dark.menu{
  background-color: $theme-dark-menu-bg;
}
.navs--light.navs--horizontal > .navs__item:hover{
  color:$white;
  border-bottom-color: $white;
}
.navs--light .navs__item, .navs--light .navs__submenu-title{
  color: rgba(255, 255, 255, 0.65);
}
.navs--light .navs__item, .navs--light .navs__submenu-title:has(.navs__item--checked){
  color: $brand-primary;
  background-color: transparent;
  border-color: $brand-primary;
}
.navs--light .navs__item--checked{
  color: $brand-primary;
  background-color: transparent;
  border-color: $brand-primary;
}

ebc-middle-platform/src/constants.js

@@ -16,3 +16,4 @@ export const GIS_SEA_LAYER_URL = 'http://192.168.74.189:9999/tdtvector' // 海
export const GIS_SEA_URL = 'http://192.168.74.216:5071/gisserver/dzht/dzht/wmts' // 海图地址
export const GIS_CENTER = [33.597844, 123.647472] // 海图中心点
export const GIS_ZOOM = 7 // 海图默认缩放
export const socketUrl = 'ws://127.0.0.1:7100/stomp'

ebc-middle-platform/src/ipu-stomp.js

@@ -1,108 +1,28 @@
import SockJS from 'sockjs-client'
import Stomp from 'stompjs'
// import UUID from './uuid'
import {socketUrl} from '@/constants'
import EventBus from './bus'
// define(["sockjs", "stomp", "uuid"],function(SockJS, Stomp, UUID) {
// var IpuStomp = {};
var socket = null
var stompClient = null
export default function (params, callbacks) {
  var onConnected, onFailure
  if (callbacks) {
    /* 供stomp.js中做判断：args[1] instanceof Function */
    onConnected = callbacks.onConnected ? callbacks.onConnected : new Function()
    onFailure = callbacks.onFailure ? callbacks.onFailure : new Function()
  } else {
    onConnected = new Function()
    onFailure = new Function()
  }
  var client
  if (params.url.startsWith('http') || params.url.startsWith('https')) { // SockJS支持http和https前缀
    var socket = new SockJS(params.url)
    client = Stomp.over(socket)
export default function initWebSocket(params) {
  if (socketUrl.startsWith('http') || socketUrl.startsWith('https')) {
    socket = new SockJS(socketUrl)// 连接服务端
    stompClient = Stomp.over(socket)
  } else { // SockJS支持ws前缀
    client = Stomp.client(params.url)
    stompClient = Stomp.client(socketUrl)
  }
  var headers = {'name': params.name, 'passcode': params.passcode, 'host': params.host, 'uuid': params.UUID}
  client.connect(headers, onConnected, onFailure)
  return new StompClient(client)
}
// IpuStomp.connect = function(url, login, passcode, callbacks, host){
// 	if(url.startsWith("http")||url.startsWith("https")){
// 		return connectWithSockJS(url, login, passcode, callbacks, host); //SockJS支持http和https前缀
// 	}else {
// 		return connectWithStomp(url, login, passcode, callbacks, host); //SockJS支持ws前缀
// 	}
// }
//
// function connectWithStomp(url, login, passcode, callbacks, host){
// 	var onConnected, onFailure;
//     if(callbacks){
//     	/*供stomp.js中做判断：args[1] instanceof Function*/
//     	onConnected = callbacks.onConnected?callbacks.onConnected:new Function();
//         onFailure = callbacks.onFailure?callbacks.onFailure:new Function();
//     }else{
//     	onConnected = new Function();
//     	onFailure = new Function();
//     }
//     var client = Stomp.client(url);
//     var headers = {"login":login,"passcode":passcode,"host":host,"uuid":UUID};
//     client.connect(headers, onConnected, onFailure);
//     return new StompClient(client);
// }
//
// function connectWithSockJS(url, login, passcode, callbacks, host){
// 	var onConnected, onFailure;
//     if(callbacks){
//     	/*供stomp.js中做判断：args[1] instanceof Function*/
//     	onConnected = callbacks.onConnected?callbacks.onConnected:new Function();
//         onFailure = callbacks.onFailure?callbacks.onFailure:new Function();
//     }else{
//     	onConnected = new Function();
//     	onFailure = new Function();
//     }
//
// 	var socket = new SockJS(url);
//     var client = Stomp.over(socket);
//     var headers = {"login":login,"passcode":passcode,"host":host,"uuid":UUID};
//     client.connect(headers, onConnected, onFailure);
//     return new StompClient(client);
// }
function StompClient(client) {
  this.client = client
}
StompClient.prototype.setTopicPath = function(topicPath) {
//   topicPath = topicPath.startsWith('/') ? topicPath : '/' + topicPath
//   topicPath = topicPath.endsWith('/') ? topicPath : topicPath + '/'
//   console.log(topicPath)
  this.topicPath = topicPath
}
StompClient.prototype.disconnect = function() {
  this.client.disconnect()
}
StompClient.prototype.connected = function() {
  return this.client.connected
  stompClient.connect(params, (frame) => {
    successCallback()
  }, () => {
    initWebSocket(params)
  })
  return stompClient
}
StompClient.prototype.subscribe = function(topic, callback) {
//   return this.client.subscribe(this.topicPath + topic, callback)
  return this.client.subscribe(this.topicPath, callback)
function successCallback() {
  stompClient.subscribe('personnel', msg => {
    EventBus.$emit('person', msg)
  })
}
StompClient.prototype.publish = function(topic, text) {
//   this.client.send(this.topicPath + topic, {}, text)
  this.client.send(this.topicPath, {}, text)
}
// return IpuStomp;
// })
// export default {
//     IpuStomp: {
//         connect:IpuStomp.connect
//     }
// }

ebc-middle-platform/src/modules/layouts/BasicLayout.vue

@@ -43,8 +43,8 @@
<script>
import GlobalLayout from '../page/GlobalLayout.vue'
import IpuStomp from '../../ipu-stomp'
import EventBus from '../../bus'
import initWebSocket from '../../ipu-stomp'
export default {
  name: 'BasicLayout',
  components: {
@@ -67,38 +67,34 @@ export default {
  },
  mounted() {
    // 镜屏调用
    var client
    var callbacks = {}
    callbacks.onConnected = msg => {
      console.log('连接成功：' + msg)
      client.subscribe('zhangsan', msg => {
        var obj = JSON.parse(msg.body)
        if (obj.isNewAlarm == '1') {
          this.alarmObj.alarmType = obj.alarmType
          this.alarmObj.alarmLocation = obj.longitude + ' , ' + obj.latitude
          this.alarmObj.userName = obj.userName
          this.modal = true
        }
        EventBus.$emit('person', msg)
      })
    }
    callbacks.onFailure = msg => {
      console.log('连接失败：' + msg)
    }
    client = IpuStomp(
      {
        url: 'ws://10.19.90.34:7100/stomp',
        name: 'zhangsan',
        passcode: '123456',
        UUID: 'zhangsan'
      },
      callbacks
    )
    client.setTopicPath('personnel')
    initWebSocket({name: 'zhangsan', passcode: '123456', uuid: this.uuid()})
    EventBus.$on('person', (msg) => { // 获取镜屏推送消息
      console.log(msg)
      var obj = JSON.parse(msg.body)
      if (obj.isNewAlarm == '1') {
        this.alarmObj.alarmType = obj.alarmType
        this.alarmObj.alarmLocation = obj.longitude + ' , ' + obj.latitude
        this.alarmObj.userName = obj.userName
        this.modal = true
      }
    })
  },
  methods: {
    closeAlarmModal() {
      this.modal = false
    },
    uuid() {
      var s = []
      var hexDigits = '0123456789abcdef'
      for (var i = 0; i < 36; i++) {
        s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1)
      }
      s[14] = '4' // bits 12-15 of the time_hi_and_version field to 0010
      s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1) // bits 6-7 of the clock_seq_hi_and_reserved to 01
      s[8] = s[13] = s[18] = s[23] = '-'
      var uuid = s.join('')
      return uuid
    }
  }
}

ebc-middle-platform/src/modules/orientation/orientation.vue

@@ -345,12 +345,28 @@ export default {
    },
    changeLocation(msg) { // 修改人员信息状态等
      var obj = JSON.parse(msg.body)
      var flag = false
      this.layer.personLayer.eachLayer((e) => {
        if (e.getAttributes().deviceId == obj.deviceId) {
          flag = true
          e.setLatLng([obj.latitude, obj.longitude])
          this.popupContent(obj, e)
        }
      })
      if (!flag) {
        var point = Ai.Point([obj.latitude, obj.longitude], {
          icon: Ai.Icon({
            iconUrl: '/static/images/normalworker.png',
            // 设置图标大小
            iconSize: [20, 20],
            // 设置点对象和图标的相对偏移量
            iconAnchor: [0, 0]
          })
        })
        point.setAttributes(obj)
        this.layer.personLayer.addLayer(point)
        this.popupContent(obj, point)
      }
    },
    popupContent(e, point) { // 修改点的信息
      console.log(e, point)
@@ -399,7 +415,7 @@ export default {
        if (e.locationStatus == '2') {
          other = '<div class="row outline">' +
                  '<div>定点停留超时</div>' +
                  '<div>' + e.fixedLong + 'min</div>' +
                  '<div>已停留' + e.fixedLong + 'min</div>' +
                  '</div>'
        } else {
          other = '<div class="row outline">' +

ebc-middle-platform/src/modules/system-management/map-mark.vue

@@ -188,8 +188,7 @@
<script>
import './map-mark.scss'
import services from '../../conf/services'
import {GIS_SEA_LAYER_URL, GIS_SEA_URL, GIS_CENTER,
  GIS_ZOOM} from '../../constants'
import {GIS_SEA_LAYER_URL, GIS_SEA_URL, GIS_CENTER, GIS_ZOOM} from '../../constants'
export default {
  data() {
    return {
@@ -202,8 +201,6 @@ export default {
        }
      },
      queryCondition: {
        type: '',
        alarmPerson: '',
        userName: ''
      },
      rangeDate: '',
@@ -263,7 +260,7 @@ export default {
      this.polygonDrawer.enable() // 激活多边形绘制工具
      this.map.on(AiDrawEvent.CREATED, (e) => {
      // debugger
        console.log(1)
        console.log(e)
        this.layer = this.polygonDrawer.polygon(e) // 获取多边形信息
        // console.log(this.polygonDrawer.getPoints())
        this.modalData = this.layer._latlngs[0]
@@ -472,8 +469,7 @@ export default {
      return year + '-' + mon + '-' + da + ' ' + h + '-' + m + '-' + s
    },
    cancel() {
      console.log(this.layer)
      if (this.layer !== undefined) {
      if (this.map.hasLayer(this.layer)) {
        this.map.removeLayer(this.layer)
      }
      this.polygonDrawer.disable()