tijiaoi

build/utils.js

@@ -16,7 +16,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 // let devModules = ['all']
-let devModules = ['index','TMS','WMS'];
+let devModules = ['index','TMS','appoint','sale','statisticalReport'];
 // let devModules = ['index','appoint','WMS'];
 // let devModules = ['index','inward','SporadicManage']
 // let devModules = ['index','sale','RMS']

config/index.js

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

src/components/DilCommonUI/packages/table/src/table.vue

@@ -267,7 +267,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 @media print {
   .el-pagination {
     display: none;

src/components/OffFactoryMapShow/packages/src/GAODEMap.js

@@ -2,278 +2,359 @@
 import { Loading } from 'element-ui';
 
 export default {
-props:{
-    orderNumber:'',
-    capacityNumber:'',
-},
-data() {
-    return {
-        loading : null,
-       
-    };
-},
-watch:{
-    orderNumber:{
-         deep: true,
-        handler(val, oldVal) {
-            console.log("111111111234646")
-            this.reloadData();
-        }
-    }
-},
-created(){
-  
-     this.reloadData();
-},
-mounted: function () {
-             
-        },
-methods: {
-    startLoading (){
-        this.loading = Loading.service({ lock: true, text: '加载中……', background: 'rgba(0, 0, 0, 0.7)' });
+    props:{
+        //运输订单号
+        orderNumber:'', 
+        //车牌号
+        capacityNumber:'',
     },
-    reloadData() {
-        let resultData = {
-            orderNumber: this.orderNumber,
+    data() {
+        return {
+            //地图对象
+            map:{},
+            //加载消息
+            loading : null,
+            //运输详情
+            transportDetails:{
+                //车牌号
+                capacityNumber:'',
+                //规划路线
+                planeRoute:[],
+                //已行驶轨迹
+                routeTraveled:[],
+                //当前位置
+                currentPoint:{
+                    currentPointLat:"",
+                    currentPointLon:""
+                },
+                //起点位置
+                startPoint:{
+                    currentPointLat:"",
+                    currentPointLon:""
+                },
+                //重点位置
+                endPoint:{
+                    currentPointLat:"",
+                    currentPointLon:""
+                },
+                //自定义标记
+                content:[],
+                //异常位置
+                abnormalLocation:[],
+            }
         };
-        this.startLoading(this.orderNumber);
-        console.log()
-        this.$axios.post(
-            "api/v1/getway/fullPathVisualization",resultData
-            ).then((res) => {
-            this.loading.close(); 
-            if(res.data.startAndEndRoutes!=null){
-                this.initMap(res.data);
-
-            
-            }else{
-                this.$message('车辆未入网或没有开启定位，不能访问');
-                this.newMap();
+    },
+    watch:{
+        //监听车牌号变化
+        orderNumber:{
+            deep: true,
+            handler(val, oldVal) {
+                this.reloadData();
             }
-            
-            
-        })
-        .catch(error => {
+        },
+        //进度条速度
+        sliderVal(newVal) {
+            if (!this.isOnSlider) {
+                return false;
+            }
+            this.sliderChange(newVal)
+        },
+    },
+    created(){
+        //加载数据
+        this.reloadData();
+    },
+    mounted: function () {
+                
+    },
+    methods: {
+        //加载中提示
+        startLoading (){
+            this.loading = Loading.service({ lock: true, text: '加载中……', background: 'rgba(0, 0, 0, 0.7)' });
+        },
+        //加载数据
+        reloadData() {
+            let resultData = {
+                orderNumber: this.orderNumber,
+            };
+            this.startLoading(this.orderNumber);
+            this.$axios.post(
+                "api/v1/getway/fullPathVisualization",resultData
+                ).then((res) => {
                 this.loading.close(); 
-               
-            if((error+"").indexOf("500") !== -1){
+                if(res.data.startAndEndRoutes!=null){
+                    this.initMap(res.data);
+                }else{
                     this.$message('车辆未入网或没有开启定位，不能访问');
                     this.newMap();
+                }
+            }).catch(error => {
+                    this.loading.close(); 
+                
+                if((error+"").indexOf("500") !== -1){
+                        this.$message('车辆未入网或没有开启定位，不能访问');
+                        this.newMap();
+                }
+            });    
+        },
+        //初始化一个地图
+        initMap1(){
+            lazyAMapApiLoaderInstance.load().then(() => {
+                this.map = new AMap.Map('test-map', {
+                  zooms: [13, 18], // 地图缩放范围
+                  center: new AMap.LngLat(116.397428, 39.90923)
+                })
+                this.initPathSimplifier()
+            })
+            let that = this;
+            let el = document.getElementsByClassName("el-slider__button-wrapper")[0];
+            let el2 = document.getElementsByClassName("el-slider__runway")[0];
+            el2.addEventListener("click", that.sliderChange,false);
+            el.addEventListener("mousedown", that.openSlider,false);
+            // 此处用document是因为，滑动较为随意时，mouseup可能不是作用在el上
+            document.addEventListener("mouseup",that.closeSlider,false);
+        },
+        // 初始化组件实例
+        initPathSimplifier() {
+            let that = this
+            AMapUI.load(['ui/misc/PathSimplifier'], (PathSimplifier) => {
+            if (!PathSimplifier.supportCanvas) {
+                alert('当前环境不支持 Canvas！')
+                return
             }
-                    
-                    
-            
+            //创建一个巡航轨迹路线
+            that.pathSimplifierIns = new PathSimplifier({
+                zIndex: 100,//地图层级，
+                map: this.map, //所属的地图实例
+                //巡航路线轨迹列表
+                getPath: (pathData, pathIndex) => {
+                    return pathData.path;
+                },
+                //hover每一个轨迹点，展示内容
+                getHoverTitle: function(pathData, pathIndex, pointIndex) {
+                    if (pointIndex >= 0) {
+                        return pathData.name + '，点：' + pointIndex + '/' + pathData.path.length;
+                    }
+                    return pathData.name + '，点数量' + pathData.path.length;
+                    },
+                    //自定义样式，可设置巡航器样式，巡航轨迹样式，巡航轨迹点击、hover等不同状态下的样式，不设置则用默认样式，详情请参考api文档 renderOptions:{}
+                    //绘制路线节点
+                    renderOptions: {
+                    renderAllPointsIfNumberBelow: 100 //绘制路线节点，如不需要可设置为-1
+                }
             });
-        
-        
-            
+
+            //设置数据
+            that.pathSimplifierIns.setData([{
+                name: '1',
+                path: that.actualList
+            }]);
+            //对第一条线路（即索引 0）创建一个巡航器
+            that.navgtr = that.pathSimplifierIns.createPathNavigator(0, {
+                loop: false, //循环播放
+                speed: that.navgtrSpeed //巡航速度，单位千米/小时
+            });
+
+            that.navgtr.on("start resume", function() {
+                that.navgtr._startTime = Date.now();
+                that.navgtr._startDist = this.getMovedDistance();
+            });
+            that.navgtr.on("stop pause", function() {
+                that.navgtr._movedTime = Date.now() - that.navgtr._startTime;
+                that.navgtr._movedDist = this.getMovedDistance() - that.navgtr._startDist;
+            });
+            that.navgtr.on("move", function(data,position) {
+                let idx = position.dataItem.pointIndex //走到了第几个点
+                let tail = position.tail //至下一个节点的比例位置
+                let totalIdx = idx + tail
+                let len = position.dataItem.pathData.path.length
+
+                // 计算下一个距离速度
+                if (idx < len - 1) {
+                that.navgtr.setSpeed(that.navgtrSpeed * that.times);
+                }
+                // 进度条实时展示tail
+                !that.isOnSlider && (that.sliderVal = (totalIdx / len) * 100);
+                // 如果到头了，回到初始状态
+                if (that.navgtr.isCursorAtPathEnd()) {
+                that.playIcon = "start";
+                that.isPlay = false;
+                that.sliderVal = 0;
+                that.passedTime = that.totalTime;
+                }
+            });
+            })
         },
+        //控制车辆跟随进度条移动
+        sliderChange(val){
+            let newVal = typeof(newVal)==='number' ? val : this.sliderVal
+            let num = parseInt((newVal / 100) * this.actualList.length);
+            let decimal = String((newVal / 100) * this.actualList.length).split('.')[1]||0
+            this.navgtr.moveToPoint(num, Number('0.'+decimal));
+            this.pathSimplifierIns.renderLater();
+        },
+         //创建一个地图
         newMap(){
-                var currentPointLat='32.483276';
-                var currentPointLon='114.03629';
-                this.map = new AMap.Map('container', {
-                    zoom:11,//级别
-                    center: [currentPointLon,currentPointLat],//中心点坐标
-                    viewMode:'3D'//使用3D视图
-                });
-                var content = [
-                        "<div  style='top:1px;width: 180px; background-color: rgba(0, 0, 0, 1);' ><b>"+this.capacityNumber+")</b>",
-                        "<div style='background-color:rgba(255, 255, 255, 0.5);'>提示 :"+'GPS没有开启'+"</div></div>"
-                
-                ];
-
-                // 创建 infoWindow 实例	
-                var infoWindow = new AMap.InfoWindow({
+            var currentPointLat='32.483276';//默认的中心点的纬度
+            var currentPointLon='114.03629';//默认的中心点的经度
+            this.map = new AMap.Map('container', {
+                zoom:11,//级别
+                center: [currentPointLon,currentPointLat],//中心点坐标
+                viewMode:'3D'//使用3D视图
+            });
+            //自定义的标记点
+            var content = [
+                    "<div  style='top:1px;width: 180px; background-color: rgba(0, 0, 0, 1);' ><b>"+this.capacityNumber+")</b>",
+                    "<div style='background-color:rgba(255, 255, 255, 0.5);'>提示 :"+'GPS没有开启'+"</div></div>"
+            ];
+            // 创建 infoWindow 实例	
+            var infoWindow = new AMap.InfoWindow({
                 content: content.join("<br>")  //传入 dom 对象，或者 html 字符串
-                });
-                
-                // 打开信息窗体
-                infoWindow.open(this.map,[currentPointLon,currentPointLat]);
-               
-               
+            });
+            // 打开信息窗体
+            infoWindow.open(this.map,[currentPointLon,currentPointLat]);
         },
-        //startLonlat=114.03629,32.483276
         initMap(data) {
-            console.log(1)
-                var currentPointLat='32.483276';
-                var currentPointLon='114.03629';
-                var polyline=[];
-                //初始化地图
-                if (data.startAndEndRoutes[0].currentPoint!=null){
-                    currentPointLat=data.startAndEndRoutes[0].currentPoint.lat;
-                    currentPointLon=data.startAndEndRoutes[0].currentPoint.lon;
-                }
-                
-            
-            
-                this.map = new AMap.Map('container', {
-                    zoom:11,//级别
-                    center: [currentPointLon,currentPointLat],//中心点坐标
-                    viewMode:'3D'//使用3D视图
+            var currentPointLat='32.483276';
+            var currentPointLon='114.03629';
+            var polyline=[];
+            //初始化地图
+            if (data.startAndEndRoutes[0].currentPoint!=null){
+                currentPointLat=data.startAndEndRoutes[0].currentPoint.lat;
+                currentPointLon=data.startAndEndRoutes[0].currentPoint.lon;
+            }
+            this.map = new AMap.Map('container', {
+                zoom:11,//级别
+                center: [currentPointLon,currentPointLat],//中心点坐标
+                viewMode:'3D'//使用3D视图
+            });
+            var limeList= [];
+            data.startAndEndRoutes.forEach((element,index) => {
+                var startPaths=[];
+                element.runRoute.forEach((element,index) => {
+                    var path= [element.lon,element.lat];
+                    startPaths.push(path);
                 });
-                var limeList= [];
-            
-                data.startAndEndRoutes.forEach((element,index) => {
-                    
-                    var startPaths=[];
-                    element.runRoute.forEach((element,index) => {
-                        var path= [element.lon,element.lat];
-                        startPaths.push(path);
-                    });
-                
-                    var endPaths=[];
-                    if(element.estimateRoute!=null){
-                        element.estimateRoute.forEach((element,index) => {
+                var endPaths=[];
+                if(element.estimateRoute!=null){
+                    element.estimateRoute.forEach((element,index) => {
                         var path= [element.lon,element.lat]
                         endPaths.push(path);
                     });
-                    }
-                    if (element.startPoint!=null){
-                    
-                        //当前点图标标记点
-                        let startPointicon = new AMap.Icon({
-                            size: new AMap.Size(25, 35), // 图标尺寸
-                            image: require('@/assets/img/start.png'), // Icon的图像
-                            imageOffset: new AMap.Pixel(0,0), // 图像相对展示区域的偏移量，适于雪碧图等
-                            imageSize: new AMap.Size(25, 35) // 根据所设置的大小拉伸或压缩图片
-                        });
-                        // 创建一个 Marker 实例：
-                        var startPointmarker = new AMap.Marker({
-                            position: new AMap.LngLat(element.startPoint.lon, element.startPoint.lat),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-                                icon: startPointicon, 
-                            title: '北京'
-                        });
-                        // 将创建的点标记添加到已有的地图实例：
-                        this.map.add(startPointmarker);
-                    }
-            
-
-
-
-                
-        
-
-                    
-            
-                    //终点
-                    if (element.endPoint!=null){
-
-                        //当前点图标标记点
-                        let endPointicon = new AMap.Icon({
-                            size: new AMap.Size(25, 35), // 图标尺寸
-                            image: require('@/assets/img/end.png'), // Icon的图像
-                            imageOffset: new AMap.Pixel(0,0), // 图像相对展示区域的偏移量，适于雪碧图等
-                            imageSize: new AMap.Size(25, 35) // 根据所设置的大小拉伸或压缩图片
-                        });
-                        // 创建一个 Marker 实例：
-                        var endPointmarker = new AMap.Marker({
-                            position: new AMap.LngLat(element.endPoint.lon, element.endPoint.lat),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-                                icon: endPointicon, 
-                            title: '北京'
-                        });
-
-                        // 将创建的点标记添加到已有的地图实例：
-                        this.map.add(endPointmarker);
-                    }
-                    
-                
-                //已行驶轨迹
-                    if(startPaths.length>0){
-                    
-                        var startLine = new AMap.Polyline({
-                            map:this.map,
-                            path: startPaths,
-                            isOutline: true,
-                            outlineColor: '#00FF00',
-                            borderWeight: 0,
-                            strokeColor: "#00FF00", 
-                            strokeOpacity: 1,
-                            strokeWeight: 5,
-                            // 折线样式还支持 'dashed'
-                            strokeStyle: "solid",
-                            // strokeStyle是dashed时有效
-                            strokeDasharray: [10, 5],
-                            lineJoin: 'round',
-                            lineCap: 'round',
-                            zIndex: 50,
-                        })
-                        
-                        limeList.push(startLine);
-                        
-                    }
-
-                if(endPaths.length>0){
-                    
-                        //预计轨迹
-                    
-                        var endLine = new AMap.Polyline({
-                            map:this.map,
-                            path: endPaths,
-                            isOutline: true,
-                            outlineColor: '#FF0000',
-                            borderWeight: 0,
-                            strokeColor: "#FF0000", 
-                            strokeOpacity: 1,
-                            strokeWeight: 5,
-                            // 折线样式还支持 'dashed'
-                            strokeStyle: "solid",
-                            // strokeStyle是dashed时有效
-                            strokeDasharray: [10, 5],
-                            lineJoin: 'round',
-                            lineCap: 'round',
-                            zIndex: 50,
-                        })
-                        limeList.push(endLine);
-                    
                 }
-                    
-                });
-
-                
-                var content = [
-                        "<div  style='top:1px;width: 180px; background-color: rgba(0, 0, 0, 1);' ><font color='white'>"+this.capacityNumber+'('+data.startAndEndRoutes[0].miled+")</font>",
-                        "<div style='background-color:rgba(255, 255, 255, 0.5);'><font color='white'>地址 :"+data.startAndEndRoutes[0].currentPointName+"</font></div></div>"
-                
-                ];
-                data.startAndEndRoutes.forEach((element,index) => {
-                        // 创建 infoWindow 实例	
-                        var infoWindow = new AMap.InfoWindow({
-                        content: content.join("<br>")  //传入 dom 对象，或者 html 字符串
-                        });
-                      
-
-                       //当前点图标标记点
-                    let currentPointicon = new AMap.Icon({
-                        size: new AMap.Size(40, 40), // 图标尺寸
-                        image: require('@/assets/img/car1.png'), // Icon的图像
+                if (element.startPoint!=null){
+                    //当前点图标标记点
+                    let startPointicon = new AMap.Icon({
+                        size: new AMap.Size(25, 35), // 图标尺寸
+                        image: require('@/assets/img/start.png'), // Icon的图像
                         imageOffset: new AMap.Pixel(0,0), // 图像相对展示区域的偏移量，适于雪碧图等
-                        imageSize: new AMap.Size(40, 40) // 根据所设置的大小拉伸或压缩图片
+                        imageSize: new AMap.Size(25, 35) // 根据所设置的大小拉伸或压缩图片
                     });
                     // 创建一个 Marker 实例：
-                    var currentPointmarker = new AMap.Marker({
-                        position: new AMap.LngLat(element.runRoute[element.runRoute.length-1].lon,element.runRoute[element.runRoute.length-1].lat),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-                            icon: currentPointicon, 
+                    var startPointmarker = new AMap.Marker({
+                        position: new AMap.LngLat(element.startPoint.lon, element.startPoint.lat),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+                            icon: startPointicon, 
+                        title: '北京'
+                    });
+                    // 将创建的点标记添加到已有的地图实例：
+                    this.map.add(startPointmarker);
+                }
+                //终点
+                if (element.endPoint!=null){
+                    //当前点图标标记点
+                    let endPointicon = new AMap.Icon({
+                        size: new AMap.Size(25, 35), // 图标尺寸
+                        image: require('@/assets/img/end.png'), // Icon的图像
+                        imageOffset: new AMap.Pixel(0,0), // 图像相对展示区域的偏移量，适于雪碧图等
+                        imageSize: new AMap.Size(25, 35) // 根据所设置的大小拉伸或压缩图片
+                    });
+                    // 创建一个 Marker 实例：
+                    var endPointmarker = new AMap.Marker({
+                        position: new AMap.LngLat(element.endPoint.lon, element.endPoint.lat),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+                        icon: endPointicon, 
                         title: '北京'
                     });
 
                     // 将创建的点标记添加到已有的地图实例：
-                    this.map.add(currentPointmarker);
-                        // 打开信息窗体
-                        infoWindow.open(this.map,[element.runRoute[element.runRoute.length-1].lon,element.runRoute[element.runRoute.length-1].lat]);
-                });
+                    this.map.add(endPointmarker);
+                }
+                //已行驶轨迹
+                if(startPaths.length>0){
+                    var startLine = new AMap.Polyline({
+                        map:this.map,
+                        path: startPaths,
+                        isOutline: true,
+                        outlineColor: '#00FF00',
+                        borderWeight: 0,
+                        strokeColor: "#00FF00", 
+                        strokeOpacity: 1,
+                        strokeWeight: 5,
+                        // 折线样式还支持 'dashed'
+                        strokeStyle: "solid",
+                        // strokeStyle是dashed时有效
+                        strokeDasharray: [10, 5],
+                        lineJoin: 'round',
+                        lineCap: 'round',
+                        zIndex: 50,
+                    })
+                    limeList.push(startLine);
+                }
+
+            if(endPaths.length>0){
+                //预计轨迹
+                var endLine = new AMap.Polyline({
+                    map:this.map,
+                    path: endPaths,
+                    isOutline: true,
+                    outlineColor: '#FF0000',
+                    borderWeight: 0,
+                    strokeColor: "#FF0000", 
+                    strokeOpacity: 1,
+                    strokeWeight: 5,
+                    // 折线样式还支持 'dashed'
+                    strokeStyle: "solid",
+                    // strokeStyle是dashed时有效
+                    strokeDasharray: [10, 5],
+                    lineJoin: 'round',
+                    lineCap: 'round',
+                    zIndex: 50,
+                })
+                limeList.push(endLine);
+            }
                 
+            });
+            var content = [
+                    "<div  style='top:1px;width: 180px; background-color: rgba(0, 0, 0, 1);' ><font color='white'>"+this.capacityNumber+'('+data.startAndEndRoutes[0].miled+")</font>",
+                    "<div style='background-color:rgba(255, 255, 255, 0.5);'><font color='white'>地址 :"+data.startAndEndRoutes[0].currentPointName+"</font></div></div>"
             
-                this.map.setFitView([ limeList ])
-
-
+            ];
+            data.startAndEndRoutes.forEach((element,index) => {
+                // 创建 infoWindow 实例	
+                var infoWindow = new AMap.InfoWindow({
+                content: content.join("<br>")  //传入 dom 对象，或者 html 字符串
+                });
 
-        
+                //当前点图标标记点
+                let currentPointicon = new AMap.Icon({
+                    size: new AMap.Size(40, 40), // 图标尺寸
+                    image: require('@/assets/img/car1.png'), // Icon的图像
+                    imageOffset: new AMap.Pixel(0,0), // 图像相对展示区域的偏移量，适于雪碧图等
+                    imageSize: new AMap.Size(40, 40) // 根据所设置的大小拉伸或压缩图片
+                });
 
+                // 创建一个 Marker 实例：
+                var currentPointmarker = new AMap.Marker({
+                    position: new AMap.LngLat(element.runRoute[element.runRoute.length-1].lon,element.runRoute[element.runRoute.length-1].lat),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+                        icon: currentPointicon, 
+                    title: '北京'
+                });
+                // 将创建的点标记添加到已有的地图实例：
+                this.map.add(currentPointmarker);
+                    // 打开信息窗体
+                    infoWindow.open(this.map,[element.runRoute[element.runRoute.length-1].lon,element.runRoute[element.runRoute.length-1].lat]);
+            });
             
-            
-                
-                // 缩放地图到合适的视野级别
-        
-            }
+            this.map.setFitView([ limeList ])
+        }
     }
 };

src/views/RMS/components/addCapacity.vue

@@ -30,7 +30,7 @@
           <el-upload
             class="upload-demo"
             ref="upload1"
-            action="http://172.16.33.166:8080/api/v1/rms/uploadCarrier1"
+            action="/api/v1/rms/uploadCarrier1"
             :before-upload="beforeUpload"
             :multiple="false"
             list-type="picture"

src/views/RMS/components/addCarrier.vue

@@ -35,7 +35,7 @@
     <el-upload
       class="upload-demo"
       ref="upload1"
-      action="http://172.16.33.166:8080/api/v1/rms/uploadCarrier1"
+      action="/api/v1/rms/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -59,7 +59,7 @@
     <el-upload
       class="upload-demo"
       ref="upload2"
-      action="http://172.16.33.166:8080/api/v1/rms/uploadCarrier1"
+      action="/api/v1/rms/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -82,7 +82,7 @@
     <el-upload
       class="upload-demo"
       ref="upload3"
-      action="http://172.16.33.166:8080/api/v1/rms/uploadCarrier1"
+      action="/api/v1/rms/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"

src/views/TMS/components/importedEmergency/addWagonLoadEmergency.vue

@@ -141,8 +141,8 @@ export default {
   },
   created(){
     this.form1 = {
-      sendStationId:1,
-      arrivalStationId:2,
+      sendStationId:4,
+      arrivalStationId:1,
     }
   },
   methods: {
@@ -512,7 +512,7 @@ export default {
               .el-textarea{
                 .el-textarea__inner{
                   width: 220px;
-                  margin-left: 65px;
+                
                   margin-top: 0.03rem;
                 }
               }

src/views/TMS/components/importedEmergency/addWagonUnLoadEmergency.vue

@@ -115,14 +115,14 @@ export default {
               .el-input {
                 width: 250px;
               }
-            }
-            .el-textarea {
+               .el-textarea {
                 .el-textarea__inner {
                   width: 230px;
-                  margin-left: 65px;
                   margin-top: 0.03rem;
                 }
               }
+            }
+           
           }
         }
       }

src/views/TMS/components/importedEmergency/editWagonLoadEmergency.vue

@@ -1,20 +1,15 @@
 <template>
   <!-- 修改车皮装车实绩 -->
-  <div id="contractDetails">
+  <div class="addWagonLoad">
     <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">车皮装车实绩</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
+
+      <div class="form">
+        <div class="form_box">
           <dil-form :formId="254" v-model="form1"></dil-form>
         </div>
-      </div>
     </div>
 
-    <div class="button-box">
+    <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
     </div>
@@ -36,15 +31,16 @@ export default {
   },
   methods: {
     information() {
+      console.log("add",this.$route.params);
       //编辑车皮装车作业
       this.axios
-        .post("/api/v1/tms/getTmstrainLoadingResultByResultId/" + this.$route.params.resultId)
+        .post("/api/v1/tms/getTmstrainLoadingResultByResultId/" + this.$route.params.unloadingId)
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
-            console.log(e);
-            console.log(this.form1);
-            console.log(this.$route.params.resultId);
+            // console.log(e);
+            // console.log(this.form1);
+            // console.log(this.$route.params.resultId);
           });
         });
     },
@@ -61,7 +57,7 @@ export default {
     // 确认
     onClickConfirm() {
       let tmstrainLoadingResult = {
-        resultId: this.$route.params.resultId,
+        resultId: this.$route.params.unloadingId,
         resultWagonNo: this.form1.resultWagonNo,
         resultBillableTonnage: this.form1.resultBillableTonnage,
         resultClass: this.form1.resultClass,
@@ -98,5 +94,47 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-// @import "@/styles/TMS/addwagonload.scss";
+.addWagonLoad {
+  color: #606266;
+  font-size: 0.675rem;
+  font-weight: 500;
+  .form {
+   display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 37%;   
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+              .el-textarea{
+                .el-textarea__inner{
+                  width: 220px;
+                  margin-top: 0.03rem;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .button_box{
+    display: flex;
+    justify-content: center;
+    padding-top: 30px;
+    margin-left: 3.5%;
+  }
+}
 </style>

src/views/TMS/components/importedEmergency/wagonLoadEmergency.vue

@@ -46,6 +46,7 @@ export default {
       } else if (num == 1) {
         this.$router.push("/addWagonLoadEmergency")
       } else if (num == 2) {
+        // console.log("resultId",resultId);
          this.$router.push("/editWagonLoadEmergency/" + resultId)
       }
     },

src/views/TMS/components/importedEmergency/wagonUnLoadEmergency.vue

@@ -91,7 +91,15 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
   }
 }
 </style>

src/views/TMS/components/importedMine/addApproveWagonPlease.vue

@@ -1,44 +1,7 @@
 <template>
   <!-- 新增批车作业页面 -->
   <div id="trainTransport">
-    <!-- <page-title>批车作业</page-title>
-    <div class="main">
-      <span class="text">选择已下发请车作业</span>
-      <span class="a"></span>
-    </div>
-    <div>
-      <dilTable
-        v-bind.sync="option"
-        v-model="table1"
-        @change="handleCheckedCitiesChange"
-        ref="table"
-        @radio-change="currentRadioChange"
-      >
-      </dilTable>
-    </div>
-    <div class="main">
-      <span class="text">填写批车信息</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="105" v-model="form1"></dil-form>
-        </div>
-      </div>
-    </div>
-    <div class="button-box">
-      <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
-    </div> -->
     <page-title>返回</page-title>
-    <!-- 第一部分 -->
-      <div class="top">
-        <el-input placeholder="请输入内容" v-model="input" clearable> </el-input> 
-        <el-button type="primary" class="btn" @click="onclick()">
-          <i class="el-icon-search"></i>查询
-        </el-button>   
-      </div>
       <dilTable v-bind.sync="option" v-model="table1" @change="handleCheckedCitiesChange" 
       ref="table" @radio-change="currentRadioChange">
       </dilTable>
@@ -133,43 +96,40 @@ export default {
 };
 </script>
 <style lang="scss">
-.shipTransport{
-  .form{
+#trainTransport {
+  .form {
     display: flex;
-    .form_box{
-      width: 320px;
+    .form_box {
+      width: 340px;
       margin-left: 35%;
       margin-top: 30px;
       margin-right: 20px;
-      .el-form{
-        .preview-group{
-          .el-form-item{
-            .el-form-item__label{
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
               display: inline-block;
               width: 70px !important;
             }
-            .el-form-item__content{
-              .el-select{
+            .el-form-item__content {
+              .el-select {
                 width: 250px;
               }
-              .el-input{
+              .el-input {
                 width: 250px;
               }
             }
+           
           }
+      
         }
       }
     }
+     
   }
-  .top {
-    padding: 1.25rem 0.375rem;
-    .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
-    }
-  }
-  .button_box{
-    margin-left: 45%;
-  }
+  .button_box {
+         margin-left: 42%;
+         margin-top: 55px;
+      }
 }
 </style>

src/views/TMS/components/importedMine/addWagonLoad.vue

@@ -141,8 +141,8 @@ export default {
   },
   created(){
     this.form1 = {
-      sendStationId:1,
-      arrivalStationId:2,
+      // sendStationId:1,
+      arrivalStationId:3,
     }
   },
   methods: {
@@ -527,8 +527,7 @@ export default {
               }
               .el-textarea{
                 .el-textarea__inner{
-                  width: 220px;
-                  margin-left: 65px;
+                  width: 225px;     
                   margin-top: 0.03rem;
                 }
               }

src/views/TMS/components/importedMine/addWagonPlease.vue

@@ -1,44 +1,40 @@
 <template>
   <!-- 新增请作业页面 -->
- <div class="contractDetails">
+  <div class="contractDetails">
     <page-title>返回</page-title>
 
     <div class="form">
       <div class="form_box">
-         <dil-form :formId="122" v-model="form1" ></dil-form>
+        <dil-form :formId="122" v-model="form1"></dil-form>
       </div>
     </div>
 
-     <div class="fromOther">
-          <el-form
-        :inline="true"
-        class="demo-form-inline"
-        label-width="80px"
-        >
+    <div class="fromOther">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
         <el-form-item label="发货单位">
-         <el-autocomplete
-          class="inline-input"
-          v-model="stateSupplier"
-          :fetch-suggestions="querySearchSupplier"
-          placeholder="请输入发货单位名称"
-          :trigger-on-focus="false"
-          @select="handleSelectSupplier"
-        >
-        <template slot-scope="{ item }">
-          <div class="name">{{ item.supplierName }}</div>
-        </template>
-        </el-autocomplete>
+          <el-autocomplete
+            class="inline-input"
+            v-model="stateSupplier"
+            :fetch-suggestions="querySearchSupplier"
+            placeholder="请输入发货单位名称"
+            :trigger-on-focus="false"
+            @select="handleSelectSupplier"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.supplierName }}</div>
+            </template>
+          </el-autocomplete>
         </el-form-item>
-        </el-form>
+      </el-form>
     </div>
-  <div class="trainTransport">
-    <!-- 确定和取消 -->
-    <div class="button_box">
-      <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    <div class="trainTransport">
+      <!-- 确定和取消 -->
+      <div class="button_box">
+        <el-button @click="onClickCancel">返回</el-button>
+        <el-button type="primary" @click="onClickConfirm">确认</el-button>
+      </div>
     </div>
   </div>
- </div>
 </template>
 
 <script>
@@ -59,6 +55,12 @@ export default {
   mounted() {
     // this.unit();
   },
+  created() {
+    this.form1 = {
+      sendStationId: 4,
+      toTheStationId: 1,
+    };
+  },
   methods: {
     handleCheckedCitiesChange(value) {
       console.log(value);
@@ -174,19 +176,16 @@ export default {
               margin-top: 55px;
             }
           }
-          .fromOther {
-            margin-left: 34.5%;
-            width: 50%;
-            .inline-input {
-              width: 300px;
-              .button_box {
-                margin-left: 45%;
-              }
-            }
-          }
         }
       }
     }
   }
+  .trainTransport{
+    .button_box{
+      margin-left: 40%;
+      margin-bottom: 2px;
+
+    }
+  }
 }
 </style>

src/views/TMS/components/importedMine/addWagonUnLoad.vue

@@ -123,15 +123,15 @@ export default {
               .el-input {
                 width: 250px;
               }
-            }
             .el-textarea {
               .el-textarea__inner {
                 width: 230px;
-                margin-left: 65px;
+                // margin-left: 45px;
                 margin-top: 0.03rem;
               }
             }
-          }
+           }
+         }
         }
       }
     }

src/views/TMS/components/importedMine/editWagonLoad.vue

@@ -32,6 +32,7 @@ export default {
   },
   methods: {
     information() {
+      console.log("resultId"+this.$route.params.resultId);
       //编辑车皮装车作业
       this.axios
         .post(
@@ -41,9 +42,9 @@ export default {
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
-            console.log(e);
-            console.log(this.form1);
-            console.log(this.$route.params.resultId);
+            // console.log(e);
+            // console.log(this.form1);
+            // console.log(this.$route.params.resultId);
           });
         });
     },

src/views/TMS/components/importedMine/editWagonUnLoad.vue

@@ -120,14 +120,14 @@ export default {
               .el-input {
                 width: 250px;
               }
-            }
-            .el-textarea {
+               .el-textarea {
               .el-textarea__inner {
                 width: 230px;
-                margin-left: 65px;
                 margin-top: 0.03rem;
               }
             }
+            }
+          
           }
         }
       }

src/views/TMS/components/importedShip/updateShipmentInstructions.vue

@@ -56,7 +56,7 @@ export default {
     onClickConfirm() {
       let omsshipShipmentInstructions = {
         shipmentInstructionsId:this.$route.params.instructionsId,
-        batchId: this.form1.batchId,
+        // batchId: this.form1.batchId,
         instructionsTotalTonnage: this.form1.instructionsTotalTonnage,
         instructionTime: sjTime(
           this.form1.instructionTime

src/views/appoint/components/ship/modifyDeliveryAttroney.vue

@@ -4,7 +4,7 @@
     <page-title>返回</page-title>
     <div class="form">
       <div class="form_box">
-          <dil-form :formId="228" v-model="form1"></dil-form>
+          <dil-form :formId="113" v-model="form1"></dil-form>
       </div>        
     </div>
     <!-- 确定和取消 -->
@@ -17,6 +17,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
+import { sjTime } from '../../../ADMINISTRATORS/app';
 export default {
   components: { PageTitle },
     data(){
@@ -44,33 +45,17 @@ export default {
     },
      // 确认
     onClickConfirm() {
-      let mes = {
-        resultId: this.$route.params.resultId,
-        batchId: this.form1.batchId,
+      let AmsshipDeliveryAttorney = {
+        resultId: this.$route.params.attorneyId,
         portId: this.form1.portId,
-        resultMaterialNumber: this.form1.resultMaterialNumber
+        attorneyContactTelephone:this.form1.attorneyContactTelephone,
+        attorenyPickupIdcard:this.form1.attorenyPickupIdcard,
+        attorneyPickupContactPerson:this.form1.attorneyPickupContactPerson,
+        downSwimPortId:this.form1.downSwimPortId,
+        attorneyTime:sjTime(this.form1.attorneyTime),
       };
-      function isNumber() {
-        var value = mes.resultMaterialNumber;
-        //验证是否为数字
-        var patrn = /^(-)?\d+(\.\d+)?$/;
-        if (patrn.exec(value) == null || value == "") {
-          return false;
-        } else {
-          return true;
-        }
-      }
-      var val = this.value;
-      if (
-        mes.batchId==null||
-        mes.portId==null||
-        mes.resultMaterialNumber==null
-      ) this.$message.error("存在空值！");
-      else
-      if (!isNumber(val)) this.$message.error("物资件数必须是数字");
-      else
       this.axios
-        .post("/api/v1/tms/editDeliveryAttroney" , AmsshipDeliveryAttorney
+        .post("/api/v1/tms/editDeliveryAttroney",AmsshipDeliveryAttorney
         )
         .then(() => {
           this.$message({

src/views/appoint/components/ship/modifyDeliveryNotice.vue

@@ -17,6 +17,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
     data(){
@@ -36,7 +37,7 @@ export default {
           res.data.data.forEach((e) => {
             this.form1 = e;
             console.log(e);
-            console.log(this.form1);
+            console.log("aaa" +this.form1);
             console.log(this.$route.params.pathId);
           });
           
@@ -88,7 +89,7 @@ export default {
       // else
       // if (!isNumber(val)) this.$message.error("联系电话必须是数字！");
       // else
-      
+      console.log("AmsshipDeliveryNotice",AmsshipDeliveryNotice);
       this.axios
         .post("/api/v1/tms/editDeliveryNotice" ,AmsshipDeliveryNotice
         )

src/views/inward/components/inwardFactory/timeTaskResult.vue

@@ -23,7 +23,7 @@
                 <template slot-scope="scope">
                     <div class="step">
                         <el-button
-                        @click="getStepsList(scope.row)"
+                        @click="detailclick1(scope.row)"
                         type="text"
                         size="small"
                         >运输详情</el-button>
@@ -33,14 +33,34 @@
                   </el-button> -->
                 </template>
                 </el-table-column>
+                <!-- 运输进程详情 -->
+                <el-table-column type="expand" width="1">
+                    <template slot-scope="props">
+                        <el-form label-position="center" inline class="demo-table-expand">
+                        <div v-if="false">{{ props }}</div>
+                        <div>
+                            <el-table :data="tableData1" border>
+                            <el-table-column
+                                v-for="(item, i) in tableHead"
+                                :key="i"
+                                :prop="item.prop"
+                                :label="item.label"
+                                :width="item.width"
+                            ></el-table-column>
+                            </el-table>
+                        </div>
+                        </el-form>
+                    </template>
+                </el-table-column>
             </dilTable>
         </div>
+        
         <!-- 运输进程详情 -->
-        <el-drawer
+        <!-- <el-drawer
             :visible.sync="drawer"
-            :direction="direction">
+            :direction="direction"> -->
             <!-- 步骤条显示 -->
-            <div style="height: 200px;content-align:center" >
+            <!-- <div style="height: 200px;content-align:center" >
                 <el-table
                 :data="stepList"
                 style="width: 100%">
@@ -56,7 +76,7 @@
                 </el-table-column>
                 </el-table>
             </div>
-        </el-drawer>
+        </el-drawer> -->
     </div>
 </template>
 <script>
@@ -70,6 +90,19 @@ export default {
                 // 表格请求数据的地址
                 requestUrl: "",
             },
+            tableHead: [
+                {
+                prop: "linkName",
+                label: "计时状态",
+                width: 150,
+                },
+                {
+                prop: "pointDate",
+                label: "时间",
+                width: 150,
+                }
+            ],
+            tableData1: [],
             tableData: [],
             startTime: null,
             endTime: null,
@@ -91,6 +124,41 @@ export default {
         }
     },
     methods:{
+        // -------查看物资详情(已拒绝)
+        detailclick1(row) {
+        // 记录重复点击次数
+        if (this.oldRow1 === row) {
+            this.oldRowCount1 += 1;
+        }
+        this.orderId = row.orderId
+        let map = {
+            orderId : this.orderId
+        }
+        // 切换当前详情表
+        this.$refs.excelDom.toggleRowExpansion(row);
+        // 打开前关闭上一个详情表
+        if (this.oldRow1 != "") {
+            if (this.oldRow1 != row) {
+            if (this.oldRowCount1 % 2 === 1) {
+                this.$refs.excelDom.toggleRowExpansion(this.oldRow1);
+            } else {
+                this.oldRowCount1 = 1;
+            }
+            } else {
+            this.oldRow1 = null;
+            return;
+            }
+        }
+        // 重置上一个点击对象
+        this.oldRow1 = row;
+        // 根据销售订单物资中间表id查询物资信息
+        this.axios
+            .post("/api/v1/oms/getOrderResult?orderId=",map)
+            .then((res) => {
+            console.log("res",res)
+            this.tableData1 = res.data;
+            });
+        },
         getStepsList(row){
             console.log(row.orderId)
             this.orderId = row.orderId

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -333,6 +333,12 @@ export default {
         }, {
           value: '烧结矿',
           label: '烧结矿'
+        },{
+          value: '打堆、装车',
+          label: '打堆、装车'
+        },{
+          value: '回收废旧物资',
+          label: '回收废旧物资'
         }],
         installremark: '',
       options: [],

src/views/sale/app.html

@@ -17,5 +17,6 @@
   </head>
   <body>
     <div id="app"></div>
+    <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=自己申请的key&plugin=AMap.CitySearch"></script>
   </body>
 </html>