Merge branch 'develop' into 'test'

src/containers/Dashboard/CampusRank/CampusRank.vue

@@ -54,9 +54,7 @@ export default {
     ]),
     changeFilterHandle(data) {
       this.updateFilters(data);
-      this.fetchConsumeList().then(() => {
-        this.updateCampusName(data.areaName);
-      });
+      this.fetchConsumeList();
     },
     changeCampusHandle(data) {
       this.fetchConsumeList({

src/containers/Dashboard/CampusRank/CampusRankChart.vue

@@ -103,6 +103,9 @@ export default {
         this.changeSelected(this.data[0]);
         this.updateCampusName(this.data[0].areaName);
         this.SelectedDataIndex = this.data[0];
+      } else {
+        this.updateCampusName();
+        this.SelectedDataIndex = null;
       }
     },
     clickHandle(ev) {

src/containers/Dashboard/CustomerFeedback/CustomerFeedback.vue

@@ -10,14 +10,21 @@
         <span class="red">{{count}}条</span>
       </div>
     </div>
-    <div class="CustomerFeedback-List">
+    <div
+      class="CustomerFeedback-List"
+      v-if="show"
+      :style="`width:${width}px`"
+    >
       <div
         class="CustomerFeedback-Item"
         v-for="(item, index) in feedbackList"
         :key="index"
       >
         <span class="CustomerFeedback-ItemNum">{{item.count}}条</span>
-        <span class="CustomerFeedback-ItemName">{{item.areaName}}</span>
+        <span
+          class="CustomerFeedback-ItemName"
+          :title="item.areaName"
+        >{{item.areaName}}</span>
       </div>
     </div>
   </div>
@@ -31,9 +38,21 @@ export default {
   computed: {
     ...mapGetters('Dashboard/customerFeedback', ['feedbackList', 'count']),
   },
+  data() {
+    return {
+      show: false,
+    };
+  },
   created() {
     this.initData();
   },
+  mounted() {
+    let boxDom = document.querySelector('.CustomerFeedback');
+    let listDom = document.querySelector('.CustomerFeedback-List');
+    this.width = boxDom.clientWidth;
+
+    this.show = true;
+  },
   methods: {
     ...mapActions('Dashboard/customerFeedback', ['getFeedbackList']),
     initData() {
@@ -87,7 +106,11 @@ export default {
       flex: 1;
       padding-right: 20px;
       line-height: 28px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
+
   }
 }
 @media screen and (max-width: $bigScreenWidth) {

src/containers/Dashboard/SeviceRatio/SeviceRatio.vue

@@ -5,7 +5,7 @@
         <img src="@/assets/images/dashboard/icon_zhanbi@2x.png" />
       </div>
       <div class="Dashboard-title-text">各服务消费占比</div>
-      <div class="Dashboard-title-top">TOP1</div>
+      <!-- <div class="Dashboard-title-top">TOP1</div> -->
     </div>
     <SeviceRatioChart
       :data="seviceRatioList"