diff --git a/src/utils/downloadRequest.js b/src/utils/downloadRequest.js
new file mode 100644
index 0000000..3dfce31
--- /dev/null
+++ b/src/utils/downloadRequest.js
@@ -0,0 +1,92 @@
+import axios from 'axios'
+import { getToken } from '@/utils/auth'
+import { Loading, Message } from 'element-ui'
+
+/*
+ * @params {string} url 请求拼接地址
+ * @params {object} info 请求参数params或data
+ */
+
+let loading;
+export async function download(url,method='get',info,filename){
+
+  loading = Loading.service({
+    lock:true,
+    background:"rgba(0,0,0,0.4)",
+    text:"文件正在生成中..."
+  })
+
+  let options = {
+    baseURL:process.env.VUE_APP_BASE_API,
+    url,
+    method,
+    responseType: 'blob',
+    timeout:10000,
+    headers: {
+      Accept: 'application/json','Content-Type':'application/json; charset=utf-8',
+      withCredentials: true,
+      Authorization:"Bearer " + getToken()
+    },
+  }
+  if(method === 'get'){
+    Object.defineProperty(options,'params',{
+      value:info,
+      enumerable:true,
+      writable:false
+    })
+  }
+  if(method === 'post'){
+    Object.defineProperty(options,'data',{
+      value:info,
+      enumerable:true,
+      writable:false
+    })
+  }
+
+  try {
+    const response = await axios.request(options)
+
+    loading.close()
+
+    // 提取文件名
+    if(!filename){
+      filename = response.headers['content-disposition']?.match(
+        /filename=(.*)/
+      )[1] || ''
+    }
+
+    // 将二进制流转为blob
+    const blob = new Blob([response.data], { type: 'application/octet-stream' })
+    if (typeof window.navigator.msSaveBlob !== 'undefined') {
+      // 兼容IE，window.navigator.msSaveBlob：以本地方式保存文件
+      window.navigator.msSaveBlob(blob, decodeURI(filename))
+    } else {
+      // 创建新的URL并指向File对象或者Blob对象的地址
+      const blobURL = window.URL.createObjectURL(blob)
+      // 创建a标签，用于跳转至下载链接
+      const tempLink = document.createElement('a')
+      tempLink.style.display = 'none'
+      tempLink.href = blobURL
+      tempLink.setAttribute('download', decodeURI(filename))
+      // 兼容：某些浏览器不支持HTML5的download属性
+      if (typeof tempLink.download === 'undefined') {
+        tempLink.setAttribute('target', '_blank')
+      }
+      // 挂载a标签
+      document.body.appendChild(tempLink)
+      tempLink.click()
+      document.body.removeChild(tempLink)
+      // 释放blob URL地址
+      window.URL.revokeObjectURL(blobURL)
+    }
+  }catch (err){
+    console.error(err)
+    loading.close()
+    Message({
+      type:'error',
+      message:err
+    })
+  }
+}
+
+
diff --git a/src/utils/request.js b/src/utils/request.js
index 6a85292..c1679c8 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -11,13 +11,19 @@ import {
 
 let loading ;
 // create an axios instance
+let baseUrl = ''
+if(window.location.origin.indexOf('localhost')>-1){
+  baseUrl = process.env.VUE_APP_BASE_API
+}else{
+  baseUrl = window.location.origin + '/'
+}
+console.log(baseUrl,window.location.origin)
 const service = axios.create({
-  baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
+  baseURL: baseUrl, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 10000, // request timeout
+  timeout: 100000, // request timeout
   isLoading:true
 })
-
 // request interceptor
 service.interceptors.request.use(
   config => {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index d1dfd99..13a0026 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,461 +1,533 @@
-<template>
-  <div>
-
-   <!-- <div class="statistics">
-      <div style="display: flex;justify-content: flex-end;margin-bottom: 10px;">
-        <el-date-picker v-model="dateMonth" value-format="yyyy-MM" type="month" @change="loadData" placeholder="选择月份">
-        </el-date-picker>
-      </div>
-     <panel-group :totaldata="list" />
-    </div> -->
-    <div>
-      <div ref="lxHeader">
-        <LxHeader icon="md-apps" text="待处理订单" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
-          <div slot="content"></div>
-
-        </LxHeader>
-      </div>
-    </div>
-
-    <xy-table
-      :table-item="table"
-      :list="data"
-      :total="total"
-      @pageSizeChange="e => {select.rows = e;select.page = 1;getList()}"
-      @pageIndexChange="e => {select.page = e;getList()}">
-      <template v-slot:btns><div></div></template>
-    </xy-table>
-
-<!--    <div class="chart">-->
-<!--      <div style="display: flex;justify-content: flex-end;margin-bottom: 10px;">-->
-<!--        <el-date-picker v-model="year" value-format="yyyy" type="year" @change="getCharData" placeholder="选择年份">-->
-<!--        </el-date-picker>-->
-<!--      </div>-->
-<!--      <div>-->
-
-<!--        <el-row :gutter="16">-->
-<!--          <el-col :xs="12" :sm="12" :lg="8">-->
-<!--            <div class="chart-wrapper">-->
-<!--              <div class="chart-title">-->
-<!--                <router-link to="/toolbox/exception">人员借阅统计</router-link>-->
-<!--              </div>-->
-<!--              <ybar-chart :chartData="lineUserData" />-->
-<!--            </div>-->
-<!--          </el-col>-->
-<!--          <el-col :xs="12" :sm="12" :lg="8">-->
-<!--            <div class="chart-wrapper">-->
-<!--              <div class="chart-title">-->
-<!--                <router-link to="/toolbox/exception">部门借阅统计</router-link>-->
-<!--              </div>-->
-<!--              <ybar-chart :chartData="lineDeptData" />-->
-<!--            </div>-->
-<!--          </el-col>-->
-<!--          <el-col :xs="12" :sm="12" :lg="8">-->
-<!--            <div class="chart-wrapper">-->
-<!--              <div class="chart-title">-->
-<!--                <router-link to="/toolbox/exception">书籍借阅统计</router-link>-->
-<!--              </div>-->
-<!--              <ybar-chart :chartData="lineBookData" />-->
-<!--            </div>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
-<!--      </div>-->
-<!--    </div>-->
-
-
-<!--    <el-row :gutter="16" style="margin-top: 20px;">-->
-
-<!--      <el-col :xs="12" :sm="12" :lg="8">-->
-<!--        <div class="chart-wrapper">-->
-<!--          <div class="chart-title">-->
-<!--            <router-link to="/toolbox/exception">类目借阅统计</router-link>-->
-<!--          </div>-->
-<!--          <ybar-chart :chartData="lineTypeData" />-->
-<!--        </div>-->
-<!--      </el-col>-->
-<!--      <el-col :xs="16" :sm="16" :lg="16">-->
-<!--        <div class="chart-wrapper">-->
-<!--          <div class="chart-title">-->
-<!--            <router-link to="/toolbox/exception">月度借阅趋势</router-link>-->
-<!--          </div>-->
-<!--          <line-chart :chartData="lineArr" />-->
-<!--        </div>-->
-<!--      </el-col>-->
-<!--    </el-row>-->
-
-  </div>
-</template>
-
-<script>
-  import echarts from "echarts"
-  import PanelGroup from './components/PanelGroup'
-  import LineChart from './components/LineChart.vue'
-  import YbarChart from './components/YbarChart.vue'
-  import {
-    getChartsData,
-    getCounts
-  } from "../../api/dashboard.js"
-  import LxHeader from '@/components/LxHeader/index.vue'
-  import {getList} from '@/api/order'
-
-  export default {
-    components: {
-      PanelGroup,
-      LineChart,
-      YbarChart,
-      LxHeader
-    },
-    data() {
-      return {
-        select:{
-          page:1,
-          rows:10,
-          show_history:0,
-          state:'assigned',
-          keyword:'',
-          not_state:["pending"],
-          sort_name:"updated_at",
-          sort_type:"desc"
-        },
-        total:0,
-        data:[],
-        table:[
-          {
-            label:'订单名称',
-            sortable:false,
-            prop:'order.order_name',
-            width:180,
-            align:'left'
-          },
-          {
-            label:'客户姓名',
-            sortable:false,
-            prop:'member_name',
-            width:140
-          },
-          {
-            label:'客户电话',
-            sortable:false,
-            prop:'member_phone',
-            width: 180
-          },
-          {
-            label:'区域',
-            sortable:false,
-            prop:'member.area',
-            width: 160
-          },
-          {
-            label:'预产期',
-            sortable:false,
-            prop:'member_due_date',
-            width: 160
-          },
-          {
-            label:'产品类型',
-            sortable:false,
-            prop:'product_type.name',
-            width: 140
-          },
-          {
-            prop:'order.serial',
-            label:'订单编号',
-            width:180,
-            sortable:false,
-          },
-          {
-            prop:'order.created_at',
-            label:'订单创建时间',
-            // width:180,
-            sortable:false,
-          },
-          {
-            label:'状态',
-            sortable:false,
-            prop:'state_name',
-            width:120
-          }],
-
-
-
-
-
-        dateMonth: "",
-        year: "",
-        col: '',
-        line: '',
-        business_data: [],
-        collect_data: [],
-        list: {},
-        customerArr: [],
-        orderArr: [],
-        chartData: {},
-        lineTypeData: {
-          xArr: [],
-          yArr: []
-        },
-        lineUserData: {
-          xArr: [],
-          yArr: []
-        },
-        lineDeptData: {
-          xArr: [],
-          yArr: []
-        },
-        lineBookData: {
-          xArr: [],
-          yArr: []
-        },
-        lineArr: {
-          xArr: [],
-          legendArr: ["借阅次数"],
-          series: [{
-            name: '借阅次数',
-            type: 'line',
-            stack: 'Total',
-            data: []
-          }]
-        }
-      }
-    },
-    watch: {},
-    methods: {
-      async getList(){
-        let res = await getList(this.select)
-        console.log(res)
-        this.data = res.data
-        this.total = res.total
-      },
-      async loadData() {
-        await getCounts({
-          date: this.dateMonth
-        }).then((res) => {
-          this.list = res;
-        }).catch(error => {
-
-        });
-
-      },
-      async getCharData() {
-
-        await getChartsData({
-          year: this.year
-        }).then((res) => {
-
-          var xArrMonth = [];
-          var yArrData = [];
-          for (var i = 1; i <= 12; i++) {
-            xArrMonth.push(i + "月");
-            let d = res.month.filter(function(item) {
-              return item.month == i;
-            })
-            if (d.length > 0)
-              yArrData.push(d[0].total);
-            else
-              yArrData.push(0);
-          }
-          this.lineArr.xArr = xArrMonth;
-
-          this.lineArr.series[0].data = yArrData;
-
-
-          let xTypeArr = [];
-          let yTypeArr = [];
-
-
-          for (var mod of res.type) {
-            xTypeArr.push(mod.total)
-            yTypeArr.push(mod.type.name)
-          }
-          this.lineTypeData = {
-            xArr: xTypeArr,
-            yArr: yTypeArr
-          }
-
-
-
-          xTypeArr = [];
-          yTypeArr = [];
-
-
-          for (var mod of res.person) {
-            xTypeArr.push(mod.total)
-            yTypeArr.push(mod.user?.name)
-          }
-          this.lineUserData = {
-            xArr: xTypeArr,
-            yArr: yTypeArr
-          }
-
-
-
-
-          xTypeArr = [];
-          yTypeArr = [];
-
-
-          for (var mod of res.book) {
-            xTypeArr.push(mod.total)
-            yTypeArr.push(mod.book?.name)
-          }
-          this.lineBookData = {
-            xArr: xTypeArr,
-            yArr: yTypeArr
-          }
-
-
-          xTypeArr = [];
-          yTypeArr = [];
-
-
-          for (var mod of res.department) {
-            xTypeArr.push(mod.total)
-            yTypeArr.push(mod.department?.name)
-          }
-          this.lineDeptData = {
-            xArr: xTypeArr,
-            yArr: yTypeArr
-          }
-
-
-
-
-
-        }).catch(error => {
-
-        })
-      }
-    },
-    created() {
-
-      this.dateMonth = this.$moment().format("YYYY-MM");
-      this.year = this.$moment().format("YYYY");
-      //this.loadData();
-      //this.getCharData();
-    },
-    mounted() {
-    this.getList()
-
-    },
-    destroyed() {
-      //window.onresize = null
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .chart-wrapper {
-    background: #fff;
-    padding: 15px;
-  }
-
-  .statistics {
-    display: flex;
-    flex-direction: column;
-
-    margin-top: 20px;
-
-    &-title {
-
-      padding-left: 6px;
-    }
-
-    &-content {
-      text-align: center;
-      font-size: 13px;
-
-      &-top {
-
-        &__num {
-          font-weight: 600;
-        }
-
-        &__name {
-          font-size: 10px;
-          color: rgb(140, 140, 140);
-        }
-      }
-
-      &-bottom {
-        display: flex;
-        justify-content: space-between;
-
-        &-left {
-
-          &__num {
-            font-weight: 600;
-          }
-
-          &__name {
-            font-size: 10px;
-            color: rgb(140, 140, 140);
-          }
-        }
-
-        &-right {
-
-          &__num {
-            font-weight: 600;
-          }
-
-          &__name {
-            font-size: 10px;
-            color: rgb(140, 140, 140);
-          }
-        }
-      }
-    }
-
-    &>div {
-      flex: 1;
-      margin-right: 20px;
-
-      &:last-child {
-        margin-right: 0;
-      }
-    }
-  }
-
-  .chart {
-    display: flex;
-
-    margin-top: 20px;
-    flex-direction: column;
-
-    .chartBox {
-      display: flex;
-
-      .chartItem {
-
-        width: 49%;
-
-        .chartItemTitle {
-          font-size: 16px;
-          margin-bottom: 20px;
-        }
-
-        #col-chart {
-          background: #fff;
-          border-radius: 10px;
-          flex: 1;
-          margin-right: 20px;
-          padding: 20px;
-          box-sizing: border-box;
-          min-height: 400px;
-          width: 100%;
-        }
-
-        #line-chart {
-          background: #fff;
-          border-radius: 10px;
-          flex: 1;
-          padding: 20px;
-          box-sizing: border-box;
-          min-height: 400px;
-        }
-      }
-    }
-
-
-  }
+<template>
+  <div>
+
+    <!-- <div class="statistics">
+      <div style="display: flex;justify-content: flex-end;margin-bottom: 10px;">
+        <el-date-picker v-model="dateMonth" value-format="yyyy-MM" type="month" @change="loadData" placeholder="选择月份">
+        </el-date-picker>
+      </div>
+     <panel-group :totaldata="list" />
+    </div> -->
+    <div>
+      <div ref="lxHeader">
+        <LxHeader icon="md-apps" text="待处理订单" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+          <div slot="content"></div>
+
+        </LxHeader>
+      </div>
+    </div>
+
+    <xy-table :table-item="table" :list="data" :total="total"
+      @pageSizeChange="e => {select.rows = e;select.page = 1;getList()}"
+      @pageIndexChange="e => {select.page = e;getList()}">
+      <template v-slot:btns>
+        <div></div>
+      </template>
+    </xy-table>
+
+
+    <div>
+      <div ref="lxHeader">
+        <LxHeader icon="md-apps" text="财务中心" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+          <div slot="content"></div>
+
+        </LxHeader>
+      </div>
+    </div>
+
+    <xy-table :table-item="fintable" :list="findata" :total="fintotal"
+      @pageSizeChange="e => {finselect.rows = e;finselect.page = 1;getFinList()}"
+      @pageIndexChange="e => {finselect.page = e;getFinList()}">
+      <template v-slot:btns>
+        <div></div>
+      </template>
+    </xy-table>
+
+    <!--    <div class="chart">-->
+    <!--      <div style="display: flex;justify-content: flex-end;margin-bottom: 10px;">-->
+    <!--        <el-date-picker v-model="year" value-format="yyyy" type="year" @change="getCharData" placeholder="选择年份">-->
+    <!--        </el-date-picker>-->
+    <!--      </div>-->
+    <!--      <div>-->
+
+    <!--        <el-row :gutter="16">-->
+    <!--          <el-col :xs="12" :sm="12" :lg="8">-->
+    <!--            <div class="chart-wrapper">-->
+    <!--              <div class="chart-title">-->
+    <!--                <router-link to="/toolbox/exception">人员借阅统计</router-link>-->
+    <!--              </div>-->
+    <!--              <ybar-chart :chartData="lineUserData" />-->
+    <!--            </div>-->
+    <!--          </el-col>-->
+    <!--          <el-col :xs="12" :sm="12" :lg="8">-->
+    <!--            <div class="chart-wrapper">-->
+    <!--              <div class="chart-title">-->
+    <!--                <router-link to="/toolbox/exception">部门借阅统计</router-link>-->
+    <!--              </div>-->
+    <!--              <ybar-chart :chartData="lineDeptData" />-->
+    <!--            </div>-->
+    <!--          </el-col>-->
+    <!--          <el-col :xs="12" :sm="12" :lg="8">-->
+    <!--            <div class="chart-wrapper">-->
+    <!--              <div class="chart-title">-->
+    <!--                <router-link to="/toolbox/exception">书籍借阅统计</router-link>-->
+    <!--              </div>-->
+    <!--              <ybar-chart :chartData="lineBookData" />-->
+    <!--            </div>-->
+    <!--          </el-col>-->
+    <!--        </el-row>-->
+    <!--      </div>-->
+    <!--    </div>-->
+
+
+    <!--    <el-row :gutter="16" style="margin-top: 20px;">-->
+
+    <!--      <el-col :xs="12" :sm="12" :lg="8">-->
+    <!--        <div class="chart-wrapper">-->
+    <!--          <div class="chart-title">-->
+    <!--            <router-link to="/toolbox/exception">类目借阅统计</router-link>-->
+    <!--          </div>-->
+    <!--          <ybar-chart :chartData="lineTypeData" />-->
+    <!--        </div>-->
+    <!--      </el-col>-->
+    <!--      <el-col :xs="16" :sm="16" :lg="16">-->
+    <!--        <div class="chart-wrapper">-->
+    <!--          <div class="chart-title">-->
+    <!--            <router-link to="/toolbox/exception">月度借阅趋势</router-link>-->
+    <!--          </div>-->
+    <!--          <line-chart :chartData="lineArr" />-->
+    <!--        </div>-->
+    <!--      </el-col>-->
+    <!--    </el-row>-->
+
+  </div>
+</template>
+
+<script>
+  import echarts from "echarts"
+  import PanelGroup from './components/PanelGroup'
+  import LineChart from './components/LineChart.vue'
+  import YbarChart from './components/YbarChart.vue'
+  import {
+    getChartsData,
+    getCounts
+  } from "../../api/dashboard.js"
+  import LxHeader from '@/components/LxHeader/index.vue'
+  import {
+    getList
+  } from '@/api/order'
+  import {
+    getList as getfinlist
+  } from '@/api/finance'
+  export default {
+    components: {
+      PanelGroup,
+      LineChart,
+      YbarChart,
+      LxHeader
+    },
+    data() {
+      return {
+        select: {
+          page: 1,
+          rows: 10,
+          show_history: 0,
+          state: 'assigned',
+          keyword: '',
+          not_state: ["pending"],
+          sort_name: "updated_at",
+          sort_type: "desc"
+        },
+        finselect: {
+          page: 1,
+          rows: 10,
+        },
+        fintotal: 0,
+        findata: [],
+        fintable: [{
+            label: '产生时间',
+            prop: 'created_at_formatted',
+            width: 200,
+            sortable: false
+          },
+          {
+            label: '金额',
+            align: 'right',
+            prop: 'money',
+            width: 160,
+            sortable: false
+          },
+          {
+            label: '余额',
+            prop: 'balance',
+            align: 'right',
+            width: 160,
+            sortable: false
+          },
+          {
+            label: '类型',
+            prop: 'type_name',
+            width: 160,
+            sortable: false
+          },
+          {
+            label: '相关类型',
+            prop: 'related_type_name',
+            width: 160,
+            sortable: false
+          },
+          // {
+          //   label:'相关流水号',
+          //   prop:'related_id',
+          //   sortable:false
+          // },
+          {
+            label: '订单编号',
+            prop: 'order.serial',
+            sortable: false
+          }
+        ],
+        total: 0,
+        data: [],
+        table: [{
+            label: '订单名称',
+            sortable: false,
+            prop: 'order.order_name',
+            width: 180,
+            align: 'left'
+          },
+          {
+            label: '客户姓名',
+            sortable: false,
+            prop: 'member_name',
+            width: 140
+          },
+          {
+            label: '客户电话',
+            sortable: false,
+            prop: 'member_phone',
+            width: 180
+          },
+          {
+            label: '区域',
+            sortable: false,
+            prop: 'member.area',
+            width: 160
+          },
+          {
+            label: '预产期',
+            sortable: false,
+            prop: 'member_due_date',
+            width: 160
+          },
+          {
+            label: '产品类型',
+            sortable: false,
+            prop: 'product_type.name',
+            width: 140
+          },
+          {
+            prop: 'order.serial',
+            label: '订单编号',
+            width: 180,
+            sortable: false,
+          },
+          {
+            prop: 'order.created_at',
+            label: '订单创建时间',
+            // width:180,
+            sortable: false,
+          },
+          {
+            label: '状态',
+            sortable: false,
+            prop: 'state_name',
+            width: 120
+          }
+        ],
+        dateMonth: "",
+        year: "",
+        col: '',
+        line: '',
+        business_data: [],
+        collect_data: [],
+        list: {},
+        customerArr: [],
+        orderArr: [],
+        chartData: {},
+        lineTypeData: {
+          xArr: [],
+          yArr: []
+        },
+        lineUserData: {
+          xArr: [],
+          yArr: []
+        },
+        lineDeptData: {
+          xArr: [],
+          yArr: []
+        },
+        lineBookData: {
+          xArr: [],
+          yArr: []
+        },
+        lineArr: {
+          xArr: [],
+          legendArr: ["借阅次数"],
+          series: [{
+            name: '借阅次数',
+            type: 'line',
+            stack: 'Total',
+            data: []
+          }]
+        }
+      }
+    },
+    watch: {},
+    methods: {
+      async getList() {
+        let res = await getList(this.select)
+        console.log(res)
+        this.data = res.data
+        this.total = res.total
+      },
+      async getFinList() {
+        let res = await getfinlist(this.finselect)
+        console.log(res)
+        this.findata = res.data
+        this.fintotal = res.total
+      },
+      async loadData() {
+        await getCounts({
+          date: this.dateMonth
+        }).then((res) => {
+          this.list = res;
+        }).catch(error => {
+
+        });
+
+      },
+      async getCharData() {
+
+        await getChartsData({
+          year: this.year
+        }).then((res) => {
+
+          var xArrMonth = [];
+          var yArrData = [];
+          for (var i = 1; i <= 12; i++) {
+            xArrMonth.push(i + "月");
+            let d = res.month.filter(function(item) {
+              return item.month == i;
+            })
+            if (d.length > 0)
+              yArrData.push(d[0].total);
+            else
+              yArrData.push(0);
+          }
+          this.lineArr.xArr = xArrMonth;
+
+          this.lineArr.series[0].data = yArrData;
+
+
+          let xTypeArr = [];
+          let yTypeArr = [];
+
+
+          for (var mod of res.type) {
+            xTypeArr.push(mod.total)
+            yTypeArr.push(mod.type.name)
+          }
+          this.lineTypeData = {
+            xArr: xTypeArr,
+            yArr: yTypeArr
+          }
+
+
+
+          xTypeArr = [];
+          yTypeArr = [];
+
+
+          for (var mod of res.person) {
+            xTypeArr.push(mod.total)
+            yTypeArr.push(mod.user?.name)
+          }
+          this.lineUserData = {
+            xArr: xTypeArr,
+            yArr: yTypeArr
+          }
+
+
+
+
+          xTypeArr = [];
+          yTypeArr = [];
+
+
+          for (var mod of res.book) {
+            xTypeArr.push(mod.total)
+            yTypeArr.push(mod.book?.name)
+          }
+          this.lineBookData = {
+            xArr: xTypeArr,
+            yArr: yTypeArr
+          }
+
+
+          xTypeArr = [];
+          yTypeArr = [];
+
+
+          for (var mod of res.department) {
+            xTypeArr.push(mod.total)
+            yTypeArr.push(mod.department?.name)
+          }
+          this.lineDeptData = {
+            xArr: xTypeArr,
+            yArr: yTypeArr
+          }
+
+
+
+
+
+        }).catch(error => {
+
+        })
+      }
+    },
+    created() {
+
+      this.dateMonth = this.$moment().format("YYYY-MM");
+      this.year = this.$moment().format("YYYY");
+      //this.loadData();
+      //this.getCharData();
+      this.getList()
+      this.getFinList()
+    },
+    mounted() {
+
+    },
+    destroyed() {
+      //window.onresize = null
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .chart-wrapper {
+    background: #fff;
+    padding: 15px;
+  }
+
+  .statistics {
+    display: flex;
+    flex-direction: column;
+
+    margin-top: 20px;
+
+    &-title {
+
+      padding-left: 6px;
+    }
+
+    &-content {
+      text-align: center;
+      font-size: 13px;
+
+      &-top {
+
+        &__num {
+          font-weight: 600;
+        }
+
+        &__name {
+          font-size: 10px;
+          color: rgb(140, 140, 140);
+        }
+      }
+
+      &-bottom {
+        display: flex;
+        justify-content: space-between;
+
+        &-left {
+
+          &__num {
+            font-weight: 600;
+          }
+
+          &__name {
+            font-size: 10px;
+            color: rgb(140, 140, 140);
+          }
+        }
+
+        &-right {
+
+          &__num {
+            font-weight: 600;
+          }
+
+          &__name {
+            font-size: 10px;
+            color: rgb(140, 140, 140);
+          }
+        }
+      }
+    }
+
+    &>div {
+      flex: 1;
+      margin-right: 20px;
+
+      &:last-child {
+        margin-right: 0;
+      }
+    }
+  }
+
+  .chart {
+    display: flex;
+
+    margin-top: 20px;
+    flex-direction: column;
+
+    .chartBox {
+      display: flex;
+
+      .chartItem {
+
+        width: 49%;
+
+        .chartItemTitle {
+          font-size: 16px;
+          margin-bottom: 20px;
+        }
+
+        #col-chart {
+          background: #fff;
+          border-radius: 10px;
+          flex: 1;
+          margin-right: 20px;
+          padding: 20px;
+          box-sizing: border-box;
+          min-height: 400px;
+          width: 100%;
+        }
+
+        #line-chart {
+          background: #fff;
+          border-radius: 10px;
+          flex: 1;
+          padding: 20px;
+          box-sizing: border-box;
+          min-height: 400px;
+        }
+      }
+    }
+
+
+  }
 </style>
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 45e40d9..81638f5 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -22,6 +22,8 @@
               <el-input size="mini" placeholder="请输入关键词" v-model="select.keyword" style="width: 160px;margin-right: 10px;"></el-input>
 
               <el-button size="medium" type="primary" @click="getList" style="margin-left: 10px">查询</el-button>
+              <el-button size="medium" type="primary" @click="downloadExel" style="margin-left: 10px">导出</el-button>
+              
             </div>
           </slot>
         </LxHeader>
@@ -57,6 +59,9 @@ import operate from '@/views/order/component/operate.vue'
 import LxHeader from '@/components/LxHeader/index.vue'
 
 import {getList,log} from '@/api/order'
+  import {
+    download
+  } from '@/utils/downloadRequest'
 export default {
   components: {
     LxHeader,
@@ -299,6 +304,17 @@ export default {
       console.log(res)
       this.data = res.data
       this.total = res.total
+    },
+    downloadExel() {
+    
+      download(
+        '/api/merchant/order/get-list',
+        'get', {
+          is_export: 1,
+          ...this.select
+        },
+        '订单列表.xlsx')
+    
     }
   },
   computed: {},