应急管理模块合并新项目代码合并

src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue

@@ -564,7 +564,7 @@ export default {
       }
       this.webSocket.onerror = () => {
         console.log('指挥调度的webSocket链接失败')
-        this.$router.back()
+        this.$router.push('/emergen_cyrescue/incident_management')
       }
       this.webSocket.onclose = () => {
         console.log('指挥调度的webSocket链接关闭')

static/config.js

@@ -11,5 +11,6 @@ const config = {
   httpurlWaiwang: 'https://qgqy.qhdsafety.com/qa-prevention-gwj/', // ,
   fileUrlWaiwang: 'https://qgqy.qhdsafety.com/file/', //  服务器外网 附件地址,
   publicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2zCyUYSD0pNrbtaYdvGfHfWoRV+fo/2N9O2PLLz/jZvMkigkq4eAq4JO+Ek0wDHI9WxP6iTSLYCHhIOs9CQTPvyldJFm8riZtQZlBTD8Plkb3rjrgwTqbBi3w3+HKYdkSvGFXJIdSOPbpXnj5BzN8vlVaybs24R/vpUzG9178lwIDAQAB',
-  NoDwSysUrl: 'ws://192.168.151.27:9002' // 人员定位系统websocket地址
+  NoDwSysUrl: 'ws://192.168.151.27:9002', // 人员定位系统websocket地址
+  YjSysUrl:'ws://192.168.0.101:8091'
 }