From a3817e7d4b3e2a8785c40ac81e26c2eaebfabd70 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 9 Aug 2022 14:34:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/proj/TaskGenerate.vue | 13 ++++++-------
 src/style/layout.styl           |  7 ++++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/proj/TaskGenerate.vue b/src/pages/proj/TaskGenerate.vue
index 2a70016..782ba92 100644
--- a/src/pages/proj/TaskGenerate.vue
+++ b/src/pages/proj/TaskGenerate.vue
@@ -6,7 +6,7 @@
         <div class="item_block" :class="reg === e.region_id ? 'item_block_focus' : ''" v-for="e in areaArr" :key="e.region_id" @click="getPoint(e)"><p>{{e.region_name}}</p></div>
       </div>
       <div class="fl right_block">
-        <div class="clear icons">
+        <!-- <div class="clear icons">
           <div class="fl item_icon">
             <div class="color_icon gray"></div>
             <div class="font_icon">空</div>
@@ -23,20 +23,20 @@
             <div class="color_icon blue"></div>
             <div class="font_icon">有任务</div>
           </div>
-        </div>
+        </div> -->
         <div class="locate_block">
           <div class="item_locate" v-for="(e, i) in pointArr" :key="i" :class="['gray', 'orange', 'green', 'blue'][Number(e.status)]" @click="setInfo(e)">
-            <p>站点：{{e.device_name}}</p>
+            <p>站点：{{e.device_code}}</p>
           </div>
         </div>
         <div class="clear bottom_block">
           <div class="fl dot_item">
             <p class="p1">起始点</p>
-            <p class="p2">设备号：{{scodeObj.device_name}}</p>
+            <p class="p2">设备号：{{scodeObj.device_code}}</p>
           </div>
           <div class="fl dot_item">
             <p class="p1">目标点</p>
-            <p class="p2">设备号：{{ncodeObj.device_name}}</p>
+            <p class="p2">设备号：{{ncodeObj.device_code}}</p>
           </div>
           <div class="fr btn_block">
             <button class="btn btn1 mgb20" @click="cancle">清空</button>
@@ -88,6 +88,7 @@ export default {
         this.areaArr = [...res.result]
         if (this.areaArr.length > 0) {
           this.initPonit(this.areaArr[0].region_id)
+          this.refresh(this.areaArr[0].region_id)
         }
       } else {
         this.Dialog(res.desc)
@@ -162,8 +163,6 @@ export default {
 
 <style lang="stylus" scoped>
 @import '~@style/mixin'
-.item_locate
-  _fj(center)
 .i_block
   _fj()
   _wh(100%, .6rem)
diff --git a/src/style/layout.styl b/src/style/layout.styl
index 36cf6c9..737bc7b 100644
--- a/src/style/layout.styl
+++ b/src/style/layout.styl
@@ -719,13 +719,14 @@ header
 .item_locate
   float left
   _wh(23%, .72rem)
-  margin 0 2% .1rem 0
+  margin .1rem 2% .1rem 0
   border-radius .1rem
   overflow hidden
-  _fj()
-  padding 0 .1rem
+  _fj(center)
   p
     _font(.16rem,.24rem,#fff,,center)
+    padding 0 .1rem
+    word-break break-all
 .bottom_block
   _fj()
   width 100%