Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/pc-admin

src/store/modules/indexEcharts.js

@@ -36,7 +36,6 @@ export default {
       })
     },
     getNewsUserCount ({ commit }, payload) {
-      console.log('8888888888888888')
       return new Promise((resolve, reject) => {
         request({
           ...apis.indexEcharts.newsUserCount,

src/views/carouselFigure/advertisementEdit.vue

@@ -25,11 +25,11 @@
       <el-form-item label="标题：">
         <el-input v-model="form.title"></el-input>
       </el-form-item>
-      <el-form-item label="发布位置：">
+      <!-- <el-form-item label="发布位置：">
         <el-select v-model="form.showPosition" placeholder="请选择">
           <el-option v-for="(item,i) in showPositionList" :key="i" :label="item.name" :value="item.value"></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="类型：">
         <el-select v-model="form.contentType" placeholder="请选择">
           <el-option v-for="(t,i) in contentTypeList" :key="i" :label="t.name" :value="t.value"></el-option>

src/views/index.js

@@ -20,8 +20,8 @@ const pages = [
     },
     children:[
       {
-        path: 'indexEcharts',
-        name: 'indexEcharts',
+        path: 'index',
+        name: 'index',
         component: () => import('./indexEcharts/index.vue'),
         meta: {
           menuShow: false,

src/views/indexEcharts/behaviorAnalysis.vue

@@ -23,7 +23,7 @@
         </ul>
       </div>
     </div>
-  <p>用户行为 最近一个月 
+  <p>最近一周 最近一个月 
     <el-date-picker
       v-model="value"
       type="daterange"

src/views/indexEcharts/index.vue

@@ -57,7 +57,7 @@
   <p class="title under-line" @click="toNewUsers()">新增用户</p>
   <span class="title-desc under-line" @click="toNewUsers()">最近7天</span>
   <el-table :data="tableData"  border  center  style="width: 100%">
-    <el-table-column label=date prop="name" ></el-table-column>
+    <el-table-column v-for="(item, index) in tableTitle" :key="index" :label="item" :prop="index == 0 ? 'label': item"></el-table-column>
   </el-table>
   <p class="title">意向客户</p>
   <el-table :data="tableData2"  border  center  style="width: 100%">
@@ -83,24 +83,12 @@ export default {
   components: {},
   data() {
     return {
+      // 新增用户
       tableData: [
-        {
-          date: "2016-05-02",
-          name: "15"
-        },
-        {
-          date: "2016-05-04",
-          name: "16"
-        },
-        {
-          date: "2016-05-01",
-          name: "17"
-        },
-        {
-          date: "2016-05-03",
-          name: "18"
-        }
+        { label: '新增用户', },
+        { label: '授权注册', }
       ],
+      tableTitle: [ '类型' ],
       tableData2: [
         {
           num: "98",
@@ -139,7 +127,25 @@ export default {
     ...mapIndexEchartsActions(["getIndexEcharts", "setDetailNull"]),
     initPage() {
       this.setDetailNull();
-      this.getIndexEcharts();
+      this.getIndexEcharts().then(x => {
+        const data = this.echartsInfo.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)
+      });;
     },
     toNewUsers() {
       this.$router.push({ name: "newUsers" });
@@ -256,15 +262,15 @@ export default {
         },
         series: [
           {
-            name: "访问来源",
+            name: "用户来源",
             type: "pie",
             radius: "55%",
             center: ["50%", "60%"],
-            label: {
-              normal: {
-                position: "inner"
-              }
-            },
+            // label: {
+            //   normal: {
+            //     position: "inner"
+            //   }
+            // },
             data: [
               { value: 15, name: "自主进入" },
               { value: 30, name: "来源全民经纪人" },
@@ -422,7 +428,7 @@ export default {
         },
         series: [
           {
-            name: "访问来源",
+            name: "转化率",
             type: "pie",
             radius: ["40%", "56%"],
             avoidLabelOverlap: false,
@@ -464,7 +470,7 @@ export default {
         },
         series: [
           {
-            name: "访问来源",
+            name: "性别比例",
             type: "pie",
             radius: ["40%", "56%"],
             avoidLabelOverlap: false,
@@ -508,15 +514,15 @@ export default {
         },
         series: [
           {
-            name: "访问来源",
+            name: "城市分布",
             type: "pie",
             radius: "55%",
             center: ["50%", "60%"],
-            label: {
-              normal: {
-                position: "inner"
-              }
-            },
+            // label: {
+            //   normal: {
+            //     position: "inner"
+            //   }
+            // },
             data: [
               { value: 21, name: "合肥" },
               { value: 90, name: "南京" },

src/views/indexEcharts/newUsers.vue

@@ -1,15 +1,16 @@
 <template>
 <div>
-  <p class="title">最近一周 最近一个月 
+  <p class="title"><span @click="choose(list.id)" :class="active==list.id?'active':''" v-for="(list,index) in dateList" :key="index" >{{list.date}}</span>  
     <el-date-picker
       v-model="value"
       type="daterange"
       start-placeholder="开始日期"
       end-placeholder="结束日期"
+      @change="changeDate"
       default-value="2019-08-08">
     </el-date-picker></p>
   <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 :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>
 
@@ -32,6 +33,11 @@ export default {
   data() {
     return {
       value: "",
+      dateList:[
+        {date:'最近一周',id:1},
+        {date:'最近一个月',id:2},
+      ],
+      active:1,
       lineSeting: {
         dataset: {
           dimensions: ['date', 'userCount', 'authorizationCount'],
@@ -52,8 +58,16 @@ export default {
   },
   methods: {
     ...mapIndexEchartsActions(["getNewsUserCount"]),
+    choose(id){
+      this.active = id;
+    },
+    changeDate(){
+      console.log(this.value,"value");
+      if(this.value!=''){
+        this.active = '3'
+      }
+    },
     initPage() {
-      console.log('11111111111111')
       this.getNewsUserCount().then(x => {
         const data = this.newsUserCount.selectNewsUserCount
         this.lineSeting.dataset.source = data
@@ -88,6 +102,14 @@ export default {
 p {
   margin: 0;
 }
+.title{
+  span{
+    margin-right: 15px;
+  }
+  .active{
+    color: #044281;
+  }
+}
 </style>
 
 

src/views/indexEcharts/userSource.vue

@@ -1,9 +1,10 @@
 <template>
 <div>
-  <p class="title">用户行为 最近2个月 
+  <p class="title"><span @click="choose(list.id)"  :class="active==list.id?'active':''" v-for="(list,index) in dateList" :key="index" >{{list.date}}</span> 
     <el-date-picker
       v-model="value"
       type="daterange"
+      @change="changeDate"
       start-placeholder="开始日期"
       end-placeholder="结束日期"
       default-value="2019-08-08">
@@ -54,6 +55,11 @@ export default {
   },
   data() {
     return {
+      dateList:[
+        {date:'最近一周',id:1},
+        {date:'最近一个月',id:2},
+      ],
+      active:1,
       value: '', // 时间
         header: [], // 表头
        tableData2: [
@@ -103,6 +109,15 @@ export default {
      ...mapEchartsActions([
         'getUserResource'
      ]),
+     choose(id){
+      this.active = id;
+    },
+    changeDate(){
+      console.log(this.value,"value");
+      if(this.value!=''){
+        this.active = '3'
+      }
+    },
     drawLine() {
       // 基于准备好的dom，初始化echarts实例
       let firstChart = Echarts.init(this.$refs.firstChart);
@@ -273,6 +288,14 @@ export default {
 p {
   margin: 0;
 }
+.title{
+  span{
+    margin-right: 15px;
+  }
+  .active{
+    color: #044281;
+  }
+}
 </style>