diff --git a/pages.json b/pages.json index 91beccc..bf93dfd 100644 --- a/pages.json +++ b/pages.json @@ -709,6 +709,18 @@ "style": { "navigationStyle": "custom" } + }, + { + "path": "pages/workPlan/weekPlan/index", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/workPlan/monthPlan/index", + "style": { + "navigationStyle": "custom" + } } ], "globalStyle": { diff --git a/pages/workPlan/index/components/risk-calendar.vue b/pages/workPlan/index/components/risk-calendar.vue index bc04768..ad9cfe9 100644 --- a/pages/workPlan/index/components/risk-calendar.vue +++ b/pages/workPlan/index/components/risk-calendar.vue @@ -14,13 +14,11 @@ - @@ -34,7 +32,13 @@ export default { return { primary: '', activeIndex: 0, - btnList: [{ btn_title: '月' }, { btn_title: '周' }, { btn_title: '日' }] + btnList: [{ btn_title: '月' }, { btn_title: '周' }, { btn_title: '日' }], + info: { + lunar: true, + range: true, + insert: false, + selected: [] + } } }, methods: { @@ -47,6 +51,35 @@ export default { onTimeCheck(i) { this.activeIndex = i } + }, + created() { + this.$nextTick(() => { + // this.showCalendar = true + }) + // TODO 模拟请求异步同步数据 + setTimeout(() => { + this.info.date = getDate(new Date(), -30).fullDate + this.info.startDate = getDate(new Date(), -60).fullDate + this.info.endDate = getDate(new Date(), 30).fullDate + this.info.selected = [ + { + date: getDate(new Date(), -3).fullDate, + info: '打卡' + }, + { + date: getDate(new Date(), -2).fullDate, + info: '签到', + data: { + custom: '自定义信息', + name: '自定义消息头' + } + }, + { + date: getDate(new Date(), -1).fullDate, + info: '已打卡' + } + ] + }, 2000) } } diff --git a/pages/workPlan/monthPlan/components/time-select.vue b/pages/workPlan/monthPlan/components/time-select.vue new file mode 100644 index 0000000..f0772a4 --- /dev/null +++ b/pages/workPlan/monthPlan/components/time-select.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/pages/workPlan/monthPlan/index-lod.vue b/pages/workPlan/monthPlan/index-lod.vue new file mode 100644 index 0000000..b36580c --- /dev/null +++ b/pages/workPlan/monthPlan/index-lod.vue @@ -0,0 +1,606 @@ + + + + + diff --git a/pages/workPlan/monthPlan/index.vue b/pages/workPlan/monthPlan/index.vue new file mode 100644 index 0000000..af06100 --- /dev/null +++ b/pages/workPlan/monthPlan/index.vue @@ -0,0 +1,737 @@ + + + + + diff --git a/pages/workPlan/planDetail/index.vue b/pages/workPlan/planDetail/index.vue new file mode 100644 index 0000000..9ee743d --- /dev/null +++ b/pages/workPlan/planDetail/index.vue @@ -0,0 +1,7 @@ + + + + + diff --git a/pages/workPlan/weekPlan/components/time-select.vue b/pages/workPlan/weekPlan/components/time-select.vue new file mode 100644 index 0000000..400b2b3 --- /dev/null +++ b/pages/workPlan/weekPlan/components/time-select.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/pages/workPlan/weekPlan/index.vue b/pages/workPlan/weekPlan/index.vue new file mode 100644 index 0000000..b5f6b22 --- /dev/null +++ b/pages/workPlan/weekPlan/index.vue @@ -0,0 +1,592 @@ + + + + + diff --git a/pages/workPlan/workbench/components/infrastructure-model.vue b/pages/workPlan/workbench/components/infrastructure-model.vue index 9a47bf3..1f42f3a 100644 --- a/pages/workPlan/workbench/components/infrastructure-model.vue +++ b/pages/workPlan/workbench/components/infrastructure-model.vue @@ -21,8 +21,16 @@ export default { url: '/pages/workPlan/dayPlan/index', img_src: require('../../../../static/images/workPlan/day_plan.png') }, - { icon_title: '周计划', url: 'xxx', img_src: require('../../../../static/images/workPlan/week_plan.png') }, - { icon_title: '月计划', url: 'xxx', img_src: require('../../../../static/images/workPlan/month_plan.png') }, + { + icon_title: '周计划', + url: '/pages/workPlan/weekPlan/index', + img_src: require('../../../../static/images/workPlan/week_plan.png') + }, + { + icon_title: '月计划', + url: '/pages/workPlan/monthPlan/index', + img_src: require('../../../../static/images/workPlan/month_plan.png') + }, { icon_title: '涉网计划', url: 'xxx', img_src: require('../../../../static/images/workPlan/web_plan.png') }, { icon_title: '临时计划', diff --git a/pages/workPlan/workbench/components/production-model.vue b/pages/workPlan/workbench/components/production-model.vue index 29744f2..5562ab4 100644 --- a/pages/workPlan/workbench/components/production-model.vue +++ b/pages/workPlan/workbench/components/production-model.vue @@ -21,8 +21,16 @@ export default { url: '/pages/workPlan/dayPlan/index', img_src: require('../../../../static/images/workPlan/day_plan.png') }, - { icon_title: '周计划', url: 'xxx', img_src: require('../../../../static/images/workPlan/week_plan.png') }, - { icon_title: '月计划', url: 'xxx', img_src: require('../../../../static/images/workPlan/month_plan.png') }, + { + icon_title: '周计划', + url: '/pages/workPlan/weekPlan/index', + img_src: require('../../../../static/images/workPlan/week_plan.png') + }, + { + icon_title: '月计划', + url: '/pages/workPlan/monthPlan/index', + img_src: require('../../../../static/images/workPlan/month_plan.png') + }, { icon_title: '涉网计划', url: 'xxx', img_src: require('../../../../static/images/workPlan/web_plan.png') }, { icon_title: '临时计划', diff --git a/static/images/workPlan/add.png b/static/images/workPlan/add.png new file mode 100644 index 0000000..ad61551 Binary files /dev/null and b/static/images/workPlan/add.png differ diff --git a/static/images/workPlan/delete.png b/static/images/workPlan/delete.png new file mode 100644 index 0000000..410c359 Binary files /dev/null and b/static/images/workPlan/delete.png differ