diff --git a/src/views/equipment/analysis/efficiency/index.vue b/src/views/equipment/analysis/efficiency/index.vue index 87695fb6..3364c914 100644 --- a/src/views/equipment/analysis/efficiency/index.vue +++ b/src/views/equipment/analysis/efficiency/index.vue @@ -118,12 +118,12 @@ export default { { width: 128, prop: 'workTime', - label: '工作时长', + label: '工作时长[h]', }, { width: 128, prop: 'workRate', - label: '百分比', + label: '百分比[%]', filter: (val) => (val != null ? +val.toFixed(3) : '-'), }, ], @@ -134,9 +134,9 @@ export default { { width: 128, prop: 'stopTime', - label: '停机时长', + label: '停机时长[h]', }, - { width: 128, prop: 'stopRate', label: '百分比' }, + { width: 128, prop: 'stopRate', label: '百分比[%]' }, ], }, { @@ -145,10 +145,10 @@ export default { { width: 128, prop: 'downTime', - label: '故障时长', + label: '故障时长[h]', filter: (val) => (val != null ? +val.toFixed(3) : '-'), }, - { width: 128, prop: 'downRate', label: '百分比' }, + { width: 128, prop: 'downRate', label: '百分比[%]' }, { width: 128, prop: 'timeEfficiency', diff --git a/src/views/equipment/timing-diagram/status/index.vue b/src/views/equipment/timing-diagram/status/index.vue index 5c5b02d7..c01aad99 100644 --- a/src/views/equipment/timing-diagram/status/index.vue +++ b/src/views/equipment/timing-diagram/status/index.vue @@ -24,6 +24,7 @@ :formConfigs="searchBarFormConfig" ref="search-bar" :remove-blue="true" + @select-changed="handleSearchBarSelectChange" @headBtnClick="handleSearchBarBtnClick" /> @@ -195,6 +196,7 @@ export default { placeholder: '请选择产线', selectOptions: [], param: 'lineId', + onchange: true, }, { type: 'select', @@ -592,6 +594,28 @@ export default { } }, + handleSearchBarSelectChange({ param, value }) { + switch (param) { + case 'lineId': + this.$axios({ + url: '/base/workshop-section/listByParentId', + method: 'get', + params: { + id: value, + }, + }).then(({ code, data }) => { + if (code == 0) { + this.searchBarFormConfig[1].selectOptions = data.map((item) => { + return { + name: item.name, + id: item.id, + }; + }); + } + }); + } + }, + handleSearchBarBtnClick({ btnName, ...payload }) { switch (btnName) { case 'search': diff --git a/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue b/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue index f3c06269..1d660f8a 100644 --- a/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue +++ b/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue @@ -8,7 +8,7 @@