修改销售钢材报表

src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue

@@ -326,20 +326,58 @@
               </div>
             </div>
           </el-tab-pane>
+          <el-tab-pane label="副产品或焦炭超重允许出厂" name="seventh">
+            <div class="admin2">
+              <div class="carrier from">
+                <el-form
+                  :inline="true"
+                  class="demo-form-inline"
+                  label-width="80px"
+                >
+                  <el-form-item label="车牌号:">
+                    <el-autocomplete
+                      class="inline-input"
+                      v-model="capacityName"
+                      :fetch-suggestions="querySearchCapacity"
+                      placeholder="车牌号"
+                      :trigger-on-focus="false"
+                      @select="handleSelectCapacity"
+                    >
+                      <template slot-scope="{ item }">
+                        <div class="name">{{ item.capacityNumber }}</div>
+                      </template>
+                    </el-autocomplete>
+                  </el-form-item>
+                </el-form>
+              </div>
+              <div class="poundNo from">
+                <span class="text">运输订单号:</span>
+                <el-input v-model="orderNumber" disabled></el-input>
+              </div>
+              <div class="button_box">
+                <el-button
+                  type="primary"
+                  @click="updateCanwork"
+                  :disabled="disabled"
+                  >确认</el-button
+                >
+              </div>
+            </div>
+          </el-tab-pane>
         </el-tabs>
       </div>
     </template>
   </div>
 </template>
 <script>
-import { toDateString, toDateNo } from "../app.js";
+import { toDateString, toDateNo } from '../app.js'
 export default {
   data() {
     return {
       orderNumber: null,
       first: true,
       second: true,
-      activeName: "first",
+      activeName: 'first',
       capacityName: null,
       stateCapacity: null,
       materialList: [],
@@ -364,127 +402,130 @@ export default {
       gatePostList: [],
       enFactoryGatepost: null,
       gatePostId: null
-    };
+    }
   },
   created() {
-    this.value1 = new Date();
-    this.value2 = new Date();
+    this.value1 = new Date()
+    this.value2 = new Date()
   },
   mounted() {
-    this.information();
+    this.information()
   },
   methods: {
+    updateCanwork() {
+      console.log(this.capacityName)
+    },
     onchangeGatepost(value) {
-      console.log(value);
+      console.log(value)
       this.gatePostList.forEach(e => {
         if (e.gatepostName == value) {
-          this.gatePostId = e.gatePostId;
+          this.gatePostId = e.gatePostId
         }
-      });
+      })
     },
     enFactoryResultByPDA() {
       let map = {
-        orderNumber: this.orderNumber + " ",
+        orderNumber: this.orderNumber + ' ',
         gatepostId: this.gatePostId
-      };
-      this.axios.post("");
+      }
+      this.axios.post('')
     },
     allowEnfactoryClick() {},
     queueClick() {
       this.axios
-        .post("/api/v1/qms/addQueueResult?vno=" + this.capacityName + "_")
+        .post('/api/v1/qms/addQueueResult?vno=' + this.capacityName + '_')
         .then(res => {
           if (res.data.code == 200) {
-            this.$message.success("操作成功");
-            this.$router.go(0);
+            this.$message.success('操作成功')
+            this.$router.go(0)
           }
-        });
+        })
     },
     deleteMoreResult() {
-      console.log(this.orderNumber);
+      console.log(this.orderNumber)
       this.axios
-        .post("/api/v1/bp/deleteErrorResult?orderNumber=" + this.orderNumber)
+        .post('/api/v1/bp/deleteErrorResult?orderNumber=' + this.orderNumber)
         .then(res => {
-          if (res.data.code == "200") {
-            this.$message.success("删除成功");
+          if (res.data.code == '200') {
+            this.$message.success('删除成功')
           }
-        });
+        })
     },
     updateLineSqe() {
       let map = {
         orderId: this.orderId,
         orderLineSqe: this.lineQuence
-      };
-      this.axios.post("/api/v1/uc/updateLineSqe", map).then(res => {
-        console.log(res.data);
-        if (res.data.code == "200") {
-          this.$message.success("修改路段顺序号成功");
-          this.$router.go(0);
+      }
+      this.axios.post('/api/v1/uc/updateLineSqe', map).then(res => {
+        console.log(res.data)
+        if (res.data.code == '200') {
+          this.$message.success('修改路段顺序号成功')
+          this.$router.go(0)
         }
-      });
+      })
     },
     oninput() {},
     onchange() {
       if (this.switchValue) {
-        this.first = true;
-        this.second = true;
+        this.first = true
+        this.second = true
       } else {
-        this.second = false;
+        this.second = false
       }
     },
     onchange1() {
-      console.log(this.truckCalFirst);
+      console.log(this.truckCalFirst)
       this.truckCalFirstList.forEach(e => {
         if (this.truckCalFirst == e.value) {
-          this.truckCalFirstNum = e.label;
+          this.truckCalFirstNum = e.label
         }
-      });
+      })
     },
     onchange2() {
       this.truckCalSecondList.forEach(e => {
         if (this.truckCalSecond == e.value) {
-          this.truckCalSecondNum = e.label;
+          this.truckCalSecondNum = e.label
         }
-      });
+      })
     },
     //运力弹出层
     handleSelectCapacity(item) {
-      this.capacityId = item.capacityId;
-      this.capacityName = item.capacityNumber;
+      this.capacityId = item.capacityId
+      this.capacityName = item.capacityNumber
       this.axios
-        .get("/api/v1/uc/getOrderNumber?capacityId=" + this.capacityId)
+        .get('/api/v1/uc/getOrderNumber?capacityId=' + this.capacityId)
         .then(res => {
-          if (res.data.code == "200") {
-            this.orderId = res.data.data.orderId;
-            this.orderNumber = res.data.data.orderNumber;
+          if (res.data.code == '200') {
+            this.orderId = res.data.data.orderId
+            this.orderNumber = res.data.data.orderNumber
             this.axios
-              .get("/api/v1/uc/getMaterialIdByOrderId?orderId=" + this.orderId)
+              .get('/api/v1/uc/getMaterialIdByOrderId?orderId=' + this.orderId)
               .then(res => {
-                if (res.data.code == "200") {
-                  this.materialList = res.data.data;
+                if (res.data.code == '200') {
+                  this.materialList = res.data.data
                 }
-              });
+              })
           }
-        });
+        })
     },
     //以下是运力边输边查搜索
     querySearchCapacity(queryString, cb) {
       if (queryString.length < 3) {
-        return;
+        return
       }
       this.axios
-        .get("/api/v1/uc/getCapacityNumber?index=" + queryString)
+        .get('/api/v1/uc/getCapacityNumber?index=' + queryString)
         .then(res => {
-          if (res.data.code == "200") {
-            var restaurantsCarrier = res.data.data;
-            console.log(restaurantsCarrier, "restaurantsCarrier");
+          if (res.data.code == '200') {
+            var restaurantsCarrier = res.data.data
+            console.log(restaurantsCarrier, 'restaurantsCarrier')
             var results = queryString
               ? restaurantsCarrier.filter(this.createFilterCarrier(queryString))
-              : restaurantsCarrier;
+              : restaurantsCarrier
             // 调用 callback 返回建议列表的数据
-            cb(results);
+            cb(results)
           }
-        });
+        })
     },
     createFilterCarrier(queryString) {
       return restaurantsCarrier => {
@@ -492,22 +533,22 @@ export default {
           restaurantsCarrier.capacityNumber
             .toLowerCase()
             .indexOf(queryString.toLowerCase()) > -1
-        );
-      };
+        )
+      }
     },
     //以上是承运商边输边查搜索
     information() {
-      this.axios.get("/api/v1/uc/getAllCalculateMes").then(res => {
-        this.truckCalFirstList = res.data;
-        this.truckCalSecondList = res.data;
-      });
-      this.axios.get("/api/v1/uc/getAllGatepost").then(res => {
-        console.log(res);
-        this.gatePostList = res.data;
-      });
+      this.axios.get('/api/v1/uc/getAllCalculateMes').then(res => {
+        this.truckCalFirstList = res.data
+        this.truckCalSecondList = res.data
+      })
+      this.axios.get('/api/v1/uc/getAllGatepost').then(res => {
+        console.log(res)
+        this.gatePostList = res.data
+      })
     },
     onClickConfirm() {
-      this.poundNo = "jlbl" + toDateNo(new Date());
+      this.poundNo = 'jlbl' + toDateNo(new Date())
       if (this.switchValue) {
         if (
           this.orderNumber == null ||
@@ -519,8 +560,8 @@ export default {
           this.value2 == null ||
           this.materialId == null
         ) {
-          this.$message.warning("请填写所有值!!!");
-          return;
+          this.$message.warning('请填写所有值!!!')
+          return
         }
       } else {
         if (
@@ -530,63 +571,63 @@ export default {
           this.value1 == null ||
           this.materialId == null
         ) {
-          this.$message.warning("请填写所有值!!!");
-          return;
+          this.$message.warning('请填写所有值!!!')
+          return
         }
       }
       let mapFirst = {
         orderNumber: this.orderNumber,
         resultTareCalculateNumber: this.truckCalFirstNum,
-        resultTareWeight: this.firstWeight + "",
+        resultTareWeight: this.firstWeight + '',
         resultTareWeightTime: toDateString(this.value1),
         resultPoundNo: this.poundNo,
-        materialId: this.materialId + ""
-      };
+        materialId: this.materialId + ''
+      }
       //如果首次大于二次，那么是先毛后皮，首次放在毛重上面，二次放在皮重上面
       if (this.firstWeight >= this.secondWeight) {
         var mapSecond = {
           orderNumber: this.orderNumber,
           resultTareCalculateNumber: this.truckCalSecondNum,
           resultCrossCalculateNumber: this.truckCalFirstNum,
-          resultTareWeight: this.secondWeight + "",
-          resultCrossWeight: this.firstWeight + "",
+          resultTareWeight: this.secondWeight + '',
+          resultCrossWeight: this.firstWeight + '',
           resultNetWeight:
-            Math.abs(this.firstWeight - this.secondWeight).toFixed(2) + "",
+            Math.abs(this.firstWeight - this.secondWeight).toFixed(2) + '',
           resultTareWeightTime: toDateString(this.value2),
           resultCrossWeightTime: toDateString(this.value1),
           resultPoundNo: this.poundNo,
-          materialId: this.materialId + ""
-        };
+          materialId: this.materialId + ''
+        }
       } else {
         //如果首次小于二次，那么是先皮后毛，首次放在皮重上面，二次放在毛重上面
         var mapSecond = {
           orderNumber: this.orderNumber,
           resultTareCalculateNumber: this.truckCalFirstNum,
           resultCrossCalculateNumber: this.truckCalSecondNum,
-          resultTareWeight: this.firstWeight + "",
-          resultCrossWeight: this.secondWeight + "",
+          resultTareWeight: this.firstWeight + '',
+          resultCrossWeight: this.secondWeight + '',
           resultNetWeight:
-            Math.abs(this.secondWeight - this.firstWeight).toFixed(2) + "",
+            Math.abs(this.secondWeight - this.firstWeight).toFixed(2) + '',
           resultTareWeightTime: toDateString(this.value1),
           resultCrossWeightTime: toDateString(this.value2),
           resultPoundNo: this.poundNo,
-          materialId: this.materialId + ""
-        };
+          materialId: this.materialId + ''
+        }
       }
-      var arr = [];
+      var arr = []
       if (this.switchValue) {
-        arr.push(mapSecond);
+        arr.push(mapSecond)
       } else {
-        arr.push(mapFirst);
+        arr.push(mapFirst)
       }
-      this.axios.post("/api/v1/uc/recordingWeightResult", arr).then(res => {
-        this.$message.success("补录计量实绩成功");
-        this.$router.go(0);
-      });
+      this.axios.post('/api/v1/uc/recordingWeightResult', arr).then(res => {
+        this.$message.success('补录计量实绩成功')
+        this.$router.go(0)
+      })
     },
     onClickCancel() {}
   }
-};
+}
 </script>
 <style lang="scss">
 .admin {

src/views/statisticalReport/components/salesLogisticsStatistics/currentLocation.vue

@@ -0,0 +1,427 @@
+<template>
+  <div class="container">
+    <!-- 实时路径 -->
+    <div class="btnx">
+      <el-button type="primary" class="" @click="openInfo"
+        >打开信息窗体</el-button
+      >
+      <el-button type="primary" class="" @click="closeinfo"
+        >关闭信息窗口</el-button
+      >
+    </div>
+    <div id="amap-container"></div>
+  </div>
+</template>
+<script>
+import { shallowRef } from '@vue/reactivity'
+import { lazyAMapApiLoaderInstance } from 'vue-amap'
+import Slider from './slider.vue'
+Vue.use(Slider)
+import Vue from 'vue'
+var infoWindow
+export default {
+  name: 'currentLocation',
+  props: {
+    carNumber: ''
+  },
+  setup() {
+    const map = shallowRef(null)
+    return {
+      map
+    }
+  },
+  watch: {
+    speedVal: {
+      deep: true,
+      handler(val, oldVal) {
+        let that = this
+        if (that.pathNavigator != null) {
+          that.pathNavigator.setSpeed(100 * val)
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      //查询车牌号
+      //开始时间和结束时间
+      startTime: '',
+      endTime: '',
+      //地图组件
+      map: null,
+      path: [],
+      pointmarker: null,
+      //定时器
+      timer: null,
+      //是否关闭信息窗体
+      infoClose: false
+    }
+  },
+  created() {
+    let that = this
+    that.initMap(105.602725, 37.076636)
+  },
+  mounted() {
+    this.initData()
+    this.initTimer()
+  },
+  methods: {
+    //初始化数据
+    initData() {
+      let that = this
+      let regExp = /(^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$)/
+      if (that.carNumber == '') {
+        this.$message.error('车牌号不能为空！')
+        //清除旧的定时器
+        clearTimeout(this.timer)
+        return
+      } else if (!regExp.test(that.carNumber)) {
+        this.$message.error('请输入正确的车牌号！')
+        //清除旧的定时器
+        clearTimeout(this.timer)
+        return
+      }
+      that.axios
+        .get('/api/v1/otms/getCurrentLocation?capcityNumber=' + that.carNumber)
+        .then(res => {
+          console.log(res.data.data)
+          if (res.data.data == '-1') {
+            this.$message.error('运输订单未关闭,自提车辆无权查看!')
+          } else if (res.data.data.status != '1006') {
+            that.map.setCenter([
+              res.data.data.result.lon,
+              res.data.data.result.lat
+            ])
+            //画车
+            that.initMarkes(
+              45,
+              60,
+              require('@/assets/img/car1.png'),
+              res.data.data.result.lon,
+              res.data.data.result.lat,
+              '现在所在位置'
+            )
+            //给路径加点
+            let point = new AMap.LngLat(
+              res.data.data.result.lon,
+              res.data.data.result.lat
+            )
+            if (
+              that.path.length <= 0 ||
+              !that.path[that.path.length - 1].equals(point)
+            ) {
+              that.path.push(point)
+            }
+            console.log(that.path)
+            //初始化轨迹
+            that.initPolyline()
+            //显示窗体
+            if (this.infoClose == false) {
+              that.initCustomMarkes(
+                that.carNumber,
+                res.data.data.result.adr,
+                res.data.data.result.lon,
+                res.data.data.result.lat
+              )
+            }
+            this.lon = res.data.data.result.lon
+            this.lat = res.data.data.result.lat
+          } else {
+            this.$message.error('车辆暂时无GPS')
+            //清除定时器
+            clearTimeout(this.timer)
+          }
+        })
+    },
+
+    //初始化地图
+    initMap(lon, lat) {
+      lazyAMapApiLoaderInstance.load().then(() => {
+        let that = this
+        that.map = new AMap.Map('amap-container', {
+          //设置地图容器id
+          viewMode: '2D', //是否为2D地图模式
+          zoom: 18, //初始化地图级别
+          center: [lon, lat] //初始化地图中心点位置105.602725,37.076636
+        })
+      })
+    },
+
+    //创建简单的标记
+    initMarkes(weight, height, image, lon, lat, title) {
+      let that = this
+      //图标标记点
+      let pointicon = new AMap.Icon({
+        size: new AMap.Size(weight, height), // 图标尺寸
+        image: image, // Icon的图像
+        imageOffset: new AMap.Pixel(2, 10), // 图像相对展示区域的偏移量，适于雪碧图等
+        imageSize: new AMap.Size(weight, height) // 根据所设置的大小拉伸或压缩图片
+      })
+      // 创建一个 Marker 实例：
+      var pointmarker = new AMap.Marker({
+        position: new AMap.LngLat(lon, lat), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+        icon: pointicon,
+        title: title
+      })
+      // 将创建的点标记添加到已有的地图实例：
+      that.pointmarker = pointmarker
+      that.map.add(pointmarker)
+    },
+    initPoint(weight, height, image, lon, lat, title) {
+      let that = this
+      //图标标记点
+      let pointicon = new AMap.Icon({
+        //size: new AMap.Size(weight, height), // 图标尺寸
+        image: image, // Icon的图像
+        imageOffset: new AMap.Pixel(0, 10), // 图像相对展示区域的偏移量，适于雪碧图等
+        imageSize: new AMap.Size(weight, height) // 根据所设置的大小拉伸或压缩图片
+      })
+      // 创建一个 Marker 实例：
+      var pointmarker = new AMap.Marker({
+        position: new AMap.LngLat(lon, lat), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+        icon: pointicon,
+        title: title,
+        label: {
+          direction: 'top',
+          content: title,
+          offset: new AMap.Pixel(-2, 10)
+        }
+      })
+      // 将创建的点标记添加到已有的地图实例：
+      that.pointmarker = pointmarker
+      that.map.add(pointmarker)
+    },
+    //初始化轨迹
+    initPolyline() {
+      let that = this
+      // 创建一个 Polyline 实例：
+      var polyline = new AMap.BezierCurve({
+        path: that.path,
+        borderWeight: 2, // 线条宽度，默认为 1
+        strokeColor: '#18BFA6', // 线条颜色
+        lineJoin: 'round' // 折线拐点连接处样式
+      })
+      // 将创建的线路添加到已有的线路中去：
+      that.map.add(polyline)
+    },
+    //时间格式转换
+    formatDate(date, fmt) {
+      if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(
+          RegExp.$1,
+          (date.getFullYear() + '').substr(4 - RegExp.$1.length)
+        )
+      }
+      let o = {
+        'M+': date.getMonth() + 1,
+        'd+': date.getDate(),
+        'h+': date.getHours(),
+        'm+': date.getMinutes(),
+        's+': date.getSeconds()
+      }
+      for (let k in o) {
+        if (new RegExp(`(${k})`).test(fmt)) {
+          let str = o[k] + ''
+          fmt = fmt.replace(
+            RegExp.$1,
+            RegExp.$1.length === 1 ? str : ('00' + str).substr(str.length)
+          )
+        }
+      }
+      return fmt
+    },
+    //定时取得当前位置并加入轨迹中去，点击查询时触发，同时清除path和旧的定时器
+    initTimer() {
+      let that = this
+      //清除旧的定时器
+      clearTimeout(this.timer)
+      that.startTime = that.formatDate(new Date(), 'yyyy年MM月dd日 hh:mm:ss')
+      that.endTime = that.formatDate(new Date(), 'yyyy年MM月dd日 hh:mm:ss')
+      console.log(that.startTime + '至' + that.endTime)
+      //清除path
+      that.path = []
+      //清除所有覆盖物
+      // that.map.clearMap()
+      //设置所有的门岗和汽车衡
+      that.setPoints()
+      //设置定时器
+      that.timer = setInterval(() => {
+        //清除之前车的图标
+        that.map.remove(that.pointmarker)
+        that.initData()
+        that.endTime = that.formatDate(new Date(), 'yyyy年MM月dd日 hh:mm:ss')
+      }, 5000)
+    },
+    //初始化厂内标记点
+    setPoints() {
+      //请求所有汽车衡和门岗
+      let that = this
+      that.axios.get('/api/v1/otms/mapvertexs/findSelections').then(res => {
+        console.log(res.data.data)
+        if (res.data.data) {
+          res.data.data.forEach(vertex => {
+            that.initPoint(
+              20,
+              25,
+              require('@/assets/img/map_site.png'),
+              vertex.longitude,
+              vertex.latitude,
+              vertex.addressName
+            )
+          })
+        }
+      })
+    },
+    //初始化窗体
+    initCustomMarkes(title, details, lon, lat) {
+      let that = this
+      //自定义窗体内容
+      var content = [
+        "<div  style='top:1px;width: 180px; background-color:rgba(22, 160, 133, 1);' ><font color='white'>" +
+          title +
+          '</font>',
+        "<div style='background-color:rgba(22, 160, 133, 1);'><font color='white'>" +
+          details +
+          '<br>' +
+          '时间范围：' +
+          that.startTime +
+          '至' +
+          that.endTime +
+          '<br>' +
+          '</font></div></div>'
+      ]
+      // 创建 infoWindow 实例
+      infoWindow = new AMap.InfoWindow({
+        content: content.join('<br>'), //传入 dom 对象，或者 html 字符串
+        offset: new AMap.Pixel(0, -20) //修改信息差窗体偏移
+      })
+      // 打开信息窗体
+      infoWindow.open(that.map, [lon, lat])
+    },
+    // 关闭信息窗口
+    closeinfo() {
+      this.infoClose = true
+      infoWindow.close()
+    },
+    openInfo() {
+      console.log(this.lon)
+      console.log(this.lat)
+      this.infoClose = false
+      infoWindow.open(this.map, [this.lon, this.lat])
+    }
+  }
+}
+</script>
+<style>
+.inputStyle {
+  position: absolute;
+  width: 200px;
+  left: 50px;
+}
+
+.controller {
+  width: 100%;
+  height: 70px;
+  background: white;
+  position: absolute;
+  z-index: 99;
+  top: 0;
+  left: 0;
+}
+.in_transit_information {
+  width: 320px;
+  float: left;
+  height: 40px;
+}
+
+.container {
+  width: 100%;
+  height: 100%;
+}
+span.item_details2 {
+  position: relative;
+  top: 20px;
+}
+.date_picker_style {
+  position: relative;
+  left: 50px;
+}
+.item_details {
+  position: relative;
+  top: 5px;
+  height: 0px;
+  left: 0px;
+}
+#amap-container {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  margin: 0;
+  font-family: '微软雅黑';
+}
+
+/* 进度条 */
+.mySlider {
+  width: 150px;
+  height: 20px;
+  display: inline-block;
+  position: relative;
+  left: 32px;
+}
+/* 进度条 */
+.mySlider2 {
+  width: 400px;
+  height: 20px;
+  display: inline-block;
+  position: relative;
+  left: 32px;
+}
+.play {
+  position: relative;
+  left: 28px;
+}
+.quickly {
+  float: right;
+  position: relative;
+  left: -20px;
+  top: 10px;
+}
+.pause {
+  position: relative;
+  left: 28px;
+}
+.passed-time {
+  position: relative;
+  left: 5px;
+}
+.end-time {
+  position: relative;
+  left: 5px;
+}
+.map-times {
+  position: relative;
+  width: 40px;
+}
+.searchstyle {
+  position: relative;
+  left: 45px;
+}
+.map-control {
+  float: left;
+  width: 270px;
+}
+.driving_information {
+  height: 40px;
+  width: 240px;
+  float: left;
+}
+</style>
+<style lang="scss" scoped>
+.btnx {
+  z-index: 1000;
+  position: fixed;
+  bottom: 10px;
+  right: 10px;
+}
+</style>

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -88,6 +88,9 @@
           <el-button type="primary" @click="operation()"
             ><i class="el-icon-edit"></i>更改</el-button
           >
+          <el-button type="primary" @click="checkPoint()"
+            ><i class="el-icon-map-location"></i>实时路径</el-button
+          >
         </el-form-item>
         <el-form-item>
           <span style="margin-left: 1rem;font-size:16px">车数/件数：</span>
@@ -226,6 +229,14 @@
         </el-table-column>
         <el-table-column prop="netWeight" label="净重" show-overflow-tooltip>
         </el-table-column>
+        <el-table-column
+          prop="isPrintDelivery"
+          label="送货单打印"
+          align="center"
+          width="100px"
+          show-overflow-tooltip
+        >
+        </el-table-column>
         <el-table-column
           prop="outGateTime"
           label="出厂时间"
@@ -263,14 +274,6 @@
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column
-          prop="isPrintDelivery"
-          label="送货单打印状态"
-          align="center"
-          width="120px"
-          show-overflow-tooltip
-        >
-        </el-table-column>
         <el-table-column
           prop="saler"
           label="业务员"
@@ -658,6 +661,7 @@
             v-model="isShow"
             show-footer
             class="vxeModal"
+            title="抵达上传照片"
           >
             <div class="demo-image__preview">
               <el-image style=" height:731px;text-align:center;" :src="src">
@@ -667,7 +671,13 @@
               </el-image>
             </div>
           </vxe-modal>
-          <vxe-modal width="549px" height="731px" v-model="isShow2" show-footer>
+          <vxe-modal
+            width="549px"
+            height="731px"
+            v-model="isShow2"
+            show-footer
+            title="签收上传照片"
+          >
             <div
               class="demo-image__preview"
               v-for="(item, index) in srcList2"
@@ -685,12 +695,30 @@
       </el-dialog>
     </div>
     <div style="height: 100%">
-      <vxe-modal width="1237" height="731" v-model="value7" show-zoom resize>
+      <vxe-modal
+        width="1237"
+        height="731"
+        v-model="value7"
+        show-zoom
+        resize
+        title="轨迹查询"
+      >
         <template #default>
           <PathView v-bind.sync="pathOption"></PathView>
         </template>
       </vxe-modal>
     </div>
+    <div style="height:100%">
+      <vxe-modal
+        width="1237"
+        height="731"
+        v-model="value8"
+        show-zoom
+        resize
+        title="实时路径"
+        ><currentLocation :carNumber="carNumber"></currentLocation
+      ></vxe-modal>
+    </div>
   </div>
 </template>
 
@@ -698,13 +726,15 @@
 import { sjTime, isVehicleNumber } from '@/utils/sharedJsFile'
 import { getCookie } from '@/utils/util.js'
 import PathView from './mapTest.vue'
+import currentLocation from './currentLocation.vue'
 export default {
   components: {
-    PathView
+    PathView,
+    currentLocation
   },
   data() {
     return {
-      consigneeFiltList: [],
+      carNumber: '',
       //弹出框
       centerDialogVisible: false,
       //根据车序号查询的值
@@ -757,6 +787,7 @@ export default {
       tableData: [],
       spanArr: [],
       pos: 0,
+      //需要合并列的名称
       mergeList: [
         '序号',
         '整车操作',
@@ -775,7 +806,7 @@ export default {
         '下单客户',
         '收货地址',
         '业务员',
-        '送货单打印状态',
+        '送货单打印',
         '收货客户电话',
         '金蝶分录ID',
         '是否自提',
@@ -828,7 +859,10 @@ export default {
       isShow2: false,
       input1: '',
       maxHeight: window.innerHeight - 140,
+      //轨迹窗口
       value7: false,
+      //实时路径窗口
+      value8: false,
       pathOption: {
         orderNumber: '',
         capacityNumber: '',
@@ -883,8 +917,7 @@ export default {
       this.steelMap = row
     },
     tableRowClassName({ row, rowIndex }) {
-      // console.log(row)
-      if (row.group == this.tableRowIndex && this.tableRowIndex != '') {
+      if (row.group == this.tableRowIndex && this.tableRowIndex !== '') {
         return 'warning-row'
       }
     },
@@ -998,6 +1031,16 @@ export default {
           this.srcList.push(res.data.data)
         })
     },
+    //查看实时路径
+    checkPoint() {
+      if (this.input || this.input1 || this.steelMap.capacityNo) {
+        this.carNumber = this.input || this.input1 || this.steelMap.capacityNo
+        console.log(this.carNumber)
+        this.value8 = true
+      } else {
+        this.$message.error('请输入或者点击有车牌号的行查询车牌号的实时路径')
+      }
+    },
     //查看签收图
     receipctPhotoClick(orderNo, num) {
       this.axios
@@ -1264,7 +1307,7 @@ export default {
             }
           })
           .catch(() => {
-            this.$message.error('派车失败,请联系管理员')
+            this.$message.error(res.data.data)
             this.operation(this.steelMap)
             this.getSteelReport()
             loading.close()
@@ -1883,10 +1926,6 @@ export default {
       height: 20px;
       background-color: transparent;
     }
-    ::v-deep .el-table .el-table__body-wrapper,
-    .el-table__footer-wrapper {
-      border: 20px solid #000000;
-    }
   }
   .dialog {
     .steelMapClass {