提交基础资料、箱管

src/views/boxManagement/buyContainer/index.vue

@@ -87,6 +87,10 @@ export default {
           name: 'boxNumber',
           type: 'sum',
           decimals:0
+        },{
+          name: 'totalAmount',
+          type: 'sum',
+          decimals:2
         }],
         column: [{
           label: '系统号',
@@ -116,6 +120,11 @@ export default {
           prop: 'boxNumber',
           width: 80,
         }, {
+          label: '箱型箱量',
+          prop: 'boxTypeNumber',
+          overHidden: true,
+          width: 170
+        }, {
           label: '合同号',
           prop: 'contractNo',
           width: 170,
@@ -140,6 +149,11 @@ export default {
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
+        },{
+          label: '订单金额',
+          prop: 'totalAmount',
+          width: 100,
+          overHidden: true
         }, {
           label: '状态',
           prop: 'status',

src/views/boxManagement/exportShipment/index.vue

@@ -127,6 +127,11 @@ export default {
           prop: 'boxNumber',
           width: 80,
         }, {
+          label: '箱型箱量',
+          prop: 'boxTypeNumber',
+          overHidden: true,
+          width: 170
+        }, {
           label: '合同号',
           prop: 'contractNo',
           width: 100,

src/views/boxManagement/importReturnTrip/index.vue

@@ -126,6 +126,11 @@ export default {
           label: '箱数',
           prop: 'boxNumber',
           width: 80,
+        }, {
+          label: '箱型箱量',
+          prop: 'boxTypeNumber',
+          overHidden: true,
+          width: 170
         },{
           label: '合同号',
           prop: 'contractNo',

src/views/boxManagement/leaseIn/index.vue

@@ -86,6 +86,10 @@ export default {
           name: 'boxNumber',
           type: 'sum',
           decimals:0
+        },{
+          name: 'totalAmount',
+          type: 'sum',
+          decimals:2
         }],
         column: [{
           label: '系统号',
@@ -121,6 +125,11 @@ export default {
           prop: 'boxNumber',
           width: 170
         }, {
+          label: '箱型箱量',
+          prop: 'boxTypeNumber',
+          overHidden: true,
+          width: 170
+        }, {
           label: '客户',
           prop: 'purchaseCompanyId',
           width: 200,
@@ -146,6 +155,11 @@ export default {
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
+        },{
+          label: '订单金额',
+          prop: 'totalAmount',
+          width: 100,
+          overHidden: true
         }, {
           label: '状态',
           prop: 'status',

src/views/boxManagement/leaseOut/index.vue

@@ -86,6 +86,10 @@ export default {
           name: 'boxNumber',
           type: 'sum',
           decimals:0
+        },{
+          name: 'totalAmount',
+          type: 'sum',
+          decimals:2
         }],
         column: [{
           label: '系统号',
@@ -121,6 +125,11 @@ export default {
           prop: 'boxNumber',
           width: 170
         }, {
+          label: '箱型箱量',
+          prop: 'boxTypeNumber',
+          overHidden: true,
+          width: 170
+        }, {
           label: '客户',
           prop: 'purchaseCompanyId',
           width: 200,
@@ -146,6 +155,11 @@ export default {
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
+        },{
+          label: '订单金额',
+          prop: 'totalAmount',
+          width: 100,
+          overHidden: true
         }, {
           label: '状态',
           prop: 'status',

src/views/boxManagement/sellingContainers/index.vue

@@ -86,6 +86,10 @@ export default {
           name: 'boxNumber',
           type: 'sum',
           decimals:0
+        },{
+          name: 'totalAmount',
+          type: 'sum',
+          decimals:2
         }],
         column: [{
           label: '系统号',
@@ -115,6 +119,11 @@ export default {
           prop: 'boxNumber',
           width: 80,
         }, {
+          label: '箱型箱量',
+          prop: 'boxTypeNumber',
+          overHidden: true,
+          width: 170
+        }, {
           label: '合同号',
           prop: 'contractNo',
           width: 170,
@@ -139,6 +148,11 @@ export default {
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
+        },{
+          label: '订单金额',
+          prop: 'totalAmount',
+          width: 100,
+          overHidden: true
         }, {
           label: '状态',
           prop: 'status',

src/views/boxManagement/stockpilingManage/index.vue

@@ -121,7 +121,7 @@ export default {
           prop: 'boxNumber',
           width: 170
         }, {
-          label: '箱形箱量',
+          label: '箱型箱量',
           prop: 'boxTypeNumber',
           overHidden: true,
           width: 170

src/views/wel/home/equipmentControl/components/sales-reached.vue

@@ -14,7 +14,7 @@
       </div>
       <div class="content" v-loading="loading">
         <div style="width: 100%;height: 300px;display: flex;justify-content: space-around;flex-wrap: wrap">
-          <div id="totalContainer" style="width: 100%;height: 350px;"></div>
+          <div id="totalContainer" style="width: 100%;height: 440px;"></div>
         </div>
       </div>
     </el-card>
@@ -164,6 +164,17 @@ export default {
       // 绘制图表
       myChart.setOption({
         xAxis: {
+          axisLabel:{
+            interval: 0,
+            formatter: function (value) {
+              //x轴的文字改为竖版显示
+              let str = value.split("");
+              return str.join("\n");
+            },
+            textStyle: {
+              color: '#666666' //color of value
+            }
+          },
           type: 'category',
           data: data.name
         },

src/views/wel/home/equipmentControl/landTransportation.vue

@@ -72,7 +72,7 @@ export default {
   width: 100%;
   height: 95.5vh;
   grid-template-columns: repeat(auto-fill, 10%);
-  grid-template-rows: 140px 180px 380px;
+  grid-template-rows: 140px 180px 480px;
   //grid-template-rows: 140px 180px 380px 350px 140px;
   grid-template-areas:
     "a a a a a a a a a a"

vue.config.js

@@ -32,10 +32,10 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
-        // target: 'http://192.168.0.103:1080',
+        target: 'http://192.168.0.103:1080',
         // target: 'http://124.222.119.174:1080',
         // 打包地址
-        target: 'http://121.37.83.47:10004',//服务器ip
+        // target: 'http://121.37.83.47:10004',//服务器ip
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {