gitee/dootask
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2021-07-01 14:46:54 +08:00
parent fc842b6daf
commit e07b05d18d
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/ProjectController.php
View File

@ -709,7 +709,7 @@ class ProjectController extends AbstractController
* @apiParam {String} name 任务描述 * @apiParam {String} name 任务描述
* @apiParam {String} [content] 任务详情 * @apiParam {String} [content] 任务详情
* @apiParam {Array} [times] 计划时间（格式：开始时间,结束时间；如：2020-01-01 00:00,2020-01-01 23:59） * @apiParam {Array} [times] 计划时间（格式：开始时间,结束时间；如：2020-01-01 00:00,2020-01-01 23:59）
* @apiParam {Number} [owner] 负责人，留空为自己 * @apiParam {Number} [owner] 负责人
* @apiParam {Array} [subtasks] 子任务（格式：[{name,owner,times}]） * @apiParam {Array} [subtasks] 子任务（格式：[{name,owner,times}]）
* @apiParam {Number} [top] 添加的任务排到列表最前面 * @apiParam {Number} [top] 添加的任务排到列表最前面
*/ */

8
resources/assets/js/pages/manage/calendar.vue
View File

@ -67,12 +67,9 @@ export default {
} }
}, },
mounted() {
this.setRenderRange();
},
activated() { activated() {
this.$refs.cal.resetRender(); this.$refs.cal.resetRender();
this.setRenderRange();
}, },
computed: { computed: {
@ -248,7 +245,8 @@ export default {
this.$store.dispatch("taskAdd", { this.$store.dispatch("taskAdd", {
project_id: res.calendarId, project_id: res.calendarId,
times: [res.start.toDate(), res.end.toDate()], times: [res.start.toDate(), res.end.toDate()],
name: res.title name: res.title,
owner: this.userId,
}).then(({msg}) => { }).then(({msg}) => {
$A.messageSuccess(msg); $A.messageSuccess(msg);
}).catch(({msg}) => { }).catch(({msg}) => {

10
resources/assets/js/store/actions.js vendored
View File

@ -1413,10 +1413,10 @@ export default {
// //
state.ws = new WebSocket(url); state.ws = new WebSocket(url);
state.ws.onopen = (e) => { state.ws.onopen = (e) => {
console.log("[WS] Open", e) // console.log("[WS] Open", e)
}; };
state.ws.onclose = (e) => { state.ws.onclose = (e) => {
console.log("[WS] Close", e); // console.log("[WS] Close", e);
state.ws = null; state.ws = null;
// //
clearTimeout(state.wsTimeout); clearTimeout(state.wsTimeout);
@ -1425,7 +1425,7 @@ export default {
}, 3000); }, 3000);
}; };
state.ws.onerror = (e) => { state.ws.onerror = (e) => {
console.log("[WS] Error", e); // console.log("[WS] Error", e);
state.ws = null; state.ws = null;
// //
clearTimeout(state.wsTimeout); clearTimeout(state.wsTimeout);
@ -1434,7 +1434,7 @@ export default {
}, 3000); }, 3000);
}; };
state.ws.onmessage = (e) => { state.ws.onmessage = (e) => {
console.log("[WS] Message", e); // console.log("[WS] Message", e);
const msgDetail = state.method.jsonParse(event.data); const msgDetail = state.method.jsonParse(event.data);
const {type, msgId} = msgDetail; const {type, msgId} = msgDetail;
switch (type) { switch (type) {
@ -1459,7 +1459,7 @@ export default {
try { try {
call(msgDetail); call(msgDetail);
} catch (err) { } catch (err) {
console.log("[WS] Callerr", err); // console.log("[WS] Callerr", err);
} }
} }
}); });

14
resources/assets/sass/pages/page-calendar.scss vendored
View File

@ -1,5 +1,8 @@
.page-calendar { .page-calendar {
display: flex;
flex-direction: column;
.calendar-head { .calendar-head {
flex-shrink: 0;
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
margin: 32px 32px 16px; margin: 32px 32px 16px;
@ -42,7 +45,11 @@
} }
} }
.calendar-box { .calendar-box {
padding: 0 48px; flex: 1;
display: flex;
flex-direction: column;
padding: 0 48px 6px;
overflow: hidden;
.calendar-wrapper { .calendar-wrapper {
flex: 1; flex: 1;
position: relative; position: relative;
@ -68,6 +75,10 @@
border-bottom-color: rgba(217, 217, 217, .5); border-bottom-color: rgba(217, 217, 217, .5);
} }
} }
.tui-full-calendar-dropdown-menu {
border-color: #e8e8e8;
width: calc(100% - 14px);
}
.tui-full-calendar-popup-creation { .tui-full-calendar-popup-creation {
.tui-full-calendar-icon { .tui-full-calendar-icon {
&.tui-full-calendar-ic-title, &.tui-full-calendar-ic-title,
@ -88,6 +99,7 @@
margin-bottom: 10px; margin-bottom: 10px;
.tui-full-calendar-popup-section-item { .tui-full-calendar-popup-section-item {
height: 36px; height: 36px;
line-height: 34px;
border-color: #e8e8e8; border-color: #e8e8e8;
border-radius: 4px; border-radius: 4px;
} }