t

dist/static/css/chunk-746a3400.ffd38c05.css

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

dist/static/css/chunk-a6749e84.01449b0b.css

@@ -0,0 +1 @@
+.dashboard-container[data-v-62fe48ba]{width:100%;height:calc(100vh - 84px);background-color:#1f2d3d}.scoped-rank[data-v-62fe48ba]{width:600px;margin-right:20px;-webkit-box-sizing:border-box;box-sizing:border-box;padding:20px;display:inline-block;vertical-align:top}.scoped-rank .sr-top-left[data-v-62fe48ba]{display:inline-block;vertical-align:middle;padding-right:20px;color:#1e9bec;font-weight:700}.scoped-rank .sr-top-right[data-v-62fe48ba]{display:inline-block;vertical-align:middle;width:200px}.scoped-rank .sr-wrap[data-v-62fe48ba]{padding:30px}.scoped-rank .sr-wrap2[data-v-62fe48ba]{padding:60px 20px 20px}.scoped-count .sc-row[data-v-62fe48ba]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.scoped-count .sc-col[data-v-62fe48ba]{-webkit-box-flex:1;-ms-flex:1;flex:1;padding:20px;margin:20px;border:1px solid #fff}.scoped-count .sc-wrap[data-v-62fe48ba]{padding:50px 20px 30px}

dist/static/js/chunk-a6749e84.b2c8f220.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-a6749e84"],{"72fa":function(e,t,a){"use strict";a("976d")},9406:function(e,t,a){"use strict";a.r(t);var i=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"dashboard-container"})},n=[],c=a("5530"),f=a("2909"),s=(a("d81d"),a("a9e3"),a("a434"),a("2f62")),r={name:"Dashboard",data:function(){return{configClick:{data:[],unit:"次"},configSearch:{data:[],unit:"次",showValue:!0,colors:["#ff3f40","#fa6544","#f16b22","#f1a124","#f1a124","#c7f123","#c7f123","#22f294","#24f1b9","#23f1dc","#35f8fe","#00a8ff","#0083ff","#0060ff","#003cff","#0018ff","#4800fe","#7800ff","#a201ff","#e300ff"]},timeTips:""}},created:function(){var e=this,t=window.sessionStorage.getItem("fp_user")?JSON.parse(window.sessionStorage.getItem("fp_user")):{},a=2;"admin"===t.username&&(a=1);var i=new Date,n=i.getHours();n<6?this.timeTips="凌晨好！":n<9?this.timeTips="早上好！":n<12?this.timeTips="上午好！":n<14?this.timeTips="中午好！":n<17?this.timeTips="下午好！":n<19?this.timeTips="傍晚好！":n<22&&(this.timeTips="晚上好！"),this.$api.other.admindexrankclick().then((function(t){var i=t.estate_click_rank||[],n=i.map((function(e){return{value:1===a?Number(e.click_num):Number(e.click_num)+1e4,name:e.estate_name}})),s=e.configClick;s.data=Object(f["a"])(n),e.configClick=Object(c["a"])({},s)})),this.$api.other.admindexrankweek().then((function(t){var i=t||[],n=i.splice(0,10),s=n.map((function(e){return{value:1===a?Number(e.week_click_num):Number(e.week_click_num)+1e4,name:e.estate_name}})),r=e.configSearch;r.data=Object(f["a"])(s),e.configSearch=Object(c["a"])({},r)}))},computed:Object(c["a"])({},Object(s["b"])(["sysUser"]))},u=r,o=(a("72fa"),a("2877")),m=Object(o["a"])(u,i,n,!1,null,"62fe48ba",null);t["default"]=m.exports},"976d":function(e,t,a){}}]);

src/api/other.js

@@ -76,4 +76,7 @@ export default {
   admindexrankweek: params => { // 楼盘 - 一周 排行
     return getRequest('/adm/index/rank/week', params)
   },
+  admindexrankmonth: params => { // 楼盘 - 一月 排行
+    return getRequest('/adm/index/rank/month', params)
+  },
 }

src/views/dashboard/index.vue

@@ -1,6 +1,21 @@
 <template>
   <div class="dashboard-container">
-    <div class="scoped-rank">
+    <!-- <div class="scoped-count">
+      <dv-border-box-1>
+        <div class="sc-row">
+          <div class="sc-col">
+            <dv-border-box-11 title="搜索总榜">
+              <div class="sc-wrap">
+                <dv-capsule-chart :config="configSearch" style="width:400px;height:300px" />
+              </div>
+            </dv-border-box-11>
+          </div>
+          <div class="sc-col"></div>
+          <div class="sc-col"></div>
+      </div>
+      </dv-border-box-1>
+    </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>
@@ -23,7 +38,7 @@
           <dv-capsule-chart :config="configSearch" style="width:500px;height:610px" />
         </div>
       </dv-border-box-11>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -73,11 +88,12 @@ export default {
       config.data = [...newArr]
       this.configClick = {...config}
     })
-    this.$api.other.admindexranksearch().then(res => {
+    this.$api.other.admindexrankweek().then(res => {
       const list = res || []
-      const newArr = list.map(item => {
+      const nList = list.splice(0, 10)
+      const newArr = nList.map(item => {
         return {
-          value: isAdmin === 1 ? Number(item.search_num) : Number(item.search_num) + 10000,
+          value: isAdmin === 1 ? Number(item.week_click_num) : Number(item.week_click_num) + 10000,
           name: item.estate_name,
         }
       })
@@ -137,4 +153,20 @@ export default {
     padding: 60px 20px 20px;
   }
 }
+
+.scoped-count {
+  .sc-row {
+    display: flex;
+    flex-wrap: wrap;
+  }
+  .sc-col {
+    flex: 1;
+    padding: 20px;
+    margin: 20px;
+    border: 1px solid #fff;
+  }
+  .sc-wrap {
+    padding: 50px 20px 30px;
+  }
+}
 </style>

src/views/house/components/popup/LotteryEdit.vue

@@ -10,7 +10,7 @@
       custom-class="xl-drawer"
       direction="rtl"
     >
-      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px" :insertSlotArr="[0,5]">
+      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px" :insertSlotArr="[0,6]">
         <div slot="OI0" class="scoped-other-form">
           <div class="scoped-img-area">
             <div class="sia-title">项目图</div>
@@ -31,7 +31,7 @@
             </el-upload>
           </div>
         </div>
-        <div slot="OI5">
+        <div slot="OI6">
           <div class="scoped-img-area">
             <div class="sia-title">一房一价图</div>
             <div class="sia-op" v-for="(imgsrc,index) in houseImg" :key="index">
@@ -200,13 +200,14 @@ export default {
       let params = { ...this.cObj }
       if (params.lottery_time) params.time = params.lottery_time.split('至')
       this.formData = [
-        { label: '楼栋分布图', key: 'project_img', type: 'upload', class: 'c-2', rules: 1 },
+        { label: '楼栋分布图', key: 'project_img', type: 'upload', class: 'c-2' },
         { label: '摇号期数', key: 'batch', class: 'c-2', rules: 1 },
         { label: '排序', key: 'sort', class: 'c-2', rules: 1 },
+        { label: '摇号中的日期', key: 'time', type: 'datePicker', rules: 1 },
         { label: '摇号中的标题', key: 'under_way', rules: 1 },
         { label: '本期包含期数', key: 'building_num', rules: 1 },
-        { label: '摇号中的日期', key: 'time', type: 'datePicker', rules: 1 },
         { label: '摇号结果的标题', key: 'lottery_res' },
+        { label: '摇号结果时间', key: 'lottery_res_time', type: 'datePicker', type2: 'date' },
       ]
       params.project_img = this.IMadd(params.project_img)
       this.setDefaultValue(params)