feats

src/config/api.js

@@ -160,7 +160,11 @@ const apis = {
     finishActivity:{
       method:'put',
       url: `${commPrefix}/buildingDynamic/finish`
-    }
+    },
+    setWeight: {
+      method:'put',
+      url: `${commPrefix}/buildingDynamic/weight`
+    },
   },
   recommendCustomer:{
     list:{
@@ -349,6 +353,21 @@ const apis = {
       method:'get',
       url: `${commPrefix}/selectConversion`
     },
+
+    newUser: {
+      method:'get',
+      url: `${commPrefix}/selectNewsUserCount`
+    }
   },
+  bizEvent: {
+    dict: {
+      method:'get',
+      url: `${commPrefix}/tdBizEventType`
+    },
+    list: {
+      method:'get',
+      url: `${commPrefix}/tdBizEventType`
+    },
+  }
 }
 export default apis

src/layout/default/index.vue

@@ -19,7 +19,7 @@
         <router-view></router-view>
       </el-main>
       <el-footer class="noPadding">
-        <xm-footer company="荟房科技"/>
+        <xm-footer company="知与行"/>
       </el-footer>
     </el-container>
   </el-container>

src/store/modules/activity.js

@@ -73,5 +73,20 @@ export default {
         })
       })
     },
+    // 置顶
+    updateWeight(_, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.activity.setWeight,
+          params: payload,
+        }).then((data) => {
+          resolve(data)
+        }).catch(({ message }) => {
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    }
   },
 }

src/store/modules/indexEcharts.js

@@ -55,11 +55,10 @@ export default {
     getNewsUserCount ({ commit }, payload) {
       return new Promise((resolve, reject) => {
         request({
-          ...apis.indexEcharts.newsUserCount,
+          ...apis.indexEcharts.newUser,
           params: payload,
         }).then((data) => {
-          commit('updateNewsUserCount', data)
-          resolve(data)
+          resolve(data.selectNewsUserCount)
         }).catch((err) => {
           const message = err.message || err.msg
           if (typeof message === 'string') {

src/store/system.js

@@ -5,7 +5,7 @@ export default {
   state: {
     app: {
       logo: '',
-      name: '荟房科技',
+      name: '知与行',
       version: 1.0,
     },
     menus: [],

src/views/Login.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="login-form" @keyup.enter="submit">
-    <xm-polygon color="#044281" :dots="800" class="xm-polygon" />
+    <!-- <xm-polygon color="#044281" :dots="800" class="xm-polygon" /> -->
     <el-container class="login-layout">
       <el-main>
         <div class="head">
           <div class="logo"></div>
           <div class="title">
-            <h2>欢迎使用荟房科技后台系统</h2>
+            <h2>欢迎使用营销云系统</h2>
           </div>
         </div>
         <div class="body">
@@ -18,14 +18,15 @@
             </el-form-item>
             <el-form-item>
               <el-row :gutter="10">
-                <el-col :span="18">
+                <el-input class="large-input" v-model="formdata.password" placeholder="请输入密码"></el-input>
+                <!-- <el-col :span="18">
                   <el-input class="large-input" v-model="formdata.password" placeholder="请输入验证码">
                     <xm-icon name="password" size="small" slot="prefix" :style="{ lineHeight: '36px' }"/>
                   </el-input>
                 </el-col>
                 <el-col :span="4">
                   <el-button type="success">验证码</el-button>
-                </el-col>
+                </el-col> -->
               </el-row>              
             </el-form-item>
             <el-form-item>
@@ -37,7 +38,7 @@
         </div>
       </el-main>
       <el-footer class="foot">
-        <xm-footer company="荟房科技" />
+        <xm-footer company="知与行" />
       </el-footer>
     </el-container>
   </div>
@@ -51,7 +52,7 @@ export default {
   name: 'login',
   components: {
     xmFooter: () => import('@/components/XMFooter.vue'),
-    xmPolygon: () => import('@/components/XMPolygon.vue'),
+    // xmPolygon: () => import('@/components/XMPolygon.vue'),
   },
   data() {
     return {

src/views/activity/list.vue

@@ -68,7 +68,7 @@
         <el-button type="text" @click="getSignList(scope.row.dynamicId)" size="small" v-if="scope.row.isEnlist == '1' || scope.row.isEnlist === '2'">报名记录</el-button>
         <el-button type="text" @click="toDetail(scope.row.dynamicId)" size="small">编辑</el-button>
         <el-button type="text" @click="finish(scope.row.dynamicId)" size="small">结束活动</el-button>
-        <!-- <el-button type="text" @click="top(scope.row.dynamicId)" size="small">置顶</el-button> -->
+        <el-button type="text" @click="top(scope.row)" size="small">{{ scope.row.weight === 1 ? '取消置顶' : '置顶' }}</el-button>
       </template>
     </el-table-column>
   </el-table>
@@ -127,7 +127,8 @@ export default {
     ]),
     ...mapActivity([
       "getActivityList",
-      'finishActivity'
+      'finishActivity',
+      'updateWeight',
       ]),
     getList() {
       this.getActivityList(this.filterData,this.filterData.pageSize,this.filterData.pageNum).then(res => {
@@ -161,19 +162,23 @@ export default {
         }).catch(() => {       
         });
     },
-    top(id){
-        //   this.filterData.dynamicId = id
-        //   this.filterData.top = 1
-        //   this.finishActivity(
-        //   JSON.stringify(this.filterData)
-        // ).then((res) => {
-        //    this.getList();
-        //   this.getBuildList()   
-        // })
+    top(row){
+      const weight = Math.abs(row.weight - 1)
+
+      this.updateWeight({ dynamicId: row.dynamicId, weight }).then(() => {
+        this.list = this.list.map(x => x.dynamicId === row.dynamicId ? { ...x, weight } : x)
+
+        if (weight) {
+          this.$message.info('置顶成功')
+        } else {
+          this.$message.info('取消置顶成功')
+        }
+      }).catch((err) => {
+          this.$message.error(err.message || err)
+      })
     },
     addDynamic() {
       this.$router.push({ name: "activity-add" });
-      console.log('11111')
     },
     toDetail(row) {
       this.$router.push({ name: "activity-edit",query: { row }});

src/views/indexEcharts/components/NewUsers.vue

@@ -2,11 +2,11 @@
   <div>
     <div class="chart-box" v-if="mode == 'all' || mode == 'line'">
       <h3>新增客户</h3>
-      <v-chart class="chart" :options="options" />
+      <v-chart v-loading="loading" class="chart" :options="options" />
     </div>
     <div class="chart-box" v-if="mode == 'all' || mode == 'table'">
       <h3>新增客户 <small>最近七天</small></h3>
-      <el-table :data="tableData"  border  center  style="width: 100%; margin-top: 16px">
+      <el-table v-loading="loading" :data="tableData"  border  center  style="width: 100%; margin-top: 16px">
         <el-table-column v-for="(item, index) in tableTitle" :key="index" :label="item" :prop="index == 0 ? 'label': item"></el-table-column>
       </el-table>
     </div>
@@ -17,12 +17,19 @@
 import ECharts from 'vue-echarts'
 import 'echarts/lib/chart/line'
 import 'echarts/lib/component/tooltip'
+import 'echarts/lib/component/dataZoom'
+import dayjs from 'dayjs'
+import { createNamespacedHelpers } from "vuex"
+
+const { mapActions } = createNamespacedHelpers("indexEcharts");
 
 export default {
   name: 'NewUsers',
   props: ['value', 'mode'],
   data () {
     return {
+      loading: false,
+      dataset: [],
       tableTitle: [ '类型' ],
       lineOpt: {
         color: ["purple", "green"],
@@ -37,6 +44,18 @@ export default {
           type: "category",
         },
         yAxis: {},
+        dataZoom: [
+          {
+            type: 'inside',
+            start: 0,
+            end: 100
+          },
+          {
+            type: 'slider',
+            start: 0,
+            end: 100
+          },
+        ],
         series: [
           {
             name: "新用户数",
@@ -56,12 +75,12 @@ export default {
         ...this.lineOpt,
         dataset: {
           dimensions: ['date', 'userCount', 'authorizationCount'],
-          source: this.value || []
+          source: this.dataset
         }
       }
     },
     tableData () {
-      return (this.value || []).reduce((acc, item, index) => {
+      return this.dataset.reduce((acc, item, index) => {
           const { date, userCount, authorizationCount } = item
           const row1 = {
             ...acc[0],
@@ -77,7 +96,25 @@ export default {
           return [row1, row2];          
         }, [{ label: '新增用户', }, { label: '授权注册', } ])
     }
-  }
+  },
+  mounted () {
+    const endDate = new Date()
+    const startDate = dayjs().subtract(7, 'day').toDate()
+
+    this.getData({ startDate, endDate })
+  },
+  methods: {
+    ...mapActions(['getNewsUserCount']),
+    getData(filters) {
+      this.loadding = true
+      this.getNewsUserCount(filters).then((data) => {
+        this.dataset = data || []
+        this.loading = false
+      }).catch((err) => {
+        this.loading = false
+      })
+    },
+  },
 }
 </script>
 

src/views/indexEcharts/components/UserSource.vue

@@ -1,15 +1,15 @@
 <template>
   <div>
     <div class="chart-box" v-if="mode == 'all' || mode == 'report'">
-      <h3>用户来源 <small>最近七天</small></h3>
-      <v-chart class="chart" :options="options" />
+      <h3>用户来源 <small>{{subTitle}}</small></h3>
+      <v-chart v-loading="loading" class="chart" :options="options" />
     </div>
     <div class="chart-box" v-if="mode == 'all' || mode == 'table'">
       <el-select v-model="userType">
         <el-option label="所有用户" value="all"></el-option>
         <el-option label="注册用户" value="registered"></el-option>
       </el-select>
-      <el-table :data="tableData"  border  center  style="width: 100%; margin-top: 16px">
+      <el-table v-loading="loading" :data="tableData"  border  center  style="width: 100%; margin-top: 16px" height="400">
         <el-table-column v-for="(item, index) in tableTitle" :key="index" :label="item" :prop="index == 0 ? 'label' : item"></el-table-column>
       </el-table>
     </div>
@@ -21,6 +21,10 @@ import ECharts from 'vue-echarts'
 import 'echarts/lib/chart/bar'
 import 'echarts/lib/chart/pie'
 import 'echarts/lib/component/tooltip'
+import dayjs from 'dayjs'
+import { createNamespacedHelpers } from "vuex"
+
+const { mapActions } = createNamespacedHelpers("indexEcharts");
 
 export default {
   name: 'UserSource',
@@ -29,10 +33,13 @@ export default {
   },
   props: [
     'value',
+    'subTitle',
     'mode',
   ],
   data () {
     return {
+      loading: false,
+      dataset: {},
       reportOpts: {
         legend: {},
         color: ['#286DD0', '#8565CE', '#6A96F8', '#F5749E', '#8B7FE2'],
@@ -44,16 +51,17 @@ export default {
         ],
       },
       userType: 'all',
-      tableTitle: ['类型'],
+      tableTitle: ['日期'],
     }
   },
   computed: {
     tableData () {
-      const data = (this.value || { data: [] }).data.reduce((acc, item, index) => {
-          const { date, fromName, count } = item
+      const data = (this.dataset.data || []).reduce((acc, item, index) => {
+          const { date, fromName, count, registered } = item
+          const num = this.userType === 'registered' ? registered : count
           
-          this.tableTitle = this.tableTitle.indexOf(date) > -1 ? this.tableTitle : this.tableTitle.concat(date) // eslint-disable-line
-          acc[fromName] = { ...acc[fromName], [`${date}`]: !count ? 0 : count }
+          this.tableTitle = this.tableTitle.indexOf(fromName) > -1 ? this.tableTitle : this.tableTitle.concat(fromName) // eslint-disable-line
+          acc[date] = { ...acc[date], [`${fromName}`]: !num ? 0 : num }
 
           return acc
         }, {})
@@ -63,7 +71,7 @@ export default {
 
     // 柱图
     barOptions () {
-      const source = (this.value || {}).columnar || [];
+      const source = this.dataset.columnar || [];
       return {
         xAxis: { type: 'category' },
         legend: {
@@ -83,7 +91,7 @@ export default {
     },
     // 饼图
     pieOptions () {
-      const { person_estate_agent = 0, person_null = 0, person_realty_consultant = 0 } = (this.value || {}).pie || {};
+      const { person_estate_agent = 0, person_null = 0, person_realty_consultant = 0 } = this.dataset.pie || {};
       return {
         xAxis: {},
         legend: {
@@ -130,6 +138,24 @@ export default {
       }
     }
   },
+  methods: {
+    ...mapActions(['getUserResource']),
+    getData(filters) {
+      this.loadding = true
+      this.getUserResource(filters).then((data) => {
+        this.dataset = data || {}
+        this.loading = false
+      }).catch((err) => {
+        this.loading = false
+      })
+    }
+  },
+  mounted () {
+    const endDate = new Date()
+    const startDate = dayjs().subtract(7, 'day').toDate()
+
+    this.getData({ startDate, endDate })
+  },
 }
 </script>
 

src/views/indexEcharts/index.vue

@@ -11,7 +11,7 @@
       <card label="最近7天新增" @click.native="toNewUsers()" class="under-line" >{{echartsInfo.selectRecentlyCount}}</card>
     </el-col>
   </el-row>
-  <user-source :value="userSourceData" mode="report"></user-source>
+  <user-source :value="userSourceData" mode="report" sub-title="最近七天"></user-source>
   <user-behavior class="marginTB" :value="userBehaviorData" @click="toBehaviorAnalysis()"></user-behavior>
  <el-row :gutter="20">
     <el-col :span="12">

src/views/indexEcharts/newUsers.vue

@@ -1,84 +1,49 @@
 <template>
 <div>
-  <div class="title">
-    <span @click="choose(list.id)" :class="active==list.id?'active':''" v-for="(list,index) in dateList" :key="index" >{{list.date}}</span>  
+  <div>
+    <el-button type="text" @click="() => getDataOf(7)">最近7天</el-button>
+    <el-button type="text" @click="() => getDataOf(30)">最近1月</el-button>
     <el-date-picker
-      v-model="value"
+      v-model="dateRange"
       type="daterange"
       start-placeholder="开始日期"
       end-placeholder="结束日期"
-      @change="changeDate"
-      default-value="2019-08-08">
+      style="margin-left: 16px">
     </el-date-picker>
+    <el-button type="primary" icon="el-icon-search" style="margin-left: 32px" @click="search">查询</el-button>
   </div>
-  
-  <new-users :mode="all" :value="userData"></new-users>
-
+  <new-users mode="line" ref="chart"></new-users>
 </div>
 </template>
 
 <script>
-import { createNamespacedHelpers } from "vuex"
-import { mapState } from "vuex"
+import dayjs from 'dayjs'
 
-const {
-  mapState: mapIndexEchartsState,
-  mapActions: mapIndexEchartsActions
-} = createNamespacedHelpers("indexEcharts");
 export default {
   components: {
     NewUsers: () => import('./components/NewUsers'),
   },
   data() {
     return {
-      value: "",
-      dateList:[
-        {date:'最近一周',id:1},
-        {date:'最近一个月',id:2},
-      ],
-      active:1,
-      userData: [],
+      dateRange: [],
     };
   },
-  computed: {
-    ...mapIndexEchartsState({
-      newsUserCount: x => x.newsUserCount
-    })
-  },
   methods: {
-    ...mapIndexEchartsActions(["getNewsUserCount"]),
-    choose(id){
-      this.active = id;
+    search () {
+      const [ startDate, endDate ] = this.dateRange || []
+      this.$refs.chart.getData({ startDate, endDate })
     },
-    changeDate(){
-      if(this.value!=''){
-        this.active = '3'
-      }
-    },
-    initPage() {
-      this.getNewsUserCount().then(x => {
-        this.userData = this.newsUserCount.selectNewsUserCount
-      });
+    getDataOf(days) {      
+      const endDate = new Date()
+      const startDate = dayjs().subtract(days, 'day').toDate()
+
+      this.$refs.chart.getData({ startDate, endDate })
     },
   },
   mounted() {
-    this.initPage();  
   }
 };
 </script>
 
 <style lang="scss" scoped>
-p {
-  margin: 0;
-}
-.title{
-  span{
-    margin-right: 15px;
-  }
-  .active{
-    color: #044281;
-  }
-}
 </style>
-
-

src/views/indexEcharts/userSource.vue

@@ -1,22 +1,23 @@
 <template>
-<div>
-  <p class="title">用户来源 最近2个月
-    <el-date-picker
-      v-model="value"
-      type="daterange"
-      @change="getInfo"
-      start-placeholder="开始日期"
-      end-placeholder="结束日期"
-      default-value="2019-08-08">
-    </el-date-picker></p>
-    <user-source :value="userData" mode="all"></user-source>
-</div>
+  <div>
+    <div>
+      <el-button type="text" @click="() => getDataOf(7)">最近7天</el-button>
+      <el-button type="text" @click="() => getDataOf(30)">最近1月</el-button>
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        style="margin-left: 16px">
+      </el-date-picker>
+      <el-button type="primary" icon="el-icon-search" style="margin-left: 32px" @click="search">查询</el-button>
+    </div>
+    <user-source ref="chart" mode="all"></user-source>
+  </div>
 </template>
 
 <script>
-import { createNamespacedHelpers } from "vuex";
-
-const { mapActions: mapEchartsActions  } = createNamespacedHelpers("indexEcharts")
+import dayjs from 'dayjs'
 
 export default {
   components: {
@@ -24,34 +25,23 @@ export default {
   },
   data() {
     return {
-      value: '', // 时间
-      userData: {},
+      dateRange: [], // 时间
     };
   },
-  computed: {},
-    created(){
-      this.getInfo()
-    },
+  mounted(){
+  },
   methods: {
-     ...mapEchartsActions([
-        'getUserResource'
-     ]),
-    getInfo() { // 获取信息
+    search () {
+      const [ startDate, endDate ] = this.dateRange || []
+      this.$refs.chart.getData({ startDate, endDate })
+    },
+    getDataOf(days) {      
+      const endDate = new Date()
+      const startDate = dayjs().subtract(days, 'day').toDate()
 
-         this.getUserResource({
-             startDate: this.value[0],
-             endDate: this.value[1],
-             registeredType: this.registeredType
-         }).then((res) => {
-            this.userData = res
-         }).catch((err) => {
-             this.$notify.error(err.msg || err.message);
-             console.log('indexEcharts/getUserResource err')
-         })
+      this.$refs.chart.getData({ startDate, endDate })
     },
   },
-  mounted() {
-  }
 };
 </script>