diff --git a/src/api/home/index.ts b/src/api/home/index.ts index 62ed75b..fa8d2bd 100644 --- a/src/api/home/index.ts +++ b/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}) } diff --git a/src/views/eam/basic/basciYearEquipment/basciYearEquipment.data.ts b/src/views/eam/basic/basciYearEquipment/basciYearEquipment.data.ts index 60305d5..d86c654 100644 --- a/src/views/eam/basic/basciYearEquipment/basciYearEquipment.data.ts +++ b/src/views/eam/basic/basciYearEquipment/basciYearEquipment.data.ts @@ -48,6 +48,20 @@ export const BasciYearEquipment = useCrudSchemas(reactive([ 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', diff --git a/src/views/eam/basic/basicMonthEquipment/basicMonthEquipment.data.ts b/src/views/eam/basic/basicMonthEquipment/basicMonthEquipment.data.ts index 44e5e90..ccde3f6 100644 --- a/src/views/eam/basic/basicMonthEquipment/basicMonthEquipment.data.ts +++ b/src/views/eam/basic/basicMonthEquipment/basicMonthEquipment.data.ts @@ -42,6 +42,17 @@ export const BasicMonthEquipment = useCrudSchemas(reactive([ component: 'Select' }, }, + { + label: '设备/模具', + field: 'dataType', + dictType: DICT_TYPE.DEVICE_MOLD_TYPE, + dictClass: 'string', + sort: 'custom', + isSearch: true, + form: { + component: 'Select' + }, + }, { label: '年月', field: 'monthIndex', diff --git a/src/views/home/index.vue b/src/views/home/index.vue index bc0f552..d748200 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -36,7 +36,7 @@
-
装配
+
模具
@@ -155,7 +155,7 @@
-
装配年度指标
+
模具年度指标
    @@ -263,7 +263,7 @@
-
装配设备停机率
+
模具设备停机率
@@ -277,7 +277,7 @@
-
装配平均故障恢复时间(MTTR/min)
+
模具平均故障恢复时间(MTTR/min)
@@ -291,7 +291,7 @@
-
装配平均故障间隔时间MTBF(H)
+
模具平均故障间隔时间MTBF(H)
@@ -321,9 +321,9 @@ const lineOptionsData7 = reactive(lineOptions7) as EChartsOption const lineOptionsData8 = reactive(lineOptions8) as EChartsOption const lineOptionsData9 = reactive(lineOptions9) as EChartsOption const lineOptionsData = reactive(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') })