SpaceOfCheng
/
admin
Watch 3
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 2 Activity
Browse Source

ytj

yuantianjiao 6 years ago
parent
270d69032a
commit
b0477ac7ef
2 changed files with 20 additions and 13 deletions
Unified View Show Diff Stats
  1. 1
    1
      dist/index.html
  2. 19
    12
      src/pages/system/newOrder/newOrderList/index.vue

+ 1
- 1
dist/index.html View File

1 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.ae72038e174a11169c7c51f94e09113e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.7e921535e20f729cf046.js></script><script type=text/javascript src=./static/js/app.eacb012101628be54e8d.js></script></body></html>
1 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.bf70b42de6cff066f179f6fcb263c589.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.7e921535e20f729cf046.js></script><script type=text/javascript src=./static/js/app.71e24e76faf4dd36b9f1.js></script></body></html>

+ 19
- 12
src/pages/system/newOrder/newOrderList/index.vue View File

179 
         var timer = setInterval(() => {
179 
         var timer = setInterval(() => {
180 
           if (param.length && bool) {
180 
           if (param.length && bool) {
181 
             bool = false
181 
             bool = false
182 
+            this.printPdf(`item_${param[0]}`)
182 
             this.putPrintGoodsOrder({
183 
             this.putPrintGoodsOrder({
183 
               id: param[0]
184 
               id: param[0]
184 
             }).then(() => {
185 
             }).then(() => {
185 
               param.splice(0, 1)
186 
               param.splice(0, 1)
186 
               bool = true
187 
               bool = true
187 
-              this.printPdf(`item_${param[0]}`)
188 
             })
188 
             })
189 
           } else {
189 
           } else {
190 
             clearInterval(timer)
190 
             clearInterval(timer)
298 
       this.updateList({ list: this.list.concat(newList) }).then(() => {
298 
       this.updateList({ list: this.list.concat(newList) }).then(() => {
299 
         newList.forEach((it) => {
299 
         newList.forEach((it) => {
300 
           console.log(it)
300 
           console.log(it)
301 
-          if (it.IsIntimidate === 0) {
301 
+          if (!it.IsIntimidate) {
302 
             console.log('print')
302 
             console.log('print')
303 
             this.putPrintGoodsOrder({
303 
             this.putPrintGoodsOrder({
304 
               id: it.OrdersId
304 
               id: it.OrdersId
316 
         this.websockets[wsRealPath] = new WebSocket(url)
316 
         this.websockets[wsRealPath] = new WebSocket(url)
317 
         this.websockets[wsRealPath].onopen = console.log
317 
         this.websockets[wsRealPath].onopen = console.log
318 
         this.websockets[wsRealPath].onmessage = this.websocketonmessage
318 
         this.websockets[wsRealPath].onmessage = this.websocketonmessage
319 
-        this.websockets[wsRealPath].onclose = this.reloadWebSocket
320 
-        this.websockets[wsRealPath].onerror = this.reloadWebSocket
319 
+        this.websockets[wsRealPath].onclose = ((ws) => {
320 
+          return e => this.reloadWebSocket(e, ws)
321 
+        })(this.websockets[wsRealPath])
321 
         this.websockets[wsRealPath].interval = setInterval(() => this.websockets[wsRealPath].send(10), 120000)
322 
         this.websockets[wsRealPath].interval = setInterval(() => this.websockets[wsRealPath].send(10), 120000)
322 
       }
323 
       }
323 
     },
324 
     },
324 
-    reloadWebSocket (e) {
325 
-      console.log(e.currentTarget.url)
326 
-      Object.keys(this.websockets).forEach((key) => {
327 
-        clearInterval(this.websockets[key].interval)
328 
-      })
329 
-      if (this.needReload) { // 此变量判断是否需要重连
330 
-        this.websockets = {}
331 
-        this.initWebSocket()
325 
+    reloadWebSocket (e, ws) {
326 
+      if (e.target.readyState >= 2) {
327 
+        console.log(e.currentTarget.url)
328 
+        Object.keys(this.websockets).forEach((key) => {
329 
+          // this.websockets[key].close()
330 
+          clearInterval(this.websockets[key].interval)
331 
+        })
332 
+        ws = null
333 
+        setTimeout(() => {
334 
+          if (this.needReload) { // 此变量判断是否需要重连
335 
+            this.websockets = {}
336 
+            this.initWebSocket()
337 
+          }
338 
+        }, 5000)
332 
       }
339 
       }
333 
     },
340 
     },
334 
     open () {
341 
     open () {