sdfs

build/utils.js

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

config/index.js

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

src/views/TMS/components/bmsship/DryWetDetails.vue

@@ -63,11 +63,26 @@
           :filters="banlanceMonthList"
         >
         </el-table-column>
-        <el-table-column prop="portName" label="放货港口" min-width="80px" align="center">
+        <el-table-column
+          prop="portName"
+          label="放货港口"
+          min-width="80px"
+          align="center"
+        >
         </el-table-column>
-        <el-table-column prop="noticeTime" label="放货日期" width="80px" align="center">
+        <el-table-column
+          prop="noticeTime"
+          label="放货日期"
+          width="80px"
+          align="center"
+        >
         </el-table-column>
-        <el-table-column prop="commerceMethod" label="矿种" width="60px" align="center"></el-table-column>
+        <el-table-column
+          prop="commerceMethod"
+          label="矿种"
+          width="60px"
+          align="center"
+        ></el-table-column>
         <el-table-column
           prop="materialName"
           label="品种"
@@ -130,9 +145,9 @@
           width="100px"
           align="center"
         >
-         <template slot-scope="scope" v-if="scope.row.lossWet">
-                {{(scope.row.lossWet*100).toFixed(2)}}%
-        </template>
+          <template slot-scope="scope" v-if="scope.row.lossWet">
+            {{ (scope.row.lossWet * 100).toFixed(2) }}%
+          </template>
         </el-table-column>
         <el-table-column
           prop="loadWaterRate"
@@ -140,9 +155,9 @@
           width="100px"
           align="center"
         >
-        <template slot-scope="scope" v-if="scope.row.loadWaterRate">
-                {{(scope.row.loadWaterRate*100).toFixed(2)}}%
-        </template>
+          <template slot-scope="scope" v-if="scope.row.loadWaterRate">
+            {{ (scope.row.loadWaterRate * 100).toFixed(2) }}%
+          </template>
         </el-table-column>
         <el-table-column
           prop="enWaterRate"
@@ -150,9 +165,9 @@
           width="120px"
           align="center"
         >
-        <template slot-scope="scope" v-if="scope.row.enWaterRate">
-                {{(scope.row.enWaterRate*100).toFixed(2)}}%
-        </template>
+          <template slot-scope="scope" v-if="scope.row.enWaterRate">
+            {{ (scope.row.enWaterRate * 100).toFixed(2) }}%
+          </template>
         </el-table-column>
         <el-table-column
           prop="totalDeduct"
@@ -169,7 +184,7 @@
         >
         </el-table-column>
         <el-table-column
-          prop="loadWaterTon"
+          prop="loadDryTon"
           label="装船干基重"
           width="120px"
           align="center"
@@ -188,9 +203,9 @@
           width="100px"
           align="center"
         >
-        <template slot-scope="scope" v-if="scope.row.lossDry">
-                {{(scope.row.lossDry*100).toFixed(2)}}%
-        </template>
+          <template slot-scope="scope" v-if="scope.row.lossDry">
+            {{ (scope.row.lossDry * 100).toFixed(2) }}%
+          </template>
         </el-table-column>
         <!-- <el-table-column
           prop="reduceEnDry"
@@ -229,7 +244,7 @@ export default {
         '车数',
         '计费吨位',
         '到厂湿吨',
-        '装船与到厂吨差',
+        '装船与到厂湿吨差',
         '到厂扣杂',
         '入厂水分吨位',
         '装船干基重',
@@ -300,35 +315,33 @@ export default {
     }
   },
   created() {},
-  mounted(){
-    this.onClick();
+  mounted() {
+    this.onClick()
   },
   methods: {
     filterTag(value, row) {
       return row.balanceMonth === value
     },
     //查询数据
-    onClick(){
-      let map={
-        con:this.con
-      };
-      let startTime = null;
-      let endTime = null;
+    onClick() {
+      let map = {
+        con: this.con
+      }
+      let startTime = null
+      let endTime = null
       if (this.startTime) {
-        startTime = sjTime(this.startTime);
+        startTime = sjTime(this.startTime)
       }
       if (this.endTime) {
-        endTime = sjTime(this.endTime);
+        endTime = sjTime(this.endTime)
       }
-      if(startTime && endTime && startTime < endTime){
-          map.startTime=startTime;
-          map.endTime=endTime;
+      if (startTime && endTime && startTime < endTime) {
+        map.startTime = startTime
+        map.endTime = endTime
       }
-      this.axios  
-        .post("/api/v1/bms/getWetDryDetails",map)
-        .then((res) => {
-         this.tableData=res.data.data;
-        });
+      this.axios.post('/api/v1/bms/getWetDryDetails', map).then(res => {
+        this.tableData = res.data.data
+      })
     },
     //处理表格数据
     computedTableData(data) {
@@ -366,8 +379,11 @@ export default {
             sums[index] = 'N/A'
           }
         }
-        //遍历数组,找到符合条件的列
       })
+      sums[12] = `${((1 - sums[10] / sums[6]) * 100).toFixed(2)}%`
+      sums[19] = `${((1 - sums[18] / sums[17]) * 100).toFixed(2)}%`
+      sums[13] = `${((sums[7] / sums[6]) * 100).toFixed(2)}%`
+      sums[14] = `${((sums[16] / sums[10]) * 100).toFixed(2)}%`
       return sums
     },
     //结算