bug-fix:

1. 权限管理界面优化
2. 转关运抵界面错误提示参数修复
3. 取消websocket的初始化

 
 
 var websock = null;
 var websock = null;
 var global_callback = null;
 var global_callback = null;
-var serverPort = '10002';	//webSocket连接端口
+var serverPort = '9088';	//webSocket连接端口
 
 
 
 
 function getWebIP(){
 function getWebIP(){
@@ -11,7 +11,7 @@ function getWebIP(){
 
 
 function initWebSocket(){ //初始化weosocket
 function initWebSocket(){ //初始化weosocket
     //ws地址
     //ws地址
-    var wsuri = "ws://" +getWebIP()+ ":" + serverPort+"/websocket";
+    var wsuri = "wss://" +getWebIP()+ ":" + serverPort+"/websocket";
     websock = new WebSocket(wsuri);
     websock = new WebSocket(wsuri);
     websock.onmessage = function(e){
     websock.onmessage = function(e){
         websocketonmessage(e);
         websocketonmessage(e);
@@ -69,7 +69,7 @@ function websocketOpen(e){
     console.log("连接成功");
     console.log("连接成功");
 }
 }
 
 
-initWebSocket();
+// initWebSocket();
 
 
 export{sendSock}
 export{sendSock}
 
 

@@ -12,7 +12,7 @@ import rout from './routes'
 import i18n from './lang'
 import i18n from './lang'
 import 'font-awesome/css/font-awesome.min.css'
 import 'font-awesome/css/font-awesome.min.css'
 import drag from './drag'
 import drag from './drag'
-import * as socketApi from './api/socket'
+// import * as socketApi from './api/socket'
 import '@/styles/index.scss'
 import '@/styles/index.scss'
 import sys_init from '@/common/init/sys_init'
 import sys_init from '@/common/init/sys_init'
 import Print from 'vue-print-nb'
 import Print from 'vue-print-nb'

@@ -45,11 +45,13 @@
 			</el-table-column>
 			</el-table-column>
 			<el-table-column prop="permissionOrder" label="排序" width="100" sortable>
 			<el-table-column prop="permissionOrder" label="排序" width="100" sortable>
 			</el-table-column>
 			</el-table-column>
-			<el-table-column label="操作" align="center" width="230" fixed="right">
+			<el-table-column label="操作" align="center" width="250" fixed="right">
 				<template slot-scope="scope">
 				<template slot-scope="scope">
+					<el-row>
 						<el-button type="success" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
 						<el-button type="success" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
 						<el-button type="warning" @click="handleEdit(scope.$index, scope.row)">白名单</el-button>
 						<el-button type="warning" @click="handleEdit(scope.$index, scope.row)">白名单</el-button>
 						<el-button type="danger"  @click="handleDel(scope.$index, scope.row)">删除</el-button>
 						<el-button type="danger"  @click="handleDel(scope.$index, scope.row)">删除</el-button>
+					</el-row>
 				</template>
 				</template>
 			</el-table-column>
 			</el-table-column>
 		</el-table>
 		</el-table>

@@ -876,7 +876,7 @@
                         // 刷新列表
                         // 刷新列表
                         this.trnList()
                         this.trnList()
                     }).catch(error => {
                     }).catch(error => {
-                        this.$message.error(res.msg)
+                        this.$message.error(error.msg)
                     })
                     })
                 }).catch(() => {
                 }).catch(() => {
                 })
                 })