diff --git a/src/views/base/coreEquipment/index.vue b/src/views/base/coreEquipment/index.vue index d040fed3..4a191a3b 100644 --- a/src/views/base/coreEquipment/index.vue +++ b/src/views/base/coreEquipment/index.vue @@ -248,6 +248,9 @@ export default { label: '设备编码', prop: 'code', url: '/base/core-equipment/getCode', + rules: [ + { required: true, message: '设备编码不能为空', trigger: 'blur' }, + ], }, { input: true, diff --git a/src/views/equipment/analysis/Visualization/index.vue b/src/views/equipment/analysis/Visualization/index.vue index d311dbde..c8d32ca8 100644 --- a/src/views/equipment/analysis/Visualization/index.vue +++ b/src/views/equipment/analysis/Visualization/index.vue @@ -27,20 +27,20 @@
- 工作时长 + 有效时长
- 停机时长 + 关机时长
- 故障时长 + 中断时长
-
+
@@ -389,14 +389,14 @@ export default { position: relative; padding: 4px 0; padding-left: 12px; - font-size: 14px; + font-size: 18px; &::before { content: ''; position: absolute; left: 0; top: 6px; - height: 16px; + height: 20px; width: 4px; border-radius: 1px; background: #0b58ff; diff --git a/src/views/equipment/analysis/efficiency/components/pieChart.vue b/src/views/equipment/analysis/efficiency/components/pieChart.vue index 27f30311..7417bac1 100644 --- a/src/views/equipment/analysis/efficiency/components/pieChart.vue +++ b/src/views/equipment/analysis/efficiency/components/pieChart.vue @@ -16,23 +16,22 @@
{{ textData.workTime }}
-
工作时长
+
有效时长
{{ textData.stopTime }}
-
停机时长
+
关机时长
{{ textData.downTime }}
-
故障时长
+
中断时长
-
- +
@@ -93,7 +92,7 @@ export default { // 外环 name: '', type: 'pie', - radius: ['75%', '90%'], + radius: ['60%', '90%'], center: ['50%', '48%'], label: { show: false, @@ -259,7 +258,7 @@ export default { } .data-view__item__title { - font-size: 8px; + font-size: 14px; line-height: 14px; } diff --git a/src/views/equipment/analysis/efficiency/index.vue b/src/views/equipment/analysis/efficiency/index.vue index cc49a574..94d7571a 100644 --- a/src/views/equipment/analysis/efficiency/index.vue +++ b/src/views/equipment/analysis/efficiency/index.vue @@ -19,6 +19,7 @@ :page="1" :limit="10" :table-data="list" + height="65vh" @emitFun="handleEmitFun" /> @@ -61,21 +61,19 @@ - - - + - + + + - - - + - + - + @@ -108,7 +106,8 @@ :table-data="list" /> - + +
@@ -117,7 +116,7 @@ @@ -185,7 +184,7 @@ export default { actualTime: undefined, responsible: undefined, description: undefined, - origin: undefined, + origin: 1, files: [] }, list: [], @@ -220,9 +219,12 @@ export default { async setConfig() { const configres = await getcheckConfigByEqList({equipmentId: this.dataForm.equipmentId}) this.configList = configres.data + this.dataForm.configId = this.configList.filter(it => { + return it.id === this.dataForm.configId + })[0]?.id ?? undefined this.dataForm.equipmentCode = this.eqList.filter(item => { return item.id === this.dataForm.equipmentId - })[0].code + })[0]?.code ?? undefined }, goback() { this.$emit('refreshDataList'); @@ -265,6 +267,7 @@ export default { this.file = this.dataForm.files[0].fileUrl this.fileName = this.dataForm.files[0].fileName } + this.dataForm.description = this.dataForm.description || '无' this.setConfig() this.setInspectionContet() }); diff --git a/src/views/equipment/base/inspection/Record/index.vue b/src/views/equipment/base/inspection/Record/index.vue index 4d822298..8dec700e 100644 --- a/src/views/equipment/base/inspection/Record/index.vue +++ b/src/views/equipment/base/inspection/Record/index.vue @@ -94,7 +94,7 @@ export default { tableProps: [ { prop: 'configName', label: '配置名称' }, { prop: 'equipmentName', label: '设备名称' }, - { prop: 'origin', label: '数据来源', filter: (val) => ['', '手动', '自动'][val] }, + { prop: 'origin', label: '数据来源', filter: (val) => ['', '手动', 'PDA'][val] }, // { prop: 'sectionName', label: '计划巡检时间' }, { prop: 'actualTime', label: '实际巡检时间', filter: parseTime }, // { prop: 'maintenanceDetail', label: '完成状态' }, @@ -131,6 +131,15 @@ export default { { type: 'separate', }, + { + type: this.$auth.hasPermi('equipment:check-record:export') + ? 'button' + : '', + btnName: '导出', + name: 'export', + plain: true, + color: 'primary', + }, { type: this.$auth.hasPermi('equipment:check-record:create') ? 'button' @@ -140,17 +149,6 @@ export default { plain: true, color: 'success', }, - { - type: 'separate', - }, - { - type: this.$auth.hasPermi('equipment:check-record:export') - ? 'button' - : '', - btnName: '导出', - name: 'export', - color: 'warning', - }, ], rows: [ [ diff --git a/src/views/equipment/base/inspection/Settings/add-or-updata.vue b/src/views/equipment/base/inspection/Settings/add-or-updata.vue index 1f980d48..b985822c 100644 --- a/src/views/equipment/base/inspection/Settings/add-or-updata.vue +++ b/src/views/equipment/base/inspection/Settings/add-or-updata.vue @@ -2,14 +2,14 @@ * @Author: zwq * @Date: 2021-11-18 14:16:25 * @LastEditors: DY - * @LastEditTime: 2023-11-27 10:48:55 + * @LastEditTime: 2023-12-01 11:02:43 * @Description: -->