Browse Source

[SBBJ-833、SBBJ-834][设备月指标模板导出、导入、列表、分页 兼容dataType字段,

首页优化代码写法,兼容dataType字段]
master
曾庆源 4 days ago
parent
commit
04a618faea
  1. 4
      src/api/home/index.ts
  2. 14
      src/views/eam/basic/basciYearEquipment/basciYearEquipment.data.ts
  3. 11
      src/views/eam/basic/basicMonthEquipment/basicMonthEquipment.data.ts
  4. 28
      src/views/home/index.vue

4
src/api/home/index.ts

@ -11,6 +11,6 @@ export const getYearTarget = async () => {
}
// 获取年度指标
export const getChartsData = async (factory) => {
return await request.get({ url: `/eam/home-page/selectMonthGraphByFactory?factory=`+factory })
export const getChartsData = async (factory, dataType) => {
return await request.get({ url: `/eam/home-page/selectMonthGraphByFactory?factory=` + factory +`&dataType=`+ dataType})
}

14
src/views/eam/basic/basciYearEquipment/basciYearEquipment.data.ts

@ -48,6 +48,20 @@ export const BasciYearEquipment = useCrudSchemas(reactive<CrudSchema[]>([
component: 'Select'
}
},
{
label: '设备/模具',
field: 'dataType',
dictType: DICT_TYPE.DEVICE_MOLD_TYPE,
dictClass: 'string',
sort: 'custom',
isSearch: true,
form: {
component: 'Select',
componentProps:{
disabled: false
}
},
},
{
label: '年指标',
field: 'yearIndex',

11
src/views/eam/basic/basicMonthEquipment/basicMonthEquipment.data.ts

@ -42,6 +42,17 @@ export const BasicMonthEquipment = useCrudSchemas(reactive<CrudSchema[]>([
component: 'Select'
},
},
{
label: '设备/模具',
field: 'dataType',
dictType: DICT_TYPE.DEVICE_MOLD_TYPE,
dictClass: 'string',
sort: 'custom',
isSearch: true,
form: {
component: 'Select'
},
},
{
label: '年月',
field: 'monthIndex',

28
src/views/home/index.vue

@ -36,7 +36,7 @@
</div>
</div>
<div class="data-item ml-14px">
<div class="small-title">装配</div>
<div class="small-title">模具</div>
<div class="small-data">
<div class="small-data-item small-data-item5">
<div class="small-data-item-txt">
@ -155,7 +155,7 @@
</div>
</div>
<div class="data-item ml-14px">
<div class="small-title">装配年度指标</div>
<div class="small-title">模具年度指标</div>
<div class="small-data">
<div class="table-box">
<ul class="table header">
@ -263,7 +263,7 @@
<Echart :options="lineOptionsData1" :height="280" />
</div>
<div class="data1 ml-14px">
<div class="title">装配设备停机率</div>
<div class="title">模具设备停机率</div>
<Echart :options="lineOptionsData2" :height="280" />
</div>
<div class="data1 ml-14px">
@ -277,7 +277,7 @@
<Echart :options="lineOptionsData4" :height="280" :key="lineIndex" />
</div>
<div class="data1 ml-14px">
<div class="title">装配平均故障恢复时间MTTR/min</div>
<div class="title">模具平均故障恢复时间MTTR/min</div>
<Echart :options="lineOptionsData5" :height="280" :key="lineIndex" />
</div>
<div class="data1 ml-14px">
@ -291,7 +291,7 @@
<Echart :options="lineOptionsData7" :height="280" :key="lineIndex" />
</div>
<div class="data1 ml-14px">
<div class="title">装配平均故障间隔时间MTBFH</div>
<div class="title">模具平均故障间隔时间MTBFH</div>
<Echart :options="lineOptionsData8" :height="280" :key="lineIndex" />
</div>
<div class="data1 ml-14px">
@ -321,9 +321,9 @@ const lineOptionsData7 = reactive<EChartsOption>(lineOptions7) as EChartsOption
const lineOptionsData8 = reactive<EChartsOption>(lineOptions8) as EChartsOption
const lineOptionsData9 = reactive<EChartsOption>(lineOptions9) as EChartsOption
const lineOptionsData = reactive<EChartsOption>(lineOptions) as EChartsOption
const getInvoiceCharts = async (factory, data) => {
const getInvoiceCharts = async (factory, dataType, data) => {
console.log( data)
if (factory == 'ZS') {
if (factory === 'ZS' && dataType === 'DEVICE') {
let ZSTJAGOAL = data.TJACT.map((item) => data.TJAGOAL)
let ZSHFGOAL = data.HFACT.map((item) => data.HFGOAL)
let ZSJGGOAL = data.JGACT.map((item) => data.JGGOAL)
@ -397,7 +397,7 @@ const getInvoiceCharts = async (factory, data) => {
}
])
}else if(factory == 'ZP'){
}else if(factory === 'ZS' && dataType === 'MOLD'){
let ZPTJAGOAL = data.TJACT.map((item) => data.TJAGOAL)
let ZPHFGOAL = data.HFACT.map((item) => data.HFGOAL)
let ZPJGGOAL = data.JGACT.map((item) => data.JGGOAL)
@ -564,19 +564,19 @@ function getYearTarget() {
})
}
// 线
function getChartsData(factory) {
IndexApi.getChartsData(factory).then((res) => {
function getChartsData(factory, dataType) {
IndexApi.getChartsData(factory, dataType).then((res) => {
console.log(res)
getInvoiceCharts(factory, res)
getInvoiceCharts(factory, dataType, res)
})
}
onMounted(async () => {
// getInvoiceCharts()
getData()
getYearTarget()
getChartsData('ZS')
getChartsData('ZP')
getChartsData('TZ')
getChartsData('ZS', 'DEVICE')
getChartsData('ZS','MOLD')
getChartsData('TZ', 'DEVICE')
})
</script>
<style scoped lang="scss">

Loading…
Cancel
Save