Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/sale/components/offSiteTransportation/inTransit.vue

@@ -15,23 +15,7 @@
   </el-form-item>
   <el-form-item>
      <label class="el-form-item__label" style="width: auto;">产品分类</label>
-      <el-select v-model="inputValue" placeholder="产品分类">
-        <el-option
-          v-for="item in inputValues"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-        </el-option>
-      </el-select>
-      <!-- <label class="el-form-item__label" style="width: auto;">产品分类</label>
-      <el-autocomplete
-        popper-class="my-autocomplete"
-        v-model="inputValue"
-        :fetch-suggestions="querySearch"
-        placeholder="请输入内容" 
-      >
-        <i class="el-icon-edit el-input__icon" slot="suffix"> </i>
-      </el-autocomplete> -->
+      <el-input v-model="inputValue" placeholder="请输入内容"></el-input>
   </el-form-item>
   <el-form-item>
       <label class="el-form-item__label" style="width: auto;">车牌号</label>
@@ -47,23 +31,7 @@
   </el-form-item> 
    <el-form-item>
      <label class="el-form-item__label" style="width: auto;">门岗名称</label>
-      <el-select v-model="gatepostName" placeholder="门岗名称">
-        <el-option
-          v-for="item in gatepostNames1"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-        </el-option>
-      </el-select>
-      <!-- <label class="el-form-item__label" style="width: auto;">门岗名称</label>
-       <el-autocomplete
-            popper-class="my-autocomplete"
-            v-model="gatepostName"
-            :fetch-suggestions="querySearch2"
-            placeholder="请输入内容" 
-          >
-            <i class="el-icon-edit el-input__icon" slot="suffix"> </i>
-          </el-autocomplete> -->
+     <el-input v-model="gatepostName" placeholder="请输入内容"></el-input>
   </el-form-item> 
   <el-form-item>
     <label class="el-form-item__label" style="width: auto;">报警类型</label>
@@ -242,11 +210,13 @@ export default {
       },
        option2: {
         // 表格请求数据的地址
-        // requestUrl: "/api/v1/tms/getFinishTruckOrderInfo?apiId=160",
+        requestUrl: "/api/v1/otms/getFinishTruckOrderInfo?apiId=468",
       },
       pathOption:{
            orderNumber:'',
         capacityNumber:'',
+         startPointName:'',
+        endPointName:'',
       },
       mileOption:{
         orderNumber:''
@@ -367,31 +337,31 @@ export default {
       //改变执行中条件
       this.$refs.tab.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
                       "endTime": sjTime(this.dateValue[1]),
-                      "productClassification": this.inputValue,
-                      "capacityNumber1": this.capacityNumber1,
-                      "carrierName1":this.carrierName,
-                      "gatepostName1":this.gatepostName,
-                      "consigneeCompanyName1": this.consigneeCompanyName1});
+                      "materialNames": this.inputValue,
+                      "capacityNumbers": this.capacityNumber1,
+                      "carrierNames":this.carrierName,
+                      "outGatepostNames":this.gatepostName,
+                      "consigneeCompanyNames": this.consigneeCompanyName1});
       }
       if(this.activeName=="second"){
       //改变已完成条件              
       this.$refs.tab2.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
                       "endTime": sjTime(this.dateValue[1]),
-                      "productClassification": this.inputValue,
-                      "capacityNumber1": this.capacityNumber1,
-                      "carrierName1":this.carrierName,
-                      "gatepostName1":this.gatepostName,
-                      "consigneeCompanyName1": this.consigneeCompanyName1});
+                      "materialNames": this.inputValue,
+                      "capacityNumbers": this.capacityNumber1,
+                      "carrierNames":this.carrierName,
+                      "outGatepostNames":this.gatepostName,
+                      "consigneeCompanyNames": this.consigneeCompanyName1});
       }
       if(this.activeName=="third"){
       //改变有异常条件              
       this.$refs.tab3.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
                       "endTime": sjTime(this.dateValue[1]),
-                      "productClassification": this.inputValue,
+                      "materialNames": this.inputValue,
                       "capacityNumber1": this.capacityNumber1,
                       "carrierName1":this.carrierName,
                       "abnormalType":this.exceptionType=="全部类型"?"":this.exceptionType,
-                      "gatepostName1":this.gatepostName,
+                      "outGatepostNames":this.gatepostName,
                       "consigneeCompanyName1": this.consigneeCompanyName1});
       }                              
     },
@@ -399,15 +369,20 @@ export default {
 
     //other
     click(row) {
-      console.log(row,"row")
+     
         this.pathOption.orderNumber=row.orderNumber;
         this.pathOption.capacityNumber=row.capacityNumber;
+        this.pathOption.startPointName="达钢集团"+row.outGatepostName,
+        this.pathOption.endPointName=row.deliveryAddress,
+         console.log(this.pathOption,"this.pathOption")
         this.value7=true;
       // this.$router.push("/offsite/pathView?orderNumber="+row.orderNumber+"&capacityNumber="+row.capacityNumber);
     },
     historyclick(row){
+      
       this.pathOption.orderNumber=row.orderNumber;
         this.pathOption.capacityNumber=row.capacityNumber;
+        
         this.value7=true;
       //this.$router.push("/offsite/pathView?orderNumber="+row.orderNumber+"&capacityNumber="+row.capacityNumber);
     },

src/views/sale/components/offSiteTransportation/mapTest.vue

@@ -3,9 +3,9 @@
         <div id="amap-container"></div>
          <div class="controller">
              <div class="in_transit_information">
-                 <label class="item_details">起点:{{transportDetail.startPointName}}</label>
+                 <label class="item_details">起点:{{startPointName}}</label>
                  <br/>
-                 <label class="item_details">终点:{{transportDetail.endPointName}}</label>
+                 <label class="item_details">终点:{{endPointName}}</label>
                  <br/>
              </div>
              <div class="driving_information">  
@@ -57,6 +57,8 @@ export default {
     props:{
         orderNumber:'',
         capacityNumber:'',
+        startPointName:'',
+        endPointName:'',
         startTime:'',
         endTime:'',
     },
@@ -159,7 +161,7 @@ export default {
                     lon:""
                 },
                 //起点位置
-                startPointName:"中国达州市通川区",
+                startPointName:"中国达州市通川区", 
                 //起点位置经纬度
                 startPoint:{
                     lon:"114.03922119568348",
@@ -277,7 +279,7 @@ export default {
                 that.initPathSimplifier();
                 that.threeMarker();
                 console.log("that.listPath[0]",that.listPath)
-                that.initCustomMarkes(that.ctmarkes.title+"("+that.listPath[0].miled+")",that.listPath[0].currentPointName,that.listPath[0].currentPoint.lon,that.listPath[0].currentPoint.lat)
+                that.initCustomMarkes(that.capacityNumber+"("+that.listPath[0].miled+")",that.listPath[0].currentPointName,that.listPath[0].currentPoint.lon,that.listPath[0].currentPoint.lat)
                 that.endline();
             });
         },