修改

config/index.js

@@ -64,9 +64,9 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    // target: "http://192.168.1.106:8019",
-    // target: "http://172.16.33.166:8080",
-    target: "http://172.16.33.166:8080",
+    //target: "http://localhost:8019",
+     target: "http://172.16.33.166:8080",
+    //target: "http://172.16.33.166:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

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

@@ -1,64 +1,53 @@
 <template>
   <!-- 在途运输信息选择页面 -->
   <div class="inTransit">
-
     <el-form :inline="true">
-  <el-form-item>
-    <label class="el-form-item__label" style="width: auto;">时间段</label>
-         <el-date-picker
-      v-model="dateValue"
-      type="daterange"
-      range-separator="至"
-      start-placeholder="开始日期"
-      end-placeholder="结束日期">
-    </el-date-picker>
-  </el-form-item>
-  <el-form-item>
-     <label class="el-form-item__label" style="width: auto;">产品分类</label>
-      <el-input v-model="inputValue" placeholder="请输入内容"></el-input>
-  </el-form-item>
-  <el-form-item>
-      <label class="el-form-item__label" style="width: auto;">车牌号</label>
-      <el-input v-model="capacityNumber1" placeholder="请输入内容"></el-input>
-  </el-form-item>
-  <el-form-item>
-      <label class="el-form-item__label" style="width: auto;">收货单位</label>
-      <el-input v-model="consigneeCompanyName1" placeholder="请输入内容"></el-input>
-  </el-form-item> 
-  <el-form-item>
-      <label class="el-form-item__label" style="width: auto;">承运单位</label>
-      <el-input v-model="carrierName" placeholder="请输入内容"></el-input>
-  </el-form-item> 
-   <el-form-item>
-     <label class="el-form-item__label" style="width: auto;">门岗名称</label>
-     <el-input v-model="gatepostName" placeholder="请输入内容"></el-input>
-  </el-form-item> 
-  <el-form-item>
-    <label class="el-form-item__label" style="width: auto;">报警类型</label>
-      <el-select v-model="exceptionType" placeholder="报警类型">
-        <el-option
-          v-for="item in exceptionTypes"
-          :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="exceptionType"
-            :fetch-suggestions="querySearch3"
-            placeholder="请输入内容" 
-          >
-            <i class="el-icon-edit el-input__icon" slot="suffix"> </i>
-          </el-autocomplete> -->
-  </el-form-item> 
-  <el-form-item>
-    <el-button type="primary" @click="onSearch"><i class="el-icon-search"></i>查询</el-button>
-    <el-button type="primary" @click="exportData">导出</el-button>
-  </el-form-item>
-</el-form>
-  
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;">时间段</label>
+            <el-date-picker
+          v-model="dateValue"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;">产品分类</label>
+          <el-input v-model="inputValue" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item>
+          <label class="el-form-item__label" style="width: auto;">车牌号</label>
+          <el-input v-model="capacityNumber1" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item>
+          <label class="el-form-item__label" style="width: auto;">收货单位</label>
+          <el-input v-model="consigneeCompanyName1" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+          <label class="el-form-item__label" style="width: auto;">承运单位</label>
+          <el-input v-model="carrierName" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;">门岗名称</label>
+        <el-input v-model="gatepostName" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;">报警类型</label>
+          <el-select v-model="exceptionType" placeholder="报警类型">
+            <el-option
+              v-for="item in exceptionTypes"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+      </el-form-item> 
+      <el-form-item>
+        <el-button type="primary" @click="onSearch"><i class="el-icon-search"></i>查询</el-button>
+        <el-button type="primary" @click="exportData">导出</el-button>
+      </el-form-item>
+    </el-form>
     <!-- 执行中 -->
 <el-tabs v-model="activeName" >
     <el-tab-pane label="执行中" name="first">
@@ -100,7 +89,6 @@
     <div style="height: 100%">
       <vxe-modal width="1237" height="731" v-model="value7" show-zoom resize>
             <template #default>
-              
               <PathView v-bind.sync="pathOption"></PathView>
             </template>
       </vxe-modal>
@@ -108,42 +96,31 @@
     <!-- <div style="height: 100%">
       <vxe-modal width="1237" height="731" v-model="value6" show-zoom resize>
             <template #default>
-              
               <inTransitOrderMileage v-bind.sync="mileOption"></inTransitOrderMileage>
             </template>
           </vxe-modal>
-    </div>
-     <div style="height: 100%">
-      <vxe-modal width="1237" height="731" v-model="value5" show-zoom resize>
-            <template #default>
-              
-              <inTransitAlarm v-bind.sync="alarmOption"></inTransitAlarm>
-            </template>
-          </vxe-modal>
     </div> -->
-         
+    <div style="height: 100%">
+      <vxe-modal width="1237" height="731" v-model="value5" show-zoom resize>
+        <template #default>
+          <dilTable ref="tableAlarm" v-bind.sync="optionAlarm"></dilTable>
+        </template>
+      </vxe-modal>
+    </div> 
   </div>
 </template>
 
 
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
-
-//PathView组件注册
-// import PageTitle from "@/offSiteTransportation/mapTest.vue";
 import PathView from "./mapTest.vue"
-// import InTransitOrderMileage from "@/views/TMS/tms-offsite/inTransitOrderMileage.vue"
-// import inTransitAlarm from "@/views/TMS/tms-offsite/inTransitAlarm.vue"
 export default {
   name: "inTransit",
-    components: { 
-      PathView,
-      // InTransitOrderMileage,
-      // inTransitAlarm
+  components: { 
+    PathView,
   },
   data() {
     return {
-      
       exceptionTypes:[{
           value: '全部类型',
           label: '全部类型'
@@ -212,6 +189,9 @@ export default {
         // 表格请求数据的地址
         requestUrl: "/api/v1/otms/getFinishTruckOrderInfo?apiId=468",
       },
+      optionAlarm:{
+        requestUrl: "",
+      },
       pathOption:{
            orderNumber:'',
         capacityNumber:'',
@@ -374,17 +354,17 @@ export default {
         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.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);
     },
     allDistanceclick(orderNumber){
       //this.$router.push("/offsite/inTransitOrderMileage?orderNumber="+orderNumber);
@@ -393,8 +373,7 @@ export default {
       this.value6=true;
     },
     inTransitAlarmclick(orderNumber){
-      // this.$router.push("/offsite/inTransitAlarm?orderNumber="+orderNumber);
-      this.alarmOption.orderNumber=orderNumber;
+      this.optionAlarm.requestUrl="/api/v1/otms/getTransportAbnormalInfo?apiId=472&orderNumbers="+orderNumber;
       this.value5=true;
     },
     },

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

@@ -3,29 +3,18 @@
   
   <div class="addWagonLoad">
     <page-title>请选择需要开启的预警物料</page-title>
-
-      <el-divider content-position="left">请选择报警类型</el-divider>
+    <el-divider content-position="left">请选择报警类型</el-divider>
     <div style="width:100%;text-align:center;">
             <el-radio v-model="radio" label="0">关闭</el-radio>
             <el-radio v-model="radio" label="1">异常线路预警</el-radio>
             <el-radio v-model="radio" label="2">异常线路预警+停车</el-radio>
             <el-radio v-model="radio" label="3">异常线路预警+离线</el-radio>
             <el-radio v-model="radio" label="4">异常线路预警+停车+离线</el-radio>
-      </div>
-     <div class="form-box" style="margin-right: 10rem">
-         
-        <!-- <dil-form :formId="244" v-model="form1" ref="from1"></dil-form> -->
-      </div>
+    </div>
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
-    <!-- <div class="primarybtn">
-      <el-button class="btn" @click="goback">取消</el-button>
-      <el-button type="primary" class="btn" @click="submitclick"
-        >确定</el-button
-      >
-    </div> -->
   </div>
 </template>
 
@@ -38,7 +27,7 @@ export default {
       checkList:[],
       checktype:[],
       form1: {},
-      radio:'1',
+      radio:'0',
       value: undefined,
     };
   },
@@ -51,14 +40,10 @@ export default {
     // 确定
     makeSure() {
 
-      this.axios
-        .post(
-          "/api/v1/otms/inTransitWarn?warnSwitch="+'1'+"&radio="+this.radio,
+      this.axios.post(
+          "/api/v1/otms/inTransitWarn?warnSwitch="+1+"&radio="+this.radio,
         )
         .then((res) => {
-
-          console.log(res);
-        //   console.log(this.form4);
           this.$message({
             type: "success",
             message: "操作成功!",

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

@@ -241,11 +241,12 @@ export default {
         initData(orderNumber){
             let that=this;
              that.axios.post("/api/v1/otms/fullPath?orderNumber="+orderNumber).then((res) => {
-                that.listPath=res.data.startAndEndRoutes
-                // res.startAndEndRoutes.forEach((item,index)=>{
-                //     that.transportDetail.estimateRoute=item.estimateRoute;
-                     that.initMap();
-                // });
+                 if(res.data.startAndEndRoutes!='0'){
+                     that.listPath=res.data.startAndEndRoutes
+                    that.initMap();
+                 }else{
+                     this.$message.error('车辆没有开启GPS');
+                 }
             });
         },
         endline(){