Browse Source

fix: 修改小红点传参

pull/1/head
song 4 years ago
parent
commit
87b20fd1f8
  1. 3
      CHANGELOG.md
  2. 15
      src/components/Calendar/Calendar.vue
  3. 2
      src/components/Tips/Tips.vue

3
CHANGELOG.md

@ -1,4 +1,4 @@
# 0.1.0 (2021-08-11)
# 0.1.0 (2021-08-12)
### 🌟 新功能
范围|描述|commitId
@ -21,6 +21,7 @@
- | 定期任务面板骨架屏添加 | [b2698c0](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b2698c0)
富文本插件 | 富文本插件demo测试 | [ed3d644](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ed3d644)
- | 导入wbs | [1224fcb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1224fcb)
- | 导入项目,更新项目 | [5e06adf](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5e06adf)
- | 导入项目后提示并打开项目详情页 | [410f527](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/410f527)
- | 引入dayjs | [29b8b93](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/29b8b93)
- | 提交到本地 | [9cbe411](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/9cbe411)

15
src/components/Calendar/Calendar.vue

@ -112,9 +112,10 @@ export default {
watch: {
dotList: function (newvalue) {
const days = this.days.slice(0);
const index = days.findIndex(day => day.show);
days.forEach((day, i) => {
newvalue.forEach((item, j) => {
if (i === j) {
if (i - index === j) {
day.info = item;
}
});
@ -224,14 +225,18 @@ export default {
if (current - pre === 1 || current - pre === -2) {
//
this.daysNext();
this.start = this.$t.time.add(this.start, 1, 'month').valueOf();
this.end = this.$t.time.add(this.end, 1, 'month').valueOf();
const arr = this.days.filter(s => s.show);
const end = `${arr[arr.length - 1].fullDate} 23:59:59`;
this.start = this.$moment(arr[0].fullDate).valueOf();
this.end = this.$moment(end).valueOf();
this.$emit('handleFindPoint', this.start, this.end);
} else {
//
this.daysPre();
this.start = this.$t.time.add(this.start, -1, 'month').valueOf();
this.end = this.$t.time.add(this.end, -1, 'month').valueOf();
const arr = this.days.filter(s => s.show);
const end = `${arr[arr.length - 1].fullDate} 23:59:59`;
this.start = this.$moment(arr[0].fullDate).valueOf();
this.end = this.$moment(end).valueOf();
this.$emit('handleFindPoint', this.start, this.end);
}
},

2
src/components/Tips/Tips.vue

@ -77,7 +77,7 @@ export default {
this.$t.ui.showToast('项目结束');
}
this.tip.show = false;
location.reload();
// location.reload();
// this.$router.go(0);
} catch (error) {
console.error(error);

Loading…
Cancel
Save