zhangqiOMG 2 gadi atpakaļ
vecāks
revīzija
da3211b697

+ 5 - 1
src/components/newLayout/index.vue

@@ -15,6 +15,7 @@
       </div>
       <navTemp  @getModules="getModules"></navTemp>
     </div>
+    <socketMessage></socketMessage>
   </div>
 </template>
 
@@ -23,6 +24,8 @@ import headeTemp from './modules/header.vue'
 import asideTemp from './modules/aside.vue'
 import menuTemp from './modules/menu.vue'
 import navTemp from './modules/navRight.vue'
+import socketMessage from '@/components/socketMessage/index.vue'
+
 import {mapGetters} from 'vuex'
 
 export default {
@@ -30,7 +33,8 @@ export default {
     headeTemp,
     asideTemp,
     menuTemp,
-    navTemp
+    navTemp,
+    socketMessage
   },
   computed: {
     ...mapGetters({

+ 1 - 0
src/components/normal-basic-layout/index.vue

@@ -91,6 +91,7 @@
 </template>
 
 <script>
+
 import {mapGetters} from 'vuex'
 export default {
   componentName:'normalTable',

+ 1 - 1
src/components/normal-basic-layout/normal.vue

@@ -20,11 +20,11 @@
 </template>
 
 <script>
+
 import {mapGetters} from 'vuex'
 export default {
   props:['tableName','idName','tableData','apiId','formPath','oldFormPath','options','autoQuery','detailPath','customTitle','hidePagination'],
   components:{
-
     drawer:() =>  import('./drawerDetail/drawer'),
 
   },

+ 3 - 1
src/components/socketMessage/index.vue

@@ -73,7 +73,7 @@
           }
       },
       open: function (val) {
-          // console.log("socket连接成功",val)
+          console.log("socket连接成功",val)
       },
       error: function () {
           console.log("连接错误")
@@ -81,7 +81,9 @@
       getMessage: function (msg) {
         if(msg.data !== 'alive') {
           this.panelIsShow = true
+          console.log(msg.data)
           this.list = [JSON.parse(msg.data).message]
+          console.log(this.list)
           this.getMessageList()
         }
       },

+ 2 - 2
vue.config.js

@@ -15,8 +15,8 @@ module.exports = {
       proxy: {
         '/apis': {
           // target: 'http://61.164.207.46:8000',  // target host*/
-            target: 'http://192.168.3.9:8080',
-          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+            // target: 'http://192.168.3.9:8080',
+          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites