Skip to content

T
TF-MOM-WEB
Commit cc81047a authored by jingnan's avatar jingnan 👀
Browse files
Options

看板功能开发

parent dd28df7b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 208 deletions
applications/dee-mes/src/api/kanban.js
View file @ cc81047a
import { post } from '../utils/http' import { post } from '../utils/http'
// 主页面
/** /**
* 获取架次 * 获取架次
*/ */
...@@ -13,58 +14,50 @@ export function getMaterial(params) { ...@@ -13,58 +14,50 @@ export function getMaterial(params) {
export function getAllPlan(params) { export function getAllPlan(params) {
return post(`/ExtPosition/board/getPosition?sortieId=${params.sortieId}`) return post(`/ExtPosition/board/getPosition?sortieId=${params.sortieId}`)
} }
// ------------------end------------------------
// 站位现场看板
/** /**
* 架次SQCDP * 现场问题督办table
* @param {*} params * @param {*} params
* @returns * @returns
*/ */
export function sortiesSQCDP(params) { export function stationSpotProblemTable(params) {
return post(`/FactoryCalendar/look/SQCDP?sorties=${params.sorties}&planeType=${params.planeType}`) return post(`/SpotProblem/board/plan/spotProblem?positionNo=${params.positionNo}&sorties=${params.sorties}`)
} }
/** /**
* 架次配套情况 * 站位sqcdp数据
* @param {*} params * @param {*} params
* @returns * @returns
*/ */
export function sortiesFitRates(params) { export function stationSQCDP(params) {
return post(`/DxProcessPlan/look/fitRates?sorties=${params.sorties}&planeType=${params.planeType}&typeName=${params.typeName}`) return post(`/FactoryCalendar/look/plan/SQCDP?positionNo=${params.positionNo}`)
} }
/** /**
* 架次三期预警 * 现场问题督办echart
* @param {*} params * @param {*} params
* @returns * @returns
*/ */
export function sortiesThree() { export function stationSpotProblemEchart(params) {
return post('/Inventory/look/recursionThree/three') return post(`/SpotProblem/board/plan/spotProblem/matrix?positionNo=${params.positionNo}&sorties=${params.sorties}`)
}
/**
* 架次现场督办
* @param {*} paramss
* @returns
*/
export function sortiesSpotProblem(params) {
return post(`/SpotProblem/look/getSpotProblem?sorties=${params.sorties}&planeType=${params.planeType}`)
} }
/** /**
* 架次行动项 * 物料配套及缺件情况 echart
* @param {*} paramss * @param {*} params
* @returns * @returns
*/ */
export function sortiesActionitems(params) { export function stationFitRates(params) {
return post(`/ActionItem/look/actionItem?airModel=${params.planeType}&sorties=${params.sorties}`) return post(`/ExtSupportingItem/board/plan/fitRates?positionNo=${params.positionNo}&sorties=${params.sorties}`)
} }
/** /**
* 站位sqcdp数据 * 站位三天滚动计划
* @param {*} planId * @param {*} params
* @returns * @returns
*/ */
export function stationSQCDP(planId) { export function stationPlan(params) {
return post(`/FactoryCalendar/look/plan/SQCDP?planId=${planId}`) return post(`/ExtProcessPlan/board/threeDay/plan?positionNo=${params.positionNo}&sorties=${params.sorties}`)
} }
/** /**
* 周作业计划完成趋势 * 周作业计划完成趋势
* @param {*} params * @param {*} params
...@@ -73,47 +66,60 @@ export function stationSQCDP(planId) { ...@@ -73,47 +66,60 @@ export function stationSQCDP(planId) {
export function completion(params) { export function completion(params) {
return post(`/JoExecutePlan/board/weekPlan/search?positionNo=${params.positionNo}&sorties=${params.sorties}`) return post(`/JoExecutePlan/board/weekPlan/search?positionNo=${params.positionNo}&sorties=${params.sorties}`)
} }
/** /**
* 站位三天滚动计划 * 物料配套及缺件情况 table
* @param {*} params * @param {*} params
* @returns * @returns
*/ */
export function stationPlan(params) { export function stationMaterialLacke(params) {
return post(`/ExtProcessPlan/board/threeDay/plan?positionNo=${params.positionNo}&sorties=${params.sorties}`) return post(`/WrMaterialLack/board/plan/materialLack?positionNo=${params.positionNo}&sorties=${params.sorties}`)
} }
// ------------------end------------------------
// 总装集成现场看板
/** /**
* 现场问题督办echart * 架次现场督办
* @param {*} params * @param {*} paramss
* @returns * @returns
*/ */
export function stationSpotProblemEchart(params) { export function sortiesSpotProblem(params) {
return post(`/SpotProblem/board/plan/spotProblem/matrix?positionNo=${params.positionNo}&sorties=${params.sorties}`) return post(`/SpotProblem/board/spotProblemWithSortie?sorties=${params.sorties}&aircraftType=${params.aircraftType}`)
} }
/** /**
* 现场问题督办table * 架次SQCDP
* @param {*} params * @param {*} params
* @returns * @returns
*/ */
export function stationSpotProblemTable(params) { export function sortiesSQCDP(params) {
return post(`/SpotProblem/board/plan/spotProblem?positionNo=${params.positionNo}&sorties=${params.sorties}`) return post(`/FactoryCalendar/look/SQCDP/searchWithSortieId?sorties=${params.sorties}&aircraftType=${params.aircraftType}`)
} }
/** /**
* 物料配套及缺件情况 echart * 架次三期预警
* @param {*} params * @param {*} params
* @returns * @returns
*/ */
export function stationFitRates(params) { export function sortiesThree() {
return post(`/ExtSupportingItem/board/plan/fitRates?positionNo=${params.positionNo}&sorties=${params.sorties}`) return post('/Inventory/board/third/warning')
} }
/** /**
* 物料配套及缺件情况 table * 架次行动项
* @param {*} paramss
* @returns
*/
export function sortiesActionitems(params) {
return post(`/ActionItem/board/actionItem/matrix?aircraftType=${params.aircraftType}&sorties=${params.sorties}`)
}
/**
* 架次配套情况
* @param {*} params * @param {*} params
* @returns * @returns
*/ */
export function stationMaterialLacke(params) { export function sortiesFitRates(params) {
return post(`/WrMaterialLack/board/plan/materialLack?positionNo=${params.positionNo}&sorties=${params.sorties}`) return post(`/ExtSupportingItem/board/fitRatesWithSorties?sorties=${params.sorties}&aircraftType=${params.aircraftType}&typeName=${params.typeName}`)
} }
// ------------------end------------------------
/** /**
*站位缺件汇总 获取站位 *站位缺件汇总 获取站位
*/ */
......
applications/dee-mes/src/privateComponents/components/Visualization/ExperimentKanban.vue
View file @ cc81047a
...@@ -2254,16 +2254,6 @@ export default { ...@@ -2254,16 +2254,6 @@ export default {
borderColor: '#06E2E8', borderColor: '#06E2E8',
borderWidth: 1 borderWidth: 1
}, },
// itemStyle: {
// decal: {
// show: true,
// color: '#000',
// // symbolSize: 10,
// symbolKeepAspect: false,
// dashArrayX: [10, 30],
// dashArrayY: 15
// }
// },
data: [] data: []
}, },
{ {
...@@ -2287,16 +2277,6 @@ export default { ...@@ -2287,16 +2277,6 @@ export default {
borderColor: '#F29F34', borderColor: '#F29F34',
borderWidth: 1 borderWidth: 1
}, },
// itemStyle: {
// decal: {
// show: true,
// color: '#000',
// // symbolSize: 10,
// symbolKeepAspect: false,
// dashArrayX: [10, 30],
// dashArrayY: 15
// }
// },
data: [] data: []
} }
] ]
...@@ -2533,11 +2513,13 @@ export default { ...@@ -2533,11 +2513,13 @@ export default {
* sqcdp数据 * sqcdp数据
*/ */
initSQCDP() { initSQCDP() {
stationSQCDP(this.planId) const params = {
positionNo: this.info.serialNumber
}
stationSQCDP(params)
.then((res) => { .then((res) => {
if (res.message.includes('成功')) { if (res.message.includes('成功')) {
this.sqcdpData = res.items this.sqcdpData = res.items
console.log(res)
} }
}) })
.catch((err) => console.error(err)) .catch((err) => console.error(err))
...@@ -2560,23 +2542,6 @@ export default { ...@@ -2560,23 +2542,6 @@ export default {
// 计划完工 // 计划完工
const plan = res.items['计划完成任务'] const plan = res.items['计划完成任务']
const optionTrendxAxisdata = res.items['X轴'] const optionTrendxAxisdata = res.items['X轴']
// let nowWeek = new Date().getDay()
// nowWeek = nowWeek || 7
// const dataActual = []
// const dataPlan = []
// optionTrendxAxisdata.forEach(p => {
// const week = new Date(p).getDay() || 7
// const countActual = actual.filter(t => t.NAME === p)
// dataActual.push({
// NAME: p,
// COUNT: countActual.length ? countActual[0].COUNT : nowWeek >= week ? 0 : null
// })
// const countPlan = plan.filter(t => t.NAME === p)
// dataPlan.push({
// NAME: p,
// COUNT: countPlan.length ? countPlan[0].COUNT : 0// nowWeek >= i ? 0 : null
// })
// })
const formatActual = Object.values(actual) const formatActual = Object.values(actual)
const formatPlan = Object.values(plan) const formatPlan = Object.values(plan)
optionTrend.xAxis.data = optionTrendxAxisdata optionTrend.xAxis.data = optionTrendxAxisdata
...@@ -2589,8 +2554,11 @@ export default { ...@@ -2589,8 +2554,11 @@ export default {
const that = this const that = this
const chartDom = document.getElementById('experimentKanbanEchart') const chartDom = document.getElementById('experimentKanbanEchart')
const myChart = echarts.init(chartDom) const myChart = echarts.init(chartDom)
// myChart.getZr().on('click', function(params) {
myChart.on('click', function(params) { myChart.on('click', function(params) {
if (params) {
console.log('跳转暂时未做，需要做的时候删除这段代码！')
return
}
that.routerJobPlanExecutionSummary(params) that.routerJobPlanExecutionSummary(params)
}) })
myChart.setOption(optionTrend) myChart.setOption(optionTrend)
...@@ -2608,7 +2576,6 @@ export default { ...@@ -2608,7 +2576,6 @@ export default {
stationFitRates(params) stationFitRates(params)
.then((res) => { .then((res) => {
if (res.message.includes('成功')) { if (res.message.includes('成功')) {
console.log('物料配套及缺件情况echart', res)
optionParts.yAxis.data = res.items.map((p) => p.typeName) optionParts.yAxis.data = res.items.map((p) => p.typeName)
optionParts.series[0].data = res.items.map((p) => p.countFit) optionParts.series[0].data = res.items.map((p) => p.countFit)
optionParts.series[1].data = res.items.map((p) => p.countNotFit) optionParts.series[1].data = res.items.map((p) => p.countNotFit)
...@@ -2620,7 +2587,10 @@ export default { ...@@ -2620,7 +2587,10 @@ export default {
const chartDom = document.getElementById('missPartsEchart') const chartDom = document.getElementById('missPartsEchart')
const myChart = echarts.init(chartDom) const myChart = echarts.init(chartDom)
myChart.on('click', function(params) { myChart.on('click', function(params) {
console.log(2602, params) if (params) {
console.log('跳转暂时未做，需要做的时候删除这段代码！')
return
}
that.routerSummaryOfStationMissingParts(params.name, params.seriesName) that.routerSummaryOfStationMissingParts(params.name, params.seriesName)
}) })
myChart.setOption(optionParts) myChart.setOption(optionParts)
...@@ -2650,6 +2620,10 @@ export default { ...@@ -2650,6 +2620,10 @@ export default {
const chartDom = document.getElementById('superviseEchart') const chartDom = document.getElementById('superviseEchart')
const myChart = echarts.init(chartDom) const myChart = echarts.init(chartDom)
myChart.on('click', function(params) { myChart.on('click', function(params) {
if (params) {
console.log('跳转暂时未做，需要做的时候删除这段代码！')
return
}
that.routerSiteProblemManagementSummary(params.name) that.routerSiteProblemManagementSummary(params.name)
}) })
myChart.setOption(superviseOption) myChart.setOption(superviseOption)
...@@ -2672,7 +2646,6 @@ export default { ...@@ -2672,7 +2646,6 @@ export default {
// department 责任部门 // department 责任部门
// fixDate 要求解决时间 // fixDate 要求解决时间
// 责任人 删掉 // 责任人 删掉
console.log('现场问题督办table', res)
} }
}) })
.catch((err) => console.error(err)) .catch((err) => console.error(err))
...@@ -2724,7 +2697,6 @@ export default { ...@@ -2724,7 +2697,6 @@ export default {
stationMaterialLacke(params) stationMaterialLacke(params)
.then((res) => { .then((res) => {
if (res.message.includes('成功')) { if (res.message.includes('成功')) {
console.log('物料配套及缺件情况table', res)
this.missingPartsData = res.items this.missingPartsData = res.items
this.selectMissPartsTabs(this.missPartsTab) this.selectMissPartsTabs(this.missPartsTab)
} }
...@@ -2741,6 +2713,10 @@ export default { ...@@ -2741,6 +2713,10 @@ export default {
* sqcdp维护 * sqcdp维护
*/ */
routerWordCalendar(name) { routerWordCalendar(name) {
if (name) {
console.log('跳转暂时未做，需要做的时候删除这段代码！')
return
}
this.sqcdpParams = { this.sqcdpParams = {
name: 'sqcdpMaintain', name: 'sqcdpMaintain',
query: { query: {
...@@ -2765,16 +2741,6 @@ export default { ...@@ -2765,16 +2741,6 @@ export default {
* 路由跳转作业计划执行查询 * 路由跳转作业计划执行查询
*/ */
routerJobPlanExecutionSummary(params) { routerJobPlanExecutionSummary(params) {
// this.$router.push({
// name: 'jobPlanExecutionSummary',
// query: {
// serialNumber: this.$route.query.planId,
// // planId: this.$route.query.planId,
// model: this.$route.query.model,
// sorties: this.$route.query.sorties,
// isOk: 'string'
// }
// })
this.JobPlanExecutionQueryParams = { this.JobPlanExecutionQueryParams = {
name: 'jobPlanExecutionSummary', name: 'jobPlanExecutionSummary',
query: { query: {
...@@ -2792,15 +2758,6 @@ export default { ...@@ -2792,15 +2758,6 @@ export default {
* 现场问题管理查询 * 现场问题管理查询
*/ */
routerSiteProblemManagementSummary(name) { routerSiteProblemManagementSummary(name) {
// this.$router.push({
// name: 'siteProblemManagementSummary',
// query: {
// name: name,
// planId: this.$route.query.planId,
// sorties: this.$route.query.sorties
// }
// })
this.siteProblemManagementSummaryParams = { this.siteProblemManagementSummaryParams = {
name: 'siteProblemManagementSummary', name: 'siteProblemManagementSummary',
query: { query: {
......
applications/dee-mes/src/privateComponents/components/Visualization/ProductionKanban.vue
View file @ cc81047a
...@@ -23,11 +23,6 @@ ...@@ -23,11 +23,6 @@
@dblclick="routerExperiment(item)" @dblclick="routerExperiment(item)"
@click="selectStation(item.serialNumber)" @click="selectStation(item.serialNumber)"
> >
<!-- <p>
<span>{{ item.serialNumber }}</span>
<span>{{ item.name }}</span>
</p>
<el-slider v-model="item.progress" disabled /> -->
<div :class="platformClass(item.extPositionPlans&&item.extPositionPlans[0].planState)" /> <div :class="platformClass(item.extPositionPlans&&item.extPositionPlans[0].planState)" />
<div class="stage" /> <div class="stage" />
<div :class="stageClass(item.isLogo)" /> <div :class="stageClass(item.isLogo)" />
...@@ -100,8 +95,6 @@ ...@@ -100,8 +95,6 @@
<span class="number">{{ stationRow.progress }}%</span> <span class="number">{{ stationRow.progress }}%</span>
</div> </div>
</div> </div>
<!-- <div class="router" @click="routerAssemble">
</div> -->
<img <img
alt="" alt=""
src="../../../assets/看板/最大化.png" src="../../../assets/看板/最大化.png"
...@@ -327,7 +320,6 @@ export default { ...@@ -327,7 +320,6 @@ export default {
this.stationRow = this.stationData.filter( this.stationRow = this.stationData.filter(
(p) => p.serialNumber === serialNumber (p) => p.serialNumber === serialNumber
)[0] )[0]
// console.log('选择站位', this.stationRow)
}, },
/** /**
* 路由跳转站位试验看板 * 路由跳转站位试验看板
...@@ -348,6 +340,10 @@ export default { ...@@ -348,6 +340,10 @@ export default {
* 路由跳转作业计划执行查询 * 路由跳转作业计划执行查询
*/ */
routerJobPlanExecutionSummary(planStateCode) { routerJobPlanExecutionSummary(planStateCode) {
if (planStateCode) {
console.log('跳转暂时未做，需要做的时候删除这段代码！')
return
}
const params = { const params = {
name: 'jobPlanExecutionSummary', name: 'jobPlanExecutionSummary',
query: { query: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment