|
@@ -248,9 +248,9 @@ export default {
|
|
|
[expectStartTime, expectEndTime]
|
|
|
);
|
|
|
// cell【包含-startEnd】在时间段中
|
|
|
- if(flag=="2" || flag=="3"){
|
|
|
- console.log("时间点:",[filedTime, filedTime + 30], [expectStartTime, expectEndTime], flag, item.planTime, item.procedureNo);
|
|
|
- }
|
|
|
+ //if(flag=="2" || flag=="3"){
|
|
|
+ // console.log("时间点:",[filedTime, filedTime + 30], [expectStartTime, expectEndTime], flag, item.planTime, item.procedureNo);
|
|
|
+ //}
|
|
|
if (flag == "1") {
|
|
|
// 文字偏移量
|
|
|
let leftNums = 0;
|
|
@@ -358,11 +358,26 @@ export default {
|
|
|
return seconds;
|
|
|
},
|
|
|
|
|
|
- getHourSecend2(date){
|
|
|
+ getHourSecend2(date){
|
|
|
let d = new Date(date);
|
|
|
return d.getTime();
|
|
|
- },
|
|
|
-
|
|
|
+ },
|
|
|
+ getHourTitle(titleList){
|
|
|
+ let titles = [];
|
|
|
+ titleList.map(item=> {
|
|
|
+ for(let i=0; i<=47; i++){
|
|
|
+ let j = parseInt(i/2);
|
|
|
+ let t = j<10? "0"+j: j;
|
|
|
+ if(i%2==0){
|
|
|
+ t=t+":00";
|
|
|
+ }else{
|
|
|
+ t=t+":30";
|
|
|
+ }
|
|
|
+ titles.push({field:t, id:item+" "+t, text:item+" "+t})
|
|
|
+ }
|
|
|
+ });
|
|
|
+ return titles;
|
|
|
+ },
|
|
|
setTenant(val) {
|
|
|
if (val) {
|
|
|
this.tenant = { ...val };
|
|
@@ -397,14 +412,14 @@ export default {
|
|
|
this.queryParams.planIds = this.orderData.planIds;
|
|
|
}
|
|
|
|
|
|
- planMgrApi
|
|
|
- .scheduleTaskByResource(this.queryParams)
|
|
|
+ planMgrApi.scheduleTaskByResource(this.queryParams)
|
|
|
.then((response) => {
|
|
|
const res = response.data;
|
|
|
if (res.isSuccess) {
|
|
|
this.tableData = res.data;
|
|
|
//this.titleData = res.data.titleList
|
|
|
- this.titleData = res.data.titleList.filter(item => {
|
|
|
+ this.titleData = this.getHourTitle(res.data.titleList)
|
|
|
+ this.titleData = this.titleData.filter(item => {
|
|
|
return this.getHourSecend2(item.text) > this.getHourSecend2(this.tenant.createTime);
|
|
|
})
|
|
|
}
|