liujq 3 년 전
부모
커밋
1aa671e8f0

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/index.html


+ 1 - 0
dist/static/css/chunk-17854054.93d1c251.css

@@ -0,0 +1 @@
+.scoped-wrap{position:relative;padding:0 20px;-webkit-box-sizing:border-box;box-sizing:border-box;height:300px}.scoped-wrap .sw-name{position:absolute;font-size:20px;top:10px;right:70px;color:#fff}.dashboard-container[data-v-396d0681]{width:100%;height:calc(100vh - 84px);overflow-y:auto;background-color:#1f2d3d}.dashboard-container.full[data-v-396d0681]{position:fixed;overflow:hidden;top:0;left:0;width:100%;height:100%;z-index:9999999;min-height:100%}.scoped-num[data-v-396d0681]{min-width:1400px;-webkit-box-sizing:border-box;box-sizing:border-box;padding:20px 20px 0}.scoped-num .sn-wrap[data-v-396d0681]{padding:10px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-sizing:border-box;box-sizing:border-box}.scoped-num .sn-item[data-v-396d0681]{padding:10px;-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:center}.scoped-num .sn-item .sn-label[data-v-396d0681]{padding-top:20px;color:#8cdacc;font-size:18px}.scoped-num .sn-item .dv-digital-flop[data-v-396d0681]{display:inline-block;margin-bottom:10px}.scoped-count[data-v-396d0681]{padding:20px;display:inline-block;min-width:1400px;-webkit-box-sizing:border-box;box-sizing:border-box}.scoped-count.t2[data-v-396d0681]{display:inline-block;vertical-align:middle;min-width:500px}.scoped-count .sc-row[data-v-396d0681]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:10px 0;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.scoped-count .sc-col[data-v-396d0681]{width:450px;padding:10px}.scoped-count .sc-wrap[data-v-396d0681]{padding:50px 20px 20px}.scoped-count .sc-user[data-v-396d0681]{width:450px;height:320px;padding-top:80px;text-align:center}.scoped-count .sc-user .t[data-v-396d0681]{color:#fff;font-size:20px;padding-top:10px;font-weight:700}

+ 0 - 1
dist/static/css/chunk-78205f82.aef0ec91.css

@@ -1 +0,0 @@
-.scoped-wrap{position:relative;padding:0 20px;-webkit-box-sizing:border-box;box-sizing:border-box;height:300px}.scoped-wrap .sw-name{position:absolute;font-size:20px;top:10px;right:70px;color:#fff}.dashboard-container[data-v-195d16ce]{width:100%;height:calc(100vh - 84px);overflow-y:auto;background-color:#1f2d3d}.dashboard-container.full[data-v-195d16ce]{position:fixed;overflow:hidden;top:0;left:0;width:100%;height:100%;z-index:9999999;min-height:100%}.scoped-num[data-v-195d16ce]{min-width:1400px;-webkit-box-sizing:border-box;box-sizing:border-box;padding:20px 20px 0}.scoped-num .sn-wrap[data-v-195d16ce]{padding:10px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-sizing:border-box;box-sizing:border-box}.scoped-num .sn-item[data-v-195d16ce]{padding:10px;-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:center}.scoped-num .sn-item .sn-label[data-v-195d16ce]{padding-top:20px;color:#8cdacc;font-size:18px}.scoped-num .sn-item .dv-digital-flop[data-v-195d16ce]{display:inline-block;margin-bottom:10px}.scoped-count[data-v-195d16ce]{padding:20px;display:inline-block;min-width:1400px;-webkit-box-sizing:border-box;box-sizing:border-box}.scoped-count.t2[data-v-195d16ce]{display:inline-block;vertical-align:middle;min-width:500px}.scoped-count .sc-row[data-v-195d16ce]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:10px 0;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.scoped-count .sc-col[data-v-195d16ce]{width:450px;padding:10px}.scoped-count .sc-wrap[data-v-195d16ce]{padding:50px 20px 20px}.scoped-count .sc-user[data-v-195d16ce]{width:450px;height:320px;padding-top:80px;text-align:center}.scoped-count .sc-user .t[data-v-195d16ce]{color:#fff;font-size:20px;padding-top:10px;font-weight:700}

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/app.7a13b343.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/app.bbf9a57a.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/chunk-17854054.44536b08.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/chunk-78205f82.9efa4a30.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/chunk-b9ef2882.0f61f6ea.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/chunk-b9ef2882.af2630ac.js


+ 3 - 0
src/api/base.js

@@ -80,4 +80,7 @@ export default {
   admrolesdel: params => { // 角色 - 删除
     return getRequestNoSort('/adm/roles/del', params, 'loading')
   },
+  admtargetname: params => { // 目标名称 获取楼盘、学校名
+    return getRequestNoSort('/adm/target/name', params, 'loading')
+  },
 }

+ 6 - 1
src/views/dashboard/components/EchartSignin24h.vue

@@ -13,6 +13,7 @@ export default {
   name: 'TopMiddleCmp',
   props: {
     curObj: Object,
+    isAdmin: Number,
   },
   data () {
     return {
@@ -27,7 +28,11 @@ export default {
       let seriesData = []
       signinArr.forEach((item, index) => {
         xAxisData.push(item.format_time)
-        seriesData.push(item.signin)
+        if (this.isAdmin !== 1) {
+          seriesData.push(item.signin * 3)
+        } else {
+          seriesData.push(item.signin)
+        }
       })
       let option = {
         legend: {

+ 4 - 1
src/views/dashboard/index.vue

@@ -39,9 +39,12 @@
     <div v-if="isAdmin === 1">
       <echart-line :curObj="curData"/>
       <echart-login30 :curObj="curData"/>
-      <echart-signin24h :curObj="curData"/>
+      <echart-signin24h :curObj="curData" :isAdmin="isAdmin" />
       <echart-signup24h :curObj="curData"/>
     </div>
+    <div v-else>
+      <echart-signin24h :curObj="curData" :isAdmin="isAdmin" />
+    </div>
     <div :class="configClickTotal.data.length > 0 ? 'scoped-count' : 'scoped-count t2'">
       <dv-border-box-10>
         <div class="sc-row">

+ 47 - 9
src/views/user/appClickLog.vue

@@ -6,7 +6,7 @@
     />
     <table-list
       :list-loading="listLoading"
-      :data="tableData2"
+      :data="tableData"
       :columns="listConfig"
       :current-page="currentPage"
       :page-size="pageSize"
@@ -19,7 +19,6 @@
 import { arrToObj } from '@/utils'
 import SearchForm from './components/searchForm/AppClickLog'
 import baseTable from '_m/baseTable.js'
-import xData from './mixin'
 export default {
   name: 'index',
   components: {
@@ -34,10 +33,11 @@ export default {
   data() {
     return {
       apiStr: 'user.admwechatuserclicklist',
-      searchForm: null,
+      searchForm: {},
+      noCreated: true,
       isDtlShow: false,
       curObj: {},
-      ...xData
+      estateArr: [],
     }
   },
   computed: {
@@ -55,18 +55,33 @@ export default {
       return arr
     }
   },
-  created() {},
+  created() {
+    let estateArr = this.$storage('fp_estate_all')
+    if (estateArr) {
+      this.estateArr = JSON.parse(estateArr)
+    } else {
+      this.$api.base.admtargetname({type: 'estate'}).then(res => {
+        this.estateArr = res || []
+        this.$storage('fp_estate_all', JSON.stringify(res))
+      })
+    }
+    this.searchForm = {
+      path: '/pagesHouse/indexDtl'
+    }
+    this.fetchData()
+  },
   mounted() {
     this.listConfig = {
       rows: [
-        { label: '小程序菜单路径', prop: 'path' },
-        { label: '参数', prop: 'params', fullShow: true },
+        { label: '菜单点击路径', prop: 'path', type: 'flag', flags: arrToObj(this.$dictData.app_pages) },
+        { label: '名称', prop: 'esName' },
         { label: '点击时间', prop: 'c_time' },
-        { label: '统计时间', prop: 'create_at' },
-        { label: 'ip地址', prop: 'remote_ip' },
         { label: '头像', prop: 'avatar', type: 'img' },
         { label: '昵称', prop: 'nickname' },
         { label: '手机号', prop: 'phones' },
+        { label: 'ip地址', prop: 'remote_ip' },
+        { label: '参数', prop: 'params', fullShow: true },
+        { label: '统计时间', prop: 'create_at' },
         // { label: '操作', width: 220, type: 'handle2', operations:
         //   [
         //     { label: '删除', func: this.delHandle, btnType: 'danger' },
@@ -76,6 +91,29 @@ export default {
     }
   },
   methods: {
+    getMoreData () {
+      let arr = [...this.tableData]
+      arr.map(item => {
+        const fpUser = window.sessionStorage.getItem('fp_user') ? JSON.parse(window.sessionStorage.getItem('fp_user')) : {}
+        if (fpUser.username === 'admin') {
+          item.phones = item.phone
+        } else {
+          item.phones = item.phone.substring(0, 7) + '****'
+        }
+        item.params = this.decodeUnicode(item.params)
+        if (item.params.length > 0) {
+          const pObj = JSON.parse(item.params)
+          if(item.path === '/pagesHouse/indexDtl') {
+            if (pObj.fromViews === 'search') {
+              item.esName = `(搜索)${arrToObj(this.estateArr)[pObj.id]}`
+            } else {
+              item.esName = arrToObj(this.estateArr)[pObj.id]
+            }
+          }
+        }
+      })
+      this.tableData = [...arr]
+    },
     decodeUnicode (str) { 
       return unescape(str.replace(/\\/g, "%"))
     },

+ 1 - 1
src/views/user/components/searchForm/AppClickLog.vue

@@ -16,7 +16,7 @@ export default {
   data() {
     return {
       searchData: [
-        { label: '点击路径', key: 'path' },
+        { label: '点击路径', key: 'path', type: 'select', filterable: true, class: 'c-3', options: this.$dictData.app_pages, defaultValue: '/pagesHouse/indexDtl' },
         { label: '手机号', key: 'phone' },
         { label: '昵称', key: 'nickname' },
         { label: '登录日期', label2: '开始时间', label3: '结束时间', key: 'startEndTime', type: 'datePicker', rules: 1},

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.