mt-fe-group/yudao-dev
13
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

排班及bug

Browse Source
This commit is contained in:
朱菊兰
2023-09-18 14:49:03 +08:00
parent eff5e0d1e1
commit 0371859d14
10 changed files with 79 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

198
src/views/group/base/groupTeamScheduling/index.vue
View File

@@ -37,7 +37,6 @@
<el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('1')">班组上下片查询</el-button>
<el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('2')">班组能源查询</el-button>
<el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('3')">班组检测查询</el-button>
<el-button type="primary" size="small" @click="aaa">查询</el-button>
</el-form-item>
</el-form>
</div>
@@ -66,7 +65,7 @@
</div>
<!-- 不能选择班组 -->
<div class="toggle-icon-hide" v-show="!(showSetting && (new Date(data.day).valueOf() < new Date().valueOf() ? false: true))"></div>
<el-select v-model="item.teamId" size='small' :disabled="!showSetting || (new Date(data.day).valueOf() > new Date().valueOf() ? false: true)" @change="a">
<el-select v-model="item.teamId" size='small' :disabled="!showSetting || (new Date(data.day).valueOf() > new Date().valueOf() ? false: true)">
<el-option
v-for="i in teamList"
:key="i.id"
@@ -100,129 +99,7 @@ export default {
year: '',// 2023
month: '',// 九月
monthList: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],
// list: {
// 1:[
// {
// classesId: "1674293974662062081",
// endTime: 1690891200000,
// startDay:"2023-09-01",
// startTime: 1690848000000,
// teamId: "1685934333821423617",
// teamName: "S班"
// },
// {
// classesId: "1674293974662062081",
// endTime: 1690934400000,
// startDay:"2023-09-01",
// startTime: 1690894000000,
// teamId: "1685926036653445121",
// teamName: "test3"
// }
// ],
// 2:[
// {
// classesId: "1674293974662062081",
// endTime: 1690891200000,
// startDay:"2023-09-02",
// startTime: 1690848000000,
// teamId: "1685934333821423617",
// teamName: "S班"
// },
// {
// classesId: "1674293974662062081",
// endTime: 1690934400000,
// startDay:"2023-09-02",
// startTime: 1690894000000,
// teamId: "1685926036653445121",
// teamName: "test3"
// }
// ],
// 3:[
// {
// classesId: "1674293974662062081",
// endTime: 1690891200000,
// startDay:"2023-09-03",
// startTime: 1690848000000
// },
// {
// classesId: "1674293974662062081",
// endTime: 1690934400000,
// startDay:"2023-09-03",
// startTime: 1690894000000
// }
// ],
// 4:[
// {
// classesId: "1674293974662062081",
// endTime: 1690891200000,
// startDay:"2023-09-04",
// startTime: 1690848000000
// },
// {
// classesId: "1674293974662062081",
// endTime: 1690934400000,
// startDay:"2023-09-04",
// startTime: 1690894000000
// }
// ],
// 5:[
// {
// classesId: "1674293974662062081",
// endTime: 1690891200000,
// startDay:"2023-09-15",
// startTime: 1690848000000
// },
// {
// classesId: "1674293974662062081",
// endTime: 1690934400000,
// startDay:"2023-09-15",
// startTime: 1690894000000
// }
// ],
// 6:[
// {
// classesId: "1674293974662062081",
// endTime: 1690891200000,
// startDay:"2023-09-16",
// startTime: 1690848000000
// },
// {
// classesId: "1674293974662062081",
// endTime: 1690934400000,
// startDay:"2023-09-16",
// startTime: 1690894000000
// }
// ],
// 7:[
// {
// classesId: "1674293974662062081",
// endTime: 1690891200000,
// startDay:"2023-09-17",
// startTime: 1690848000000
// },
// {
// classesId: "1674293974662062081",
// endTime: 1690934400000,
// startDay:"2023-09-17",
// startTime: 1690894000000
// }
// ],
// 18:[
// {
// classesId: "1674293974662062081",
// endTime: 1690891200000,
// startDay:"2023-09-18",
// startTime: 1690848000000
// },
// {
// classesId: "1674293974662062081",
// endTime: 1690934400000,
// startDay:"2023-09-18",
// startTime: 1690894000000
// }
// ]
// },//日历数据
list: [],
list: {},
teamList: [],// 班组下拉
showSetting: false,// 设置模式。自动排班，确认，取消按钮显示
settingBtnDis: false,
@@ -269,9 +146,19 @@ export default {
year: year,
month: month
}).then(res => {
this.list = res.data || []
let obj = res.data || {}
if (obj) {
for (let item in obj) {
for (let i = 0; i < obj[item].length; i++) {
if (!obj[item][i].teamId) {
obj[item][i].teamId = ''
}
}
}
}
this.list = obj
}).catch(() => {
this.list = []
this.list = {}
this.settingBtnDis = true // 禁用设置按钮
})
},
@@ -287,10 +174,18 @@ export default {
},
// 确认
confirmSetting() {
let num = 0
// 当月数据的话，今天及今天之前的不传
if (moment(this.startDay).format('YYYY-MM') === moment().format('YYYY-MM')) {
num = Number(moment().format('DD'))
} else {
num = 0
}
// 下月数据全部都传
// 打平数据
let tempArr = Object.values(this.list)
let arr = []
for (let i = 0; i < tempArr.length; i++) {
for (let i = num; i < tempArr.length; i++) {
for (let j = 0; j < tempArr[i].length; j++) {
arr.push(tempArr[i][j])
}
@@ -298,6 +193,7 @@ export default {
createOrUpdateList(arr).then(res => {
if (res.code === 0) {
this.showSetting = !this.showSetting
this.$modal.msgSuccess("操作成功")
this.getList() // 数据更新
}
})
@@ -314,9 +210,9 @@ export default {
},
// 自动排班
schedulingBtn() {
let tempData = this.list
// 次月1号有值前端排班
if (this.list[1][0].teamId) {
console.log('次月1号有值前端排班')
let tempArr = Object.values(this.list)
let arr = []
let n = 0
@@ -332,27 +228,24 @@ export default {
}
}
}
console.log(arr)
let tempNum = 0
for (let k = 0; k < tempArr.length; k++) {
for (let v = 0; v < tempArr[k].length; v++) {
let t = (k*(k+1)+v) % arr.length
// console.log(t)
let t = tempNum % arr.length
if (arr.length === 1) {
this.list[k+1][v].teamId = arr[0]
tempData[k+1][v].teamId = arr[0]
} else {
if (k === 0 && v === 0) {
this.list[k+1][v].teamId = arr[0]
} else {
this.list[k+1][v].teamId = arr[t]
}
tempData[k+1][v].teamId = arr[t]
}
tempNum++
}
}
this.list = []
this.list = tempData
} else {
// 次月1号没有值,接口排班
console.log('次月1号没有值接口排班')
autoSet().then(res => {
this.list = res.data || []
this.list = res.data || {}
})
}
},
@@ -389,33 +282,24 @@ export default {
switch (val) {
case '1':
this.$router.push({
path: '/core/monitoring/production-line-data',
// name: 'reportDesign',
params: { startTime: '1111', endTime: '2222' }
// path: '/core/monitoring/production-line-data',
name: 'ProductionLineData',
params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
})
break;
case '2':
case '2': // 能源
this.$router.push({
// path: '/energy/monitoring/energy-report-search',
name: 'EnergyReportSearch',
params: { startTime: '1111', endTime: '2222' }
params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
})
console.log('aaa')
break;
default:
this.$router.push({
path: '/quality/monitoring/quality-statistics',
// name: 'reportDesign',
params: { startTime: '1111', endTime: '2222' }
// path: '/quality/monitoring/quality-statistics',
name: 'QualityStatistics',
params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
})
}
},
aaa() {
console.log(this.list)
},
a() {
console.log('11111')
this.$forceUpdate()
}
}
}