From a751e547d67c4f8e2c6fddf958c1559f792515bd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 27 六月 2025 16:11:50 +0800
Subject: [PATCH] 添加工作流
---
src/views/mdc/base/AlarmManager.vue | 73 +++++++++++++++++++++++++++++-------
1 files changed, 58 insertions(+), 15 deletions(-)
diff --git a/src/views/mdc/base/AlarmManager.vue b/src/views/mdc/base/AlarmManager.vue
index b8378ab..04620a2 100644
--- a/src/views/mdc/base/AlarmManager.vue
+++ b/src/views/mdc/base/AlarmManager.vue
@@ -40,10 +40,17 @@
: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"
+ :allowClear="true"
/>
</a-form-item>
</a-col>
@@ -165,7 +172,7 @@
<a-table
ref="table"
size="middle"
- :scroll="{x:true}"
+ :scroll="{x:'max-content',y:465}"
bordered
rowKey="id"
:columns="columns"
@@ -177,10 +184,9 @@
@change="handleTableChange"
>
-
<span
slot="action"
- slot-scope="text, record"
+ slot-scope="text, record"
>
<a @click="handleEdit(record)">缂栬緫</a>
@@ -196,8 +202,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 +219,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],
@@ -224,6 +231,18 @@
data() {
return {
description: '鎶ヨ鍙风鐞嗙晫闈�',
+ /* 鍒嗛〉鍙傛暟 */
+ ipagination:{
+ current: 1,
+ pageSize: 30,
+ pageSizeOptions: ['30', '50', '100'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
// 琛ㄥご
columns: [
{
@@ -252,20 +271,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: '鏄惁杩囨护',
@@ -275,8 +297,9 @@
// },
{
dataIndex:'isUse_dictText',
- title: '鏄惁杩囨护',
+ title: '鏄惁鍚敤',
align: "center",
+ width:380
// dictCode:'alarm_is_use'
},
{
@@ -284,7 +307,7 @@
dataIndex: 'action',
align: "center",
fixed: "right",
- width: 147,
+ width: 150,
scopedSlots: { customRender: 'action' }
}
],
@@ -297,11 +320,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 +338,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();
@@ -327,7 +351,7 @@
fieldList.push({ type: 'string', value: 'alarmCode', text: '鎶ヨ鍙�', dictCode: '' })
fieldList.push({ type: 'string', value: 'alarmDescription', text: '鎶ヨ鍐呭', dictCode: '' })
fieldList.push({ type: 'int', value: 'driveType', text: '璁惧椹卞姩绫诲瀷', dictCode: '' })
- fieldList.push({ type: 'switch', value: 'isUse', text: '鏄惁杩囨护' })
+ fieldList.push({ type: 'switch', value: 'isUse', text: '鏄惁鍚敤' })
this.superFieldList = fieldList
},
@@ -344,6 +368,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