websoket

energyManagement/src/components/common/Header.vue

@@ -59,6 +59,7 @@
 </template>
 <script>
 import { mapState, mapGetters, mapMutations, mapActions } from 'vuex';
+import { createSocket } from '@/utils/websoket';
 import envConfig from '@/config';
 import vTags from './Tags.vue';
 export default {
@@ -176,6 +177,12 @@ export default {
         },
         //初始化websoket
         initWebSocket(id) {
+            // createSocket('ws://' + this.envConfig.websoketUrl + '/sc-message/webSocket/' + id);
+            // const getsocketData = (e) => {
+            //     const data = e && e.detail.data;
+            //     console.log(data);
+            // };
+            // window.addEventListener('onmessageWS', getsocketData);
             if ('WebSocket' in window) {
                 var serviceIp = this.envConfig.websoketUrl;
 
@@ -203,34 +210,37 @@ export default {
                 // this.send('addsocket');
             };
 
-            //接收到消息的回调方法
+            // 接收到消息的回调方法
             this.websocket.onmessage = function (event) {
-                debugger;
-                let msg = JSON.parse(event.data);
-                let i = msg.typeId - 1;
-                if (msg.userId) {
-                    that.$notify({
-                        dangerouslyUseHTMLString: true,
-                        showClose: true,
-                        customClass: 'notice_icon',
-                        offset: 60,
-                        duration: 3000,
-                        message:
-                            "<div class='notice'><img src=" +
-                            that.imgList[i] +
-                            " class='img'/><div class='notice-content'><span class='title'>新消息通知</span><span class='nowrap'>" +
-                            '【' +
-                            msg.type +
-                            '】' +
-                            msg.content +
-                            '</span></div></div>'
-                    });
-                    that.getMessageList();
-                    that.getUnreadNumber();
+                if (typeof event.data == 'string') {
+                    console.log(event.data);
+                } else {
+                    let msg = JSON.parse(event.data);
+                    let i = msg.typeId - 1;
+                    if (msg.userId) {
+                        that.$notify({
+                            dangerouslyUseHTMLString: true,
+                            showClose: true,
+                            customClass: 'notice_icon',
+                            offset: 60,
+                            duration: 3000,
+                            message:
+                                "<div class='notice'><img src=" +
+                                that.imgList[i] +
+                                " class='img'/><div class='notice-content'><span class='title'>新消息通知</span><span class='nowrap'>" +
+                                '【' +
+                                msg.type +
+                                '】' +
+                                msg.content +
+                                '</span></div></div>'
+                        });
+                        that.getMessageList();
+                        that.getUnreadNumber();
+                    }
                 }
             };
 
-            //连接关闭的回调方法
+            // 连接关闭的回调方法
             this.websocket.onclose = function (ev) {
                 console.log('WebSocket连接关闭');
                 this.websocket = null;

energyManagement/src/config/env.development.js

@@ -17,7 +17,7 @@ module.exports = {
   baseImgApi: "http://114.135.61.186:21012/", // 图片api请求地址
   baseExcelApi: "http://114.135.61.187:38082", // excel请求地址
   loginUrl: "http://114.135.61.186:21020/sc-login/",
-  websoketUrl: '10.0.0.62:8082',
+  websoketUrl: '114.135.61.186:21012',
 
 
   upload: {

energyManagement/src/config/env.production.js

@@ -14,7 +14,7 @@ module.exports = {
   baseImgApi: "http://114.135.61.186:21020", // 图片api请求地址
   baseExcelApi: "http://114.135.61.186:21020", // excel请求地址
   loginUrl: "http://114.135.61.186:21020/sc-login/",
-  websoketUrl: '10.0.0.62:8082',
+  websoketUrl: '114.135.61.186:21012',
 
   upload: {
     imageSize: 5, // MB

energyManagement/src/config/env.sit.js

@@ -14,7 +14,7 @@ module.exports = {
     baseExcelApi: "http://114.135.61.186:21020", // excel请求地址
     baseMapApi:"http://114.135.61.187:38082",
     loginUrl: "http://114.135.61.186:21020/sc-login/", // 项目地址
-    websoketUrl:'10.0.0.62:8082',
+    websoketUrl: '114.135.61.186:21012',
     
     upload: {
       imageSize: 5, // MB

operationSupport/src/components/common/Header.vue

@@ -202,27 +202,31 @@ export default {
 
             //接收到消息的回调方法
             this.websocket.onmessage = function (event) {
-                let msg = JSON.parse(event.data);
-                let i = msg.typeId - 1;
-                if (msg.userId) {
-                    that.$notify({
-                        dangerouslyUseHTMLString: true,
-                        showClose: true,
-                        customClass: 'notice_icon',
-                        offset: 60,
-                        duration: 3000,
-                        message:
-                            "<div class='notice'><img src=" +
-                            that.imgList[i] +
-                            " class='img'/><div class='notice-content'><span class='title'>新消息通知</span><span class='nowrap'>" +
-                            '【' +
-                            msg.type +
-                            '】' +
-                            msg.content +
-                            '</span></div></div>'
-                    });
-                    that.getMessageList();
-                    that.getUnreadNumber();
+                if (typeof event.data == 'string') {
+                    console.log(event.data);
+                } else {
+                    let msg = JSON.parse(event.data);
+                    let i = msg.typeId - 1;
+                    if (msg.userId) {
+                        that.$notify({
+                            dangerouslyUseHTMLString: true,
+                            showClose: true,
+                            customClass: 'notice_icon',
+                            offset: 60,
+                            duration: 3000,
+                            message:
+                                "<div class='notice'><img src=" +
+                                that.imgList[i] +
+                                " class='img'/><div class='notice-content'><span class='title'>新消息通知</span><span class='nowrap'>" +
+                                '【' +
+                                msg.type +
+                                '】' +
+                                msg.content +
+                                '</span></div></div>'
+                        });
+                        that.getMessageList();
+                        that.getUnreadNumber();
+                    }
                 }
             };
 

operationSupport/src/config/env.development.js

@@ -17,7 +17,7 @@ module.exports = {
   baseImgApi: "http://114.135.61.186:21012/", // 图片api请求地址
   baseExcelApi: "http://114.135.61.187:38082", // excel请求地址
   loginUrl: "http://114.135.61.186:21020/sc-login/",
-  websoketUrl: '114.135.61.187:38081',
+  websoketUrl: '114.135.61.186:21012',
   warnDetailUrl: "http://114.135.61.188:18093/dispatch/warnDetail",// 综合调度系统-系统管理-报警管理-报警详情界面
   taskManagementUrl: "http://114.135.61.188:18093/maintenance/taskManagement",// 运维管理系统-巡检管理-任务管理界面
   eventHiddenDangerUrl: "http://114.135.61.188:18093/maintenance/eventHiddenDanger",// 运维管理系统-工单管理-事件隐患界面

operationSupport/src/config/env.production.js

@@ -14,7 +14,7 @@ module.exports = {
   baseImgApi: "http://114.135.61.186:21020", // 图片api请求地址
   baseExcelApi: "http://114.135.61.186:21020", // excel请求地址
   loginUrl: "http://114.135.61.186:21020/sc-login/",
-  websoketUrl: '114.135.61.186:21020',
+  websoketUrl: '114.135.61.186:21012',
   warnDetailUrl: "http://114.135.61.188:18093/dispatch/warnDetail",// 综合调度系统-系统管理-报警管理-报警详情界面
   taskManagementUrl: "http://114.135.61.188:18093/maintenance/taskManagement",// 运维管理系统-巡检管理-任务管理界面
   eventHiddenDangerUrl: "http://114.135.61.188:18093/maintenance/eventHiddenDanger",// 运维管理系统-工单管理-事件隐患界面

operationSupport/src/config/env.sit.js

@@ -14,7 +14,7 @@ module.exports = {
     baseExcelApi: "http://114.135.61.186:21020", // excel请求地址
     baseMapApi:"http://114.135.61.187:38082",
     loginUrl: "http://114.135.61.186:21020/sc-login/", // 项目地址
-    websoketUrl:'114.135.61.186:21020',
+    websoketUrl: '114.135.61.186:21012',
     warnDetailUrl:"http://114.135.61.186:21020/dispatch/warnDetail",// 综合调度系统-系统管理-报警管理-报警详情界面
     twosupplywarnDetailUrl:"http://114.135.61.186:21020/secondwatersupply/warnDetail",// 二供系统-报警管理-报警详情界面
     pdwarnDetailUrl:"http://114.135.61.186:21020/productionmanage/warnDetail",//生产管理系统-报警管理-报警详情界面

userCenter/src/components/common/Header.vue

@@ -203,27 +203,31 @@ export default {
 
             //接收到消息的回调方法
             this.websocket.onmessage = function (event) {
-                let msg = JSON.parse(event.data);
-                let i = msg.typeId - 1;
-                if (msg.userId) {
-                    that.$notify({
-                        dangerouslyUseHTMLString: true,
-                        showClose: true,
-                        customClass: 'notice_icon',
-                        offset: 60,
-                        duration: 3000,
-                        message:
-                            "<div class='notice'><img src=" +
-                            that.imgList[i] +
-                            " class='img'/><div class='notice-content'><span class='title'>新消息通知</span><span class='nowrap'>" +
-                            '【' +
-                            msg.type +
-                            '】' +
-                            msg.content +
-                            '</span></div></div>'
-                    });
-                    that.getMessageList();
-                    that.getUnreadNumber();
+                if (typeof event.data == 'string') {
+                    console.log(event.data);
+                } else {
+                    let msg = JSON.parse(event.data);
+                    let i = msg.typeId - 1;
+                    if (msg.userId) {
+                        that.$notify({
+                            dangerouslyUseHTMLString: true,
+                            showClose: true,
+                            customClass: 'notice_icon',
+                            offset: 60,
+                            duration: 3000,
+                            message:
+                                "<div class='notice'><img src=" +
+                                that.imgList[i] +
+                                " class='img'/><div class='notice-content'><span class='title'>新消息通知</span><span class='nowrap'>" +
+                                '【' +
+                                msg.type +
+                                '】' +
+                                msg.content +
+                                '</span></div></div>'
+                        });
+                        that.getMessageList();
+                        that.getUnreadNumber();
+                    }
                 }
             };
 

userCenter/src/config/env.development.js

@@ -26,7 +26,7 @@ module.exports = {
   baseImgApi: "http://114.135.61.186:21020", // 图片api请求地址
   baseExcelApi: "http://114.135.61.187:38082", // excel请求地址
   loginUrl: "http://114.135.61.188:18093/sc-login/",
-  websoketUrl: '114.135.61.187:38081',
+  websoketUrl: '114.135.61.186:21012',
   warnDetailUrl: "http://114.135.61.188:18093/dispatch/warnDetail",// 综合调度系统-系统管理-报警管理-报警详情界面
   taskManagementUrl: "http://114.135.61.188:18093/maintenance/taskManagement",// 运维管理系统-巡检管理-任务管理界面
   eventHiddenDangerUrl: "http://114.135.61.188:18093/maintenance/eventHiddenDanger",// 运维管理系统-工单管理-事件隐患界面

userCenter/src/config/env.production.js

@@ -14,7 +14,7 @@ module.exports = {
   baseImgApi: "http://114.135.61.187:38082", // 图片api请求地址
   baseExcelApi: "http://114.135.61.187:38082", // excel请求地址
   loginUrl: "http://114.135.61.188:18093/sc-login/",
-  websoketUrl:'114.135.61.187:38081',
+  websoketUrl: '114.135.61.186:21012',
   warnDetailUrl:"http://114.135.61.188:18093/dispatch/warnDetail",// 综合调度系统-系统管理-报警管理-报警详情界面
   taskManagementUrl:"http://114.135.61.188:18093/maintenance/taskManagement",// 运维管理系统-巡检管理-任务管理界面
   eventHiddenDangerUrl:"http://114.135.61.188:18093/maintenance/eventHiddenDanger",// 运维管理系统-工单管理-事件隐患界面

userCenter/src/config/env.sit.js

@@ -14,7 +14,7 @@ module.exports = {
     baseExcelApi: "http://114.135.61.186:21020", // excel请求地址
     baseMapApi:"http://114.135.61.187:38082",
     loginUrl: "http://114.135.61.186:21020/sc-login/", // 项目地址
-    websoketUrl:'114.135.61.186:21020',
+    websoketUrl: '114.135.61.186:21012',
     warnDetailUrl:"http://114.135.61.186:21020/dispatch/warnDetail",// 综合调度系统-系统管理-报警管理-报警详情界面
     twosupplywarnDetailUrl:"http://114.135.61.186:21020/secondwatersupply/warnDetail",// 二供系统-报警管理-报警详情界面
     pdwarnDetailUrl:"http://114.135.61.186:21020/productionmanage/warnDetail",//生产管理系统-报警管理-报警详情界面