修改bug

src/api/wel.js

@@ -28,6 +28,22 @@ export const xinsalaryDataChain = (query) => {
     params: query
   })
 }
+// 新的两个数据线的方法
+export const columnarRz = (query) => {
+  return request({
+    url: 'api/blade-sales-part/orderStatistics/columnarRz',
+    method: 'get',
+    params: query
+  })
+}
+// 新的两个数据线的方法
+export const realTimeOverview = (query) => {
+  return request({
+    url: 'api/blade-sales-part/statistics/realTimeOverview',
+    method: 'get',
+    params: query
+  })
+}
 export const checkDate = (query) => {
   return request({
     url: '/api/blade-purchase-sales/exportOrder/checkDate',

src/enums/column-name.js

@@ -1172,6 +1172,9 @@ const columnName = [{
   code: 269.3,
   name: '轮胎商城-销售管理-明细-出库列表'
 },{
+  code: 269.5,
+  name: '轮胎商城-销售管理-明细-出库明细'
+},{
   code: 269.4,
   name: '轮胎商城-盘点-明细列表'
 },{

src/views/tirePartsMall/financialManagement/purchaseDetail/index.vue

@@ -86,7 +86,7 @@ import { getWorkDicts } from "@/api/system/dictbiz";
 import { getToken } from "@/util/auth";
 import { getSalesman } from "@/api/landTransportation";
 import { listAll, storageDesc } from "@/api/tirePartsMall/basicData/listingManagement";
-
+import { getParamservice } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
 export default {
     components: { SearchQuery },
     data() {
@@ -369,10 +369,24 @@ export default {
     },
     async created() {
         this.option = await this.getColumnData(this.getColumnName(337.2), this.optionList);
-        getWorkDicts('cg_business_Type').then(res => {
-            this.bsTypeData = res.data.data
+        getWorkDicts('cg_business_Type').then(res2 => {
+            getParamservice(1, 10, { paramKey: 'whether.financing' }).then(res => {
+                if (res.data.data.records.length) {
+                    res.data.data.records.forEach(e => {
+                        if (e.paramValue == 1) {
+                            this.bsTypeData = res2.data.data
+                        } else {
+                            this.bsTypeData = res2.data.data.filter(e => e.dictKey != "RZCG")
+                        }
+                    })
+                } else {
+                    this.bsTypeData = res2.data.data.filter(e => e.dictKey != "RZCG")
+                }
+
+            })
+
         })
-        this.query=this.deepClone(this.query)
+        this.query = this.deepClone(this.query)
     },
     methods: {
         resetChange() {

src/views/tirePartsMall/financingManagement/financingManagement/detailsPage.vue

@@ -33,7 +33,7 @@
                     <tempalte slot="fundingPartyName" slot-scope="{ row }">
                         <dic-select v-model="form.fundingPartyName" placeholder="资金方" key="id" label="cname" res="records"
                             url="/blade-sales-part/corpsDesc/list?corpType=GYS" :filterable="true" :remote="true"
-                            dataName="cname" @selectChange="dicChange('fundingPartyName', $event)"></dic-select>
+                            dataName="cname" :disabled="form.fundingItemList.length>0" @selectChange="dicChange('fundingPartyName', $event)"></dic-select>
                     </tempalte>
                 </avue-form>
             </trade-card>

src/views/tirePartsMall/financingManagement/financingManagement/index.vue

@@ -8,7 +8,7 @@
         @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 403)" :page.sync="page">
         <template slot-scope="{type,size,row,index}" slot="menu">
           <!-- <el-button :size="size" :type="type" @click="check(row)">查看</el-button> -->
-          <el-button :size="size" :type="type" @click="rowDel(row, index)">删除</el-button>
+          <el-button :disabled="row.count>0" :size="size" :type="type" @click="rowDel(row, index)">删除</el-button>
         </template>
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新建</el-button>
@@ -27,7 +27,6 @@
     </detailsPage>
   </div>
 </template>
-
 <script>
 import { getList, remove, getGoodsInfo } from "@/api/tirePartsMall/financingManagement/financingManagement";
 import detailsPage from "./detailsPage"

src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -204,6 +204,22 @@
                             </template> -->
                         </avue-crud>
                     </el-tab-pane>
+                    <el-tab-pane label="出库明细" name="record_records">
+                        <avue-crud :option="optionrecordRecords" v-model="formContacts" ref="record_records"
+                            :data="form.shipItemsRecordList"
+                            @resetColumn="resetColumnTwo('record_records', 'optionrecordRecords', 'optionrecordRecordsBack', 269.5)"
+                            @saveColumn="saveColumnTwo('record_records', 'optionrecordRecords', 'optionrecordRecordsBack', 269.5)">
+                            <!-- <template slot-scope="{type,size,row,index,disabled}" slot="menu">
+                                <el-button :size="size" :disabled="disabled" :type="type"
+                                    :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
+                                    @click="$refs.formContacts.rowCell(row, index)">{{ row.$cellEdit ? '确认' : '修改' }}
+                                </el-button>
+                                <el-button icon="el-icon-delete" :size="size" :disabled="disabled" :type="type"
+                                    @click="rowDelBox(row, index)">删除
+                                </el-button>
+                            </template> -->
+                        </avue-crud>
+                    </el-tab-pane>
                 </el-tabs>
             </trade-card>
             <report-dialog :switchDialog="switchDialog" reportName="轮胎商城-采购订单" :reportId="form.id"
@@ -527,7 +543,7 @@ export default {
                         message: " ",
                         trigger: "blur"
                     }]
-                }, 
+                },
                 {
                     label: '资金方',
                     prop: "fundingPartyName",
@@ -607,7 +623,12 @@ export default {
                     disabled: false,
                 },
                 {
-                    label: '实际金额',
+                    label: '入库数量',
+                    prop: "goodsTotalShipNum",
+                    disabled: true,
+                },
+                {
+                    label: '入库金额',
                     prop: "goodsTotalShipAmount",
                     disabled: true,
                 },
@@ -645,7 +666,7 @@ export default {
                         value: 'id'
                     },
                     dicUrl: '/api/blade-sales-part/corpsAddr/corpIdByAddr?pid={{key}}'
-                }, 
+                },
                 {
                     label: '单据编号',
                     prop: "ordNo",
@@ -965,6 +986,43 @@ export default {
                     prop: 'createTime'
                 }]
             },
+            optionrecordRecords: {},
+            optionrecordRecordsBack: {
+                align: 'center',
+                index: true,
+                menu: false,
+                addBtnText: "录入明细",
+                refreshBtn: false,
+                dialogDrag: true,
+                addBtn: false,
+                span: 8,
+                height: 600,
+                addRowBtn: false,
+                editBtn: false,
+                delBtn: false,
+                // menuWidth: 140,
+                dialogTop: 25,
+                dialogWidth: "80%",
+                column: [{
+                    label: '出库单号',
+                    prop: 'billNo'
+                },
+                {
+                    label: '出库人',
+                    prop: 'createUserName'
+                },
+                {
+                    label: '出库数量',
+                    prop: 'num'
+                }, {
+                    label: '出库金额',
+                    prop: 'amount'
+                },
+                {
+                    label: '创建时间',
+                    prop: 'createTime'
+                }]
+            },
             optionOutboundRecords: {},
             optionOutboundRecordsBack: {
                 align: 'center',
@@ -1111,6 +1169,7 @@ export default {
         })
         this.optionPaymentDetails = await this.getColumnData(this.getColumnName(269.2), this.optionPaymentDetailsBack);
         this.optionOutboundRecords = await this.getColumnData(this.getColumnName(269.3), this.optionOutboundRecordsBack);
+        this.optionrecordRecords = await this.getColumnData(this.getColumnName(269.5), this.optionrecordRecordsBack);
         this.key++
         if (this.onLoad.id && this.detailData.id) {
             this.$set(this.optionForm, 'disabled', true)

src/views/tirePartsMall/purchasingManagement/financingProcurement/index.vue

@@ -26,8 +26,8 @@
             :disabled="row.status != '录入' && row.status != '待确认' && row.item >= 1 || row.numberRows >= 1 || row.confirmWarehouse == 1 || row.whetherRedeem == 1"
             @click="$refs.crud.rowDel(row, index)">删除</el-button>
           <el-button v-if="row.confirmWarehouse != 1" :size="size" :type="type"
-            @click="confirm(row, index, 1)">确认入库</el-button>
-          <el-button v-else :size="size" :type="type" @click="confirm(row, index, 2)">撤销入库</el-button>
+            @click="confirm(row, index, 1)">确认到货</el-button>
+          <el-button v-else :size="size" :type="type" @click="confirm(row, index, 2)">撤销到货</el-button>
           <el-button v-if="row.whetherRedeem != 1" :size="size" :type="type"
             @click="confirm(row, index, 3)">确认赎回</el-button>
           <el-button v-else :size="size" :type="type" @click="confirm(row, index, 4)">撤销赎回</el-button>
@@ -62,7 +62,7 @@ import { getList, remove, getGoodsInfo, confirmWarehouse, revokeWarehouse, confi
 import detailsPage from "./detailsPage"
 import { getDetails } from "@/api/tirePartsMall/salesManagement/saleOrder";
 import { getToken } from "@/util/auth";
-
+import { dateFormat } from '@/util/date'
 export default {
   name: "index",
   components: {
@@ -312,6 +312,10 @@ export default {
             },
             dicUrl: '/api/blade-sales-part/storageDesc/listAll?cname={{key}}',
           }, {
+            label: '总数量',
+            prop: "goodsTotalNum",
+            overHidden: true,
+          }, {
             label: '总金额',
             prop: "totalMoney",
             overHidden: true,
@@ -344,7 +348,12 @@ export default {
             overHidden: true,
           },
           {
-            label: '实际金额',
+            label: '入库数量',
+            prop: "goodsTotalShipNum",
+            overHidden: true,
+          },
+          {
+            label: '入库金额',
             prop: "goodsTotalShipAmount",
             overHidden: true,
           },
@@ -359,15 +368,13 @@ export default {
             overHidden: true,
           },
           {
-            label: '应付类别',
-            prop: "receivableType",
-            type: "select",
-            disabled: false,
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=receivableType",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
+            label: '剩余数量',
+            prop: "surplusShipNum",
+            overHidden: true,
+          },
+          {
+            label: '剩余金额',
+            prop: "surplusShipAmount",
             overHidden: true,
           },
           {
@@ -383,6 +390,23 @@ export default {
             }
           },
           {
+            label: '赎回状态',
+            prop: "whetherRedeem",
+            search: true,
+            overHidden: true,
+            type: 'select',
+            dicData: [
+              {
+                label: "未赎回",
+                value: '0',
+              },
+              {
+                label: "已赎回",
+                value: '1',
+              }
+            ],
+          },
+          {
             label: '单据编号',
             prop: "ordNo",
             search: true,
@@ -546,27 +570,57 @@ export default {
     },
     confirm(row, index, type) {
       if (type == 1) {
-        confirmWarehouse(row).then(res => {
-          this.$message.success("确认成功");
-          this.onLoad(this.page, this.search)
+        this.$confirm('采购数量:' + row.goodsTotalNum + ',金额:' + row.totalMoney + '<br/>到货数量:' + row.goodsTotalShipNum + ',金额:' + row.goodsTotalShipAmount, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          dangerouslyUseHTMLString: true,
+        }).then(() => {
+          confirmWarehouse(row).then(res => {
+            this.$message.success("确认成功");
+            this.onLoad(this.page, this.search)
+          })
         })
       }
       if (type == 2) {
-        revokeWarehouse(row).then(res => {
-          this.$message.success("撤销成功");
-          this.onLoad(this.page, this.search)
+        this.$confirm('是否撤销到货?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          revokeWarehouse(row).then(res => {
+            this.$message.success("撤销成功");
+            this.onLoad(this.page, this.search)
+          })
         })
+
       }
       if (type == 3) {
-        confirmRedeem(row).then(res => {
-          this.$message.success("确认成功");
-          this.onLoad(this.page, this.search)
+        const start = new Date(row.businesDate);
+        const end = new Date(dateFormat(new Date(), 'yyyy-MM-dd'))
+        const daysDiff = (end - start) / (1000 * 60 * 60 * 24);
+        this.$confirm('订单超过90天需要赎回,当前单据为' + daysDiff + '天,确实要赎回吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          confirmRedeem(row).then(res => {
+            this.$message.success("确认成功");
+            this.onLoad(this.page, this.search)
+          })
         })
+
       }
       if (type == 4) {
-        revokeRedeem(row).then(res => {
-          this.$message.success("撤销成功");
-          this.onLoad(this.page, this.search)
+        this.$confirm('是否撤销赎回?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          revokeRedeem(row).then(res => {
+            this.$message.success("撤销成功");
+            this.onLoad(this.page, this.search)
+          })
         })
       }
     },

src/views/tirePartsMall/salesManagement/Inventory/detailsPage.vue

@@ -724,7 +724,7 @@ export default {
     methods: {
         outExport() {
             if (!this.form.id) return this.$message.error("请保存单据");
-            let config = { params: { id:this.form.id } }
+            let config = { params: { id: this.form.id } }
             if (config.params) {
                 for (const propName of Object.keys(config.params)) {
                     const value = config.params[propName];
@@ -925,6 +925,9 @@ export default {
                 if (this.form.status == '已确认') {
                     this.optionForm.disabled = true
                 }
+                this.$nextTick(() => {
+                    this.$refs.formContacts.doLayout()
+                })
                 loading.close();
             }).catch(() => {
                 loading.close();
@@ -989,7 +992,38 @@ export default {
         },
         uploadAfter(res, done, loading, column) {
             if (res instanceof Array) {
-                this.form.orderItemsList = this.form.orderItemsList.concat(res)
+                res.forEach(e => {
+                    const item = this.form.orderItemsList.find(item => e.goodsId == item.goodsId)
+                    if (item) {
+                        this.$set(item, 'sendNum', Number(e.sendNum))
+                        this.$set(item, 'subTotalMoney', Number(e.sendNum) * Number(item.costprie))
+                        this.$set(item, 'profitLossNum', Number(e.sendNum) - Number(e.inventory))
+                        this.$set(item, 'profitLossAmount', Number(e.sendNum) * Number(item.costprie) - Number(item.price))
+                    } else {
+                        inventoryGetList({ code: e.goodsNo }).then(res => {
+                            const i = res.data.data.records.find(item => e.goodsId == item.goodsId)
+                            this.form.orderItemsList.push({
+                                ...e,
+                                costprie: i.inventoryCostPrice,// 库存成本
+                                price: i.inventoryAmount,
+                                subTotalMoney: Number(e.sendNum) * Number(i.inventoryCostPrice),
+                                profitLossNum: Number(e.sendNum) - Number(e.inventory),
+                                profitLossAmount: Number(e.sendNum) * Number(i.inventoryCostPrice) - Number(i.inventoryAmount)
+                            })
+                        })
+                    }
+                })
+                // res.forEach(e => {
+                //     if (!e.goodsId) {
+                //         this.form.orderItemsList.push(e)
+                //     }
+                // })
+                // res.forEach(e => {
+                //     if (!e.goodsId) {
+                //         this.form.orderItemsList.push(e)
+                //     }
+                // })
+
             }
             this.excelBox = false;
             loading = false;

src/views/tirePartsMall/salesManagement/outboundWorkOrder/detailsPage.vue

@@ -53,7 +53,7 @@
                     <el-table-column property="createUserName" label="制单人"></el-table-column>
                     <el-table-column property="createTime" label="制单日期"></el-table-column>
                   </el-table>
-                  <el-button slot="reference" :size="size" :disabled="!row.id" :type="type" icon="el-icon-view"
+                  <el-button v-if="row.recordList" slot="reference" :size="size" :disabled="!row.id" :type="type" icon="el-icon-view"
                     style="margin-right: 8px;">
                     查看记录
                   </el-button>

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -1938,8 +1938,6 @@ export default {
                     if (this.form.orderItemsList.length <= 0) {
                         this.$message.error('请录入明细');
                     } else {
-                        this.$set(this.optionForm, 'disabled', true)
-                        this.$set(this.optionContactsBack, 'disabled', true)
                         this.$refs["form"].validate((valid, done) => {
                             done();
                             if (valid) {
@@ -1971,6 +1969,8 @@ export default {
                                                                 background: 'rgba(255,255,255,0.7)'
                                                             });
                                                             generateShipTask(this.form).then(res => {
+                                                                this.$set(this.optionForm, 'disabled', true)
+                                                                this.$set(this.optionContactsBack, 'disabled', true)
                                                                 this.$message.success("生成出库任务成功");
                                                                 // 将按钮文本更改为"撤销任务"
                                                                 this.buttonText = '撤销任务';
@@ -2001,6 +2001,8 @@ export default {
                                                                 bsType: "XS",
                                                                 ...this.form
                                                             }).then(res => {
+                                                                this.$set(this.optionForm, 'disabled', true)
+                                                                this.$set(this.optionContactsBack, 'disabled', true)
                                                                 this.$message.success("提交成功");
                                                                 // 将按钮文本更改为"撤销任务"
                                                                 this.buttonText = '撤销任务';
@@ -2040,6 +2042,8 @@ export default {
                                                         background: 'rgba(255,255,255,0.7)'
                                                     });
                                                     generateShipTask(this.form).then(res => {
+                                                        this.$set(this.optionForm, 'disabled', true)
+                                                        this.$set(this.optionContactsBack, 'disabled', true)
                                                         this.$message.success("生成出库任务成功");
                                                         // 将按钮文本更改为"撤销任务"
                                                         this.buttonText = '撤销任务';
@@ -2077,6 +2081,8 @@ export default {
                                             // this.refresh(res.data.data.id)
                                             this.isDisabledTask = false
                                             generateShipTask(this.form).then(res => {
+                                                this.$set(this.optionForm, 'disabled', true)
+                                                this.$set(this.optionContactsBack, 'disabled', true)
                                                 this.$message.success("生成出库任务成功");
                                                 // 将按钮文本更改为"撤销任务"
                                                 this.buttonText = '撤销任务';

src/views/wel/components/card.vue

@@ -8,6 +8,9 @@
         <slot name="select"></slot>
       </div>
       <div :class="classType?'card-content-border':'card-content'">
+        <slot name="header"></slot>
+      </div>
+      <div :class="classType?'card-content-border':'card-content'">
         <slot name="content"></slot>
       </div>
     </div>

src/views/wel/home/xindongPower/xindongPower.vue

@@ -9,14 +9,17 @@
                     </div>
                     <div class="statisticsTop_text">
                         <div>本日成交额</div>
-                        <div class="statisticsTop_amount">¥{{typeFalse?'****':statisticsData.dealAmountD}}元</div>
+                        <div class="statisticsTop_amount">¥{{ typeFalse ? '****' : statisticsData.dealAmountD }}元</div>
                     </div>
                 </div>
                 <div style="color: #53b2da" class="statisticsBottom">
-                    <span>当月成交额：¥{{typeFalse?'****':statisticsData.dealAmountM}}元</span>
+                    <span>当月成交额：¥{{ typeFalse ? '****' : statisticsData.dealAmountM }}元</span>
                 </div>
-                <div class="position" v-if="saberUserInfo.role_name.indexOf('admin') != -1 || saberUserInfo.role_name.indexOf('老板') != -1 || saberUserInfo.role_name.indexOf('首页数据') != -1" @click="typeFalse = !typeFalse">
-                    <i style="font-size: 16px" :class="typeFalse?'el-icon-partly-cloudy':'el-icon-cloudy-and-sunny'"></i>
+                <div class="position"
+                    v-if="saberUserInfo.role_name.indexOf('admin') != -1 || saberUserInfo.role_name.indexOf('老板') != -1 || saberUserInfo.role_name.indexOf('首页数据') != -1"
+                    @click="typeFalse = !typeFalse">
+                    <i style="font-size: 16px"
+                        :class="typeFalse ? 'el-icon-partly-cloudy' : 'el-icon-cloudy-and-sunny'"></i>
                 </div>
             </div>
             <div class="statisticsBox">
@@ -26,14 +29,17 @@
                     </div>
                     <div class="statisticsTop_text">
                         <div>本日轮胎销售量</div>
-                        <div class="statisticsTop_amount">{{typeFalse?'****':statisticsData.salesNumD}}条</div>
+                        <div class="statisticsTop_amount">{{ typeFalse ? '****' : statisticsData.salesNumD }}条</div>
                     </div>
                 </div>
                 <div style="color: #69d1a0" class="statisticsBottom">
-                    <span>当月轮胎销售量：{{typeFalse?'****':statisticsData.salesNumM}}条</span>
+                    <span>当月轮胎销售量：{{ typeFalse ? '****' : statisticsData.salesNumM }}条</span>
                 </div>
-                <div class="position" v-if="saberUserInfo.role_name.indexOf('admin') != -1 || saberUserInfo.role_name.indexOf('老板') != -1 || saberUserInfo.role_name.indexOf('首页数据') != -1" @click="typeFalse = !typeFalse">
-                    <i style="font-size: 16px" :class="typeFalse?'el-icon-partly-cloudy':'el-icon-cloudy-and-sunny'"></i>
+                <div class="position"
+                    v-if="saberUserInfo.role_name.indexOf('admin') != -1 || saberUserInfo.role_name.indexOf('老板') != -1 || saberUserInfo.role_name.indexOf('首页数据') != -1"
+                    @click="typeFalse = !typeFalse">
+                    <i style="font-size: 16px"
+                        :class="typeFalse ? 'el-icon-partly-cloudy' : 'el-icon-cloudy-and-sunny'"></i>
                 </div>
             </div>
             <div class="statisticsBox">
@@ -43,14 +49,17 @@
                     </div>
                     <div class="statisticsTop_text">
                         <div>当日线上收款金额</div>
-                        <div class="statisticsTop_amount">¥{{typeFalse?'****':statisticsData.stlAmountD}}元</div>
+                        <div class="statisticsTop_amount">¥{{ typeFalse ? '****' : statisticsData.stlAmountD }}元</div>
                     </div>
                 </div>
                 <div style="color: #c865d7" class="statisticsBottom">
-                    <span>当月线上收款金额：¥{{typeFalse?'****':statisticsData.stlAmountM}}元</span>
+                    <span>当月线上收款金额：¥{{ typeFalse ? '****' : statisticsData.stlAmountM }}元</span>
                 </div>
-                <div class="position" v-if="saberUserInfo.role_name.indexOf('admin') != -1 || saberUserInfo.role_name.indexOf('老板') != -1 || saberUserInfo.role_name.indexOf('首页数据') != -1" @click="typeFalse = !typeFalse">
-                    <i style="font-size: 16px" :class="typeFalse?'el-icon-partly-cloudy':'el-icon-cloudy-and-sunny'"></i>
+                <div class="position"
+                    v-if="saberUserInfo.role_name.indexOf('admin') != -1 || saberUserInfo.role_name.indexOf('老板') != -1 || saberUserInfo.role_name.indexOf('首页数据') != -1"
+                    @click="typeFalse = !typeFalse">
+                    <i style="font-size: 16px"
+                        :class="typeFalse ? 'el-icon-partly-cloudy' : 'el-icon-cloudy-and-sunny'"></i>
                 </div>
             </div>
             <div class="statisticsBox">
@@ -60,14 +69,17 @@
                     </div>
                     <div class="statisticsTop_text">
                         <div>当日利润</div>
-                        <div class="statisticsTop_amount">¥{{typeFalse?'****':statisticsData.profitD}}元</div>
+                        <div class="statisticsTop_amount">¥{{ typeFalse ? '****' : statisticsData.profitD }}元</div>
                     </div>
                 </div>
                 <div style="color: #f09d68" class="statisticsBottom">
-                    <span>当月利润：¥{{typeFalse?'****':statisticsData.profitM}}元</span>
+                    <span>当月利润：¥{{ typeFalse ? '****' : statisticsData.profitM }}元</span>
                 </div>
-                <div class="position" v-if="saberUserInfo.role_name.indexOf('admin') != -1 || saberUserInfo.role_name.indexOf('老板') != -1 || saberUserInfo.role_name.indexOf('首页数据') != -1" @click="typeFalse = !typeFalse">
-                    <i style="font-size: 16px" :class="typeFalse?'el-icon-partly-cloudy':'el-icon-cloudy-and-sunny'"></i>
+                <div class="position"
+                    v-if="saberUserInfo.role_name.indexOf('admin') != -1 || saberUserInfo.role_name.indexOf('老板') != -1 || saberUserInfo.role_name.indexOf('首页数据') != -1"
+                    @click="typeFalse = !typeFalse">
+                    <i style="font-size: 16px"
+                        :class="typeFalse ? 'el-icon-partly-cloudy' : 'el-icon-cloudy-and-sunny'"></i>
                 </div>
             </div>
 
@@ -89,13 +101,13 @@
                 </div>
                 <div class="content-icon" @click="inPage('ckgd')" v-if="menuAll.includes('1649222873652400129')">
                     <div class="iconDivBox" style="background: #57927a">
-                        <i class="tradingIcon iconfont icon-wodegongdan" ></i>
+                        <i class="tradingIcon iconfont icon-wodegongdan"></i>
                     </div>
                     <span style="font-size: 12px">出库工单</span>
                 </div>
                 <div class="content-icon" @click="inPage('kccx')" v-if="menuAll.includes('1726789203724873729')">
                     <div class="iconDivBox" style="background: #f09d68">
-                        <i class="tradingIcon iconfont icon-a-kucunchaxun3x" ></i>
+                        <i class="tradingIcon iconfont icon-a-kucunchaxun3x"></i>
                     </div>
                     <span style="font-size: 12px">库存查询</span>
                 </div>
@@ -138,59 +150,31 @@
                 </div>
                 <div style="padding: 10px">
                     <div style="display:flex;">
-                        <el-date-picker
-                            v-model="search.dateList"
-                            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)"
-                            :clearable="false"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期">
+                        <el-date-picker v-model="search.dateList" 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)" :clearable="false"
+                            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>
                         <el-tooltip class="item" effect="dark" content="排序" placement="top-start">
                             <el-button size="mini" icon="el-icon-sort" @click="sortfun"></el-button>
                         </el-tooltip>
-                    </div >
-                    <el-table
-                        :data="tableData"
-                        size="mini"
-                        height="300"
-                        style="width: 100%">
-                        <el-table-column
-                            prop="orderNo"
-                            align="center"
-                            show-overflow-tooltip
-                            label="订单号">
+                    </div>
+                    <el-table :data="tableData" size="mini" height="300" style="width: 100%">
+                        <el-table-column prop="orderNo" align="center" show-overflow-tooltip label="订单号">
                             <template slot-scope="{row}">
-                                <span style="color: #1e9fff" @click="Jumpfun(row)">{{row.orderNo}}</span>
+                                <span style="color: #1e9fff" @click="Jumpfun(row)">{{ row.orderNo }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column
-                            prop="corpName"
-                            align="center"
-                            show-overflow-tooltip
-                            label="客户名称">
+                        <el-table-column prop="corpName" align="center" show-overflow-tooltip label="客户名称">
                         </el-table-column>
-                        <el-table-column
-                            prop="date"
-                            align="center"
-                            show-overflow-tooltip
-                            label="订单日期">
+                        <el-table-column prop="date" align="center" show-overflow-tooltip label="订单日期">
                             <template slot-scope="{row}">
-                                <span>{{row.date.slice(0,10)}}</span>
+                                <span>{{ row.date.slice(0, 10) }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column
-                            prop="status"
-                            align="center"
-                            show-overflow-tooltip
-                            label="订单状态">
+                        <el-table-column prop="status" align="center" show-overflow-tooltip label="订单状态">
                             <!--<template slot-scope="{row}">-->
                             <!--    <span v-for="item in dingdanzhuangtai"-->
                             <!--          :style="{background: item.colour}"-->
@@ -200,11 +184,7 @@
                             <!--    </span>-->
                             <!--</template>-->
                         </el-table-column>
-                        <el-table-column
-                            prop="payStatus"
-                            align="center"
-                            show-overflow-tooltip
-                            label="支付状态">
+                        <el-table-column prop="payStatus" align="center" show-overflow-tooltip label="支付状态">
                             <!--<template slot-scope="{row}">-->
                             <!--    <span v-for="item in orderStatusList"-->
                             <!--          :style="{background: item.colour}"-->
@@ -214,11 +194,7 @@
                             <!--    </span>-->
                             <!--</template>-->
                         </el-table-column>
-                        <el-table-column
-                            prop="salesman"
-                            align="center"
-                            show-overflow-tooltip
-                            label="业务员">
+                        <el-table-column prop="salesman" align="center" show-overflow-tooltip label="业务员">
                         </el-table-column>
                         <!--<el-table-column-->
                         <!--    prop="type"-->
@@ -230,411 +206,589 @@
                 </div>
             </div>
             <div class="echattsBox">
-                <index-card
-                    :classType="true"
-                    title="经营趋势"
-                    iconName="el-icon-s-fold"
-                    style="height:400px;margin-bottom: 30px"
-                >
+                <index-card :classType="true" 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 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 slot="content" style="height:350px" id="commoDity2"></div>
                 </index-card>
             </div>
-
+        </div>
+        <div class="tableEchatsBox">
+            <div class="echattsBox">
+                <index-card :classType="true" title="实时总览" iconName="el-icon-s-fold"
+                    style="height:450px;margin-bottom: 30px">
+                    <div slot="select">
+                        <el-date-picker v-model="annual4" type="year" size="mini" placeholder="选择年" value-format="yyyy"
+                            style="margin-right:10px;margin-bottom: -20px" @change="commoDity3Datafun">
+                        </el-date-picker>
+                    </div>
+                    <div slot="header">
+                        <div style="display: flex;align-items: center;justify-content: space-around">
+                            <div style="width: 100%;">
+                                <div class="bottomFlex" style="justify-content: space-around">
+                                    <div>
+                                        <div style="color: #81B337">
+                                            <span>客户名:</span>
+                                            <span class="weightnum">{{ overviewForm.corpName }}</span>
+                                        </div>
+                                    </div>
+                                    <div>
+                                        <div style="color: #808bbd">
+                                            <span>在库金额:</span>
+                                            <span class="weightnum">¥{{ overviewForm.surplusFundingAmount }}元</span>
+                                        </div>
+                                    </div>
+                                    <div style="color: #8dab14">
+                                        <span>保证金:</span>
+                                        <span>¥{{ overviewForm.bondAmount }}元</span>
+                                    </div>
+                                    <div>
+                                        <div style="color: #b3373f">
+                                            <span>可用金额:</span>
+                                            <span class="weightnum">¥{{ overviewForm.availableAmount }}元</span>
+                                        </div>
+                                    </div>
+                                    <div>
+                                        <div style="color: #6BBCD1">
+                                            <span>融资金额:</span>
+                                            <span class="weightnum">¥{{ overviewForm.sumAmount }}元</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div slot="content" style="height:350px" id="commoDity3"></div>
+                </index-card>
+            </div>
         </div>
     </div>
 </template>
 
 <script>
-    import indexCard from "@/views/wel/components/card.vue";
-    import xinsalesTrend from "@/views/wel/components/xinsales-trend.vue";
-    import {xinsalaryDataChain, xinsalesList, amountStatistics, stayDoOrder} from "@/api/wel";
-    import {dateFormat, getYearDate} from "@/util/date";
-    import '@/assets/icon/homeicon/iconfont.css'
-    export default {
-        components: {indexCard,xinsalesTrend},
-        props:{
-            sysType:Number
+import indexCard from "@/views/wel/components/card.vue";
+import xinsalesTrend from "@/views/wel/components/xinsales-trend.vue";
+import { xinsalaryDataChain, xinsalesList, amountStatistics, stayDoOrder, columnarRz, realTimeOverview } from "@/api/wel";
+import { dateFormat, getYearDate } from "@/util/date";
+import '@/assets/icon/homeicon/iconfont.css'
+export default {
+    components: { indexCard, xinsalesTrend },
+    props: {
+        sysType: Number
+    },
+    data() {
+        return {
+            menuAll: [], //所有路由菜单id
+            annual3: '', // echatts 时间筛选
+            annual4: '', // echatts 时间筛选
+            amountList2: [], // 金额
+            numberList2: [], // 数量
+            amountList3: [], // 金额
+            numberList3: [], // 数量
+            search: {
+                dateList: [],
+                sort: 1,
+            }, // 表格 筛选
+            tableData: [], // 表格数据
+            dingdanzhuangtai: [], // 订单状态
+            orderStatusList: [], // 支付状态
+            // 展开是否查看
+            typeFalse: false,
+            statisticsData: {}, // 统计
+            saberUserInfo: {}, // 当前登录人数据
+            overviewForm: {}
+        }
+    },
+    created() {
+        this.amountStatisticsfun()
+        this.annual3 = getYearDate().toString(); // 获取当前时间
+        this.annual4 = getYearDate().toString(); // 获取当前时间
+        // // 支付状态
+        // this.getWorkDicts("settlement_Status").then(res => {
+        //     this.orderStatusList = res.data.data
+        // });
+        // // 订单状态
+        // this.getWorkDicts("sales_Status").then(res => {
+        //     this.dingdanzhuangtai = res.data.data
+        // });
+        // 获取当前登录人数据
+        this.saberUserInfo = JSON.parse(localStorage.getItem("saber-userInfo")).content;
+        if (this.saberUserInfo.role_name.indexOf('admin') == -1 && this.saberUserInfo.role_name.indexOf('老板') == -1 && this.saberUserInfo.role_name.indexOf('首页数据') == -1) {
+            this.typeFalse = true
+        }
+
+        this.query(1)
+        //从缓存中获取所有路由信息
+        setTimeout(data => {
+            let menu = JSON.parse(localStorage.getItem("saber-menuAll")).content
+            for (let item of menu) {
+                this.menuAll.push(item.id)
+                if (item.children.length > 0) {
+                    this.getMenuId(item.children)
+                }
+            }
+        }, 600)
+        realTimeOverview().then(res => {
+            this.overviewForm = res.data.data
+        })
+    },
+    mounted() {
+        this.commoDity2Datafun()
+        this.commoDity3Datafun()
+    },
+    methods: {
+        // 排序切换
+        sortfun() {
+            if (this.search.sort == 1) {
+                this.search.sort = 2
+            } else {
+                this.search.sort = 1
+            }
+            this.query()
         },
-        data() {
-            return {
-                menuAll:[], //所有路由菜单id
-                annual3:'', // echatts 时间筛选
-                amountList2:[], // 金额
-                numberList2:[], // 数量
-                search:{
-                    dateList:[],
-                    sort:1,
-                }, // 表格 筛选
-                tableData:[], // 表格数据
-                dingdanzhuangtai:[], // 订单状态
-                orderStatusList:[], // 支付状态
-                // 展开是否查看
-                typeFalse:false,
-                statisticsData:{}, // 统计
-                saberUserInfo:{}, // 当前登录人数据
+        // 点击跳转
+        Jumpfun(row) {
+            if (row.type == 'FHGD') {
+                this.$router.push({
+                    path: '/tirePartsMall/salesManagement/outboundWorkOrder/index',
+                    query: { id: row.id }
+                });
+            } else if (row.type == 'XS') {
+                this.$router.push({
+                    path: '/tirePartsMall/salesManagement/saleOrder/index',
+                    query: { jumpId: row.id }
+                });
+            } else if (row.type == 'FHRW') {
+                this.$router.push({
+                    path: '/tirePartsMall/salesManagement/outboundTask/index',
+                });
             }
         },
-        created() {
-            this.amountStatisticsfun()
-            this.annual3 = getYearDate().toString(); // 获取当前时间
-            // // 支付状态
-            // this.getWorkDicts("settlement_Status").then(res => {
-            //     this.orderStatusList = res.data.data
-            // });
-            // // 订单状态
-            // this.getWorkDicts("sales_Status").then(res => {
-            //     this.dingdanzhuangtai = res.data.data
-            // });
-            // 获取当前登录人数据
-            this.saberUserInfo = JSON.parse(localStorage.getItem("saber-userInfo")).content;
-            if (this.saberUserInfo.role_name.indexOf('admin') == -1 && this.saberUserInfo.role_name.indexOf('老板') == -1 && this.saberUserInfo.role_name.indexOf('首页数据') == -1) {
-                this.typeFalse = true
+        // 获取顶部统计数据
+        amountStatisticsfun() {
+            amountStatistics().then(res => {
+                this.statisticsData = res.data.data
+            })
+        },
+        // 表格数据获取
+        query(type) {
+            const date = new Date();
+            if (type == 1) {
+                this.$set(this.search, "dateList", [`${dateFormat(new Date(), "yyyy-MM-dd")} 00:00:00`, `${dateFormat(new Date(), "yyyy-MM-dd")} 23:59:59`])
             }
-
-            this.query(1)
-            //从缓存中获取所有路由信息
-            setTimeout(data=>{
-                let menu = JSON.parse(localStorage.getItem("saber-menuAll")).content
-                for (let item of menu){
-                    this.menuAll.push(item.id)
-                    if (item.children.length > 0){
-                        this.getMenuId(item.children)
-                    }
-                }
-            },600)
+            if (type == 2) {
+                this.$set(this.search, "dateList", [
+                    `${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`
+                ])
+            }
+            stayDoOrder({ ...this.search }).then(res => {
+                this.tableData = res.data.data
+            })
         },
-        mounted() {
-            this.commoDity2Datafun()
+        // 获取echarts 表的数据
+        commoDity2Datafun() {
+            xinsalaryDataChain({
+                year: Number(this.annual3)
+            }).then(res => {
+                this.amountList2 = res.data.data.amount
+                this.numberList2 = res.data.data.number
+                this.commoDity2()
+            })
         },
-        methods:{
-            // 排序切换
-            sortfun(){
-                if (this.search.sort == 1) {
-                    this.search.sort = 2
-                }else {
-                    this.search.sort = 1
-                }
-                this.query()
-            },
-            // 点击跳转
-            Jumpfun(row){
-                if (row.type == 'FHGD') {
-                    this.$router.push({
-                        path: '/tirePartsMall/salesManagement/outboundWorkOrder/index',
-                        query: { id: row.id }
-                    });
-                } else if (row.type == 'XS') {
-                    this.$router.push({
-                        path: '/tirePartsMall/salesManagement/saleOrder/index',
-                        query: { jumpId: row.id }
-                    });
-                } else if (row.type == 'FHRW') {
-                    this.$router.push({
-                        path: '/tirePartsMall/salesManagement/outboundTask/index',
-                    });
-                }
-            },
-            // 获取顶部统计数据
-            amountStatisticsfun(){
-                amountStatistics().then(res=>{
-                    this.statisticsData = res.data.data
-                })
-            },
-            // 表格数据获取
-            query(type){
-                const date = new Date();
-                if (type == 1){
-                    this.$set(this.search,"dateList",[`${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,"dateList",[
-                        `${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`
-                    ])
-                }
-                stayDoOrder({...this.search}).then(res=>{
-                    this.tableData = res.data.data
-                })
-            },
-            // 获取echarts 表的数据
-            commoDity2Datafun() {
-                xinsalaryDataChain({
-                    year:Number(this.annual3)
-                }).then(res=>{
-                    this.amountList2 = res.data.data.amount
-                    this.numberList2 = res.data.data.number
-                    this.commoDity2()
-                })
-            },
-            //获取所有路由信息id
-            getMenuId(array){
-                for (let item of array){
-                    this.menuAll.push(item.id)
-                }
-            },
-            // 快捷跳转
-            inPage(type){
-                switch(type){
-                    case 'xs':
-                        this.$router.push('/tirePartsMall/salesManagement/saleOrder/index?showTrue=' + true);
-                        break;
-                    case 'ck':
-                        this.$router.push('/tirePartsMall/salesManagement/outboundTask/index');
-                        break;
-                    case 'ckgd':
-                        this.$router.push('/tirePartsMall/salesManagement/outboundWorkOrder/index');
-                        break;
-                    case 'cgdd':
-                        this.$router.push('/tirePartsMall/salesManagement/purchaseOrder/index?showTrue=' + true);
-                        break;
-                    case 'rkrw':
-                        this.$router.push('/tirePartsMall/salesManagement/inboundTask/index');
-                        break;
-                    case 'rk':
-                        this.$router.push('/tirePartsMall/purchasingManagement/warehouseEntryOrder/index');
-                        break;
-                    case 'kccx':
-                        this.$router.push('/tirePartsMall/inventory/index');
-                        break;
-                    case 'db':
-                        this.$router.push('/tirePartsMall/salesManagement/outboundWorkOrderL/index?showTrue=' + true);
-                        break;
-                }
-            },
-            // echatts 配置
-            commoDity2() {
-                // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
-                let myChart = this.$echarts.init(document.getElementById("commoDity2"));
-                // 绘制图表
-                myChart.setOption({
-                    tooltip: {
-                        trigger: 'axis',
+        // 获取echarts 表的数据
+        commoDity3Datafun() {
+            columnarRz({
+                year: Number(this.annual4)
+            }).then(res => {
+                this.amountList3 = res.data.data.amount
+                this.numberList3 = res.data.data.number
+                this.commoDity3()
+            })
+        },
+        //获取所有路由信息id
+        getMenuId(array) {
+            for (let item of array) {
+                this.menuAll.push(item.id)
+            }
+        },
+        // 快捷跳转
+        inPage(type) {
+            switch (type) {
+                case 'xs':
+                    this.$router.push('/tirePartsMall/salesManagement/saleOrder/index?showTrue=' + true);
+                    break;
+                case 'ck':
+                    this.$router.push('/tirePartsMall/salesManagement/outboundTask/index');
+                    break;
+                case 'ckgd':
+                    this.$router.push('/tirePartsMall/salesManagement/outboundWorkOrder/index');
+                    break;
+                case 'cgdd':
+                    this.$router.push('/tirePartsMall/salesManagement/purchaseOrder/index?showTrue=' + true);
+                    break;
+                case 'rkrw':
+                    this.$router.push('/tirePartsMall/salesManagement/inboundTask/index');
+                    break;
+                case 'rk':
+                    this.$router.push('/tirePartsMall/purchasingManagement/warehouseEntryOrder/index');
+                    break;
+                case 'kccx':
+                    this.$router.push('/tirePartsMall/inventory/index');
+                    break;
+                case 'db':
+                    this.$router.push('/tirePartsMall/salesManagement/outboundWorkOrderL/index?showTrue=' + true);
+                    break;
+            }
+        },
+        // echatts 配置
+        commoDity2() {
+            // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
+            let myChart = this.$echarts.init(document.getElementById("commoDity2"));
+            // 绘制图表
+            myChart.setOption({
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'cross',
+                        label: {
+                            precision: '0', // 设备y轴指示线保留整数 文本标签中数值的小数点精度。默认根据当前轴的值自动判断。也可以指定如 2 表示保留两位小数。
+                        },
+                        crossStyle: {
+                            color: '#999'
+                        }
+                    }
+                },
+                toolbox: {
+                },
+                legend: {
+                    data: ['数量', '金额']
+                },
+                xAxis: [
+                    {
+                        type: 'category',
+                        data: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
                         axisPointer: {
-                            type: 'cross',
-                            label:{
-                                precision:'0', // 设备y轴指示线保留整数 文本标签中数值的小数点精度。默认根据当前轴的值自动判断。也可以指定如 2 表示保留两位小数。
-                            },
-                            crossStyle: {
-                                color: '#999'
-                            }
+                            type: 'shadow'
                         }
-                    },
-                    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,
+                        axisLine: {
+                            show: true,
+                            lineStyle: {
+                                color: "#5266bc",//y轴线的颜色（若只设置了y轴线的颜色，未设置y轴文字的颜色，则y轴文字会默认跟设置的y轴线颜色一致）
+                            },
+                        },
+                        axisLabel: {
+                            formatter: '{value}'
                         }
-                    ],
-                    grid: {
-                        left: "10%",
-                        right: "10%",
-                        bottom: "3%",
-                        containLabel: true
                     },
-                    yAxis: [
-                        {
-                            type: 'value',
-                            name: '数量(条)',
-                            min: 0,
-                            axisLine:{
-                                show:true,
-                                lineStyle: {
-                                    color: "#5266bc",//y轴线的颜色（若只设置了y轴线的颜色，未设置y轴文字的颜色，则y轴文字会默认跟设置的y轴线颜色一致）
-                                },
+                    {
+                        type: 'value',
+                        name: '金额(元)',
+                        min: 0,
+                        axisLine: {
+                            show: true,
+                            lineStyle: {
+                                color: "#98c46d",//y轴线的颜色（若只设置了y轴线的颜色，未设置y轴文字的颜色，则y轴文字会默认跟设置的y轴线颜色一致）
                             },
-                            axisLabel: {
-                                formatter: '{value}'
+                        },
+                        axisLabel: {
+                            formatter: '{value}',
+                            // textStyle: {
+                            //     color: "#000",//Y轴内容文字颜色
+                            // },
+                        }
+                    }
+                ],
+                series: [
+                    {
+                        name: '数量',
+                        type: 'bar',
+                        yAxisIndex: 0,
+                        tooltip: {
+                            valueFormatter: function (value) {
+                                return value + ' 条';
                             }
                         },
-                        {
-                            type: 'value',
-                            name: '金额(元)',
-                            min: 0,
-                            axisLine:{
-                                show:true,
-                                lineStyle: {
-                                    color: "#98c46d",//y轴线的颜色（若只设置了y轴线的颜色，未设置y轴文字的颜色，则y轴文字会默认跟设置的y轴线颜色一致）
-                                },
-                            },
-                            axisLabel: {
-                                formatter: '{value}',
-                                // textStyle: {
-                                //     color: "#000",//Y轴内容文字颜色
-                                // },
+                        data: this.numberList2
+                    },
+                    {
+                        name: '金额',
+                        type: 'bar',
+                        yAxisIndex: 1,
+                        tooltip: {
+                            valueFormatter: function (value) {
+                                return value + ' 元';
                             }
+                        },
+                        data: this.amountList2
+                    },
+                ]
+            });
+        },
+        commoDity3() {
+            // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
+            let myChart = this.$echarts.init(document.getElementById("commoDity3"));
+            // 绘制图表
+            myChart.setOption({
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'cross',
+                        label: {
+                            precision: '0', // 设备y轴指示线保留整数 文本标签中数值的小数点精度。默认根据当前轴的值自动判断。也可以指定如 2 表示保留两位小数。
+                        },
+                        crossStyle: {
+                            color: '#999'
+                        }
+                    }
+                },
+                toolbox: {
+                },
+                legend: {
+                    data: ['订单数量', '融资金额']
+                },
+                xAxis: [
+                    {
+                        type: 'category',
+                        data: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+                        axisPointer: {
+                            type: 'shadow'
                         }
-                    ],
-                    series: [
-                        {
-                            name: '数量',
-                            type: 'bar',
-                            yAxisIndex: 0,
-                            tooltip: {
-                                valueFormatter: function (value) {
-                                    return value + ' 条';
-                                }
+                    }
+                ],
+                grid: {
+                    left: "10%",
+                    right: "10%",
+                    bottom: "3%",
+                    containLabel: true
+                },
+                yAxis: [
+                    {
+                        type: 'value',
+                        name: '订单数量(条)',
+                        min: 0,
+                        axisLine: {
+                            show: true,
+                            lineStyle: {
+                                color: "#5266bc",//y轴线的颜色（若只设置了y轴线的颜色，未设置y轴文字的颜色，则y轴文字会默认跟设置的y轴线颜色一致）
                             },
-                            data: this.numberList2
                         },
-                        {
-                            name: '金额',
-                            type: 'bar',
-                            yAxisIndex: 1,
-                            tooltip: {
-                                valueFormatter: function (value) {
-                                    return value + ' 元';
-                                }
+                        axisLabel: {
+                            formatter: '{value}'
+                        }
+                    },
+                    {
+                        type: 'value',
+                        name: '融资金额(元)',
+                        min: 0,
+                        axisLine: {
+                            show: true,
+                            lineStyle: {
+                                color: "#98c46d",//y轴线的颜色（若只设置了y轴线的颜色，未设置y轴文字的颜色，则y轴文字会默认跟设置的y轴线颜色一致）
                             },
-                            data: this.amountList2
                         },
-                    ]
-                });
-            },
-        }
+                        axisLabel: {
+                            formatter: '{value}',
+                            // textStyle: {
+                            //     color: "#000",//Y轴内容文字颜色
+                            // },
+                        }
+                    }
+                ],
+                series: [
+                    {
+                        name: '订单数量',
+                        type: 'bar',
+                        yAxisIndex: 0,
+                        tooltip: {
+                            valueFormatter: function (value) {
+                                return value + ' 条';
+                            }
+                        },
+                        data: this.numberList3
+                    },
+                    {
+                        name: '融资金额',
+                        type: 'bar',
+                        yAxisIndex: 1,
+                        tooltip: {
+                            valueFormatter: function (value) {
+                                return value + ' 元';
+                            }
+                        },
+                        data: this.amountList3
+                    },
+                ]
+            });
+        },
     }
+}
 </script>
 
 <style lang="scss" scoped>
-    .xindongpowerBox {
-        padding: 15px;
-        box-sizing: border-box;
-    }
-    .statisticsFlex {
-        display: flex;
-        align-items: center;
-        .statisticsBox {
-            flex: 1;
-            background: #fff;
-            border-radius: 10px;
-            padding: 10px 30px;
-            box-sizing: border-box;
-            margin-right: 20px;
-            position: relative;
-            &:last-child {
-                margin-right: 0;
-            }
-            .position {
-                width: 20px;
-                height: 20px;
-                position: absolute;
-                top: 10px;
-                right: 20px;
-            }
-            .statisticsTop {
-                display: flex;
-                align-items: center;
-                .statisticsTop_ioc {
-                    //background: red;
-                    width: 60px;
-                    height: 60px;
-                    margin-right: 20px;
-                }
-                .statisticsTop_text {
-                    font-size: 12px;
-                    font-weight: 300;
-                    .statisticsTop_amount {
-                        font-weight: 500;
-                        font-size: 24px;
-                    }
-                }
-            }
-            .statisticsBottom {
-                color: #1e9fff;
-                margin-top: 20px;
-                font-size: 12px;
-                text-align: center;
-            }
-        }
-    }
-    .quickJumpBox {
-        margin-top: 10px;
+.xindongpowerBox {
+    padding: 15px;
+    box-sizing: border-box;
+}
+
+.statisticsFlex {
+    display: flex;
+    align-items: center;
+
+    .statisticsBox {
+        flex: 1;
         background: #fff;
         border-radius: 10px;
-        padding: 20px;
+        padding: 10px 30px;
         box-sizing: border-box;
-        .content {
+        margin-right: 20px;
+        position: relative;
+
+        &:last-child {
+            margin-right: 0;
+        }
+
+        .position {
+            width: 20px;
+            height: 20px;
+            position: absolute;
+            top: 10px;
+            right: 20px;
+        }
+
+        .statisticsTop {
             display: flex;
-            &-icon {
-                display: flex;
-                flex-direction: column;
-                align-items: center;
-                margin: 1.5vh 1vw 0vh 1vw;
-                span {
-                    margin-top: 0.2vh;
+            align-items: center;
+
+            .statisticsTop_ioc {
+                //background: red;
+                width: 60px;
+                height: 60px;
+                margin-right: 20px;
+            }
+
+            .statisticsTop_text {
+                font-size: 12px;
+                font-weight: 300;
+
+                .statisticsTop_amount {
+                    font-weight: 500;
+                    font-size: 24px;
                 }
             }
         }
-    }
-    .tableEchatsBox {
-        margin-top: 10px;
-        display: flex;
-        .tableBox {
-            flex: 2;
-            background: #fff;
-            border-radius: 10px;
-            box-sizing: border-box;
-            margin-right: 20px;
-            padding-bottom: 20px;
-        }
-        .echattsBox {
-            flex: 3;
-            background: #fff;
-            border-radius: 10px;
-            padding-bottom: 20px;
-            box-sizing: border-box;
+
+        .statisticsBottom {
+            color: #1e9fff;
+            margin-top: 20px;
+            font-size: 12px;
+            text-align: center;
         }
     }
+}
 
+.quickJumpBox {
+    margin-top: 10px;
+    background: #fff;
+    border-radius: 10px;
+    padding: 20px;
+    box-sizing: border-box;
 
-    .tradingIcon {
-        font-size: 24px;
-        color: #fff;
-    }
-    .imgbox {
-        width: 100%;
-        height: 100%;
-    }
-    .card-head {
-        margin-top: 5px;
-        height: 28px;
-        font-size: 12px;
+    .content {
         display: flex;
-        align-items: center;
-    }
-    .index-icon {
-        margin: 0 10px;
+
+        &-icon {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            margin: 1.5vh 1vw 0vh 1vw;
+
+            span {
+                margin-top: 0.2vh;
+            }
+        }
     }
-    .bottomBox {
-        padding: 3px 6px;
-        border-radius: 12px;
-        color: #fff;
-        font-size: 10px;
+}
+
+.tableEchatsBox {
+    margin-top: 10px;
+    display: flex;
+
+    .tableBox {
+        flex: 2;
+        background: #fff;
+        border-radius: 10px;
+        box-sizing: border-box;
+        margin-right: 20px;
+        padding-bottom: 20px;
     }
-    .iconDivBox {
-        padding: 8px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
+
+    .echattsBox {
+        flex: 3;
+        background: #fff;
         border-radius: 10px;
+        padding-bottom: 20px;
+        box-sizing: border-box;
     }
+}
+
+
+.tradingIcon {
+    font-size: 24px;
+    color: #fff;
+}
+
+.imgbox {
+    width: 100%;
+    height: 100%;
+}
+
+.card-head {
+    margin-top: 5px;
+    height: 28px;
+    font-size: 12px;
+    display: flex;
+    align-items: center;
+}
+
+.index-icon {
+    margin: 0 10px;
+}
+
+.bottomBox {
+    padding: 3px 6px;
+    border-radius: 12px;
+    color: #fff;
+    font-size: 10px;
+}
+
+.iconDivBox {
+    padding: 8px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 10px;
+}
+
+.bottomFlex {
+    display: flex;
+    align-items: center;
+}
 </style>