Merge branch 'develop' of http://git.kdan.cc:8865/Server_Service/compdfkit_vendors_manage_front_end into develop_lyb

src/views/projects/dashboard.vue

@@ -123,7 +123,7 @@
       <div class="chart" ref="chart"></div>
       <p class="stats-text">Stats are updated every hour</p>
     </div>
-    <div class="cover" v-show="showCalender" @click.self="showCalender = false"></div>
+    <div class="cover" v-show="showCalender" @click.self="selectTime(4)"></div>
   </div>
 </template>
 
@@ -220,6 +220,10 @@ export default class dashBoard extends Vue {
     if (this.timeSelected === val && this.timeSelected !== 4) return
     if (val === 4 && this.timeSelected === 4 && this.datePickerValue.length === 0) {
       this.timeSelected = this.oldTimeSelectVal
+    } else if (val === 4 && this.timeSelected === 4 && this.datePickerValue.length === 2) {
+      this.timeSelected = val
+      this.getChartsData(this.dataSelected)
+      this.getFourAnalysisData()
     } else {
       this.timeSelected = val
     }