From 301df333c4dc0c28cee67a8579784bd1c3b85abe Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 22 二月 2024 15:07:51 +0800
Subject: [PATCH] 1、标准加工时间页面取消按照时间查询 2、设备利用率、设备开动率以及班次利用率页面查询区域日期被删除后因查询不到数据时表格中不会出现任何数据且无提示，故增加提示及禁止删除日期 3、设备综合效率分析页面和设备加工工件报表页面时间被手动清空与点击重置按钮清空后的查询条件不同，调整为时间为空时则查询除时间限定内所有数据 4、利用率走势分析、利用率分段分析以及报警分析页面简化页面查询功能，禁止删除日期 5、优化假期管理、加工数量管理以及合格率管理页面手动清空日期后无法正常查询数据 6、统计分析与统计图表页面调整重置按钮功能为重置名称为第一级车间以及日期为当日前一天，且无法手动清空日期 7、对比分析页面调整重置按钮功能为重置日期为当日前一周，且无法手动清空日期
---
src/views/mdc/base/AlarmManager.vue | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/src/views/mdc/base/AlarmManager.vue b/src/views/mdc/base/AlarmManager.vue
index b8378ab..acd894f 100644
--- a/src/views/mdc/base/AlarmManager.vue
+++ b/src/views/mdc/base/AlarmManager.vue
@@ -40,10 +40,16 @@
:sm="24"
>
<a-form-item label="鎺у埗绯荤粺绫诲瀷">
- <j-dict-select-tag
- placeholder="璇烽�夋嫨鎺у埗绯荤粺绫诲瀷"
+ <!--<j-dict-select-tag-->
+ <!--placeholder="璇烽�夋嫨鎺у埗绯荤粺绫诲瀷"-->
+ <!--v-model="queryParam.driveType"-->
+ <!--dictCode="mdc_driveType"-->
+ <!--/>-->
+ <a-auto-complete
v-model="queryParam.driveType"
- dictCode="mdc_driveType"
+ :data-source="driveTypeList"
+ placeholder="璇烽�夋嫨鎺у埗绯荤粺绫诲瀷"
+ :filter-option="filterOption"
/>
</a-form-item>
</a-col>
@@ -165,7 +171,7 @@
<a-table
ref="table"
size="middle"
- :scroll="{x:true}"
+ :scroll="{x:'max-content',y:465}"
bordered
rowKey="id"
:columns="columns"
@@ -177,10 +183,9 @@
@change="handleTableChange"
>
-
<span
slot="action"
- slot-scope="text, record"
+ slot-scope="text, record"
>
<a @click="handleEdit(record)">缂栬緫</a>
@@ -196,8 +201,8 @@
</a-table>
</div>
- <alarm-manager-modal ref="modalForm" @ok="modalFormOk"></alarm-manager-modal>
- <alarm-manager-form ref="modalFormType" @ok="modalFormOk"></alarm-manager-form>
+ <!--<alarm-manager-modal ref="modalForm" @ok="modalFormOk"></alarm-manager-modal>-->
+ <alarm-manager-form ref="modalFormType" @ok="modalFormOk" :driveTypeList="driveTypeList" :filterOption="filterOption"></alarm-manager-form>
<alarm-manager-edit ref="modalFormEdit" @ok="modalFormOk"></alarm-manager-edit>
</a-card>
</template>
@@ -213,6 +218,7 @@
import AlarmManagerEdit from './modules/alarmManager/alarmManagerEdit'
import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
import { filterObj } from '@/utils/util';
+ import api from '@/api/mdc'
export default {
name: 'AlarmManager',
mixins: [JeecgListMixin, mixinDevice],
@@ -252,20 +258,23 @@
title: '鎶ヨ鍙�',
align: "center",
// sorter: true,
- dataIndex: 'alarmCode'
+ dataIndex: 'alarmCode',
+ width:400
},
{
title: '鎶ヨ鍐呭',
align: "center",
// sorter: true,
- dataIndex: 'alarmContent'
+ dataIndex: 'alarmContent',
+ width:400
},
{
title: '璁惧椹卞姩绫诲瀷',
align: "center",
// sorter: true,
- dataIndex: 'driveType'
+ dataIndex: 'driveType',
+ width:400
},
// {
// title: '鏄惁杩囨护',
@@ -277,6 +286,7 @@
dataIndex:'isUse_dictText',
title: '鏄惁杩囨护',
align: "center",
+ width:380
// dictCode:'alarm_is_use'
},
{
@@ -284,7 +294,7 @@
dataIndex: 'action',
align: "center",
fixed: "right",
- width: 147,
+ width: 150,
scopedSlots: { customRender: 'action' }
}
],
@@ -297,11 +307,13 @@
},
dictOptions: {},
superFieldList: [],
+ driveTypeList:[]
}
},
created() {
this.$set(this.dictOptions, 'isUse', [{ text: '鏄�', value: '0' }, { text: '鍚�', value: '-1' }])
this.getSuperFieldList();
+ this.getDriveTypeByApi()
},
computed: {
// importExcelUrl: function () {
@@ -313,7 +325,6 @@
this.$refs.modalFormEdit.edit(record);
this.$refs.modalFormEdit.title = "缂栬緫";
this.$refs.modalFormEdit.disableSubmit = false;
- this.$refs.modalFormEdit.isUse = record.isUse === '1' ? true : false
},
handleAddTRype(){
this.$refs.modalFormType.add();
@@ -344,6 +355,25 @@
param.pageSize = this.ipagination.pageSize
return filterObj(param)
},
+ /**
+ * 璋冪敤鎺ュ彛鑾峰彇鎺у埗绯荤粺绫诲瀷
+ */
+ getDriveTypeByApi(){
+ api.getDriveTypeApi().then((res)=>{
+ this.driveTypeList=res.result.map(item=>item.value)
+ })
+ },
+ /**
+ * 鑱旀兂杈撳叆妗嗙瓫閫夊姛鑳�
+ * @param input 杈撳叆鐨勫唴瀹�
+ * @param option 閰嶇疆
+ * @returns {boolean} 鍒ゆ柇鏄惁绛涢��
+ */
+ filterOption(input, option) {
+ return (
+ option.componentOptions.children[0].text.toUpperCase().indexOf(input.toUpperCase()) >= 0
+ );
+ },
}
}
--
Gitblit v1.9.3