前端

src/global.js

@@ -12,10 +12,9 @@ export default {
   whetherWebSocket: function() {
     var that =this
     debugger
-    if (store.getters.adminId!='') {
       if ('WebSocket' in window) {
         if (process.env.NODE_ENV === 'production') {
-          that.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/' + store.getters.adminId)
+          that.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/?adminId=84f62127b7384dcdbaeaddfe460329fc' )
         }
         else {
           that.websocket = new WebSocket('ws://localhost:3000/')
@@ -24,7 +23,6 @@ export default {
       } else {
         alert('当前浏览器不支持websocket')
       }
-    }
   },
   initWebSocket: function() {
     // 连接错误

src/layout/index/sidebar/sidebarItem.vue

@@ -111,7 +111,7 @@ export default {
       return generateTitle(item[this.labelKey], (item.meta || {}).title, this)
     },
     vaildAvtive(item) {
-      console.log(item)
+      // console.log(item)
       const groupFlag = (item['group'] || []).some((ele) =>
         this.$route.path.includes(ele)
       )

src/model/home/index.js

@@ -27,4 +27,4 @@ export const getCurrentUserInfo = appRx.get(API_GET_GETCURRENTUSERINFO, errorCat
 
 export const getStaffHomeShowList = appRx.get(API_GET_GETSTAFFHOMESHOWLIST, errorCatcher, errorHandle, filter)
 export const gChartsData = appRx.get(API_GET_GETCHARTSDATA, errorCatcher, errorHandle, filter)
-export const getAdminId = appRx.get(API_GET_ADMINID, errorCatcher, errorHandle, filter)
+export const getAdminId = appRx.post(API_GET_ADMINID, errorCatcher, errorHandle, filter)

src/store/modules/permission.js

@@ -67,7 +67,7 @@ const mutations = {
     // console.log(routerList)
     state.menu = leftMenu(routerList, {})
     state.routes = routerList
-    console.log(routerList)
+    // console.log(routerList)
   },
   SET_MENU: (state, menu) => {
     state.menu = menu

src/views/home/index.vue

@@ -328,23 +328,18 @@
       },
 
     },
-    activated(){debugger
-           getAdminId().toPromise().then(response => {debugger
-                this.loading = false
-                // WebSocket
-                this.$store.dispatch('setAdminId', response.data.data)
-                if ('WebSocket' in window) {
+    activated(){
+           if ('WebSocket' in window) {
                   if (process.env.NODE_ENV === 'production') {
-                    this.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/' + response.data.data)
+                    this.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/?adminId=84f62127b7384dcdbaeaddfe460329fc' )
                   }
                   else {
-                    this.websocket = new WebSocket('ws://localhost:8080/websocket/' + response.data.data)
+                    this.websocket = new WebSocket('ws://localhost:8080/websocket/?adminId=84f62127b7384dcdbaeaddfe460329fc' )
                   }
                   this.initWebSocket()
                 } else {
                   alert('当前浏览器不支持websocket')
                 }
-              })
     },
     async created() {
       //获取快捷路口列表
@@ -361,6 +356,22 @@
       }
     },
     async mounted() {
+      // getAdminId().toPromise().then(response => {
+                this.loading = false
+                // WebSocket
+                // this.$store.dispatch('setAdminId', response.data.data)
+                if ('WebSocket' in window) {
+                  if (process.env.NODE_ENV === 'production') {
+                    this.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/84f62127b7384dcdbaeaddfe460329fc' )
+                  }
+                  else {
+                    this.websocket = new WebSocket('ws://192.168.1.115:8090/websocket/1' )
+                  }
+                  this.initWebSocket()
+                } else {
+                  alert('当前浏览器不支持websocket')
+                }
+              // })
       let that = this
       this.getChartsData()
       // this.timer = setInterval(function(){
@@ -436,6 +447,7 @@
         })
       },
          initWebSocket () {
+           console.log(this.webSocket,this.WebSocket)
       // 连接错误
       this.websocket.onerror = this.setErrorMessage
       // 连接成功
@@ -451,12 +463,15 @@
       window.onbeforeunload = this.onbeforeunload
     },
     setErrorMessage () {
+      console.log(11111111)
       console.log('WebSocket连接发生错误   状态码：' + this.websocket.readyState)
     },
     setOnopenMessage () {
+      console.log(222222222)
       console.log('WebSocket连接成功    状态码：' + this.websocket.readyState)
     },
     setOnmessageMessage (event) {
+      console.log(3333)
       // 根据服务器推送的消息做自己的业务处理
       console.log('服务端返回：' + event.data)
       var msg = event.data.split('$')
@@ -475,6 +490,7 @@
       that.$router.push({ path: currentPage })
     },
     setOncloseMessage () {
+      debugger
       console.log('WebSocket连接关闭    状态码：' + this.websocket.readyState)
     },
       //跳转

src/views/warehouse/warehouseManagementRecord.vue

@@ -294,9 +294,11 @@
 		<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
 			@on-cancel="handleClose">
 			<p>查看附件</p>
-			<ws-upload ref="upload" table-name="maintain_work_order" oss-key="mainPlan" :comp-id="compId"
-				:appendix-ids="appendixIdsAdd" :vesselId="deptBudgetList.addressUrl" :size-limit="size"
-				@uploadSuccess="uploadSuccess" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+			<el-image 
+    style="width: 100px; height: 100px"
+    :src="appendixIdss" 
+    :preview-src-list="srcList">
+  </el-image>
 		</WinseaContentModal>
 	</div>
 
@@ -338,21 +340,17 @@
 			return {
 				//弹出框
 				dialogViewSpareMoney: false,
-				dialogApproveFormVisible: false,
 				binnumberList:[],
 				// 船舶类型
 				monetaryKey: null,
-				// 表格显示数据
-				tableDate: [],
-				appendixIdsAdd: '',
 				// 是否显示
 				showType: true,
 				// 年
 				year: '',
+				srcList:[],
 				deptBudgetTotal: 0,
 				currentPage: 1,
 				pageSize: 10,
-				radiostatus: 1,
 				capacity: '',
 				searchKeyWord: '',
 				contractType: 2,
@@ -362,15 +360,14 @@
 				binNumber: '',
 				status: 1,
 				value2:[],
+				appendixIdss:'',
 				// 提交类型
 				submitType: true,
 				selectpackingMethod: {},
 				size: 10,
 				warehouseType: '1',
-				deptBudgetList1: {},
 				compId: localStorage.getItem('ws-pf_compId'),
 				deptCircularPage: {},
-				packtypeList: {},
 				pcFlag: 1,
 				date: {
 					year: dayjs().format('YYYY'),
@@ -657,8 +654,8 @@
 			},
 			fujian(row) {
 				if (
-					row.receiveAttachmentPath === null ||
-					row.receiveAttachmentPath === ''
+					row.addressUrl === null ||
+					row.addressUrl === ''
 				) {
 					EventBus.$emit(
 						'warning',
@@ -667,7 +664,8 @@
 				} else {
 					this.accessoryTFs = true
 				}
-				this.appendixIdss = row.receiveAttachmentPath
+				this.appendixIdss = row.addressUrl
+				this.srcList=[row.addressUrl]
 			},
 			// 关闭 dialog时 处理文件url 初始化upload组件
 			handleCloe() {