Merge branch 'dev-followUp-20190312' of...

Merge branch 'dev-followUp-20190312' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312

src/views/home.vue

@@ -124,9 +124,9 @@ export default {
         vm.getTodayAppointsList({
           status:0
         });
-        vm.getTodayOverview({
+        /*vm.getTodayOverview({
           status:0
-        });
+        });*/
     },
     computed: {
         ...mapGetters([
@@ -135,7 +135,7 @@ export default {
       ...mapState('workbench', {
         todayPlansList: state => state.todayPlansList,
         todayAppointsList: state => state.todayAppointsList,
-        todayOverview: state => state.todayOverview,
+        //todayOverview: state => state.todayOverview,
       }),
       ...mapState('recordManage',{
         formList: state => state.formList,
@@ -212,7 +212,7 @@ export default {
           this.selectFormShow = false;
         },
         async goToScale(row) {
-          await this.getFormList(row.plantimesId); //获取量表列表
+          await this.getFormList(row.planTimesId); //获取量表列表
           //获取量表列表情况
           if(this.formList.scalesList.length > 1){
             this.selectFormShow = true