admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-xiaole' into shenzhen-dev

Browse Source
This commit is contained in:
骆乐 2022-11-05 16:47:33 +08:00
commit 1243ede43e
3 changed files with 654 additions and 491 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1088
public/doc/ExtGantt/Ext甘特图.html
View File

File diff suppressed because it is too large Load Diff

43
public/doc/ExtGantt/Ext甘特图_files/GanttMenu.js
View File

@ -95,24 +95,38 @@ mini.extend(GanttMenu, mini.Menu, {
// },
__OnAdd: function(e) {
console.log("点击新增执行");
console.log("点击新增执行",e);
var gantt = this.owner;
var targetTask = gantt.getSelected();
var task = gantt.newTask();
console.log("=====添加", task);
var task = gantt.newTask()
//加到选中任务之后
// gantt.addTask(task, "after", targetTask);
// 新增弹窗
// 没有父级的时候
if (!targetTask) {
// var x;
// var name=prompt("请输入任务名称",""); //显示默认文本 ""
// var duration=prompt("请输入工期",""); //显示默认文本 ""
// var duration=prompt("请输入工期",""); //显示默认文本 ""
// var dutyUserName=prompt("请输入负责人名称",""); //显示默认文本 ""
// console.log('name',name,duration,dutyUserName,)
}
document.getElementById('addDiv').style.display = 'block';
console.log('vvvvv',document.getElementById('addDiv'))
// if(!e.task.taskName){
// data.taskName = e.task.taskName
// }
// console.log('data',data)
// if(e.task.taskName !="" && e.task.Start!="" && e.task.Finish!="" && e.task.duration!=""&&e.task.progressRatio!=""&&e.task.remark!=""){
// var data2 = {
// taskName: e.task.taskName,
// Start: e.task.Start,
// Finish: e.task.Finish,
// // actualStartDate: e.task.actualStartDate,
// // actualFinishDate: e.task.actualFinishDate,
// duration: e.task.duration,
// progressRatio: e.task.progressRatio,
// remark: e.task.remark,
// // projectSn: projectSn,
// };
// // 没有父级的时候
// if (targetTask) {
// data.parentId = e.task.id
// }
// console.log('添加data',data)
// }
},
__OnEdit: function(e) {
var gantt = this.owner;
@ -129,7 +143,6 @@ mini.extend(GanttMenu, mini.Menu, {
.location.search;
var parameter = url.split("="); //所有参数
var requestUrl = parameter[1].split("&")[0]; //请求服务器的地址
console.log("=======task", task);
if (task) {
if (confirm('确定删除任务 "' + task.taskName + '" ？')) {
gantt.removeTask(task);

14
public/doc/ExtGantt/Ext甘特图_files/GanttSchedule.js
View File

@ -35,7 +35,7 @@ GanttSchedule.prototype = {
__OnCellBeginEdit: function (e) {
var task = e.record, field = e.field;
if (task.Summary) {
if (field == 'Start' || field == 'Finish' || field == 'Duration') {
if (field == 'Start' || field == 'Finish' || field == 'duration') {
e.cancel = true;
}
}
@ -59,12 +59,12 @@ GanttSchedule.prototype = {
}
switch (field) {
case "Duration":
task.Duration = value;
case "duration":
task.duration = value;
if (task.Start) {
task.Finish = maxTime(task.Start);
task.Finish.setDate(task.Finish.getDate() + task.Duration - 1);
task.Finish.setDate(task.Finish.getDate() + task.duration - 1);
gantt.setTaskModified(task, "Finish");
}
@ -75,7 +75,7 @@ GanttSchedule.prototype = {
if (task.Start) {
task.Finish = maxTime(task.Start);
task.Finish.setDate(task.Start.getDate() + task.Duration - 1);
task.Finish.setDate(task.Start.getDate() + task.duration - 1);
gantt.setTaskModified(task, "Finish");
}
@ -86,9 +86,9 @@ GanttSchedule.prototype = {
if (task.Finish && task.Start) {
var days = parseInt((task.Finish - task.Start) / (3600 * 24 * 1000));
task.Duration = days + 1;
task.duration = days + 1;
gantt.setTaskModified(task, "Duration");
gantt.setTaskModified(task, "duration");
}
break;