Merge branch 'develop'

README.md

@@ -23,9 +23,9 @@
 
 ### 最新版本下载
 
-[![Windows 版本下载链接 v1.9.1](https://img.shields.io/badge/v1.9.1-Windows-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.9.1/whu-library-seat-setup-1.9.1.exe)
-[![Mac OS 版本下载链接 v1.9.1](https://img.shields.io/badge/v1.9.1-Mac%20OS-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.9.1/whu-library-seat-1.9.1.dmg)
-[![Linux 版本下载链接 v1.9.1](https://img.shields.io/badge/v1.9.1-Linux-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.9.1/whu-library-seat-1.9.1-x86_64.AppImage)
+[![Windows 版本下载链接 v1.9.2](https://img.shields.io/badge/v1.9.2-Windows-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.9.2/whu-library-seat-setup-1.9.2.exe)
+[![Mac OS 版本下载链接 v1.9.2](https://img.shields.io/badge/v1.9.2-Mac%20OS-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.9.2/whu-library-seat-1.9.2.dmg)
+[![Linux 版本下载链接 v1.9.2](https://img.shields.io/badge/v1.9.2-Linux-limegreen.svg)](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.9.2/whu-library-seat-1.9.2-x86_64.AppImage)
 
 ### 安装软件
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "whu-library-seat",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "author": "CS-Tao <[email protected]>",
   "description": "武汉大学图书馆抢座软件",
   "license": null,

src/renderer/components/Body/Monitor/index.vue

@@ -87,6 +87,8 @@ import { monitorStatuses } from './mixin'
 
 const sparkLength = 300
 
+const defaultInterval = 1500
+
 export default {
   name: 'monitor-form',
   props: {
@@ -136,7 +138,7 @@ export default {
   },
   data () {
     return {
-      interval: 1500,
+      interval: defaultInterval,
       last: 60,
       intervalTooLowWarned: false,
       spark: {
@@ -192,7 +194,7 @@ export default {
     },
     warnIntervalTooLow () {
       if (!this.intervalTooLowWarned) {
-        if (this.interval < 1500) {
+        if (this.interval < defaultInterval) {
           this.$message({
             type: 'warning',
             duration: '0',
@@ -210,7 +212,7 @@ export default {
         case monitorStatuses.starting:
           return 20
         case monitorStatuses.checking:
-          return Math.random() > 0.5 ? 40 : -40
+          return 40
         case monitorStatuses.checkFailed:
           return -20
         case monitorStatuses.checkSuccessfulYes:

src/renderer/components/Body/index.vue

@@ -278,43 +278,40 @@ export default {
           for (var key in response.data.data.layout) {
             this.seats.push(response.data.data.layout[key])
           }
-          this.filterSeats(true)
+          this.filterSeats()
         } else {
           this.$message({
             type: 'error',
             duration: '2000',
             showClose: true,
             message: response.data.message ? response.data.message : emptyMessage
           })
-          this.filterSeats(true)
+          this.filterSeats()
         }
       }).catch(() => {
-        this.filterSeats(true)
+        this.filterSeats()
       })
     },
     chargerButtonClicked () {
       this.form.battery = !this.form.battery
-      this.filterSeats(true)
+      this.filterSeats()
     },
     sunButtonClicked () {
       this.form.sun = !this.form.sun
-      this.filterSeats(true)
+      this.filterSeats()
     },
-    filterSeats (disableCache = false) {
+    filterSeats () {
       this.seatsForSelect = this.seats.filter((item) => {
         return item.type === 'seat' && (this.form.battery ? item.power : true) && (this.form.sun ? item.window : true)
       }).sort((x, y) => {
         return parseInt(x.name) - parseInt(y.name)
       })
-      if (!disableCache) {
-        let cachedSeatExist = this.seatsForSelect.findIndex((item) => {
-          return item.id === this.seatInfo.seatNum
-        }) !== -1
-        if (this.form.library && this.form.library === this.seatInfo.library && this.form.room && this.form.room === this.seatInfo.room && cachedSeatExist) {
-          this.form.seatNum = this.seatInfo.seatNum
-        } else {
-          this.form.seatNum = null
-        }
+      let clearSeatSelect = this.form.seatNum >= 0 &&
+        (this.seatsForSelect.findIndex((item) => {
+          return item.id === this.form.seatNum
+        }) === -1)
+      if (clearSeatSelect) {
+        this.form.seatNum = null
       }
     },
     showWarning (message) {