首页更新

src/api/wel.js

@@ -20,6 +20,14 @@ export const salaryDataChain = (query) => {
     params: query
   })
 }
+// 新的两个数据线的方法
+export const xinsalaryDataChain = (query) => {
+  return request({
+    url: 'api/blade-sales-part/orderStatistics/columnar',
+    method: 'get',
+    params: query
+  })
+}
 export const checkDate = (query) => {
   return request({
     url: '/api/blade-purchase-sales/exportOrder/checkDate',
@@ -153,6 +161,15 @@ export const documentQuantityStatistics = (query) => {
     params: query
   })
 }
+// 新家的首页业务员和数量金额的表格
+export const xindocumentQuantityStatistics = (query) => {
+  return request({
+  url: '/api/blade-sales-part/orderStatistics/salesman',
+    method: 'get',
+    params: query
+  })
+}
+
 export const salesList = (query) => {
   return request({
     url: '/api/blade-purchase-sales/exportOrder/salesList',
@@ -160,3 +177,12 @@ export const salesList = (query) => {
     params: query
   })
 }
+
+// 新加的首页最下放的表格
+export const xinsalesList = (query) => {
+  return request({
+    url: '/api/blade-sales-part/orderStatistics/list',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -44,45 +44,45 @@
       </div>
     </span>
     <span v-else>
-      <div class="home-container" v-if="sysType != 2">
-        <el-card class="home-container__card">
-          <div class="title">
-          <span>
-            当月报价
-          </span>
-            <span>
-            <i
-                class="el-icon-refresh-right"
-                style="cursor: pointer;font-size:20px"
-                @click="refresh"
-            ></i>
-          </span>
-          </div>
-          <div class="content" v-loading="loading">
-            <div style="display:flex">
-              <div id="ringData" ref="ringData" style="width:20vw;height:33vh"/>
-              <div>
-                <div class="content_item">
-                  <div class="content_item_num">{{ data.grossAmount }}</div>
-                  <div class="content_item_text">订单总金额</div>
-                </div>
-                <div class="content_item">
-                  <div class="content_item_num">{{ data.reachAmount }}</div>
-                  <div class="content_item_text">达成</div>
-                </div>
-                <div class="content_item">
-                  <div class="divider"/>
-                </div>
-                <div class="content_item">
-                  <div class="content_item_num">{{ data.notReachAmount }}</div>
-                  <div class="content_item_text">未达成</div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </el-card>
-      </div>
-      <domSales v-if="sysType == 2"/>
+      <!--<div class="home-container" v-if="sysType != 2">-->
+      <!--  <el-card class="home-container__card">-->
+      <!--    <div class="title">-->
+      <!--    <span>-->
+      <!--      当月报价-->
+      <!--    </span>-->
+      <!--      <span>-->
+      <!--      <i-->
+      <!--          class="el-icon-refresh-right"-->
+      <!--          style="cursor: pointer;font-size:20px"-->
+      <!--          @click="refresh"-->
+      <!--      ></i>-->
+      <!--    </span>-->
+      <!--    </div>-->
+      <!--    <div class="content" v-loading="loading">-->
+      <!--      <div style="display:flex">-->
+      <!--        <div id="ringData" ref="ringData" style="width:20vw;height:33vh"/>-->
+      <!--        <div>-->
+      <!--          <div class="content_item">-->
+      <!--            <div class="content_item_num">{{ data.grossAmount }}</div>-->
+      <!--            <div class="content_item_text">订单总金额</div>-->
+      <!--          </div>-->
+      <!--          <div class="content_item">-->
+      <!--            <div class="content_item_num">{{ data.reachAmount }}</div>-->
+      <!--            <div class="content_item_text">达成</div>-->
+      <!--          </div>-->
+      <!--          <div class="content_item">-->
+      <!--            <div class="divider"/>-->
+      <!--          </div>-->
+      <!--          <div class="content_item">-->
+      <!--            <div class="content_item_num">{{ data.notReachAmount }}</div>-->
+      <!--            <div class="content_item_text">未达成</div>-->
+      <!--          </div>-->
+      <!--        </div>-->
+      <!--      </div>-->
+      <!--    </div>-->
+      <!--  </el-card>-->
+      <!--</div>-->
+      <!--<domSales v-if="sysType == 2"/>-->
     </span>
   </div>
 </template>

src/views/wel/components/sales-trend.vue

@@ -71,38 +71,58 @@
     </el-card>
     <el-card class="home-container__card" v-else>
       <div v-if="sysType !== 5">
-        <div class="title">
-          <span>
-            销售趋势
-          </span>
-          <span>
-            <i
-              class="el-icon-refresh-right"
-              style="cursor: pointer;font-size:20px"
-              @click="refresh"
-            ></i>
-          </span>
-        </div>
+        <!--<div class="title">-->
+        <!--  <span>-->
+        <!--    销售趋势-->
+        <!--  </span>-->
+        <!--  <span>-->
+        <!--    <i-->
+        <!--      class="el-icon-refresh-right"-->
+        <!--      style="cursor: pointer;font-size:20px"-->
+        <!--      @click="refresh"-->
+        <!--    ></i>-->
+        <!--  </span>-->
+        <!--</div>-->
+              <index-card
+                  title="销售趋势"
+                  iconName="el-icon-s-fold"
+                  style="height:400px;margin-bottom: 30px"
+              >
+                  <div slot="select">
+                      <el-date-picker
+                          v-model="annual3"
+                          type="year"
+                          size="mini"
+                          placeholder="选择年"
+                          value-format="yyyy"
+                          style="margin-right:10px;margin-bottom: -20px"
+                          @change="commoDity2Datafun"
+                      >
+                      </el-date-picker>
+                  </div>
 
-        <div class="content" v-loading="loading">
-          <div class="content-year">
-            <el-date-picker
-              v-model="annual"
-              type="year"
-              size="mini"
-              placeholder="选择年"
-              value-format="yyyy"
-              style="margin-right:10px"
-              @change="getsalesTrend"
-            />
-          </div>
+                  <div slot="content" style="height:350px" id="commoDity2"></div>
+              </index-card>
 
-          <div
-            id="polylineData"
-            ref="polylineData"
-            style="width:55vw;height:33vh"
-          />
-        </div>
+        <!--<div class="content" v-loading="loading">-->
+        <!--  <div class="content-year">-->
+        <!--    <el-date-picker-->
+        <!--      v-model="annual"-->
+        <!--      type="year"-->
+        <!--      size="mini"-->
+        <!--      placeholder="选择年"-->
+        <!--      value-format="yyyy"-->
+        <!--      style="margin-right:10px"-->
+        <!--      @change="getsalesTrend"-->
+        <!--    />-->
+        <!--  </div>-->
+
+        <!--  <div-->
+        <!--    id="polylineData"-->
+        <!--    ref="polylineData"-->
+        <!--    style="width:55vw;height:33vh"-->
+        <!--  />-->
+        <!--</div>-->
       </div>
       <div v-if="sysType === 5">
         <div class="title">
@@ -131,9 +151,15 @@
 
 <script>
 import {dateFormat, getYearDate} from "@/util/date";
-import {salesList, salesTrend} from "@/api/wel";
+import {salesList, salesTrend, xinsalaryDataChain} from "@/api/wel";
+import indexCard from "../components/card.vue";
+import butCard from "../components/butCard.vue";
 export default {
   name: "basicContainer",
+    components: {
+        indexCard,
+        butCard
+    },
   props: {
     sysType: Number
   },
@@ -146,7 +172,10 @@ export default {
       tenantId: this.$store.getters.userInfo.tenant_id,
       moneyList: [],
       tableData:[],
-      orderStatusList:[]
+      orderStatusList:[],
+        annual3:'',
+        amountList2:[],
+        numberList2:[],
     };
   },
   created() {
@@ -155,9 +184,11 @@ export default {
     this.getWorkDicts("order_status").then(res => {
       this.orderStatusList = res.data.data
     });
+      this.annual3 = getYearDate().toString();
   },
   mounted() {
     this.init();
+    this.commoDity2Datafun()
   },
   methods: {
     query(type){
@@ -256,7 +287,107 @@ export default {
           }
         ]
       });
-    }
+    },
+      // 获取echarts 表的数据
+      commoDity2Datafun() {
+          xinsalaryDataChain({
+              year:Number(this.annual3)
+          }).then(res=>{
+              this.amountList2 = res.data.data.amount
+              this.numberList2 = res.data.data.number
+              this.commoDity2()
+          })
+      },
+      commoDity2() {
+          // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
+          let myChart = this.$echarts.init(document.getElementById("commoDity2"));
+          const colors = ["#5470C6", "#91CC75", "#EE6666", "#00008b"];
+          // 绘制图表
+          myChart.setOption({
+              tooltip: {
+                  trigger: 'axis',
+                  axisPointer: {
+                      type: 'cross',
+                      crossStyle: {
+                          color: '#999'
+                      }
+                  }
+              },
+              toolbox: {
+              },
+              legend: {
+                  data: ['数量', '金额']
+              },
+              xAxis: [
+                  {
+                      type: 'category',
+                      data: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月','十二月'],
+                      axisPointer: {
+                          type: 'shadow'
+                      }
+                  }
+              ],
+              grid: {
+                  left: "10%",
+                  right: "10%",
+                  bottom: "3%",
+                  containLabel: true
+              },
+              yAxis: [
+                  {
+                      type: 'value',
+                      name: '数量(条)',
+                      min: 0,
+                      max: 250,
+                      interval: 50,
+                      axisLine:{
+                          show:true,
+                      },
+                      axisLabel: {
+                          formatter: '{value}'
+                      }
+                  },
+                  {
+                      type: 'value',
+                      name: '金额(元)',
+                      min: 0,
+                      max: 25,
+                      interval: 5,
+                      axisLine:{
+                          show:true,
+                      },
+                      axisLabel: {
+                          formatter: '{value}'
+                      }
+                  }
+              ],
+              series: [
+                  {
+                      name: '数量',
+                      type: 'bar',
+                      tooltip: {
+                          valueFormatter: function (value) {
+                              return value + ' ml';
+                          }
+                      },
+                      data: this.numberList2
+                  },
+                  {
+                      name: '金额',
+                      type: 'bar',
+                      tooltip: {
+                          valueFormatter: function (value) {
+                              return value + ' ml';
+                          }
+                      },
+                      data: this.amountList2
+                  },
+              ]
+          });
+
+
+      },
+
   }
 };
 </script>

src/views/wel/components/xinsales-reached.vue

@@ -0,0 +1,228 @@
+<template>
+  <div>
+    <span>
+      <div class="home-container">
+        <el-card class="home-container__card">
+          <div style="display:flex;">
+          <el-date-picker
+              v-model="search.businesDateList"
+              type="daterange"
+              range-separator="-"
+              size="mini"
+              style="margin-right: 5px"
+              :default-time="['00:00:00', '23:59:59']"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              @change="query(0)"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+          </el-date-picker>
+            <el-button size="mini" @click="query(1)">当日</el-button>
+            <el-button size="mini" @click="query(2)">当月</el-button>
+          </div>
+          <el-table
+              :data="tableData"
+              size="mini"
+              height="300"
+              style="width: 100%">
+            <el-table-column
+                prop="salerName"
+                align="center"
+                label="业务员">
+            </el-table-column>
+            <el-table-column
+                prop="goodsTotalNum"
+                align="center"
+                label="数量">
+            </el-table-column>
+              <el-table-column
+                  prop="totalMoney"
+                  align="center"
+                  label="金额">
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </div>
+    </span>
+  </div>
+</template>
+
+<script>
+import {monthSales, xindocumentQuantityStatistics} from "@/api/wel";
+import domSales from "../home/domesticTrade/domSales";
+import search from "@/page/index/search.vue";
+import {dateFormat} from "@/util/date";
+export default {
+  name: "basicContainer",
+  props: {
+    sysType: Number
+  },
+  components: {
+    domSales
+  },
+  data() {
+    return {
+      search:{},
+      tableData: [],
+      tenantId: this.$store.getters.userInfo.tenant_id,
+      loading: false,
+      tradeType: null,
+      data: {}
+    };
+  },
+  created() {
+    this.getSysType();
+      this.query(1)
+  },
+  mounted() {
+    this.init();
+  },
+  methods: {
+    query(type){
+      const date = new Date();
+      if (type == 1){
+        this.$set(this.search,"businesDateList",[`${dateFormat(new Date(),"yyyy-MM-dd")} 00:00:00`,`${dateFormat(new Date(),"yyyy-MM-dd")} 23:59:59`])
+      }
+      if (type == 2){
+        this.$set(this.search,"businesDateList",[
+          `${dateFormat(new Date(date.getFullYear(), date.getMonth(), 1),"yyyy-MM-dd")} 00:00:00`,
+          `${dateFormat(new Date(date.getFullYear(), date.getMonth() + 1, 0),"yyyy-MM-dd")} 23:59:59`
+        ])
+      }
+        console.log({...this.search})
+        xindocumentQuantityStatistics({...this.search}).then(res=>{
+        this.tableData = res.data.data
+      })
+    },
+    init() {
+      this.getmonthSales();
+    },
+    getSysType() {
+      const sysType = localStorage.getItem("sysitemType");
+      if (sysType == 6) {
+        this.tradeType = "JXS";
+      } else if (sysType == 5) {
+        this.tradeType = "SW";
+      } else if (sysType == 4) {
+        this.tradeType = "CK";
+      } else if (sysType == 3) {
+        this.tradeType = "JK";
+      } else if (sysType == 2) {
+        this.tradeType = "GN";
+      } else if (sysType == 1) {
+        this.tradeType = "XX";
+      } else if (sysType == 999) {
+        this.tradeType = "ADMIN";
+      }
+    },
+    getmonthSales() {
+      this.loading = true;
+      monthSales({ tradeType: this.tradeType, billType: "BJ" })
+        .then(res => {
+          this.data = res.data.data;
+        })
+        .finally(() => {
+          this.loading = false;
+          this.ringData();
+        });
+    },
+    refresh() {
+      this.init();
+    },
+    ringData() {
+      let ringData = this.$echarts.init(document.getElementById("ringData"));
+      ringData.setOption({
+        tooltip: {
+          trigger: "item"
+        },
+        legend: {
+          top: "3%",
+          left: "center"
+        },
+        graphic: [
+          {
+            type: "text",
+            left: "center",
+            top: "43%",
+            style: {
+              text: this.data.yieldRate + "%",
+              textAlign: "center",
+              fill: "#000",
+              fontSize: 24
+            }
+          },
+          {
+            type: "text",
+            left: "center",
+            top: "53%",
+            style: {
+              text: "报价达成率",
+              textAlign: "center",
+              fill: "#999999",
+              fontSize: 16
+            }
+          }
+        ],
+        color: ["#F6695E", "#E3E3E3"],
+        series: [
+          {
+            name: "当月报价",
+            type: "pie",
+            radius: ["55%", "70%"],
+            avoidLabelOverlap: false,
+            label: {
+              show: false,
+              position: "center"
+            },
+            labelLine: {
+              show: false
+            },
+            data: [
+              { value: Number(this.data.reachAmount), name: "已报价数量" },
+              { value: Number(this.data.notReachAmount), name: "未报价数量" }
+            ]
+          }
+        ]
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.home-container {
+  padding: 0px 5px 5px 5px;
+  box-sizing: border-box;
+  height: 100%;
+  ::v-deep .el-card__body {
+    padding: 10px 15px;
+    font-size: 14px;
+  }
+  &__card {
+    width: 100%;
+    height: 100%;
+  }
+  .title {
+    display: flex;
+    justify-content: space-between;
+  }
+}
+.content {
+  display: flex;
+  &_item {
+    margin-top: 20px;
+    .divider {
+      display: block;
+      height: 0px;
+      width: 12vw;
+      border-top: 1px dashed #dcdfe6;
+    }
+    &_num {
+      font-size: 18px;
+      font-weight: 600;
+    }
+    &_text {
+      color: #909399;
+    }
+  }
+}
+</style>

src/views/wel/components/xinsales-trend.vue

@@ -0,0 +1,239 @@
+<template>
+  <div class="home-container">
+    <el-card class="home-container__card" v-if="tenantId != 577435 && sysType !== 5">
+      <div style="display:flex;">
+        <el-date-picker
+            v-model="search.businesDateList"
+            type="daterange"
+            range-separator="-"
+            size="mini"
+            style="margin-right: 5px"
+            :default-time="['00:00:00', '23:59:59']"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            @change="query(0)"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+        </el-date-picker>
+        <el-button size="mini" @click="query(1)">当日</el-button>
+        <el-button size="mini" @click="query(2)">当月</el-button>
+      </div>
+      <el-table
+          :data="tableData"
+          size="mini"
+          height="300"
+          style="width: 100%">
+        <el-table-column
+            prop="ordNo"
+            align="center"
+            show-overflow-tooltip
+            label="订单号">
+        </el-table-column>
+        <el-table-column
+            prop="customerName"
+            align="center"
+            show-overflow-tooltip
+            label="客户名称">
+        </el-table-column>
+        <el-table-column
+            prop="businesDate"
+            align="center"
+            show-overflow-tooltip
+            label="订单日期">
+        </el-table-column>
+        <el-table-column
+            prop="status"
+            align="center"
+            show-overflow-tooltip
+            label="订单状态">
+            <template slot-scope="{row}">
+                <span v-for="item in dingdanzhuangtai" :style="{color: item.colour}" v-if="item.dictKey == row.status">{{item.dictValue}}</span>
+            </template>
+        </el-table-column>
+          <el-table-column
+              prop="actualPaymentStatus"
+              align="center"
+              show-overflow-tooltip
+              label="支付状态">
+              <template slot-scope="{row}">
+                  <span v-for="item in orderStatusList" :style="{color: item.colour}" v-if="item.dictKey == row.actualPaymentStatus">{{item.dictValue}}</span>
+              </template>
+          </el-table-column>
+        <el-table-column
+            prop="salerName"
+            align="center"
+            show-overflow-tooltip
+            label="业务员">
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {dateFormat, getYearDate} from "@/util/date";
+import {xinsalesList, salesTrend} from "@/api/wel";
+export default {
+  name: "basicContainer",
+  props: {
+    sysType: Number
+  },
+  data() {
+    return {
+      loading: false,
+      annual: "",
+      search:{},
+      tradeType: null,
+      tenantId: this.$store.getters.userInfo.tenant_id,
+      moneyList: [],
+      tableData:[],
+      orderStatusList:[],
+        dingdanzhuangtai:[]
+    };
+  },
+  created() {
+    this.annual = getYearDate().toString();
+    this.getSysType();
+    this.getWorkDicts("settlement_Status").then(res => {
+        console.log(res)
+      this.orderStatusList = res.data.data
+    });
+      this.getWorkDicts("sales_Status").then(res => {
+          console.log(res)
+          this.dingdanzhuangtai = res.data.data
+      });
+      this.query(1)
+  },
+  mounted() {
+    this.init();
+
+  },
+  methods: {
+    query(type){
+      const date = new Date();
+      if (type == 1){
+        this.$set(this.search,"businesDateList",[`${dateFormat(new Date(),"yyyy-MM-dd")} 00:00:00`,`${dateFormat(new Date(),"yyyy-MM-dd")} 23:59:59`])
+      }
+      if (type == 2){
+        this.$set(this.search,"businesDateList",[
+          `${dateFormat(new Date(date.getFullYear(), date.getMonth(), 1),"yyyy-MM-dd")} 00:00:00`,
+          `${dateFormat(new Date(date.getFullYear(), date.getMonth() + 1, 0),"yyyy-MM-dd")} 23:59:59`
+        ])
+      }
+
+      xinsalesList({...this.search}).then(res=>{
+        this.tableData = res.data.data.records
+      })
+    },
+    init() {
+      this.getsalesTrend();
+    },
+    getSysType() {
+      const sysType = localStorage.getItem("sysitemType");
+      if (sysType == 6) {
+        this.tradeType = "JXS";
+      } else if (sysType == 5) {
+        this.tradeType = "SW";
+      } else if (sysType == 4) {
+        this.tradeType = "CK";
+      } else if (sysType == 3) {
+        this.tradeType = "JK";
+      } else if (sysType == 2) {
+        this.tradeType = "GN";
+      } else if (sysType == 1) {
+        this.tradeType = "XX";
+      } else if (sysType == 999) {
+        this.tradeType = "ADMIN";
+      }
+    },
+    getsalesTrend() {
+      this.loading = true;
+      this.moneyList = [];
+      salesTrend({
+        tradeType: this.tradeType,
+        billType: "XS",
+        annual: this.annual
+      })
+        .then(res => {
+          res.data.data.forEach(e => {
+            this.moneyList.push(Number(e.money));
+          });
+        })
+        .finally(() => {
+          this.loading = false;
+          this.polylineData();
+        });
+    },
+    refresh() {
+      this.init();
+    },
+    polylineData() {
+      let polylineData = this.$echarts.init(
+        document.getElementById("polylineData")
+      );
+      polylineData.setOption({
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "line"
+          }
+        },
+        xAxis: {
+          type: "category",
+          data: [
+            "一月",
+            "二月",
+            "三月",
+            "四月",
+            "五月",
+            "六月",
+            "七月",
+            "八月",
+            "九月",
+            "十月",
+            "十一月",
+            "十二月"
+          ]
+        },
+        yAxis: {
+          type: "value"
+        },
+        series: [
+          {
+            data: this.moneyList,
+            type: "line",
+            smooth: true
+          }
+        ]
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.home-container {
+  padding: 0px 5px 5px 0px;
+  box-sizing: border-box;
+  height: 100%;
+  ::v-deep .el-card__body {
+    padding: 10px 15px;
+    font-size: 14px;
+  }
+  &__card {
+    width: 100%;
+    height: 100%;
+  }
+  .title {
+    display: flex;
+    justify-content: space-between;
+  }
+}
+.content {
+  display: flex;
+  flex-direction: column;
+  &-year {
+    display: flex;
+    justify-content: right;
+  }
+}
+</style>

src/views/wel/home/defaultPage.vue

@@ -4,7 +4,14 @@
     <audit-data class="item2" v-if="sysType !== 999" :sysType="sysType"/>
     <realtime-data class="item3" v-if="sysType !== 999" :sysType="sysType"/>
     <sales-reached class="item4" :sysType="sysType" v-if="sysType!=4||roleName!='采购'"/>
-    <sales-trend class="item5" :sysType="sysType" v-if="sysType!=4||roleName!='采购'"/>
+
+      <!--新加的-->
+      <xinsales-reached class="item4" :sysType="sysType" v-if="(sysType!=4||roleName!='采购') && $store.getters.userInfo.tenant_id !== 577435"/>
+
+    <sales-trend :class="sysType!=5 && sysType!=4?'item3':'item5'" :sysType="sysType" v-if="sysType!=4||roleName!='采购'"/>
+      <!--新家的表格-->
+      <xinsales-trend class="item5" :sysType="sysType" v-if="sysType!=4||roleName!='采购'"/>
+
     <charge-today class="item6" :sysType="sysType" v-if="(sysType!=4||roleName!='采购')&&sysType !== 999"/>
     <pay-today class="item7" :sysType="sysType" v-if="(sysType!=4||roleName!='采购')&&sysType !== 999"/>
   </div>
@@ -15,7 +22,9 @@ import quickLaunch from "../components/quick-launch";
 import auditData from "../components/audit-data";
 import realtimeData from "../components/realtime-data";
 import salesReached from "../components/sales-reached";
+import xinsalesReached from "../components/xinsales-reached.vue";
 import salesTrend from "../components/sales-trend";
+import xinsalesTrend from "../components/xinsales-trend.vue";
 import chargeToday from "../components/charge-today";
 import payToday from "../components/pay-today";
 export default {
@@ -38,7 +47,9 @@ export default {
     salesReached,
     salesTrend,
     chargeToday,
-    payToday
+    payToday,
+      xinsalesReached,
+      xinsalesTrend
   },
   computed: {},
   methods: {}

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

@@ -18,7 +18,7 @@
           <div id="totalContainer" style="width: 26%;height: 210px;"></div>
           <div id="totalBulkCargo" style="width: 26%;height: 210px;"></div>
           <div id="specialTotal" style="width: 26%;height: 210px;"></div>
-<!--          <div id="totalContainerTwo" style="width: 26%;height: 210px;"></div>-->
+          <!--<div id="totalContainerTwo" style="width: 26%;height: 210px;"></div>-->
 <!--          <div id="totalBulkCargoTwo" style="width: 26%;height: 210px;"></div>-->
 <!--          <div id="specialTotalTwo" style="width: 26%;height: 210px;"></div>-->
         </div>
@@ -44,6 +44,7 @@ export default {
     this.getSysType();
   },
   mounted() {
+      // 延迟获取数据
     frequency().then(res=>{
       let this_ = this
       this_.entrustTimer = setInterval(function () {
@@ -63,7 +64,6 @@ export default {
     },
     //箱分布图表
     rankingTwo(id, name, data) {
-        console.log(id,name,data)
       // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
       let myChart = this.$echarts.init(document.getElementById(id));
       // 绘制图表
@@ -100,16 +100,20 @@ export default {
     init() {
       this.getSysType();
     },
+      // 渲染echarts图
     getSysType() {
       this.loading = true
+        // 集装箱的数据
       bizCount({mold:1}).then(res=>{
         this.rankingTwo('totalContainer', '集装箱:'+res.data.data.flow.all, res.data.data.flow.list)
         // this.rankingTwo('totalContainerTwo', '集装箱总量:'+res.data.data.dept.all, res.data.data.dept.list)
       })
+        // 散货的echarts的数据
       bizCount({mold:2}).then(res=>{
         this.rankingTwo('totalBulkCargo', '散货:'+res.data.data.flow.all,  res.data.data.flow.list)
         // this.rankingTwo('totalBulkCargoTwo', '散货总量:'+res.data.data.dept.all, res.data.data.dept.list)
       })
+        // 特种运输的echarts的数据
       bizCount({mold:3}).then(res=>{
         this.rankingTwo('specialTotal', '特种运输:'+res.data.data.flow.all,res.data.data.flow.list)
         // this.rankingTwo('specialTotalTwo', '特种车辆总量:'+res.data.data.dept.all,res.data.data.dept.list)

src/views/wel/home/landTransportation/components/sales-trend.vue

@@ -961,6 +961,7 @@ export default {
       })
     },
     query(data) {
+        console.log(data)
       this.getsalesTrend(data)
     },
     getsalesTrend(data = {status: 0, mold: 1}) {