修改图片显示

config/index.js

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

src/views/TMS/components/domesticMine/wagonUnLoadEdit.vue

@@ -83,7 +83,6 @@ export default {
                 type: "success",
                 message: "修改成功!",
               });
-
               this.$router.go(-1);
             } else {
               this.$message({

src/views/statisticalReport/components/defendCapacity/getCapacityByDefend.vue

@@ -29,7 +29,10 @@
         style="width: 100px"
       ></el-input>
     </div>
-    <div class="input_box" style="width:225px;margin-left:30px;margin-top:20px">
+    <div
+      class="input_box"
+      style="width: 225px; margin-left: 30px; margin-top: 20px"
+    >
       <el-input placeholder="请输入车牌号/出厂门岗" v-model="input" clearable>
       </el-input>
       <el-button type="primary" class="btn" @click="onclick">
@@ -37,7 +40,11 @@
       </el-button>
     </div>
     <div class="table">
-      <dilTable ref="excelDom" v-bind.sync="option" @func="func"></dilTable>
+      <mergeRowTable
+        ref="excelDom"
+        v-bind.sync="option"
+        @func="func"
+      ></mergeRowTable>
     </div>
   </div>
 </template>
@@ -52,11 +59,14 @@ export default {
       totalCapacity: null,
       startTime: null,
       endTime: null,
+
       input: "",
       tableTitle: "汽车抽查报表",
       option: {
         // 表格请求数据的地址
         requestUrl: "api/v1/tms/getCapacityByDefend?apiId=474",
+        comparison: "orderNumber",
+        columnIndexs: [0, 1, 2,7],
       },
     };
   },

src/views/statisticalReport/components/sporadicReport/inwardSporadicReport.vue

@@ -52,7 +52,7 @@ export default {
   },
   methods: {
     func(res){
-        console.log(res)
+        // console.log(res)
         var resultNetWeightTotalFirst = 0
         var resultNetWeightTotalSecond = 0
         var currentCapacityTotal = 0