订单流程

src/views/MLargeScreen/components/startOrderReceiving/index.vue

@@ -6,9 +6,12 @@
         class="el-icon-message-solid orderText1_img"
         style="color: #00ffff; font-size: 28px"
       ></span>
-      <span style="color: #00ffff">请您前往
+      <span v-show="orderObj.status!==3" style="color: #00ffff">请您前往：
         <span style="color: #e47e1b; font-weight: 600">{{ orderObj.status<3?orderObj.zcArea||'':orderObj.xcArea||'' }}</span>
       </span>
+      <span v-show="orderObj.status===3" style="color: #00ffff">挖机牌号：
+        <span style="color: #e47e1b; font-weight: 600">{{ orderObj.ccCarNumber }}</span>
+      </span>
       <span style="color: #00ffff">状态：{{ orderStuText }}</span>
     </div>
     <div class="orderText2" @click="navigation()" v-show="orderObj.status===1 && navStu===0">
@@ -90,10 +93,22 @@ export default {
             this.navStu=0;
             this.orderStuText='正在前往';
             this.orderObj = res.data;
+            if(this.orderObj.zcArea.length>5){
+              this.orderObj.zcArea = this.orderObj.zcArea.substr(0,5)+'...'
+            }
+            if(this.orderObj.xcArea.length>5){
+              this.orderObj.xcArea = this.orderObj.xcArea.substr(0,5)+'...'
+            }
             this.audioPlayByUrl(xdd);
           } else {
             if (res.data.id !== this.orderObj) {
               this.orderObj = res.data;
+              if(this.orderObj.zcArea.length>6){
+                this.orderObj.zcArea = this.orderObj.zcArea.substr(0,5)+'...'
+              }
+              if(this.orderObj.xcArea.length>6){
+                this.orderObj.xcArea = this.orderObj.xcArea.substr(0,5)+'...'
+              }
             }
             this.orderObj.status = res.data.status;
             if (this.orderObj.status === 6) {

src/views/MLargeScreen/index.vue

@@ -464,6 +464,7 @@ export default {
             const polygon = new maptalks.MultiPolygon([item.zuobiao], {
               properties: {
                 name: item.name,
+                areaClass: item.areaClass,
                 areaLimitClass: item.areaLimitClass
               },
               symbol: {
@@ -500,9 +501,10 @@ export default {
                   const point = new maptalks.Coordinate(item.lon, item.lat);
                   this.mapDom.getLayer('regionLayer').getGeometries().forEach((polygon) => {
                     if (polygon.containsPoint(point)) {
-                      this.localName = polygon.properties.name;
                       if(polygon.properties.areaLimitClass){
                         area = polygon.properties.name;
+                      }else{
+                        this.localName = polygon.properties.name;
                       }
                     }
                   })
@@ -757,8 +759,8 @@ export default {
     //获取待装卡车列表
     loadData1() {
       httpGet(getAllLoadableKC, {carNumber: this.carnumber}).then((res) => {
-        if (res.code == 200 && res.data && res.data.length) {
-          this.daizhangCar = res.data;
+        if (res.code == 200) {
+          this.daizhangCar = res.data || [];
         }
       });
     },