From 20df8e895a67b496552b439a3004ee948e81138d Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 24 Jul 2025 20:28:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/images/new/state-item_bg.png | Bin 2201 -> 836 bytes
 src/pages/modules/device.vue     |   8 ++---
 src/pages/shells/index.vue       |  60 ++++++++++++++++++-------------
 3 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/src/images/new/state-item_bg.png b/src/images/new/state-item_bg.png
index ebd1ba5c3d4a42bf03c945a20dfce3de7667ff7f..55d93e1abb35db77e921f5cbd9498ffb1dfd5acd 100644
GIT binary patch
literal 836
zcmV-K1H1f*P)<h;3K|Lk000e1NJLTq002Ay001Ni1^@s6)p=Qj0009ENkl<ZXo20D
z%aI&65JX>QVpcRn5enKM2jqlI;8}*~tP7puT}CK2W*R6RfSGA7mj*2A(7&oiN1_V#
zYv`YUdjT+y_Y)M1)AgBG^`lIk<!WBv#l}0l$9oUi`pNSpe}4ZoX1(Rr_uqK?y+*;`
ze|`N{V^r@)_3N#mvj>H|T$D7))*oN~{M-ugsJiu|`t`N0x7Tsf^9LvK!YAwH6BjOw
z0S%znsD9k4-(E+5{ckJ49gt%?R6!dBWAy5`V;r~Z=*M-`*aNUEj$1?ig|zNbYYk5t
zC(-fF>mQM_&J#}!Xa(Sg9dMvsP|wds_*fK!v#>R$h5<C0Rxms#W&^S^foq1SRt0gR
zYtDpxfw4(gTH2LD+@_Zv1-6MzZ-PE&V+*oT6S1+qGz<uVjMYfOHi$DZAtOXpEiWBI
zGG|1lHd(`x!3$eFomQPpx@5Wn({+7(l8F2?>AnC<#xf$v+9wQKh)irUJi<}}3Zy~5
zfHy%bPfQ9V)1+q>Y2<0=!Jti?7J@8n_!)=Wa$0GjE{(0q!xoaz?oMkIV1a}YQm9SB
zk}zgs!+L7iY2X9gz<tK$EyxQ~aPGNuF#~f8+>EnHNCLo5Y%&aJGy4z&F}xVtXjsG{
zh=yi)IADUbQH;{qsR5v@Y)hw1iv*8`)FB7jrNt8=wdtdhv(pmXge@#X_DMW!0h$;K
z+87|4$aI<J(8nH*E1p$gWaP6+<C$f777y7dwTvgWN2Uc}2}vk{am*&b4wQ*W64oq=
z+Nf#LUfPvCe|u~|vOvL}CjIPbHPc5(?^HF=CMIo@2(^&5)^MMJm{{}(9iqI4Nee+H
zHde4*jrjQ>nC_slk%qZvjw>wHU}htIm55`^>S+g(R&!%!k&iZQS`*-zcx(c8Q7+AH
z&1p?MoK`Gzq05%cPJa*6nv+P8id8%~(QuKAQQyR4Epj3uS<+(-|N8rHpWkj3c-*tL
z6ui5=pq?`0NBO(lqxgDn%yGKE%dGR;Z4QhRkMF;6=byJ}oVQ`z$NL|7RCWnN`#j?S
O0000<MNUMnLSTaBjfTVk

literal 2201
zcmaJ@c~leE9*&evHW3O31aX)k5Rq&okVK+FLP&fB*_41AAsHY-GD9+$2nqs9L4%4S
zMFf=x1r=Nhg~QfEs;IcMRi6tYSQeF~RIo)K4;0^E#rBWqn{#IFy}$E)-)}wVPF_fG
zpt;Es6C4g_F5q*+u$6<o9>#{)7cZxCvBe$@5TW649I6&8A)KESj)ee$TpSODL1O97
z<QtGL4)=wtEJB2egh4C`EGLTRFhq?U!Pq#Q?-~svmLx(b5DUf26l`$3wH*XxQZ^V#
z7m|et2TG9fQ<YG7YH)-kHBrKpf@@X-z8V%LAcs&fpphpjR4fe}{GiLi_H$+u2z-E`
ziEQxCphUtDfCDQbfJvlyO2}ji;KL+}8B&@L-HXOt2~f#YFA~{{MD_Bdc(KTI7L5*k
zd_c^hQX0n!<MKYb!%l240YwoOiKJGmiE1w*tc)j7m`o;#OeImNo*2SYwNrtLHJ%C;
zeqMnKsU%7ng34e8FsCSvg;P*Ahz0v+7INg1tU~p%QdrGM8Zknm5Xo~{%>#wP{|}YR
zKcQ7<81z@X|5I2Mu@iwvVUP+=QA)7h#o^~%AuNs(5~Hv(0)~_33mK9Cqp&IgMgS^}
z=nc3>$`n#qts;CN2!$+xLWPPI5=g*hgO~(SCX=$fI7}*yO84e5m=p>nAb{ab31HA@
z49rBQQ|O#|E*F-h$RPzf&z1hg_4zD!ZXDzY=9vpAWji1#PYKI`4>_}BpO1z1S-p>3
z>E~mif0j$af+5Xy_HUh@H(}#5xBWD_*x}RgLkeu-mDp$>c1d53!x=0TaQz}Q-DA<h
zgM$&47fubi{EKYGUzu825SM+w#QIX7UJ~PS5ALC(ez49l^9oSJ=ijas?P;-oa&iCk
z%^m7{BOBYE=b?eg19cVSw<0sfZLFQzo7(V4e0*Fc`%gcL+%!8ho_Y3%>(!)H?~yd5
z<>|v;GVp2ZrIVfxKT&e0Mr>q`>Y3J-v-`ed+zQEUEofT~+6LiUNBAlK_D|dOw)a$o
zA3qaZ+o9Q{PPtB+)GdYi-bSW3JEB2JxG(`<$==jEZCU)yW`co{#lA0_uFXo^!Q82V
zl35`42e-RZpxIYN!?RPv`+7!hUpw?$sgpub|6_%UcS!#3_|NfaYu>$lesXrI^i+DF
z)1#?^ek1(d_*LobryJ5#)~vihKkb<<q3(JQ*UV1*aZ&N2;o#O8XX3^DVSj<o(i+>i
z#j`JF)Np3AZ6snDk?eQLchVIxw{&~4+GTOt_*dVDdWo}ToK{_P1#x!eVL{A`n|c;u
z_Q&a~LwQ=A!2^!XU>`mA%*>Oj&OO(nBDkpX_|t?g>Y_efD{@qO@|kgw^ZuAx!^IW(
z95`j{$Mfb?Q8BO5`Z2GiR!?*-w%6_?`AOkXkC(~I+!iOg#yJiqw{@NkU=I45`0@6}
zkL1>PU*6|ZwQy5;wf?q~$oaMqk=wwMelTN5S6Dd_DwwFHIyUZGvEHl>EkDN#`?c1@
zB1xC9Bh!rU<}bH1ePA{DAn&Sor{#c7KS`&FvL9Klz2k6XziYs;5;4auNN1>>)pr<r
ztiRg8N+;bsoZn#<v!JTO)=n<GE$VSu@<_Wh{y#(Qw+solvQON%ks>X|m6cIvXyI|j
zZdDzI$7<J|KO9<hnz3Qk_NoI$3v`8DlXWM846~-$?^bx2E0&ibvFnmtejU|PjY2%{
z-bNX{A*RcU4?Eu~!Ic>1T9@Ypt#u~AE)9AGclMgwMG`oDk<_?%!C}=c75T<2$-NFu
zv(GES9i%faCnn56P-ALu>a8E%ddBR~BF5MN;g5j(!MF#yFAX@clLx-PaU?5bH~4!_
zX>@dtxU42*Yg8t9G}l1w7{$H584u%+1I~p6*K-%lPxsq$I-bUa)rH8ahxMv%d+0Qj
zh9wsYYWov?|1o9vW=nTMbhW~<Yfp0731D=zt*XG(`8RhCbh+`IUfHz$lx>z!YVA;M
zaB^d8&i2?Zc+vIuuBr~0Zs_YeTbAVCT*_>|(L%pt#T7LLo`2=EWh-8hB{EJqy@ucs
z%WL?CAwJiHXggNOn*@zEEOAA=NsgO$fve=ZahsYO4-ZrMFJEm5I`1A@zph5*aH_RF
zzi`mFgw<fDn;P4=pb?;SitW8F1@2*Z1@`7Rb=wqJJ+LPKQ>V44B`x@!d^FR(nzM|S
zbcw&+&uR20i-516MT<GD6DA<IU-{PUoKBlRgx#e-6YSokKDN1%aOk;hO<kVR0q5!!
zp06kJ%r_LC?$Qx=t>1Xy$u>Jpg}mv;>&DUR(Uiew?7LrY`=xES@2u*5dX#yZQrfvJ
zX{;yx+xm)ctLxLc@6KF}OW*C=!rg%$3~rY&GkjB1e4`tB78So<YvZ_A*%tG5eEQfM
zyEoIju3w~dXXn|PDPz*h3D6x{U(tSJuraOOBeFX?TWepeoH3zHu3LCzYjN`Bghj5=
zed|37GGi77A?EISTp*)uTaohK==<_6JT=&Z<htEGuhi|>^FFiwc0DuPOiZk0J}EMH
P?q@*|5X`;cACvW8D+_sf

diff --git a/src/pages/modules/device.vue b/src/pages/modules/device.vue
index 063c381..4d0b5d7 100644
--- a/src/pages/modules/device.vue
+++ b/src/pages/modules/device.vue
@@ -65,8 +65,7 @@
 
 <script>
 import SaveChain from './save-chain.vue'
-import { queryStation, queryTaskChain } from '@config/mork.js'
-import { queryTaskChainDtl, sendTask, saveTask, cancelTask, deleteTaskChain, updateStation } from '@config/getData.js'
+import { queryStation, queryTaskChain, queryTaskChainDtl, sendTask, saveTask, cancelTask, deleteTaskChain, updateStation } from '@config/getData.js'
 export default {
   components: {
     SaveChain
@@ -75,7 +74,7 @@ export default {
     return {
       activeName: 'zdy',
       stationName: '',
-      radioOption: [{label: '取货', text: '取', value: 'Ascend'}, {label: '放货', text: '放', value: 'Descend'}, {label: '移动', text: '移', value: 'Move'}, {label: '返回点', text: '返', value: 'Move'}],
+      radioOption: [{label: '取货', text: '取', value: 'Ascend'}, {label: '放货', text: '放', value: 'Descend'}, {label: '移动', text: '移', value: 'Move'}, {label: '返回点', text: '返', value: 'Return'}],
       dataList: [],
       newData: [],
       linkData: [],
@@ -202,7 +201,6 @@ export default {
     },
     // 选取动作类型
     radioInput (e, i, value) {
-      console.log(this.newData)
       const lastItem = this.newData.length > 0 ? this.newData[this.newData.length - 1].station_code : null
       if (lastItem === e.station_code) {
         this.$message('相邻的两个站点不能相同')
@@ -214,7 +212,7 @@ export default {
         this.closePopover(i)
         return
       }
-      if (this.newData.length > 0 && this.newData[this.newData.length - 1].action_type === 'Move') {
+      if (this.newData.length > 0 && this.newData[this.newData.length - 1].action_type === 'Return') {
         return
       }
       e.action_type = value
diff --git a/src/pages/shells/index.vue b/src/pages/shells/index.vue
index 25f8347..5e90985 100644
--- a/src/pages/shells/index.vue
+++ b/src/pages/shells/index.vue
@@ -6,7 +6,7 @@
       </el-col>
       <el-col :span="12">
         <el-row type="flex" justify="end" align="middle">
-          <div class="state-item">自动模式</div>
+          <div v-if="JSON.stringify(topInfo) !== '{}'" class="state-item">{{ topInfo.isManual ? '手动模式' : '自动模式' }}</div>
           <div v-if="JSON.stringify(topInfo) !== '{}'" class="state-item">{{ topInfo.state }}</div>
           <div v-if="JSON.stringify(topInfo) !== '{}'" class="relative elec-qty-wrap" :class="{'elec-wraning': topInfo.batteryPower <= 40}">
             <div class="absolute elec-qty" :style="{ width: Number(topInfo.batteryPower) !== -1 ? `calc(100% - ${topInfo.batteryPower}%)` : '100%' }"></div>
@@ -26,7 +26,7 @@
     <div class="error-tips" ref="scrollContainer" @click="$router.push('/index/warning')">
       <div class="zbox scroll-text" ref="scrollText">
         <i class="el-icon-warning icon-warning"></i>
-        <div class="error-tips-t">错误提示：1.障碍物告警 2.定位丢失</div>
+        <div class="error-tips-t">错误提示：{{ exception }}</div>
       </div>
     </div>
     <el-row type="flex" class="relative main-conatiner">
@@ -54,28 +54,38 @@ export default {
   data () {
     return {
       timer: null,
-      topInfo: {
-        batteryPower: -1.0,
-        exceptionInfo: {
-          exception: ['重定位失败,检查环境或标记是否有变化.', '定位超时，尝试移动小车位置后重试.'],
-          exceptionCodes: [1, 17179869185, 1335734829057]
-        },
-        id: '1', // 车号ID
-        ip: '192.168.100.82', // 车辆IP
-        isManual: false, // 是否是手动，true是手动,false是自动
-        mapId: 39, // 地图ID
-        mapName: 'apt_map_1753078481180', // 地图名称
-        name: 'V1', // 车辆名称
-        state: '未知状态', // 车辆状态
-        stateId: 7, // 车辆状态ID
-        theta: 0.9073792099952698, // 车辆航向角
-        x: -4.030919075012207, // 车辆x坐标
-        y: -1.6574244499206543 // 车辆y坐标
-      },
+      topInfo: {},
+      // topInfo: {
+      //   batteryPower: -1.0,
+      //   exceptionInfo: {
+      //     exception: ['重定位失败,检查环境或标记是否有变化.', '定位超时，尝试移动小车位置后重试.'],
+      //     exceptionCodes: [1, 17179869185, 1335734829057]
+      //   },
+      //   id: '1', // 车号ID
+      //   ip: '192.168.100.82', // 车辆IP
+      //   isManual: false, // 是否是手动，true是手动,false是自动
+      //   mapId: 39, // 地图ID
+      //   mapName: 'apt_map_1753078481180', // 地图名称
+      //   name: 'V1', // 车辆名称
+      //   state: '未知状态', // 车辆状态
+      //   stateId: 7, // 车辆状态ID
+      //   theta: 0.9073792099952698, // 车辆航向角
+      //   x: -4.030919075012207, // 车辆x坐标
+      //   y: -1.6574244499206543 // 车辆y坐标
+      // },
       loginVisible: false,
       configVisible: false
     }
   },
+  computed: {
+    exception () {
+      let str = ''
+      if (JSON.stringify(this.topInfo) !== '{}') {
+        str = this.topInfo.exceptionInfo.exception.map((item, index) => `${index + 1}.${item}`).join('')
+      }
+      return str
+    }
+  },
   created () {
     this._queryHead()
   },
@@ -131,6 +141,7 @@ export default {
     wsMessage (res) {
       clearTimeout(this.timer)
       this.topInfo = res.data
+      this.$store.dispatch('setAgvObj', this.topInfo)
     },
     wsErr () {
       this.timer = setTimeout(() => {
@@ -151,11 +162,12 @@ export default {
   background linear-gradient(0deg, #E64F29, rgba(230, 79, 41, 0.5))
   border-color rgba(230, 79, 41, 0.7)
 .state-item
-  _wh(.72rem, .3rem)
-  _font(.14rem,.3rem,#fff,,center)
+  _wh(.72rem, .25rem)
+  _font(.14rem,.25rem,#fff,,center)
   font-family 'Adobe Heiti Std'
   margin-right .04rem
   background center / 100% 100% url(../../images/new/state-item_bg.png) no-repeat
+  box-shadow inset 0px 0px 3px 2px rgb(149, 221, 253, 70%)
 .elec-qty-wrap
   _wh(.5rem, .25rem)
   margin-right .04rem
@@ -170,12 +182,12 @@ export default {
 .elec-qty-border
   _wh(100%, 100%)
   z-index 152
-  box-shadow inset 0px 0px 4px 2px rgba(90, 223, 188, 70%)
+  box-shadow inset 0px 0px 3px 2px rgba(90, 223, 188, 70%)
 .elec-wraning
   border-color #ffe600
   background center / 100% 100% url(../../images/new/elec_y.png) no-repeat
   .elec-qty-border
-    box-shadow inset 0px 0px 4px 2px rgba(192, 176, 28, 70%)
+    box-shadow inset 0px 0px 3px 2px rgba(192, 176, 28, 70%)
 .elec-txt
   position relative
   z-index 153