Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/api/wel.js

@@ -55,6 +55,13 @@ export const monthSales = (query) => {
     params: query
   })
 }
+export const monthSalesTwo = (query) => {
+  return request({
+    url: '/api/trade-finance/settlement/selMoneyToday',
+    method: 'get',
+    params: query
+  })
+}
 export const salesTrend = (query) => {
   return request({
     url: '/api/blade-purchase-sales/exportOrder/salesTrend',

src/views/wel/components/charge-today.vue

@@ -7,9 +7,9 @@
         </span>
         <span>
           <i
-            class="el-icon-refresh-right"
-            style="cursor: pointer;font-size:20px"
-            @click="refresh"
+              class="el-icon-refresh-right"
+              style="cursor: pointer;font-size:20px"
+              @click="refresh"
           ></i>
         </span>
       </div>
@@ -17,50 +17,57 @@
         <div class="content">
           <div class="content_item divider">
             <div>
-              <div class="content_item_num">10</div>
+              <div class="content_item_num">{{ data.received }}</div>
               <div class="content_item_text">已收金额</div>
             </div>
           </div>
           <div class="content_item divider">
             <div>
-              <div class="content_item_num">100,000</div>
+              <div class="content_item_num">{{ data.toBeReceived }}</div>
               <div class="content_item_text">待收金额</div>
             </div>
           </div>
           <div class="content_item">
             <div>
-              <div class="content_item_num">1</div>
+              <div class="content_item_num">{{data.unsettledDocuments}}</div>
               <div class="content_item_text">未结单据</div>
             </div>
           </div>
         </div>
-        <div id="chargeData" ref="chargeData" style="width:45vw;height:30vh" />
+        <div id="chargeData" ref="chargeData" style="width:45vw;height:30vh"/>
       </div>
     </el-card>
   </div>
 </template>
 
 <script>
+import {monthSalesTwo} from "@/api/wel";
+
 export default {
   name: "basicContainer",
   data() {
     return {
-      loading: false
+      loading: false,
+      data:{}
     };
   },
   mounted() {
-    this.chargeData();
+    this.getmonthSales()
   },
   methods: {
     refresh() {
+      this.getmonthSales()
+    },
+    getmonthSales() {
       this.loading = true;
-      setTimeout(() => {
+      monthSalesTwo({billType: '收费'}).then(res => {
+        this.data = res.data.data;
         this.loading = false;
-      }, 1000);
+      })
     },
     chargeData() {
       let chargeData = this.$echarts.init(
-        document.getElementById("chargeData")
+          document.getElementById("chargeData")
       );
       chargeData.setOption({
         tooltip: {
@@ -94,37 +101,45 @@ export default {
   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;
     margin-bottom: 5px;
   }
 }
+
 .content {
   display: flex;
   background-color: #fafafa;
   justify-content: space-around;
+
   .divider {
     border-right: 1px dashed #dcdfe6;
   }
+
   &_item {
     margin: 20px 0px 20px 20px;
     height: 5vh;
     width: 33.3%;
     display: flex;
     align-items: center;
+
     &_num {
       font-size: 18px;
       font-weight: 600;
     }
+
     &_text {
       color: #909399;
     }

src/views/wel/components/pay-today.vue

@@ -17,19 +17,19 @@
         <div class="content">
           <div class="content_item divider">
             <div>
-              <div class="content_item_num">10</div>
+              <div class="content_item_num">{{ data.received }}</div>
               <div class="content_item_text">已付金额</div>
             </div>
           </div>
           <div class="content_item divider">
             <div>
-              <div class="content_item_num">100,000</div>
+              <div class="content_item_num">{{ data.toBeReceived }}</div>
               <div class="content_item_text">待付金额</div>
             </div>
           </div>
           <div class="content_item">
             <div>
-              <div class="content_item_num">1</div>
+              <div class="content_item_num">{{data.unsettledDocuments}}</div>
               <div class="content_item_text">未结单据</div>
             </div>
           </div>
@@ -41,22 +41,29 @@
 </template>
 
 <script>
+import {monthSalesTwo} from "@/api/wel";
+
 export default {
   name: "basicContainer",
   data() {
     return {
-      loading: false
+      loading: false,
+      data:{}
     };
   },
   mounted() {
-    this.payData();
+    this.getmonthSales()
   },
   methods: {
     refresh() {
+      this.getmonthSales()
+    },
+    getmonthSales() {
       this.loading = true;
-      setTimeout(() => {
+      monthSalesTwo({billType: '付费'}).then(res => {
         this.loading = false;
-      }, 1000);
+        this.data = res.data.data;
+      })
     },
     payData() {
       let payData = this.$echarts.init(document.getElementById("payData"));

src/views/wel/home/defaultPage.vue

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