From 6f803e2dd6c094824e5ee722c9fb8793019223b9 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 27 Sep 2023 09:51:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E8=BD=A6=E8=BE=86=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/alert.vue                      |   2 +-
 src/config/getData2.js                        |   3 -
 src/images/aio/agv_7.png                      | Bin 0 -> 2715 bytes
 src/images/aio/agv_8.png                      | Bin 0 -> 2859 bytes
 src/pages/modules/login/login.vue             |   6 +-
 .../vehicleinformation/vehiclecontrol.vue     | 212 +++++++-----------
 .../vehicleinformation/vehiclestatus.vue      |   7 +-
 src/pages/shells/index/index.vue              |  38 ++--
 src/style/common.styl                         |   5 +-
 src/style/reset.css                           |   6 +-
 10 files changed, 114 insertions(+), 165 deletions(-)
 create mode 100644 src/images/aio/agv_7.png
 create mode 100644 src/images/aio/agv_8.png

diff --git a/src/components/alert.vue b/src/components/alert.vue
index 34c2fc8..e7e675c 100644
--- a/src/components/alert.vue
+++ b/src/components/alert.vue
@@ -86,7 +86,7 @@ export default {
   z-index 2018
 .text
   padding 14px 73px
-  max-height 60vh
+  max-height 60%
   min-height 44px
   overflow-y auto
   text-align center
diff --git a/src/config/getData2.js b/src/config/getData2.js
index 4280615..deb6298 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -13,9 +13,6 @@ export const parameterSetting = (num, word) => post('api/developer/parameterSett
   password: word
 })
 
-export const homeQueryHead = () => post('api/home/queryHead', {
-})
-
 // new
 // 登录
 export const authlogin = (username, password) => post('auth/login', {
diff --git a/src/images/aio/agv_7.png b/src/images/aio/agv_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2b2c846a5394431e49e7b6cde3974ed3a088e7a
GIT binary patch
literal 2715
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
VPqX2$g3tf}002ovPDHLkV1kEtE;s-H

literal 0
HcmV?d00001

diff --git a/src/images/aio/agv_8.png b/src/images/aio/agv_8.png
new file mode 100644
index 0000000000000000000000000000000000000000..141ffc525da23bbd1682a60e0ddcaa60bb7d2b4f
GIT binary patch
literal 2859
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
JPDHLkV1j&)e~bVC

literal 0
HcmV?d00001

diff --git a/src/pages/modules/login/login.vue b/src/pages/modules/login/login.vue
index c003f2a..48b7f10 100644
--- a/src/pages/modules/login/login.vue
+++ b/src/pages/modules/login/login.vue
@@ -37,7 +37,7 @@
           <div class="login-items-wraper">
             <div class="login-item">
               <div class="login-label" @click="toFocus(3)">域名地址</div>
-              <input type="text" class="login-input" ref="input3" v-model="baseUrl" @focus="show" data-layout="normal">
+              <input type="text" class="login-input" ref="input3" v-model.trim="baseUrl" @focus="show" data-layout="normal">
             </div>
             <div class="login-item">
               <div class="login-label" @click="toFocus(4)">刷新时间（秒）</div>
@@ -191,7 +191,7 @@ export default {
   _fj(center)
 .login-wraper
   _fj()
-  _wh(70vw, 65vh)
+  _wh(70%, 65%)
   padding 20px
   background-color #fff
   border-radius 20px
@@ -260,7 +260,7 @@ export default {
   letter-spacing 5px
 .footer_wraper
   position absolute
-  width 70vw
+  width 70%
   bottom 20px
   left 50%
   transform translateX(-50%)
diff --git a/src/pages/modules/vehicleinformation/vehiclecontrol.vue b/src/pages/modules/vehicleinformation/vehiclecontrol.vue
index c39cfc0..77a4eb9 100644
--- a/src/pages/modules/vehicleinformation/vehiclecontrol.vue
+++ b/src/pages/modules/vehicleinformation/vehiclecontrol.vue
@@ -19,7 +19,7 @@
       <div class="state_wrap">
         <div class="state_tip">显示屏控制</div>
         <div class="state_content">
-          <button class="state_item_switch" :class="{'is-checked': switch1 === '1'}" :disabled="sdisabled1" @click="switchDown1('2', switch1)">
+          <button class="state_item_switch" :class="{'is-checked': switch1 === '1'}" :disabled="disabled" @click="switchDown('2', switch1)">
             <input type="checkbox" class="switch__input">
             <span class="switch_core"></span>
           </button>
@@ -28,7 +28,16 @@
       <div class="state_wrap">
         <div class="state_tip">TCS控制</div>
         <div class="state_content">
-          <div class="state_item_switch" :class="{'is-checked': switch2 === '1'}" :disabled="sdisabled2" @click="switchDown2('3', switch1)">
+          <div class="state_item_switch" :class="{'is-checked': switch2 === '1'}" :disabled="disabled" @click="switchDown('3', switch2)">
+            <input type="checkbox" class="switch__input">
+            <span class="switch_core"></span>
+          </div>
+        </div>
+      </div>
+      <div class="state_wrap">
+        <div class="state_tip">SCHE控制</div>
+        <div class="state_content">
+          <div class="state_item_switch" :class="{'is-checked': switch3 === '1'}" :disabled="disabled" @click="switchDown('4', switch3)">
             <input type="checkbox" class="switch__input">
             <span class="switch_core"></span>
           </div>
@@ -37,7 +46,7 @@
       <div class="state_wrap">
         <div class="state_tip">RC控制</div>
         <div class="state_content">
-          <div class="state_item_switch" :class="{'is-checked': switch3 === '1'}" :disabled="sdisabled3" @click="switchDown3('4', switch1)">
+          <div class="state_item_switch" :class="{'is-checked': switch4 === '1'}" :disabled="disabled" @click="switchDown('5', switch4)">
             <input type="checkbox" class="switch__input">
             <span class="switch_core"></span>
           </div>
@@ -46,7 +55,7 @@
       <div class="state_wrap">
         <div class="state_tip">Joy控制</div>
         <div class="state_content">
-          <div class="state_item_switch" :class="{'is-checked': switch4 === '1'}" :disabled="sdisabled4" @click="switchDown4('5', switch1)">
+          <div class="state_item_switch" :class="{'is-checked': switch5 === '1'}" :disabled="disabled" @click="switchDown('6', switch5)">
             <input type="checkbox" class="switch__input">
             <span class="switch_core"></span>
           </div>
@@ -55,42 +64,54 @@
       <div class="state_wrap">
         <div class="state_tip">AGV</div>
         <div class="state_content">
-          <button class="state_item_4 pointer" @click="_skipStartPoint" :disabled="disabled2">
+          <button class="state_item_4 pointer" @click="switchDown('9', '0')" :disabled="disabled">
             <div class="state_item_4_wrap">
               <span class="state_item_4_btn state_icon_2"></span>
               <span class="state_item_4_txt">跳过起点</span>
             </div>
           </button>
-          <button class="state_item_4 pointer" @click="_queryRestPoint" :disabled="disabled6">
+          <button class="state_item_4 pointer" @click="_queryRestPoint" :disabled="disabled">
             <div class="state_item_4_wrap">
               <span class="state_item_4_btn state_icon_6"></span>
               <span class="state_item_4_txt">初始化坐标</span>
             </div>
           </button>
-          <button class="state_item_4 pointer" @click="_fullscreen">
+          <button class="state_item_4 pointer" @click="switchDown('11', '0')" :disabled="disabled">
             <div class="state_item_4_wrap">
               <span class="state_item_4_btn state_icon_4"></span>
               <span class="state_item_4_txt">全屏</span>
             </div>
           </button>
-          <button class="state_item_4 pointer" @click="_exit" :disabled="disabled5">
+          <button class="state_item_4 pointer" @click="switchDown('7', '0')" :disabled="disabled">
             <div class="state_item_4_wrap">
               <span class="state_item_4_btn state_icon_3"></span>
               <span class="state_item_4_txt">退出</span>
             </div>
           </button>
-          <button class="state_item_4 pointer" @click="switchDown('1', '0')" :disabled="disabled3">
+          <button class="state_item_4 pointer" @click="switchDown('1', '0')" :disabled="disabled">
             <div class="state_item_4_wrap">
               <span class="state_item_4_btn state_icon_5"></span>
               <span class="state_item_4_txt">关机</span>
             </div>
           </button>
-          <button class="state_item_4 pointer" @click="_softStart" :disabled="disabled1">
+          <button class="state_item_4 pointer" @click="switchDown('8', '0')" :disabled="disabled">
             <div class="state_item_4_wrap">
               <span class="state_item_4_btn state_icon_1"></span>
               <span class="state_item_4_txt">软启动</span>
             </div>
           </button>
+          <button class="state_item_4 pointer" @click="switchDown('10', '0')" :disabled="disabled">
+            <div class="state_item_4_wrap">
+              <span class="state_item_4_btn state_icon_7"></span>
+              <span class="state_item_4_txt">重启</span>
+            </div>
+          </button>
+          <button class="state_item_4 pointer" @click="switchDown('12', '0')" :disabled="disabled">
+            <div class="state_item_4_wrap">
+              <span class="state_item_4_btn state_icon_8"></span>
+              <span class="state_item_4_txt">跳过检测</span>
+            </div>
+          </button>
         </div>
       </div>
     </div>
@@ -104,7 +125,7 @@
           </ul>
         </div>
         <div class="pop_btns_box">
-          <button class="button button--primary" :class="{'button--info': JSON.stringify(obj) ==='{}'}" :disabled="disabled4" @click="_restCoordinate">确定</button>
+          <button class="button button--primary" :class="{'button--info': JSON.stringify(obj) ==='{}'}" :disabled="disabled" @click="_restCoordinate">确定</button>
           <button class="button button--primary" @click="show=false">退出</button>
         </div>
       </div>
@@ -115,157 +136,73 @@
 </template>
 
 <script>
-import {softStart, skipStartPoint, ShutDown, queryRestPoint, restCoordinate, queryAgvStatus, quitNow} from '@config/getData2.js'
+import {ShutDown, queryRestPoint, restCoordinate, queryAgvStatus} from '@config/getData2.js'
 export default {
   data () {
     return {
       interTime: this.$store.getters.setTime,
       timer: null,
-      disabled1: false,
-      disabled2: false,
-      disabled3: false,
-      disabled4: false,
-      disabled5: false,
-      disabled6: false,
       show: false,
-      fullscreen: false,
       result: [],
       obj: {},
       status: {},
-      switch1: '0',
-      switch2: '0',
-      switch3: '0',
-      switch4: '0',
-      sdisabled1: false,
-      sdisabled2: false,
-      sdisabled3: false,
-      sdisabled4: false
+      switch1: '',
+      switch2: '',
+      switch3: '',
+      switch4: '',
+      switch5: '',
+      disabled: false
     }
   },
   created () {
-    this._queryAgvStatus()
     this.refresh()
   },
   beforeDestroy () {
     clearInterval(this.timer)
   },
+  destroyed () {
+    clearInterval(this.timer)
+  },
   methods: {
     refresh () {
+      this._queryAgvStatus()
       this.timer = setInterval(() => {
         this._queryAgvStatus()
       }, this.interTime)
     },
-    async _softStart () {
-      this.disabled1 = true
-      try {
-        let res = await softStart()
-        if (res.code === '1') {
-          this.toast(res.desc)
-        } else {
-          this.toast(res.desc)
-        }
-        this.disabled1 = false
-      } catch (e) {
-        this.disabled1 = false
-      }
-    },
-    async _skipStartPoint () {
-      this.disabled2 = true
-      try {
-        let res = await skipStartPoint()
-        if (res.code === '1') {
-          this.toast(res.desc)
-        } else {
-          this.toast(res.desc)
-        }
-        this.disabled2 = false
-      } catch (e) {
-        this.disabled2 = false
-      }
-    },
-    switchDown1 (type, bool) {
-      this.sdisabled1 = false
-      this._ShutDown(type, bool)
-    },
-    switchDown2 (type, bool) {
-      this.sdisabled2 = false
-      this._ShutDown(type, bool)
-    },
-    switchDown3 (type, bool) {
-      this.sdisabled3 = false
-      this._ShutDown(type, bool)
-    },
-    switchDown4 (type, bool) {
-      this.sdisabled4 = false
-      this._ShutDown(type, bool)
-    },
     switchDown (type, bool) {
-      this.disabled3 = false
+      this.disabled = true
+      if (type === '5' && this.switch4 === '0' && this.switch5 === '1') {
+        this.toast('RC控制与Joy控制不能同时开启')
+        this.disabled = false
+        return
+      }
+      if (type === '6' && this.switch4 === '1' && this.switch5 === '0') {
+        this.toast('RC控制与Joy控制不能同时开启')
+        this.disabled = false
+        return
+      }
+      clearInterval(this.timer)
+      bool = bool === '0' ? '1' : '0'
       this._ShutDown(type, bool)
     },
     async _ShutDown (type, bool) {
       try {
-        let res = await ShutDown(type, bool) // type  :  1-关机、2-显示屏控制、3-TCS控制、4-RC控制、5-Joy控制 bool  :  开关的值，开启传1，关闭传0
-        if (res.code === '1') {
-          this.toast(res.desc)
-          switch (type) {
-            case 2:
-              this.switch1 = this.switch1 === '0' ? '1' : '0'
-              break
-            case 3:
-              this.switch2 = this.switch2 === '0' ? '1' : '0'
-              break
-            case 4:
-              this.switch3 = this.switch3 === '0' ? '1' : '0'
-              break
-            case 5:
-              this.switch4 = this.switch4 === '0' ? '1' : '0'
-              break
-          }
-        } else {
-          this.toast(res.desc)
-        }
-        this.disabled3 = false
-        this.sdisabled1 = false
-        this.sdisabled2 = false
-        this.sdisabled3 = false
-        this.sdisabled4 = false
-      } catch (e) {
-        this.disabled3 = false
-        this.disabled3 = false
-        this.sdisabled1 = false
-        this.sdisabled2 = false
-        this.sdisabled3 = false
-        this.sdisabled4 = false
-      }
-    },
-    async _exit () {
-      this.disabled5 = true
-      try {
-        let res = await quitNow()
+        let res = await ShutDown(type, bool) // type:1-关机、2-显示屏控制、3-TCS控制、4-SCHE控制、5-RC控制、6-Joy控制，7-退出，8-软启动，9-跳过起点，10-重启，11-全屏，12-跳过检测 ; bool:开关或按钮的值，开关开启传1，关闭传0，按钮点击直接传1
         if (res.code === '1') {
           this.toast(res.desc)
         } else {
           this.toast(res.desc)
         }
-        this.disabled5 = false
+        this.disabled = false
+        this.refresh()
       } catch (e) {
-        this.disabled5 = false
-      }
-    },
-    _fullscreen () {
-      if (document.exitFullscreen) {
-        document.exitFullscreen()
-      } else if (document.webkitCancelFullScreen) {
-        document.webkitCancelFullScreen()
-      } else if (document.mozCancelFullScreen) {
-        document.mozCancelFullScreen()
-      } else if (document.msExitFullscreen) {
-        document.msExitFullscreen()
+        this.disabled = false
+        this.refresh()
       }
     },
     async _queryRestPoint () {
-      this.disabled6 = true
+      this.disabled = true
       try {
         let res = await queryRestPoint()
         if (res.code === '1') {
@@ -274,19 +211,19 @@ export default {
         } else {
           this.toast(res.desc)
         }
-        this.disabled6 = false
+        this.disabled = false
       } catch (e) {
-        this.disabled6 = false
+        this.disabled = false
       }
     },
     tocheck (e) {
       this.obj = e
     },
     async _restCoordinate () {
-      this.disabled4 = true
+      this.disabled = true
       if (JSON.stringify(this.obj) === '{}') {
         this.toast('请选择坐标')
-        this.disabled4 = false
+        this.disabled = false
         return
       }
       try {
@@ -297,15 +234,20 @@ export default {
         } else {
           this.toast(res.desc)
         }
-        this.disabled4 = false
+        this.disabled = false
       } catch (e) {
-        this.disabled4 = false
+        this.disabled = false
       }
     },
     async _queryAgvStatus () {
       let res = await queryAgvStatus()
       if (res.code === '1') {
         this.status = res.result
+        this.switch1 = res.result.screenStatus
+        this.switch2 = res.result.tcsStatus
+        this.switch3 = res.result.scheStatus
+        this.switch4 = res.result.rcStatus
+        this.switch5 = res.result.joyStatus
       } else {
         this.toast(res.desc)
       }
@@ -365,6 +307,10 @@ export default {
   _bis('../../../images/aio/agv_5.png', 100%)
 .state_icon_6
   _bis('../../../images/aio/agv_6.png', 100%)
+.state_icon_7
+  _bis('../../../images/aio/agv_7.png', 100%)
+.state_icon_8
+  _bis('../../../images/aio/agv_8.png', 100%)
 .pop_wrapper
   position fixed
   top 0
@@ -392,8 +338,8 @@ export default {
   position  relative
   margin 0 auto 50px
   width 65%
-  height 70vh
-  margin-top 15vh
+  height 70%
+  margin-top 15%
   padding 20px
   background-color #fff
   border-radius 16px
diff --git a/src/pages/modules/vehicleinformation/vehiclestatus.vue b/src/pages/modules/vehicleinformation/vehiclestatus.vue
index d61c5f7..26671c1 100644
--- a/src/pages/modules/vehicleinformation/vehiclestatus.vue
+++ b/src/pages/modules/vehicleinformation/vehiclestatus.vue
@@ -5,13 +5,13 @@
       <div class="state_wrap">
         <div class="state_tip">车辆状态</div>
         <div class="state_content">
-          <div class="state_item_1">{{result.vehicle_status}}</div>
+          <div class="state_item_1" :style="result.working_status === '运行' ? {'border': '1.6px solid #54c0b3', 'color': '#54c0b3'} : {'border': '1.6px solid #8b90a6', 'color': '#696969'}">{{result.vehicle_status}}</div>
         </div>
       </div>
       <div class="state_wrap">
         <div class="state_tip">工作状态</div>
         <div class="state_content">
-          <div class="state_item_1">{{result.working_status}}</div>
+          <div class="state_item_1" :style="result.working_status === '正常' ? {'border': '1.6px solid #54c0b3', 'color': '#54c0b3'} : {'border': '1.6px solid #fa6400', 'color': '#fa6400'}">{{result.working_status}}</div>
         </div>
       </div>
       <div class="state_wrap">
@@ -100,6 +100,9 @@ export default {
   beforeDestroy () {
     clearInterval(this.timer)
   },
+  destroyed () {
+    clearInterval(this.timer)
+  },
   methods: {
     refresh () {
       this.timer = setInterval(() => {
diff --git a/src/pages/shells/index/index.vue b/src/pages/shells/index/index.vue
index def597a..28624c4 100644
--- a/src/pages/shells/index/index.vue
+++ b/src/pages/shells/index/index.vue
@@ -12,9 +12,9 @@
       <div class="header-wraper__right">
         <div class="header_user_wraper">
           <div class="header_user_wraper_inn">
-            <div class="state-item">{{ agvInfo.agvrun_status_name }}</div>
+            <div class="state-item">{{ topInfo.agvrun_status_name }}</div>
             <div class="state-line"></div>
-            <div class="state-item">{{ agvInfo.automatic_status_name }}</div>
+            <div class="state-item">{{ topInfo.automatic_status_name }}</div>
             <!-- <div class="state-line"></div> -->
             <!-- <div class="state-item">中文&nbsp;<i class="icon_dropdown"></i></div> -->
           </div>
@@ -22,10 +22,10 @@
         <div class="header_user_wraper">
           <div class="header_user_wraper_inn">
             <div class="elec-qty-wrap">
-              <div class="elec-qty" :style="{height: Number(dataInfo.electric) + '%', backgroundColor: Number(dataInfo.electric) <= 40 ? 'fa6400' : '#54c0b3'}"></div>
+              <div class="elec-qty" :style="{height: Number(topInfo.electric) + '%', backgroundColor: Number(topInfo.electric) <= 40 ? 'fa6400' : '#54c0b3'}"></div>
               <div class="elec-qty-top"></div>
             </div>
-            <div class="elec-txt">{{ dataInfo.electric }}%</div>
+            <div class="elec-txt">{{ topInfo.electric }}%</div>
           </div>
         </div>
         <div class="header_user_wraper">
@@ -96,7 +96,7 @@
 import jxTime from '@components/time.vue'
 import jxDialog from '@components/dialog.vue'
 import { queryHomePage } from '@/config/getData.js'
-import { updatePass, sysMenuBuild, authLogout, homeQueryHead } from '@config/getData2.js'
+import { updatePass, sysMenuBuild, authLogout } from '@config/getData2.js'
 import {encrypt} from '../../../main.js'
 export default {
   components: {
@@ -105,6 +105,8 @@ export default {
   },
   data () {
     return {
+      itime: this.$store.getters.setTime,
+      timer: null,
       username: this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).user.username : '',
       menus: [] || JSON.parse(this.$store.getters.menus),
       // menus: [{
@@ -197,8 +199,7 @@ export default {
         useKbEvents: false,
         preventClickEvent: false
       },
-      dataInfo: {},
-      agvInfo: {}
+      topInfo: {}
     }
   },
   computed: {
@@ -240,6 +241,10 @@ export default {
   },
   created () {
     this._sysMenuBuild()
+    this._queryHomePage()
+    this.timer = setInterval(() => {
+      this._queryHomePage()
+    }, this.itime)
     if (this.menus.length) {
       this.menus.map(el => {
         if (el.router === this.$route.path) {
@@ -248,6 +253,12 @@ export default {
       })
     }
   },
+  beforeDestroy () {
+    clearInterval(this.timer)
+  },
+  destroyed () {
+    clearInterval(this.timer)
+  },
   methods: {
     handleSelect (key) {
       this.dropdown = false
@@ -334,15 +345,7 @@ export default {
     async _queryHomePage () {
       let res = await queryHomePage()
       if (res.code === '1') {
-        this.dataInfo = res.result
-      } else {
-        this.toast(res.desc)
-      }
-    },
-    async _homeQueryHead () {
-      let res = await homeQueryHead()
-      if (res.code === '1') {
-        this.agvInfo = res.result
+        this.topInfo = res.result
       } else {
         this.toast(res.desc)
       }
@@ -388,9 +391,10 @@ export default {
 <style lang="stylus" scoped>
 @import '~@style/mixin'
 .index-container
+  position relative
   _wh(100%, 100%)
 .header-container
-  position fixed
+  position absolute
   left 0
   top 0
   z-index 150
diff --git a/src/style/common.styl b/src/style/common.styl
index e4f6822..0314198 100644
--- a/src/style/common.styl
+++ b/src/style/common.styl
@@ -175,7 +175,7 @@
   box-shadow: 0 1px 3px rgba(0,0,0,.3);
   box-sizing: border-box;
   width: 65%;
-  margin-top: 15vh;
+  margin-top: 15%;
 .dialog_header
   padding: 20px 20px 10px;
 .dialog_title
@@ -501,12 +501,11 @@
     background-color: #fff;
 .is-checked
   .switch_core
-    width: 100px;
     border-color: rgb(19, 206, 102);
     background-color: rgb(19, 206, 102);
     &::after
       left: 100%;
-      margin-left: -49px;
+      margin-left: -98px;
 
 // tree
 .el-tree-node__content
diff --git a/src/style/reset.css b/src/style/reset.css
index 0993638..a4a2aeb 100644
--- a/src/style/reset.css
+++ b/src/style/reset.css
@@ -64,10 +64,10 @@ html,body {
      -webkit-text-size-adjust: none;
      -webkit-tap-highlight-color: #ffffff;
      background-color: #ffffff;
-     width: 100%;
-     height: 100%;
+     /* width: 100%;
+     height: 100%; */
      font-size: 16px;
-     min-width: 1440px;
+     /* min-width: 1440px; */
      width: 2560px;
      height: 1440px;
      /* max-width: 1920px; */