Browse Source

Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into feature_supplier

pull/87/head
wangxy 3 years ago
parent
commit
a9398f6400
2 changed files with 22 additions and 34 deletions
  1. +4
    -1
      src/styles/admin.scss
  2. +18
    -33
      src/views/productplan/workbench/schedule.vue

+ 4
- 1
src/styles/admin.scss View File

@ -187,4 +187,7 @@
border-radius: 50%;
box-shadow: 0 0 4px #ccc;
overflow: hidden;
}
}
.el-radio-button__orig-radio:checked+.el-radio-button__inner {
color: #fff !important;
}

+ 18
- 33
src/views/productplan/workbench/schedule.vue View File

@ -297,17 +297,6 @@
format: '%H:%i'
},
],
[{
unit: 'month',
format: '%M %Y',
step: 1
},
{
unit: 'day',
format: '%d %M',
step: 1
},
],
[{
unit: 'day',
format: '%d %M',
@ -316,7 +305,7 @@
{
unit: 'hour',
format: hourRangeFormat(12),
step: 1
step: 12
},
],
[{
@ -327,7 +316,7 @@
{
unit: 'hour',
format: hourRangeFormat(6),
step: 1
step: 6
},
],
[{
@ -417,18 +406,18 @@
gantt.attachEvent("onGanttScroll", function (left, top){
that.taskEventFn();
});
// --begin
gantt.templates.timeline_cell_class = function (task, date) {
var css = []
if (that.disabledDate) {
//
if (!that.disabledDate.find((item) => moment(item.StartTime) < moment(date) && moment(item.EndTime) >
moment(date))) {
css.push('week_end')
}
}
return css.join(' ')
}
// // --begin
// gantt.templates.timeline_cell_class = function (task, date) {
// var css = []
// if (that.disabledDate) {
// //
// if (!that.disabledDate.find((item) => moment(item.StartTime) < moment(date) && moment(item.EndTime) >
// moment(date))) {
// css.push('week_end')
// </span><span class="err"> pan> }
// }
// return css.join(' ')
// }
// --end
@ -681,7 +670,8 @@
sortorder: 1,
parent: 0,
open: true,
}, ]
unavailableRanges:this.disabledDate
}]
gantt.parse({
data: data
})
@ -830,7 +820,8 @@
sortorder: 1,
parent: 0,
open: true,
}, ]
unavailableRanges:this.disabledDate
}]
gantt.parse({
data: data
})
@ -1026,12 +1017,6 @@
background: #f6f6f6;
}
.el-radio-button__orig-radio:checked+.el-radio-button__inner {
background: #ecf3ff;
border-color: #ecf3ff;
box-shadow: -1px 0 0 0 #ecf3ff;
}
.el-divider--horizontal {
margin: 10px;
width: 90%;


Loading…
Cancel
Save