Tiroble 3 tahun lalu
induk
melakukan
3182498bab

+ 1 - 1
config/index.js

@@ -65,7 +65,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
    // target: "http://192.168.101.7:8019",
-   // target: "http://localhost:8019",
+    //target: "http://localhost:8080",
     target: "http://172.16.33.166:8080",
     // target: "http://192.168.1.114:8019",
     ws: true,

+ 8 - 10
src/views/sale/components/offSiteTransportation/checkGPS.vue

@@ -26,14 +26,14 @@
                 <br/>
              </div>
               <div class="map-control">
-                    <!--播放暂停按钮-->
-                    进度:
-                    <Icon v-if="!isPlay" class="play-icon play"  type="ios-play" @click="isPlay=true;play();"/>
-                    <Icon v-else class="play-icon pause" type="ios-pause" @click="isPlay=false;stop();navgControl('pause')"/>
-                    <Icon class="play-icon quickly"  type="ios-play" @click="addProgress()"/>
-                    <div class="mySlider"><Slider class="map-slider" v-model="sliderVal" :tip-format="hideFormat" :step="0.0001"></Slider></div>
-                    <!--速度-->
-                    <div class="mySlider2"><el-slider v-model="speedVal" show-input></el-slider></div>
+                <!--播放暂停按钮-->
+                进度:
+                <Icon v-if="!isPlay" class="play-icon play"  type="ios-play" @click="isPlay=true;play();"/>
+                <Icon v-else class="play-icon pause" type="ios-pause" @click="isPlay=false;stop();navgControl('pause')"/>
+                <Icon class="play-icon quickly"  type="ios-play" @click="addProgress()"/>
+                <div class="mySlider"><Slider class="map-slider" v-model="sliderVal" :tip-format="hideFormat" :step="0.0001"></Slider></div>
+                <!--速度-->
+                <div class="mySlider2"><el-slider v-model="speedVal" show-input></el-slider></div>
             </div>
             <div class="in_transit_information3" v-if="listPath.length>0">
                 <span class="item_details">停车时长:</span>
@@ -225,9 +225,7 @@ export default {
                         let afterTime=that.stringToDate(item2.gtm);
                         let second=afterTime-beforeTime;
                         if(second>that.parkingTime){
-
                              let message='停车:'+second/60000;
-                             console.log(message)
                              that.initParkingMarkes(20,35,require('@/assets/img/start.png'),calculationPoint.lon,calculationPoint.lat,message.split('.')[0]+"分钟");
                         }
                         calculationPoint=null;

+ 2 - 3
src/views/sale/components/offSiteTransportation/inTransitWarn.vue

@@ -48,12 +48,12 @@ export default {
             type: "success",
             message: "操作成功!",
           });
-          this.$router.go(-1);
+          this.switchEcho();
         });
     },
     // 取消
     cancel() {
-      this.$router.go(-1);
+      // this.$router.go(-1);
     },
     switchEcho(){
       let that=this;
@@ -61,7 +61,6 @@ export default {
                 if(res.data.status=="succeed"){
                   let arry=res.data.data.switch;
                   this.radio=res.data.data.type;
-                  console.log(this.radio)
                 }
        });
      

+ 2 - 3
src/views/sale/components/transport_excute/tms-offsite/arrivalResult.vue

@@ -62,7 +62,7 @@ export default {
       endTime: null,
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getReceiptResult?apiId=470",
+        requestUrl: "/api/v1/otms/getArrivalResult?apiId=470",
       },
     };
   },
@@ -71,9 +71,8 @@ export default {
   },
   methods: {
      toPhotoClick(orderNumber){
-    
       this.axios
-       .post("/api/v1/tms/getReceiptPhoto?orderNumber="+orderNumber)
+       .post("/api/v1/otms/getArrivalPhoto?orderNumber="+orderNumber)
        .then((res)=>{
           this.srcList=[];
           this.src=res.data.data;

+ 14 - 13
src/views/sale/components/transport_excute/tms-offsite/receiptResult.vue

@@ -24,22 +24,22 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+      <!-- <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
       <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
-      </el-button>
+      </el-button> -->
     </div>
     <div class="table">
       <dilTable ref="excelDom" v-bind.sync="option" >
        <el-table-column fixed="right" label="照片游览" width="120">
           <template slot-scope="scope">
             <el-button @click="toPhotoClick(scope.row.orderNumber)" type="text" size="small" style="font-size: 6px">
-                抵达满货照片</el-button>
+                签收照片</el-button>
           </template>
       </el-table-column>
       </dilTable>
     </div>
-    <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
+     <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
         <div class="demo-image__preview">
           <el-image 
             style=" height:731px;text-align:center"
@@ -66,7 +66,7 @@ export default {
       endTime: null,
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getReceiptResult?apiId=470",
+        requestUrl: "/api/v1/otms/getReceiptResult?apiId=470",
       },
     };
   },
@@ -75,17 +75,18 @@ export default {
   },
   methods: {
      toPhotoClick(orderNumber){
-      console.log(orderNumber)
       this.axios
-       .post("/api/v1/tms/getReceivingPhotoByUrl?orderNumber="+orderNumber)
+       .post("/api/v1/otms/getReceivingPhotoByUrl?orderNumber="+orderNumber)
        .then((res)=>{
-         console.log(res)
+         console.log(res.data)
+          this.isShow=true;
           this.srcList=[];
-          this.src=res.data.data.resultSignedNotePhoto;
-          this.isShow=true;
-          this.srcList.push(res.data.data.resultSignedNotePhoto);
-          this.srcList.push(res.data.data.resultEmptyContainerPhoto);
-          
+          this.src=res.data.resultSignedNotePhoto;
+          this.srcList.push(res.data.resultSignedNotePhoto);
+          this.srcList.push(res.data.resultEmptyContainerPhoto);
+          if(res.data.resultReceiveNotePhoto!=null){
+             this.srcList.push(res.data.resultReceiveNotePhoto);
+          }
        });
        
     },