Skip to content

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

看板功能开发

parent 846a4944
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 208 deletions
applications/dee-mes/src/api/kanban.js
View file @ f833ec9e
import { post } from '../utils/http'
// 主页面
/**
* 获取架次
*/
......@@ -13,58 +14,50 @@ export function getMaterial(params) {
export function getAllPlan(params) {
return post(`/ExtPosition/board/getPosition?sortieId=${params.sortieId}`)
}
// ------------------end------------------------
// 站位现场看板
/**
* 架次SQCDP
* 现场问题督办table
* @param {*} params
* @returns
*/
export function sortiesSQCDP(params) {
return post(`/FactoryCalendar/look/SQCDP?sorties=${params.sorties}&planeType=${params.planeType}`)
export function stationSpotProblemTable(params) {
return post(`/SpotProblem/board/plan/spotProblem?positionNo=${params.positionNo}&sorties=${params.sorties}`)
}
/**
* 架次配套情况
* 站位sqcdp数据
* @param {*} params
* @returns
*/
export function sortiesFitRates(params) {
return post(`/DxProcessPlan/look/fitRates?sorties=${params.sorties}&planeType=${params.planeType}&typeName=${params.typeName}`)
export function stationSQCDP(params) {
return post(`/FactoryCalendar/look/plan/SQCDP?positionNo=${params.positionNo}`)
}
/**
* 架次三期预警
* 现场问题督办echart
* @param {*} params
* @returns
*/
export function sortiesThree() {
return post('/Inventory/look/recursionThree/three')
}
/**
* 架次现场督办
* @param {*} paramss
* @returns
*/
export function sortiesSpotProblem(params) {
return post(`/SpotProblem/look/getSpotProblem?sorties=${params.sorties}&planeType=${params.planeType}`)
export function stationSpotProblemEchart(params) {
return post(`/SpotProblem/board/plan/spotProblem/matrix?positionNo=${params.positionNo}&sorties=${params.sorties}`)
}
/**
* 架次行动项
* @param {*} paramss
* 物料配套及缺件情况 echart
* @param {*} params
* @returns
*/
export function sortiesActionitems(params) {
return post(`/ActionItem/look/actionItem?airModel=${params.planeType}&sorties=${params.sorties}`)
export function stationFitRates(params) {
return post(`/ExtSupportingItem/board/plan/fitRates?positionNo=${params.positionNo}&sorties=${params.sorties}`)
}
/**
* 站位sqcdp数据
* @param {*} planId
* 站位三天滚动计划
* @param {*} params
* @returns
*/
export function stationSQCDP(planId) {
return post(`/FactoryCalendar/look/plan/SQCDP?planId=${planId}`)
export function stationPlan(params) {
return post(`/ExtProcessPlan/board/threeDay/plan?positionNo=${params.positionNo}&sorties=${params.sorties}`)
}
/**
* 周作业计划完成趋势
* @param {*} params
......@@ -73,47 +66,60 @@ export function stationSQCDP(planId) {
export function completion(params) {
return post(`/JoExecutePlan/board/weekPlan/search?positionNo=${params.positionNo}&sorties=${params.sorties}`)
}
/**
* 站位三天滚动计划
* 物料配套及缺件情况 table
* @param {*} params
* @returns
*/
export function stationPlan(params) {
return post(`/ExtProcessPlan/board/threeDay/plan?positionNo=${params.positionNo}&sorties=${params.sorties}`)
export function stationMaterialLacke(params) {
return post(`/WrMaterialLack/board/plan/materialLack?positionNo=${params.positionNo}&sorties=${params.sorties}`)
}
// ------------------end------------------------
// 总装集成现场看板
/**
* 现场问题督办echart
* @param {*} params
* 架次现场督办
* @param {*} paramss
* @returns
*/
export function stationSpotProblemEchart(params) {
return post(`/SpotProblem/board/plan/spotProblem/matrix?positionNo=${params.positionNo}&sorties=${params.sorties}`)
export function sortiesSpotProblem(params) {
return post(`/SpotProblem/board/spotProblemWithSortie?sorties=${params.sorties}&aircraftType=${params.aircraftType}`)
}
/**
* 现场问题督办table
* 架次SQCDP
* @param {*} params
* @returns
*/
export function stationSpotProblemTable(params) {
return post(`/SpotProblem/board/plan/spotProblem?positionNo=${params.positionNo}&sorties=${params.sorties}`)
export function sortiesSQCDP(params) {
return post(`/FactoryCalendar/look/SQCDP/searchWithSortieId?sorties=${params.sorties}&aircraftType=${params.aircraftType}`)
}
/**
* 物料配套及缺件情况 echart
* 架次三期预警
* @param {*} params
* @returns
*/
export function stationFitRates(params) {
return post(`/ExtSupportingItem/board/plan/fitRates?positionNo=${params.positionNo}&sorties=${params.sorties}`)
export function sortiesThree() {
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
* @returns
*/
export function stationMaterialLacke(params) {
return post(`/WrMaterialLack/board/plan/materialLack?positionNo=${params.positionNo}&sorties=${params.sorties}`)
export function sortiesFitRates(params) {
return post(`/ExtSupportingItem/board/fitRatesWithSorties?sorties=${params.sorties}&aircraftType=${params.aircraftType}&typeName=${params.typeName}`)
}
// ------------------end------------------------
/**
*站位缺件汇总 获取站位
*/
......
applications/dee-mes/src/privateComponents/components/Visualization/AssembleKanban.vue
View file @ f833ec9e
......@@ -68,12 +68,6 @@
"
@click="routerExperiment(item)"
>
<!-- <p>{{ item.progress || 0 }}%</p> -->
<!-- <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="stage" />
<div :class="stageClass(item.isLogo)" />
......@@ -1887,10 +1881,6 @@
<div id="earlyEchart" />
</div>
<div>
<!-- <label>
<p>现场督办</p>
<p v-show="false">Material matching and lack of parts</p>
</label> -->
<div class="tabs">
<span
v-for="item in superviseTabs"
......@@ -2354,10 +2344,6 @@ export default {
top: 5,
bottom: 10,
width: '70%',
// min: 0,
// max: 100,
// minSize: '0%',
// maxSize: '100%',
sort: 'descending',
label: {
show: true,
......@@ -2591,21 +2577,20 @@ export default {
initOutsour() {
const outsourOption = this.outsourOption
const params = {
planeType: this.$route.query.model,
aircraftType: this.$route.query.model,
sorties: this.$route.query.sorties,
typeName: '外购成品'
}
sortiesFitRates(params)
.then((res) => {
if (res.message.includes('成功')) {
console.log('外购成品', res)
// countFit // 齐套
// countNotFit // 未齐套
const data = res.items.sort((a, b) => {
return Number(a.serialNumberl - b.serialNumberl)
return Number(a.positionNumber - b.positionNumber)
})
outsourOption.series[1].data = data.map((p) => p.fitRatesCount)
outsourOption.series[0].data = data.map((p) => p.notFitRatesCount)
// fitRatesCount // 齐套
// notFitRatesCount // 未齐套
outsourOption.series[1].data = data.map((p) => p.countFit)
outsourOption.series[0].data = data.map((p) => p.countNotFit)
}
})
.catch((err) => console.error(err))
......@@ -2614,7 +2599,10 @@ export default {
const chartDom = document.getElementById('outsourcEchart')
const myChart = echarts.init(chartDom)
myChart.on('click', function(params) {
console.log(2581, params)
if (params) {
console.log('跳转暂时未做，需要做的时候删除这段代码！')
return
}
that.routerSummaryOfStationMissingParts(
'外购成品',
params.name,
......@@ -2630,19 +2618,21 @@ export default {
initSparepartsr() {
const sparepartsrOption = this.sparepartsrOption
const params = {
planeType: this.$route.query.model,
aircraftType: this.$route.query.model,
sorties: this.$route.query.sorties,
typeName: '零组件'
}
sortiesFitRates(params)
.then((res) => {
if (res.message.includes('成功')) {
// countFit // 齐套
// countNotFit // 未齐套
const data = res.items.sort((a, b) => {
return Number(a.serialNumberl - b.serialNumberl)
return Number(a.positionNumber - b.positionNumber)
})
sparepartsrOption.series[1].data = data.map((p) => p.fitRatesCount)
sparepartsrOption.series[1].data = data.map((p) => p.countFit)
sparepartsrOption.series[0].data = data.map(
(p) => p.notFitRatesCount
(p) => p.countNotFit
)
}
})
......@@ -2652,6 +2642,10 @@ export default {
const chartDom = document.getElementById('sparepartsEchart')
const myChart = echarts.init(chartDom)
myChart.on('click', function(params) {
if (params) {
console.log('跳转暂时未做，需要做的时候删除这段代码！')
return
}
that.routerSummaryOfStationMissingParts(
'零组件',
params.name,
......@@ -2667,20 +2661,20 @@ export default {
initStandard() {
const standardOption = this.standardOption
const params = {
planeType: this.$route.query.model,
aircraftType: this.$route.query.model,
sorties: this.$route.query.sorties,
typeName: '标准件'
}
sortiesFitRates(params)
.then((res) => {
if (res.message.includes('成功')) {
// fitRatesCount // 齐套
// notFitRatesCount // 未齐套
// countFit // 齐套
// countNotFit // 未齐套
const data = res.items.sort((a, b) => {
return Number(a.serialNumberl - b.serialNumberl)
return Number(a.positionNumber - b.positionNumber)
})
standardOption.series[1].data = data.map((p) => p.fitRatesCount)
standardOption.series[0].data = data.map((p) => p.notFitRatesCount)
standardOption.series[1].data = data.map((p) => p.countFit)
standardOption.series[0].data = data.map((p) => p.countNotFit)
}
})
.catch((err) => console.error(err))
......@@ -2689,6 +2683,10 @@ export default {
const chartDom = document.getElementById('standardEchart')
const myChart = echarts.init(chartDom)
myChart.on('click', function(params) {
if (params) {
console.log('跳转暂时未做，需要做的时候删除这段代码！')
return
}
that.routerSummaryOfStationMissingParts(
'标准件',
params.name,
......@@ -2703,18 +2701,13 @@ export default {
*/
initSQCDP() {
const params = {
planeType: this.$route.query.model,
aircraftType: this.$route.query.model,
sorties: this.$route.query.sorties
}
sortiesSQCDP(params)
.then((res) => {
if (res.message.includes('成功')) {
console.log('架次sqcdp', res)
this.sqcdpData = res.items
// res.items.forEach(p => {
// let key = p.date.split(' ')[0].split('-')[2]
// this.sqcdpData[key] = p.color
// })
}
})
.catch((err) => console.error(err))
......@@ -2734,7 +2727,6 @@ export default {
earlyOption.series[index].name = res.items.typeName[index]
earlyOption.series[index].data = res.items['data' + (index + 1)]
})
console.log('三期预警', res)
}
})
.catch((err) => console.error(err))
......@@ -2743,6 +2735,10 @@ export default {
const chartDom = document.getElementById('earlyEchart')
const myChart = echarts.init(chartDom)
myChart.on('click', function(params) {
if (params) {
console.log('跳转暂时未做，需要做的时候删除这段代码！')
return
}
let name = ''
let seriesName = ''
if (params.name === '元器件') {
......@@ -2779,17 +2775,15 @@ export default {
initSupervise() {
const superviseOption = this.superviseOption
const params = {
planeType: this.$route.query.model,
aircraftType: this.$route.query.model,
sorties: this.$route.query.sorties
}
sortiesSpotProblem(params)
.then((res) => {
if (res.message.includes('成功')) {
console.log('现场督办', res)
superviseOption.legend.data = res.items.map((p) => p.name)
res.items.forEach((p, index) => {
superviseOption.series[0].data[index].name = p.name
superviseOption.series[0].data[index].value = p.count
Object.entries(res.items).forEach(([key, value]) => {
const targetIndex = superviseOption.series[0].data.findIndex(el => (el.name === key))
superviseOption.series[0].data[targetIndex].value = value
})
}
})
......@@ -2799,7 +2793,10 @@ export default {
const chartDom = document.getElementById('superviseEchart')
const myChart = echarts.init(chartDom)
myChart.on('click', function(params) {
console.log(2731, params)
if (params) {
console.log('跳转暂时未做，需要做的时候删除这段代码！')
return
}
that.routerSiteProblemManagementSummary(params.name)
})
myChart.setOption(superviseOption)
......@@ -2811,17 +2808,15 @@ export default {
initActionitems() {
const superviseOption = this.superviseOption
const params = {
planeType: this.$route.query.model,
aircraftType: this.$route.query.model,
sorties: this.$route.query.sorties
}
sortiesActionitems(params)
.then((res) => {
if (res.message.includes('成功')) {
console.log('行动项', res)
superviseOption.legend.data = res.items.map((p) => p.name)
res.items.forEach((p, index) => {
superviseOption.series[0].data[index].name = p.name
superviseOption.series[0].data[index].value = p.count
Object.entries(res.items).forEach(([key, value]) => {
const targetIndex = superviseOption.series[0].data.findIndex(el => (el.name === key))
superviseOption.series[0].data[targetIndex].value = value
})
}
})
......@@ -2831,7 +2826,10 @@ export default {
const chartDom = document.getElementById('superviseEchart')
const myChart = echarts.init(chartDom)
myChart.on('click', function(params) {
console.log(2731, params)
if (params) {
console.log('跳转暂时未做，需要做的时候删除这段代码！')
return
}
that.routerActionitems(params.name)
})
myChart.setOption(superviseOption)
......@@ -2868,13 +2866,6 @@ export default {
* 三期预警
*/
routerStorageExpireWarning(item) {
// this.$router.push({
// name: 'StorageExpireWarning',
// query: {
// seriesName: item.seriesName,
// name: item.name
// }
// })
this.storageExpireWarningParams = {
name: 'StorageExpireWarning',
query: {
......@@ -2894,6 +2885,10 @@ export default {
})
},
routerWordCalendar(name) {
if (name) {
console.log('跳转暂时未做，需要做的时候删除这段代码！')
return
}
let data = []
switch (name) {
case 'S':
......@@ -2937,14 +2932,6 @@ export default {
})
break
}
// this.$router.push({
// name: 'sqcdpMaintain',
// query: {
// name: name,
// sorties: this.info.aircraftSorties.defCode,
// data: JSON.stringify(data)
// }
// })
this.sqcdpParams = {
name: 'sqcdpMaintain',
query: {
......@@ -2959,14 +2946,6 @@ export default {
* 现场问题管理查询
*/
routerSiteProblemManagementSummary(name) {
// this.$router.push({
// name: 'siteProblemManagementSummary',
// query: {
// name: name,
// planId: null,
// sorties: this.info.aircraftSorties.defCode
// }
// })
this.siteProblemManagementSummaryParams = {
name: 'siteProblemManagementSummary',
query: {
......@@ -2981,14 +2960,6 @@ export default {
* 行动项
*/
routerActionitems(name) {
// this.$router.push({
// name: 'siteProblemManagementSummary',
// query: {
// name: name,
// planId: null,
// sorties: this.info.aircraftSorties.defCode
// }
// })
this.actionitemsParams = {
name: 'actionitemsParams',
query: {
......@@ -3003,14 +2974,6 @@ export default {
* 站位缺件汇总
*/
routerSummaryOfStationMissingParts(name, serialNumber, seriesName) {
// this.$router.push({
// name: 'summaryOfStationMissingParts',
// query: {
// name: name,
// serialNumber: serialNumber,
// seriesName: seriesName
// }
// })
this.summaryOfStationMissingPartsParams = {
name: 'summaryOfStationMissingParts',
query: {
......@@ -3025,7 +2988,6 @@ export default {
this.$nextTick(() => {
const el = $('.assemble-kanban').parent()[0]
this.erd.listenTo(el, function(element) {
console.log(2658, '变动')
const width = $(element).width()
const height = $(element).height()
const scaleX = width / 1920
......
applications/dee-mes/src/privateComponents/components/Visualization/ExperimentKanban.vue
View file @ f833ec9e
......@@ -2254,16 +2254,6 @@ export default {
borderColor: '#06E2E8',
borderWidth: 1
},
// itemStyle: {
// decal: {
// show: true,
// color: '#000',
// // symbolSize: 10,
// symbolKeepAspect: false,
// dashArrayX: [10, 30],
// dashArrayY: 15
// }
// },
data: []
},
{
......@@ -2287,16 +2277,6 @@ export default {
borderColor: '#F29F34',
borderWidth: 1
},
// itemStyle: {
// decal: {
// show: true,
// color: '#000',
// // symbolSize: 10,
// symbolKeepAspect: false,
// dashArrayX: [10, 30],
// dashArrayY: 15
// }
// },
data: []
}
]
......@@ -2533,11 +2513,13 @@ export default {
* sqcdp数据
*/
initSQCDP() {
stationSQCDP(this.planId)
const params = {
positionNo: this.info.serialNumber
}
stationSQCDP(params)
.then((res) => {
if (res.message.includes('成功')) {
this.sqcdpData = res.items
console.log(res)
}
})
.catch((err) => console.error(err))
......@@ -2560,23 +2542,6 @@ export default {
// 计划完工
const plan = res.items['计划完成任务']
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 formatPlan = Object.values(plan)
optionTrend.xAxis.data = optionTrendxAxisdata
......@@ -2589,8 +2554,11 @@ export default {
const that = this
const chartDom = document.getElementById('experimentKanbanEchart')
const myChart = echarts.init(chartDom)
// myChart.getZr().on('click', function(params) {
myChart.on('click', function(params) {
if (params) {
console.log('跳转暂时未做，需要做的时候删除这段代码！')
return
}
that.routerJobPlanExecutionSummary(params)
})
myChart.setOption(optionTrend)
......@@ -2608,7 +2576,6 @@ export default {
stationFitRates(params)
.then((res) => {
if (res.message.includes('成功')) {
console.log('物料配套及缺件情况echart', res)
optionParts.yAxis.data = res.items.map((p) => p.typeName)
optionParts.series[0].data = res.items.map((p) => p.countFit)
optionParts.series[1].data = res.items.map((p) => p.countNotFit)
......@@ -2620,7 +2587,10 @@ export default {
const chartDom = document.getElementById('missPartsEchart')
const myChart = echarts.init(chartDom)
myChart.on('click', function(params) {
console.log(2602, params)
if (params) {
console.log('跳转暂时未做，需要做的时候删除这段代码！')
return
}
that.routerSummaryOfStationMissingParts(params.name, params.seriesName)
})
myChart.setOption(optionParts)
......@@ -2650,6 +2620,10 @@ export default {
const chartDom = document.getElementById('superviseEchart')
const myChart = echarts.init(chartDom)
myChart.on('click', function(params) {
if (params) {
console.log('跳转暂时未做，需要做的时候删除这段代码！')
return
}
that.routerSiteProblemManagementSummary(params.name)
})
myChart.setOption(superviseOption)
......@@ -2672,7 +2646,6 @@ export default {
// department 责任部门
// fixDate 要求解决时间
// 责任人 删掉
console.log('现场问题督办table', res)
}
})
.catch((err) => console.error(err))
......@@ -2724,7 +2697,6 @@ export default {
stationMaterialLacke(params)
.then((res) => {
if (res.message.includes('成功')) {
console.log('物料配套及缺件情况table', res)
this.missingPartsData = res.items
this.selectMissPartsTabs(this.missPartsTab)
}
......@@ -2741,6 +2713,10 @@ export default {
* sqcdp维护
*/
routerWordCalendar(name) {
if (name) {
console.log('跳转暂时未做，需要做的时候删除这段代码！')
return
}
this.sqcdpParams = {
name: 'sqcdpMaintain',
query: {
......@@ -2765,16 +2741,6 @@ export default {
* 路由跳转作业计划执行查询
*/
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 = {
name: 'jobPlanExecutionSummary',
query: {
......@@ -2792,15 +2758,6 @@ export default {
* 现场问题管理查询
*/
routerSiteProblemManagementSummary(name) {
// this.$router.push({
// name: 'siteProblemManagementSummary',
// query: {
// name: name,
// planId: this.$route.query.planId,
// sorties: this.$route.query.sorties
// }
// })
this.siteProblemManagementSummaryParams = {
name: 'siteProblemManagementSummary',
query: {
......
applications/dee-mes/src/privateComponents/components/Visualization/ProductionKanban.vue
View file @ f833ec9e
......@@ -23,11 +23,6 @@
@dblclick="routerExperiment(item)"
@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="stage" />
<div :class="stageClass(item.isLogo)" />
......@@ -100,8 +95,6 @@
<span class="number">{{ stationRow.progress }}%</span>
</div>
</div>
<!-- <div class="router" @click="routerAssemble">
</div> -->
<img
alt=""
src="../../../assets/看板/最大化.png"
......@@ -327,7 +320,6 @@ export default {
this.stationRow = this.stationData.filter(
(p) => p.serialNumber === serialNumber
)[0]
// console.log('选择站位', this.stationRow)
},
/**
* 路由跳转站位试验看板
......@@ -348,6 +340,10 @@ export default {
* 路由跳转作业计划执行查询
*/
routerJobPlanExecutionSummary(planStateCode) {
if (planStateCode) {
console.log('跳转暂时未做，需要做的时候删除这段代码！')
return
}
const params = {
name: 'jobPlanExecutionSummary',
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