liujq 4 jaren geleden
bovenliggende
commit
c93c75524c
46 gewijzigde bestanden met toevoegingen van 100 en 19 verwijderingen
  1. 0 0
      dist/index.html
  2. 0 0
      dist/static/css/app.5204f623.css
  3. 0 0
      dist/static/css/chunk-107a52b4.ee245fe0.css
  4. 0 0
      dist/static/css/chunk-24b1b024.020266d8.css
  5. 0 0
      dist/static/css/chunk-3fd79dcc.eb9c24b0.css
  6. 0 0
      dist/static/css/chunk-57e5a2f2.f8c4d6e1.css
  7. 0 1
      dist/static/css/chunk-5831349d.6c38a3f4.css
  8. 1 0
      dist/static/css/chunk-cbf14e7a.7000c7b1.css
  9. 0 0
      dist/static/css/chunk-libs.3dfb7769.css
  10. 0 0
      dist/static/css/chunk-libs.6a2cf42e.css
  11. 0 0
      dist/static/js/app.6b8e55a3.js
  12. 0 0
      dist/static/js/app.a4cf3a18.js
  13. 0 0
      dist/static/js/chunk-060a14dc.46a8efa2.js
  14. 0 0
      dist/static/js/chunk-07fc91a6.9e9ee8ca.js
  15. 0 0
      dist/static/js/chunk-093b5b3c.0ed2b337.js
  16. 0 0
      dist/static/js/chunk-0b8075f0.5be29c50.js
  17. 0 0
      dist/static/js/chunk-0c6db779.947dfee7.js
  18. 0 0
      dist/static/js/chunk-107a52b4.7ffa3aa8.js
  19. 0 0
      dist/static/js/chunk-24b1b024.0d8d1699.js
  20. 0 0
      dist/static/js/chunk-26ec3452.a978a4c1.js
  21. 0 0
      dist/static/js/chunk-36ddeec9.cc1242cb.js
  22. 0 0
      dist/static/js/chunk-3fd79dcc.5bb33569.js
  23. 0 0
      dist/static/js/chunk-43338aec.1ebafb92.js
  24. 0 0
      dist/static/js/chunk-45f420e2.bf0fee1d.js
  25. 0 0
      dist/static/js/chunk-46392093.1a7915fc.js
  26. 0 0
      dist/static/js/chunk-4c227eb8.a228765e.js
  27. 0 0
      dist/static/js/chunk-57e5a2f2.531eb741.js
  28. 0 1
      dist/static/js/chunk-5831349d.fc5dc77a.js
  29. 0 0
      dist/static/js/chunk-593f9664.0cdddba0.js
  30. 0 0
      dist/static/js/chunk-67a054c9.73be3676.js
  31. 0 0
      dist/static/js/chunk-7d14fe8a.60311013.js
  32. 0 0
      dist/static/js/chunk-7f8b33fa.c5e5968b.js
  33. 0 0
      dist/static/js/chunk-888c9d0c.e0bd9f6e.js
  34. 0 0
      dist/static/js/chunk-99416556.b85a3ad5.js
  35. 0 0
      dist/static/js/chunk-b718bb7a.4e3f07d6.js
  36. 0 0
      dist/static/js/chunk-be0229d4.78d77625.js
  37. 1 0
      dist/static/js/chunk-cbf14e7a.31d32b2a.js
  38. 0 0
      dist/static/js/chunk-e61afeb4.21843135.js
  39. 0 0
      dist/static/js/chunk-ef425484.b8051411.js
  40. 0 7
      dist/static/js/chunk-libs.aae3ff69.js
  41. 7 0
      dist/static/js/chunk-libs.dae650c6.js
  42. 1 0
      package.json
  43. 3 0
      src/api/other.js
  44. 2 2
      src/layout/components/AppMain.vue
  45. 3 0
      src/main.js
  46. 82 8
      src/views/dashboard/index.vue

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.5204f623.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-107a52b4.ee245fe0.css


+ 0 - 0
dist/static/css/chunk-7d14fe8a.020266d8.css → dist/static/css/chunk-24b1b024.020266d8.css


+ 0 - 0
dist/static/css/chunk-888c9d0c.eb9c24b0.css → dist/static/css/chunk-3fd79dcc.eb9c24b0.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-57e5a2f2.f8c4d6e1.css


+ 0 - 1
dist/static/css/chunk-5831349d.6c38a3f4.css

@@ -1 +0,0 @@
-.dashboard-container[data-v-1a5071fe]{margin:30px}.dashboard-text[data-v-1a5071fe]{font-size:30px;line-height:46px}

+ 1 - 0
dist/static/css/chunk-cbf14e7a.7000c7b1.css

@@ -0,0 +1 @@
+.dashboard-container[data-v-b1d9c0ec]{width:100%;height:calc(100vh - 84px);background:#1f2d3d}.scoped-rank[data-v-b1d9c0ec]{width:600px;-webkit-box-sizing:border-box;box-sizing:border-box;padding:20px;display:inline-block}.scoped-rank .sr-top-left[data-v-b1d9c0ec]{display:inline-block;vertical-align:middle;padding-right:20px;color:#1e9bec;font-weight:700}.scoped-rank .sr-top-right[data-v-b1d9c0ec]{display:inline-block;vertical-align:middle;width:200px}.scoped-rank .sr-wrap[data-v-b1d9c0ec]{padding:30px}

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-libs.3dfb7769.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-libs.6a2cf42e.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.6b8e55a3.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.a4cf3a18.js


+ 0 - 0
dist/static/js/chunk-060a14dc.b14baafe.js → dist/static/js/chunk-060a14dc.46a8efa2.js


+ 0 - 0
dist/static/js/chunk-07fc91a6.e9d7ac51.js → dist/static/js/chunk-07fc91a6.9e9ee8ca.js


+ 0 - 0
dist/static/js/chunk-093b5b3c.ade68d67.js → dist/static/js/chunk-093b5b3c.0ed2b337.js


+ 0 - 0
dist/static/js/chunk-0b8075f0.fa90c264.js → dist/static/js/chunk-0b8075f0.5be29c50.js


+ 0 - 0
dist/static/js/chunk-0c6db779.f0a59077.js → dist/static/js/chunk-0c6db779.947dfee7.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-107a52b4.7ffa3aa8.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-24b1b024.0d8d1699.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-26ec3452.a978a4c1.js


+ 0 - 0
dist/static/js/chunk-36ddeec9.7cd882d7.js → dist/static/js/chunk-36ddeec9.cc1242cb.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-3fd79dcc.5bb33569.js


+ 0 - 0
dist/static/js/chunk-43338aec.996e32fc.js → dist/static/js/chunk-43338aec.1ebafb92.js


+ 0 - 0
dist/static/js/chunk-45f420e2.b7b5ccad.js → dist/static/js/chunk-45f420e2.bf0fee1d.js


+ 0 - 0
dist/static/js/chunk-46392093.953081b7.js → dist/static/js/chunk-46392093.1a7915fc.js


+ 0 - 0
dist/static/js/chunk-4c227eb8.91901eee.js → dist/static/js/chunk-4c227eb8.a228765e.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-57e5a2f2.531eb741.js


+ 0 - 1
dist/static/js/chunk-5831349d.fc5dc77a.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-5831349d"],{"6f08":function(s,t,e){"use strict";e("920d")},"920d":function(s,t,e){},9406:function(s,t,e){"use strict";e.r(t);var a=function(){var s=this,t=s.$createElement,e=s._self._c||t;return e("div",{staticClass:"dashboard-container"},[e("div",{staticClass:"dashboard-text"},[s._v("你好,"+s._s(s.sysUser.nickname))])])},n=[],c=e("5530"),i=e("2f62"),r={name:"Dashboard",computed:Object(c["a"])({},Object(i["b"])(["sysUser"]))},d=r,o=(e("6f08"),e("2877")),u=Object(o["a"])(d,a,n,!1,null,"1a5071fe",null);t["default"]=u.exports}}]);

+ 0 - 0
dist/static/js/chunk-593f9664.94255faf.js → dist/static/js/chunk-593f9664.0cdddba0.js


+ 0 - 0
dist/static/js/chunk-67a054c9.92e4dceb.js → dist/static/js/chunk-67a054c9.73be3676.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-7d14fe8a.60311013.js


+ 0 - 0
dist/static/js/chunk-7f8b33fa.b95897ca.js → dist/static/js/chunk-7f8b33fa.c5e5968b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-888c9d0c.e0bd9f6e.js


+ 0 - 0
dist/static/js/chunk-99416556.2ba60a0c.js → dist/static/js/chunk-99416556.b85a3ad5.js


+ 0 - 0
dist/static/js/chunk-b718bb7a.d8ffa57a.js → dist/static/js/chunk-b718bb7a.4e3f07d6.js


+ 0 - 0
dist/static/js/chunk-be0229d4.2f9376b9.js → dist/static/js/chunk-be0229d4.78d77625.js


+ 1 - 0
dist/static/js/chunk-cbf14e7a.31d32b2a.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-cbf14e7a"],{"14da1":function(t,i,e){},9406:function(t,i,e){"use strict";e.r(i);var a=function(){var t=this,i=t.$createElement,e=t._self._c||i;return e("div",{staticClass:"dashboard-container"},[e("div",{staticClass:"scoped-rank"},[e("div",{staticClass:"sr-top-left"},[e("dv-decoration-3",{staticStyle:{width:"250px",height:"30px"}}),e("div",{staticStyle:{width:"100%","padding-top":"10px","text-align":"center"}},[t._v(t._s(t.timeTips)+t._s(t.sysUser.nickname))])],1),e("div",{staticClass:"sr-top-right"},[e("dv-decoration-12",{staticStyle:{width:"150px",height:"150px","margin-left":"20px"}}),e("dv-decoration-11",{staticStyle:{width:"200px",height:"60px",color:"#1dc1f5"}},[t._v("楼盘点击总榜")])],1),e("dv-decoration-10",{staticStyle:{width:"100%",height:"5px",margin:"30px 0"}}),e("dv-border-box-1",[e("div",{staticClass:"sr-wrap"},[e("dv-scroll-ranking-board",{staticStyle:{width:"500px",height:"300px"},attrs:{config:t.config}})],1)]),e("dv-decoration-6",{staticStyle:{width:"100%",height:"30px",margin:"30px 0"}})],1)])},s=[],c=e("5530"),n=e("2909"),d=(e("d81d"),e("a9e3"),e("2f62")),r={name:"Dashboard",data:function(){return{config:{data:[],unit:"次"},timeTips:""}},created:function(){var t=this,i=new Date,e=i.getHours();e<6?this.timeTips="凌晨好!":e<9?this.timeTips="早上好!":e<12?this.timeTips="上午好!":e<14?this.timeTips="中午好!":e<17?this.timeTips="下午好!":e<19?this.timeTips="傍晚好!":e<22&&(this.timeTips="晚上好!"),this.$api.other.admindexranklist().then((function(i){console.log(i);var e=i.estate_click_rank||[],a=e.map((function(t){return{value:Number(t.click_num),name:t.estate_name}})),s=t.config;s.data=Object(n["a"])(a),t.config=Object(c["a"])({},s)}))},computed:Object(c["a"])({},Object(d["b"])(["sysUser"]))},o=r,p=(e("b3c8"),e("2877")),h=Object(p["a"])(o,a,s,!1,null,"b1d9c0ec",null);i["default"]=h.exports},b3c8:function(t,i,e){"use strict";e("14da1")}}]);

+ 0 - 0
dist/static/js/chunk-e61afeb4.7ded6214.js → dist/static/js/chunk-e61afeb4.21843135.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-ef425484.b8051411.js


File diff suppressed because it is too large
+ 0 - 7
dist/static/js/chunk-libs.aae3ff69.js


File diff suppressed because it is too large
+ 7 - 0
dist/static/js/chunk-libs.dae650c6.js


+ 1 - 0
package.json

@@ -14,6 +14,7 @@
     "test:ci": "npm run lint && npm run test:unit"
   },
   "dependencies": {
+    "@jiaminghi/data-view": "^2.10.0",
     "axios": "0.18.1",
     "core-js": "3.6.5",
     "element-ui": "2.13.2",

+ 3 - 0
src/api/other.js

@@ -64,4 +64,7 @@ export default {
   admactivitybuyingjoinlist: params => { // 助力活动- 列表参与列表
     return getRequest('/adm/activity/buying/join/list', params)
   },
+  admindexranklist: params => { // 点击排行
+    return getRequest('/adm/index/rank/list', params)
+  },
 }

+ 2 - 2
src/layout/components/AppMain.vue

@@ -25,13 +25,13 @@ export default {
 <style scoped>
 .app-main {
   /*50 = navbar  */
-  min-height: calc(100vh - 50px);
+  min-height: calc(100vh - 84px);
   width: 100%;
   position: relative;
   overflow: hidden;
 }
 .fixed-header+.app-main {
-  padding-top: 50px;
+  padding-top: 84px;
 }
 </style>
 

+ 3 - 0
src/main.js

@@ -37,6 +37,9 @@ Vue.use(storage)
 import imgMark from '@/utils/imgMark'
 Vue.use(imgMark)
 
+import dataV from '@jiaminghi/data-view'
+Vue.use(dataV)
+
 import VueAMap from 'vue-amap' // 高德
 Vue.use(VueAMap)
 VueAMap.initAMapApiLoader({

+ 82 - 8
src/views/dashboard/index.vue

@@ -1,14 +1,62 @@
 <template>
   <div class="dashboard-container">
-    <div class="dashboard-text">你好,{{sysUser.nickname}}</div>
+    <div class="scoped-rank">
+      <div class="sr-top-left">
+        <dv-decoration-3 style="width:250px;height:30px;" />
+        <div style="width: 100%;padding-top: 10px;text-align: center;">{{timeTips}}{{sysUser.nickname}}</div>
+      </div>
+      <div class="sr-top-right">
+        <dv-decoration-12 style="width:150px;height:150px;margin-left: 20px;" />
+        <dv-decoration-11 style="width:200px;height:60px;color: #1dc1f5;">楼盘点击总榜</dv-decoration-11>
+      </div>
+      <dv-decoration-10 style="width:100%;height:5px;margin: 30px 0;"/>
+      <dv-border-box-1>
+        <div class="sr-wrap">
+          <dv-scroll-ranking-board :config="config" style="width:500px;height:300px" />
+        </div>
+      </dv-border-box-1>
+      <dv-decoration-6 style="width:100%;height:30px;margin: 30px 0;" />
+    </div>
   </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
-
 export default {
   name: 'Dashboard',
+  data () {
+    return {
+      config: {
+        data: [],
+        unit: '次',
+      },
+      timeTips: '',
+    }
+  },
+  created () {
+    let now = new Date()
+    let hour = now.getHours()
+    if(hour < 6){this.timeTips = '凌晨好!'}
+    else if (hour < 9){this.timeTips = '早上好!'}
+    else if (hour < 12){this.timeTips = '上午好!'}
+    else if (hour < 14){this.timeTips = '中午好!'}
+    else if (hour < 17){this.timeTips = '下午好!'}
+    else if (hour < 19){this.timeTips = '傍晚好!'}
+    else if (hour < 22){this.timeTips = '晚上好!'}
+    this.$api.other.admindexranklist().then(res => {
+      console.log(res)
+      const estateClickRank = res.estate_click_rank || []
+      const newArr = estateClickRank.map(item => {
+        return {
+          value: Number(item.click_num),
+          name: item.estate_name,
+        }
+      })
+      let config = this.config
+      config.data = [...newArr]
+      this.config = {...config}
+    })
+  },
   computed: {
     ...mapGetters([
       'sysUser',
@@ -18,13 +66,39 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.dashboard {
-  &-container {
-    margin: 30px;
+// .dashboard {
+//   &-container {
+//     margin: 30px;
+//   }
+//   &-text {
+//     font-size: 30px;
+//     line-height: 46px;
+//   }
+// }
+.dashboard-container {
+  width: 100%;
+  height: calc(100vh - 84px);
+  background: #1f2d3d;
+}
+.scoped-rank {
+  width: 600px;
+  box-sizing: border-box;
+  padding: 20px;
+  display: inline-block;
+  .sr-top-left {
+    display: inline-block;
+    vertical-align: middle;
+    padding-right: 20px;
+    color: #1e9bec;
+    font-weight: bold;
+  }
+  .sr-top-right {
+    display: inline-block;
+    vertical-align: middle;
+    width: 200px;
   }
-  &-text {
-    font-size: 30px;
-    line-height: 46px;
+  .sr-wrap {
+    padding: 30px;
   }
 }
 </style>

Some files were not shown because too many files changed in this diff