合并

src/components/charts/XLine.vue

@@ -0,0 +1,80 @@
+<template>
+   <div ref="thirdChart" ></div>
+</template>
+<script>
+import Echarts from "echarts";
+export default {
+  name: "XLine",
+  props: ["value"],
+  data() {
+    return {
+      chart: undefined,
+      defaultOpts: {
+        //  dataset: {
+        //   dimensions: ['date', 'userCount', 'authorizationCount'],
+        //   source,
+        // },
+        title: {
+          text: "新增用户"
+        },
+        color: ["purple", "green"],
+        tooltip: {
+          trigger: "axis"
+        },
+        legend: {
+          data: ["新用户数", "授权注册"]
+        },
+        grid: {
+          left: "3%",
+          right: "4%",
+          bottom: "3%",
+          containLabel: true
+        },
+        toolbox: {},
+        xAxis: {
+          type: "category",
+          boundaryGap: false
+        },
+        yAxis: {
+          type: "value"
+        },
+        series: [
+          {
+            name: "新用户数",
+            type: "line",
+            stack: "1"
+          },
+          {
+            name: "授权注册",
+            type: "line",
+            stack: "2"
+          }
+        ]
+      }
+    };
+  },
+  watch: {
+    value (val) {
+      this.renderChart(val)
+    },
+  },
+  mounted() {
+    if (!this.chart) {
+      this.chart = Echarts.init(this.$refs.thirdChart);
+      this.renderChart(this.value)
+    }
+  },
+  methods: {
+    renderChart(val) {
+      // 绘制图表
+      this.chart.setOption({
+        ...this.defaultOpts,
+        ...val
+      });
+    }
+  }
+};
+</script>
+<style>
+</style>
+

src/config/api.js

@@ -318,15 +318,29 @@ const apis = {
       url: `${commPrefix}/taCustomerMessage`
     }
   },
+    report:{
+        list:{
+            method:'get',
+            url: `${commPrefix}/tdReports`
+        },
+        checkedlist:{
+            method:'get',
+            url: `${commPrefix}/taBuildingReports`
+        },
+        add:{
+            method:'post',
+            url: `${commPrefix}/taBuildingReport/add`
+        },
+    },
   indexEcharts:{
     list:{
       method:'get',
       url: `${commPrefix}/indexStatistical`
     },
-    userResource: {
-      method:'get',
-      url: `${commPrefix}/selectUserResource`
-    }
+      userResource: {
+          method:'get',
+          url: `${commPrefix}/selectUserResource`
+      }
   },
 }
 export default apis

src/store/index.js

@@ -21,6 +21,7 @@ const store = new Vuex.Store({
     carouselFigure: require('./modules/carouselFigure').default,
     indexEcharts: require('./modules/indexEcharts').default,
     message: require('./modules/message').default,
+    report: require('./modules/report').default,
     news
 
   }

src/store/modules/indexEcharts.js

@@ -5,11 +5,15 @@ export default {
   namespaced: true,
   state: {
     echartsInfo: {},
+    newsUserCount:{}
   },
   mutations: {
     updateList (state, payload) {
       state.echartsInfo = payload
     },
+    updateNewsUserCount (state, payload) {
+      state.newsUserCount = payload
+    },
   },
   actions: {
     setDetailNull ({ commit }) {
@@ -31,6 +35,22 @@ export default {
         })
       })
     },
+    getNewsUserCount ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.indexEcharts.newsUserCount,
+          params: payload,
+        }).then((data) => {
+          commit('updateNewsUserCount', data)
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
     // changeExchangeStatus (_, payload) {
     //   return new Promise((resolve, reject) => {
     //     request({

src/store/modules/report.js

@@ -0,0 +1,141 @@
+import request from '../../utils/request'
+import apis from '../../config/api'
+
+export default {
+  namespaced: true,
+  state: {
+    dynamics: {},
+    detail: {}
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.dynamics = payload
+    },
+    updateDetail (state, payload) {
+      state.detail = payload
+    }
+  },
+  actions: {
+    setDetailNull ({ commit }) {
+      commit('updateDetail', {})
+    },
+    getReportList ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.report.list,
+          params: payload,
+        }).then((data) => {
+          commit('updateList', data)
+          resolve(data)
+        }).catch((err) => {
+          resolve(err)
+        })
+      })
+    },
+    getReportCheckedList ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.report.checkedlist,
+          params: payload,
+        }).then((data) => {
+          commit('updateList', data)
+          resolve(data)
+        }).catch((err) => {
+          resolve(err)
+        })
+      })
+    },
+    getGoodsDetail ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.goods.detail,
+          urlData: payload,
+        }).then((data) => {
+          commit('updateDetail', data)
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    saveCheckedReport (_, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.report.add, 
+          data: payload,
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    editGoods (_, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.goods.edit,
+          data: payload,
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    deleteDynamics (_, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.dynamic.delete,
+          ...payload
+        }).then(() => {
+          resolve()
+        }).catch(() => {
+          reject()
+        })
+      })
+    },
+    changeGoodsStatus (_, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.goods.change,
+          data: payload,
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    cancelDynamic (_, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.dynamic.cancel,
+          urlData: payload,
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    }
+  }
+}

src/views/index.js

@@ -311,6 +311,15 @@ const pages = [
           title: '客户留言',
         },
       },
+      {
+        path: 'report',
+        name: 'report',
+        component: () => import('./systemManagement/report.vue'),
+        meta: {
+          menuShow: true,
+          title: '报表数据',
+        },
+      },
     ]
   },
   {

src/views/indexEcharts/index.vue

@@ -540,7 +540,7 @@ export default {
       //   this.members.push(this.echartsInfo.selectUserBehavior[i].members);
       // }
     }
-    this.drawLine();
+    this.initPage();
   }
 };
 </script>

src/views/indexEcharts/newUsers.vue

@@ -9,12 +9,9 @@
       end-placeholder="结束日期"
       default-value="2019-08-08">
     </el-date-picker></p>
-  <div class="grid-content" ref="thirdChart"  id="thirdChart"  :style="{ height: '500px',margin:'20px 0',border:'1px solid #eee', padding:'20px',borderRadius:'5px'}" ></div>
-   <el-table :data="tableData2"  border  center  style="width: 100%">
-    <el-table-column label="用户姓名" prop="name"></el-table-column>
-    <el-table-column label="手机号" prop="phone"></el-table-column>
-    <el-table-column label="意向楼盘" prop="building"></el-table-column>
-    <el-table-column label="意向值" prop="num"></el-table-column>
+  <x-line :style="{ height: '500px',margin:'20px 0',border:'1px solid #eee', padding:'20px',borderRadius:'5px'}"  :value="lineSeting"></x-line>
+   <el-table :data="tableData"  border  center  style="width: 100%">
+    <el-table-column v-for="(item, index) in tableTitle" :key="index" :label="item" :prop="index == 0 ? 'label': item"></el-table-column>
   </el-table>
 
 </div>
@@ -24,14 +21,30 @@
 import { createNamespacedHelpers } from "vuex";
 import apis from "../../config/api";
 import { mapState } from "vuex";
-import Echarts from "echarts";
 
+const {
+  mapState: mapIndexEchartsState,
+  mapActions: mapIndexEchartsActions
+} = createNamespacedHelpers("indexEcharts");
 export default {
-  components: {},
+  components: {
+    XLine: () => import('@/components/charts/XLine.vue'),
+  },
   data() {
     return {
-      value: '',
-       tableData2: [
+      value: "",
+      lineSeting: {
+        dataset: {
+          dimensions: ['date', 'userCount', 'authorizationCount'],
+          source: [],
+        },
+      },
+      tableData: [
+        { label: '新增用户', },
+        { label: '授权注册', }
+      ],
+      tableTitle: [ '类型' ],
+      tableData2: [
         {
           num: "98",
           name: "王晓红",
@@ -59,57 +72,44 @@ export default {
       ]
     };
   },
-  computed: {},
+  computed: {
+    ...mapIndexEchartsState({
+      newsUserCount: x => x.newsUserCount
+    })
+  },
   methods: {
-    drawLine() {
-      // 折线图
-      let thirdChart = Echarts.init(this.$refs.thirdChart);
-      // 绘制图表
-      thirdChart.setOption({
-        title: {
-          text: "新增用户"
-        },
-        color: ["purple", "green"],
-        tooltip: {
-          trigger: "axis"
-        },
-        legend: {
-          data: ["新用户数", "授权注册"]
-        },
-        grid: {
-          left: "3%",
-          right: "4%",
-          bottom: "3%",
-          containLabel: true
-        },
-        toolbox: {},
-        xAxis: {
-          type: "category",
-          boundaryGap: false,
-          data: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"]
-        },
-        yAxis: {
-          type: "value"
-        },
-        series: [
-          {
-            name: "新用户数",
-            type: "line",
-            stack: "1",
-            data: [120, 132, 101, 134, 90, 230, 210]
-          },
-          {
-            name: "授权注册",
-            type: "line",
-            stack: "2",
-            data: [220, 182, 191, 234, 290, 330, 310]
-          },
-        ]
+    ...mapIndexEchartsActions(["getNewsUserCount"]),
+    initPage() {
+      this.getNewsUserCount().then(x => {
+        const data = this.newsUserCount.selectNewsUserCount
+        this.lineSeting.dataset.source = data
+        this.tableData = (data || []).reduce((acc, item, index) => {
+          const { date, userCount, authorizationCount } = item
+
+          const row2 = {
+            ...acc[0],
+            [`${date}`]: userCount,
+          }
+
+          const row3 = {
+            ...acc[1],
+            [`${date}`]: authorizationCount,
+          }
+
+          this.tableTitle = this.tableTitle.concat(`${date}`)
+
+          return [row2, row3];          
+        }, this.tableData)
+
+
+        window.console.log(this.tableData, '-------')
       });
-    }
+    },
   },
   mounted() {
-    this.drawLine();
+    this.initPage();
+    // this.drawLine();
+  
   }
 };
 </script>

src/views/systemManagement/report.vue

@@ -0,0 +1,179 @@
+<template>
+  <div>
+  <el-checkbox-group 
+    v-model="checkedReport">
+    <el-checkbox v-for="report in reportList" :label="report.reportCode" :key="report.reportCode">{{report.reportName}}</el-checkbox>
+  </el-checkbox-group>
+  <el-row>
+      <el-button type="primary" @click="saveReport">保存</el-button>
+  </el-row>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from "vuex";
+import dayjs from 'dayjs'
+
+const { mapActions: mapReportActions } = createNamespacedHelpers("report");
+
+export default {
+  name: "report",
+  data() {
+    return {
+      checkedReport: [],
+      reportList: [],
+      pageNavi: {
+        current: 1,
+        size: 200,
+        total: 0
+      }
+    };
+  },
+  computed: {},
+  methods: {
+    ...mapReportActions(["getReportList", "getReportCheckedList", "saveCheckedReport"]),
+    getList() {
+      const pageNumber = this.pageNavi.current || 1;
+      const pageSize = this.pageNavi.size;
+
+      this.getReportList({
+        pageNumber,
+        pageSize
+      })
+        .then(res => {
+          const { records, ...pageNavi } = res;
+
+          this.reportList = records;
+          this.pageNavi = pageNavi;
+        })
+        .catch(err => {
+          this.$notify.error(err.msg || err.message);
+        });
+    },
+    getCheckedList() {
+      const pageNumber = this.pageNavi.current || 1;
+      const pageSize = this.pageNavi.size;
+      this.getReportCheckedList({
+        pageNumber,
+        pageSize
+      })
+        .then(res => {
+          const { records, ...pageNavi } = res;
+        
+          this.checkedReport = (records || []).map((x) => x.reportCode);
+          this.pageNavi = pageNavi;
+        })
+        .catch(err => {
+          this.$notify.error(err.msg || err.message);
+        });
+    },
+    saveReport() {
+      if(this.checkedReport.length < 1 ){
+        this.$notify.error("请选择在保存");
+        return
+      }
+      this.showLoadding("保存中...");
+      this.saveCheckedReport({
+        list: this.checkedReport
+      })
+        .then(res => {
+          this.hideLoadding();
+         this.$notify.info("保存成功");
+        })
+        .catch(err => {
+          this.hideLoadding();
+          this.$notify.error(err.msg || err.message);
+        });
+    },
+    toDetail(row) {
+      this.$router.push({
+        name: "goods.edit",
+        params: { id: row.goodsId }
+      });
+    },
+    changeStatus(row) {
+      this.showLoadding("保存中...");
+      this.changeGoodsStatus(row)
+        .then(res => {
+          this.hideLoadding();
+          this.$notify.info("保存成功");
+          this.search();
+        })
+        .catch(err => {
+          this.hideLoadding();
+          this.$notify.error(err.message);
+        });
+    },
+    showLoadding(text) {
+      this.loading = this.$loading({
+        text,
+        lock: true,
+        spinner: "el-icon-loading",
+        background: "rgba(255, 255, 255, 0.7)"
+      });
+    },
+    hideLoadding() {
+      if (this.loading) this.loading.close();
+    },
+    search() {
+      this.pageNavi.current = 1;
+      this.getList();
+    },
+    newPage(page) {
+      this.$router.replace({ name: "goods.list", query: { page } });
+    },
+    formateDate(dt) {
+      return !dt ? '' : dayjs(dt).format('YYYY-MM-DD HH:mm')
+    },
+  },
+  created() {
+    this.pageNavi.current = this.$route.query.page || 1;
+
+    this.getList();
+    this.getCheckedList();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.list {
+  .header {
+    width: 50px;
+    height: 50px;
+    border-radius: 50%;
+  }
+  img {
+      width: 100%;
+      height: 100%;
+    }
+}
+.system-table-search {
+  width: calc(100% - 40px);
+  margin: 20px auto 0;
+}
+
+.system-table-search li {
+  margin-right: 20px;
+}
+
+.system-table-search ul {
+  font-size: 0;
+  white-space: nowrap;
+}
+
+.system-table-search ul > li {
+  display: inline-block;
+}
+
+.flex-h {
+  display: flex;
+  align-items: center;
+}
+
+.flex-item {
+  flex: 1;
+  -webkit-flex: 1;
+  position: relative;
+  overflow: hidden;
+}
+</style>