css

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

src/pages/modules/relocation.vue

@@ -20,7 +20,7 @@ export default {
     }
   },
   mounted () {
-    this._queryStation()
+    // this._queryStation()
   },
   methods: {
     // 站点查询

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)
     },