修改

build/utils.js

@@ -15,8 +15,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
-// let devModules = ['index', 'queue']
-let devModules = ['all']
+let devModules = ['index', 'queue', 'statisticalReport']
+// let devModules = ['all']
 //let devModules=['index']
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

config/index.js

@@ -34,7 +34,7 @@ let proxyTable = {
     }
   },
   '/icore-api/v1': {
-    target: 'http://172.16.33.166:8088/api/v1/truckTms', // target: "http://localhost:8080", // target: "http://192.168.1.109:8080",
+    target: 'http://172.16.33.161:8088/api/v1/truckTms', // target: "http://localhost:8080", // target: "http://192.168.1.109:8080",
     ws: true,
     pathRewrite: {
       '^/icore-api/v1': ''
@@ -70,7 +70,7 @@ let proxyTable = {
       '^/icore.icp.web/game/v1': '/v1'
     }
   },
-  // 所有数据的请求域名地址
+  // 所有数据的请求域名地址r
   '/api/v1': {
     target: 'http://172.16.33.166:80',
     // target: 'http://localhost:8080',

src/views/index/components/login.vue

@@ -228,7 +228,7 @@ export default {
                   offset: 300
                 })
                 this.loginBtnLoading = false
-                this.$router.go(0)
+                // this.$router.go(0)
               }
             })
             .catch(() => {

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -125,6 +125,10 @@
             ></el-table-column>
             <el-table-column prop="capacityNumber" label="车牌号" fit>
             </el-table-column>
+            <el-table-column
+              prop="listNodeOrder"
+              label="序号"
+            ></el-table-column>
             <el-table-column prop="resultStartTime" label="排队开始时间">
             </el-table-column>
             <el-table-column prop="consigneeName" label="客户" fit>
@@ -161,10 +165,6 @@
 
             <el-table-column prop="gatepostName" label="进厂门岗">
             </el-table-column>
-            <el-table-column
-              prop="listNodeOrder"
-              label="序号"
-            ></el-table-column>
             <el-table-column fixed="right" label="操作" width="180">
               <template slot-scope="scope">
                 <el-button
@@ -200,6 +200,10 @@
             ></el-table-column>
             <el-table-column prop="capacityNumber" label="车牌号" fit>
             </el-table-column>
+            <el-table-column
+              prop="listNodeOrder"
+              label="序号"
+            ></el-table-column>
             <el-table-column prop="resultStartTime" label="排队开始时间">
             </el-table-column>
             <el-table-column prop="consigneeName" label="客户" fit>
@@ -230,10 +234,6 @@
               </template>
             </el-table-column>
             <el-table-column prop="grid" label="拼数" fit> </el-table-column>
-            <el-table-column
-              prop="listNodeOrder"
-              label="序号"
-            ></el-table-column>
             <el-table-column prop="driverTel" label="司机电话号码">
             </el-table-column>
             <el-table-column prop="gatepostName" label="进厂门岗">
@@ -540,7 +540,7 @@ export default {
         columnIndex === 1 ||
         columnIndex === 2 ||
         columnIndex === 3 ||
-        columnIndex === 9 ||
+        columnIndex === 4 ||
         columnIndex === 10 ||
         columnIndex === 11 ||
         columnIndex === 12 ||

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

@@ -640,7 +640,8 @@ export default {
       src2: '',
       isShow2: false,
       maxHeight: window.innerHeight - 140,
-      input1: null
+      input1: null,
+      saleSteelKey: false
     }
   },
   created() {

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

@@ -125,7 +125,6 @@
         @row-click="rowClick"
         :cell-style="cellStyle"
         @filter-change="filterChange"
-        :lazy="true"
       >
         <el-table-column
           width="50"
@@ -1851,12 +1850,12 @@ export default {
         this.tableRowIndex = ''
       }
     },
-    // reset() {
-    //   var that = this
-    //   that.$nextTick(() => {
-    //     that.saleSteelKey = !that.saleSteelKey
-    //   })
-    // },
+    reset() {
+      var that = this
+      that.$nextTick(() => {
+        that.saleSteelKey = !that.saleSteelKey
+      })
+    },
     checkTrans(row) {
       this.isRowClick = 0
       if (Object.values(this.steelMap).length == 0) {
@@ -2924,10 +2923,7 @@ export default {
       background-color: transparent;
     }
   }
-  .demo-image__preview {
-    // width: 100%;
-    // height: 100%;
-  }
+
   .dialog {
     .steelMapClass {
       .steelMapClass1 {