From beecdeedae6d3e6ae90f3863095588f0b72ff301 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 15 Aug 2025 13:43:23 +0800
Subject: [PATCH] css

---
 src/config/mork.js               | 17 ++++++++++++++++-
 src/pages/modules/device.vue     | 21 +++++++++++++--------
 src/pages/modules/relocation.vue |  2 +-
 src/pages/shells/index.vue       |  3 +++
 src/style/common.styl            | 16 ++++++++++------
 5 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/src/config/mork.js b/src/config/mork.js
index e2f3580..b1410e3 100644
--- a/src/config/mork.js
+++ b/src/config/mork.js
@@ -2,7 +2,22 @@
 export const queryStation = () => {
   let res = {
     message: 'ok',
-    data: [{station_code: 'B1', station_name: 'B1', x: '10', Y: '10', angle: '90'}, {station_code: 'B2', station_name: 'B2', x: '10', Y: '10', angle: '90'}, {station_code: 'B3', station_name: 'B3', x: '10', Y: '10', angle: '90'}, {station_code: 'B1', station_name: 'B1', x: '10', Y: '10', angle: '90'}, {station_code: 'B2', station_name: 'B2', x: '10', Y: '10', angle: '90'}, {station_code: 'B3', station_name: 'B3', x: '10', Y: '10', angle: '90'}, {station_code: 'B1', station_name: 'B1', x: '10', Y: '10', angle: '90'}, {station_code: 'B2', station_name: 'B2', x: '10', Y: '10', angle: '90'}, {station_code: 'B3', station_name: 'B3', x: '10', Y: '10', angle: '90'}, {station_code: 'B1', station_name: 'B1', x: '10', Y: '10', angle: '90'}, {station_code: 'B2', station_name: 'B2', x: '10', Y: '10', angle: '90'}, {station_code: 'B3', station_name: 'B3', x: '10', Y: '10', angle: '90'}, {station_code: 'B1', station_name: 'B1', x: '10', Y: '10', angle: '90'}, {station_code: 'B2', station_name: 'B2', x: '10', Y: '10', angle: '90'}, {station_code: 'B3', station_name: 'B3', x: '10', Y: '10', angle: '90'}, {station_code: 'B1', station_name: 'B1', x: '10', Y: '10', angle: '90'}, {station_code: 'B2', station_name: 'B2', x: '10', Y: '10', angle: '90'}, {station_code: 'B3', station_name: 'B3', x: '10', Y: '10', angle: '90'}]
+    data: [
+      {station_code: 'B1', station_name: 'B1', x: '10', Y: '10', angle: '90'},
+      {station_code: 'B2', station_name: 'B2', x: '10', Y: '10', angle: '90'},
+      {station_code: 'B3', station_name: 'B3', x: '10', Y: '10', angle: '90'},
+      {station_code: 'B4', station_name: 'B4', x: '10', Y: '10', angle: '90'},
+      {station_code: 'B5', station_name: 'B5', x: '10', Y: '10', angle: '90'},
+      {station_code: 'B6', station_name: 'B6', x: '10', Y: '10', angle: '90'},
+      {station_code: 'B7', station_name: 'B7', x: '10', Y: '10', angle: '90'},
+      {station_code: 'B8', station_name: 'B8', x: '10', Y: '10', angle: '90'},
+      {station_code: 'B9', station_name: 'B9', x: '10', Y: '10', angle: '90'},
+      {station_code: 'B10', station_name: 'B10', x: '10', Y: '10', angle: '90'},
+      {station_code: 'B11', station_name: 'B11', x: '10', Y: '10', angle: '90'},
+      {station_code: 'B12', station_name: 'B12', x: '10', Y: '10', angle: '90'},
+      {station_code: 'B13', station_name: 'B13', x: '10', Y: '10', angle: '90'},
+      {station_code: 'B14', station_name: 'B14', x: '10', Y: '10', angle: '90'}
+    ]
   }
   return res
 }
diff --git a/src/pages/modules/device.vue b/src/pages/modules/device.vue
index 8348c74..6decb4f 100644
--- a/src/pages/modules/device.vue
+++ b/src/pages/modules/device.vue
@@ -13,7 +13,7 @@
                     :ref="`popover-${i}`">
                     <el-row type="flex" justify="space-between" align="middle" style="margin-bottom: .1rem">
                       <el-col :span="18"><el-input placeholder="修改名称" v-model="stationName" @focus="show" data-layout="normal"></el-input></el-col>
-                      <el-button type="success" icon="el-icon-check" size="mini" style="height: .3rem" :disabled="disabled" @click="_updateStation(e, i)"></el-button>
+                      <el-button type="success" icon="el-icon-check" size="mini" style="height: .4rem" :disabled="disabled" @click="_updateStation(e, i)"></el-button>
                     </el-row>
                     <el-row type="flex" justify="space-between">
                       <el-button class="task_button" :class="{'task_checked': e.action_type === el.value}" v-for="el in radioOption" :key="el.value" @click="radioInput(e, i, el.value)">{{ el.label }}</el-button>
@@ -37,10 +37,10 @@
             <el-row type="flex" align="middle">
               <div class="point_item point_checked">
                 <el-row type="flex" align="middle" class="zbox">
-                  <el-col :span="18">
+                  <el-col :span="17">
                     <p style="padding-left: 0.02rem;">{{ e.station_name }}</p>
                   </el-col>
-                  <el-col :span="6" style="border-left: 1px solid #fff;"><p style="font-size: .12rem;font-weight: 700;text-align: center;padding-right: 0.02rem;">{{ radioOption | findByValue(e.action_type) }}</p></el-col>
+                  <el-col :span="7" style="border-left: 1px solid #fff;"><p style="font-size: .18rem;font-weight: 700;text-align: center;padding-right: 0.02rem;">{{ radioOption | findByValue(e.action_type) }}</p></el-col>
                 </el-row>
               </div>
               <i class="el-icon-caret-right icon-caret-right" :style="i === newData.length - 1 ? 'visibility: hidden' : ''"></i>
@@ -217,6 +217,7 @@ export default {
         return
       }
       if (this.newData.length > 0 && this.newData[this.newData.length - 1].action_type === 'Return') {
+        this.$message('返回点已选取')
         return
       }
       e.action_type = value
@@ -435,12 +436,14 @@ export default {
   background-image url(../../images/new/bg1.png)
   p
     color #3CC1FF
-    font-size .16rem
+    font-size .2rem
 .result_w
+  flex-wrap wrap
   height 1rem
   border 1px solid #1E9FE7
   padding .1rem
   background-color rgba(10, 73, 164, 80%)
+
 .icon-caret-right
   width .3rem
   font-size .2rem
@@ -463,8 +466,9 @@ export default {
   margin 0
   color #9ff0fc
   background center / 100% 100% url(../../images/new/tab_bg.png) no-repeat
-  padding 0.1rem
-  font-size 0.14rem
+  padding 0 0.1rem
+  font-size 0.2rem
+  height .4rem
   &:first-child
     border-left 1px solid #233553
   &:active, &:hover
@@ -480,8 +484,9 @@ export default {
   &:first-child
     border-left-color #409EFF
 .button_box
-  height 20%
-  margin-bottom .16rem
+  height 18%
+  margin 3.5% 0
+  max-height .65rem
   text-align center
   &:last-child
     margin-bottom 0
diff --git a/src/pages/modules/relocation.vue b/src/pages/modules/relocation.vue
index 28c6e19..8adb953 100644
--- a/src/pages/modules/relocation.vue
+++ b/src/pages/modules/relocation.vue
@@ -20,7 +20,7 @@ export default {
     }
   },
   mounted () {
-    this._queryStation()
+    // this._queryStation()
   },
   methods: {
     // 站点查询
diff --git a/src/pages/shells/index.vue b/src/pages/shells/index.vue
index 580d30a..06f2782 100644
--- a/src/pages/shells/index.vue
+++ b/src/pages/shells/index.vue
@@ -179,6 +179,9 @@ export default {
         this.taskSeq = this.topInfo.task_seq.split('-')
         const target = this.topInfo.task_point
         this.currentStep = this.taskSeq.findIndex(item => item === target)
+      } else {
+        this.taskSeq = []
+        this.currentStep = null
       }
       this.$store.dispatch('setAgvObj', this.topInfo)
     },
diff --git a/src/style/common.styl b/src/style/common.styl
index a329cad..5b77c5e 100644
--- a/src/style/common.styl
+++ b/src/style/common.styl
@@ -110,15 +110,17 @@
   color #fff
   letter-spacing 0.02rem
 .el-form-item__label
-  font-size .16rem
+  font-size .18rem
   line-height .4rem
   color #AFBED8
+.el-form-item--mini.el-form-item, .el-form-item--small.el-form-item
+  margin-bottom .22rem
 .el-form-item--mini .el-form-item__content, .el-form-item--mini .el-form-item__label
   line-height .4rem
 .el-form-item__content
   font-size .15rem
 .el-input, .el-select .el-input .el-select__caret, .el-select-dropdown__item
-  font-size .15rem
+  font-size .18rem
   line-height .4rem
   height .4rem
 .el-input__inner
@@ -200,17 +202,19 @@
   background-color #009fde
   border-color #00d9f3
 .el-message-box__title
-  font-size .18rem
+  font-size .2rem
 .el-message-box__headerbtn
-  font-size .16rem
+  font-size .2rem
 .el-message-box__content
-  font-size .14rem
+  font-size .2rem
 .el-progress-bar__inner,.el-progress-bar__outer
   border-radius 0
 .el-progress__text
   font-size .2rem !important
 .config_dialog .el-dialog__body
-  padding 0 0.4rem 0.3rem 0.4rem
+  padding 0 0.4rem 0.2rem 0.4rem
+.el-form-item__error
+  font-size .16rem
 
 // button
 .button_control