优化逻辑

@CONTROL/日历部件/CONTROL-BASE.vue.ftl

@@ -232,13 +232,7 @@ import moment from 'moment';
         this.formatData(new Date(year+'/'+month+'/'+'1'));
       }
       if(this.calendarStyle == "week_timeline" || this.calendarStyle == "week"){
-        if(weekIndex == 0){
-          this.formatData(new Date(year+'/'+month+'/'+'1'));
-        }else if(weekIndex == 5){
-          this.formatData(new Date(year+'/'+(month+1)+'/'+'1'));
-        }else{
-          this.formatData(new Date(year+'/'+month+'/'+(weekIndex)*7));
-        }
+        this.countWeeks(year,month,weekIndex);
       }
     }
 
@@ -253,13 +247,7 @@ import moment from 'moment';
         this.formatData(new Date(year+'/'+month+'/'+'1'));
       }
       if(this.calendarStyle == "week_timeline" || this.calendarStyle == "week"){
-        if(weekIndex == 0){
-          this.formatData(new Date(year+'/'+month+'/'+'1'));
-        }else if(weekIndex == 5){
-          this.formatData(new Date(year+'/'+(month+1)+'/'+'1'));
-        }else{
-          this.formatData(new Date(year+'/'+month+'/'+(weekIndex)*7));
-        }
+        this.countWeeks(year,month,weekIndex);
       }
     }
 
@@ -455,8 +443,6 @@ import moment from 'moment';
         }
         </#list>
         </#if>
-
-
     }
 
 
@@ -569,6 +555,21 @@ import moment from 'moment';
             });
         }
     }
+    /**
+     * 根据周下标计算事件
+     *
+     * @param {*} $event 事件信息
+     * @memberof ${srfclassname('${ctrl.codeName}')}
+     */
+    public countWeeks(year: any, month: any, week: any) {
+        let date = new Date(year + '/' + month + '/' + 1);
+        let weekline = date.getDay();
+        if(weekline == 0){
+          this.formatData(new Date(year + '/' + month + '/' + (week*7 +1)));
+        }else{
+          this.formatData(new Date(year + '/' + month + '/' + (week*7 - weekline + 1)));
+        }
+    }
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL_BOTTOM-BASE.vue.ftl
 </#ibizinclude>