Merge branch 'init' of http://10.10.14.221/feiliming/oa-project-vue into init

src/views/superFusionPlatform/login/Login.vue

@@ -42,6 +42,16 @@
                 tips:''//登录业务的提示
             }
         },
+        created:function() {
+            //回车按键登陆
+            var _this = this;
+            document.onkeydown = function (e) {
+                let key = window.event.keyCode;
+                if(key == 13){
+                    _this.loginAccount();
+                }
+            }
+        },
         components:{
             // ACheckbox:Checkbox,
             AButton:Button,

src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planQuery/planQueryLarge.vue

@@ -777,7 +777,8 @@
                             border-radius: 20px;
                             background-color: #ff931f;
                             position: absolute;
-                            top: -10px;
+                            top: 65px;
+                            left: 10px;
                         }
                         .no-completed-content {
                             background-color: rgba(187, 222, 251, 1);
@@ -929,7 +930,8 @@
                             border-radius: 20px;
                             background-color: #ff931f;
                             position: absolute;
-                            top: -10px;
+                            top: 65px;
+                            left: -10px;
                         }
                         .no-completed-content {
                             background-color: rgba(187, 222, 251, 1);

src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planRecord/myPlan.vue

@@ -389,7 +389,7 @@
                 border-radius: 1rem;
                 background-color: #31a8fa;
                 color: white;
-                font-size: 1rem;
+                font-size: 12px;
             }
             .part-content {
                 display: flex;
@@ -531,7 +531,7 @@
                     border-radius: 1rem;
                     background-color: #31a8fa;
                     color: white;
-                    font-size: 1rem;
+                    font-size: 12px;
                 }
                 .part-content {
                     display: flex;

src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planRecord/planRecord.vue

@@ -864,7 +864,7 @@
                         border-radius: 1rem;
                         background-color: #31a8fa;
                         color: white;
-                        font-size: 1rem;
+                        font-size: 12px;
                     }
                     .part-content {
                         display: flex;

src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/scheduleRecord/scheduleRecord.vue

@@ -540,7 +540,7 @@
                 border-radius: 1rem;
                 background-color: #31a8fa;
                 color: white;
-                font-size: 1rem;
+                font-size: 12px;
             }
             .part-content {
                 display: flex;

src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/scheduleRecord/scheduleRecordLarge.vue

@@ -839,7 +839,7 @@
                     border-radius: 1rem;
                     background-color: #31a8fa;
                     color: white;
-                    font-size: 1rem;
+                    font-size: 12px;
                 }
                 .part-content {
                     display: flex;
@@ -890,7 +890,7 @@
                     border-radius: 1rem;
                     background-color: #31a8fa;
                     color: white;
-                    font-size: 1rem;
+                    font-size: 12px;
                 }
                 .echart-item-title-div{
                     width: 100%;
@@ -962,7 +962,7 @@
                     border-radius: 1rem;
                     background-color: #31a8fa;
                     color: white;
-                    font-size: 1rem;
+                    font-size: 12px;
                 }
                 .day-compare-div{
                     width: 90%;

src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/summaryQuery/summaryQuery.vue

@@ -36,7 +36,7 @@
                                 :summary_Id="summaryList[2*index - 2 + i - 1]['summary_id']"
                                 :read_flag="summaryList[2*index - 2 + i - 1]['leader_view_flag']"
                                 :belong_type="tabIndex > 0?summaryList[2*index - 2 + i - 1]['summary_belong_type']:''"
-                                :callLeaderView="getCallLeaderView()"
+                                :call_leader_view="getCallLeaderView()"
                                 @viewSummary="viewSummary"
                         />
                     </div>
@@ -154,13 +154,8 @@
                             let year = resData.data.year;
                             let month = resData.data.month;
                             let day = resData.data.day;
-                            if(this.typeId == 5){
-                                this.currentDate = year + "-" + month + "-" + day;
-                            }else if (this.typeId == 4 || this.typeId == 3) {
-                                this.currentDate = year;
-                            }else {
-                                this.currentDate = "";
-                            }
+                            this.currentDate = year + "-" + month + "-" + day;
+
                             this.getListSuperfusionWorkSummary();
                         }
                     }
@@ -219,7 +214,7 @@
                     this.typeId = item.id;
                     this.typeValue = item.value;
                     this.clearParam();
-                    this.getNowDate();
+                    this.getListSuperfusionWorkSummary();
                 }
             },
             changeDate: function (date) {
@@ -234,14 +229,15 @@
                     person_id: this.BaseConfig.userInfo.person_id,
                     page_number: this.pageNumber,
                     page_size: this.pageSize,
-                    anchor_point_info:this.currentDate
                 }
                 if (this.tabIndex == 0) {
                     param.summary_belong_type = 1;
                 } else if (this.tabIndex == 1) {
                     param.summary_belong_type = 2;
+                    param.anchor_point_info = this.currentDate;
                 } else if (this.tabIndex == 2) {
                     param.summary_belong_type = 3;
+                    param.anchor_point_info = this.currentDate;
                 }
                 this.showLoading = true;
                 this.InterfaceConfig.callInterface([{