From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/mdc/base/AlarmManager.vue | 160 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 102 insertions(+), 58 deletions(-)
diff --git a/src/views/mdc/base/AlarmManager.vue b/src/views/mdc/base/AlarmManager.vue
index 2da413e..83c5383 100644
--- a/src/views/mdc/base/AlarmManager.vue
+++ b/src/views/mdc/base/AlarmManager.vue
@@ -7,33 +7,52 @@
@keyup.enter.native="searchQuery"
>
<a-row :gutter="24">
+ <!--<a-col-->
+ <!--:xl="4"-->
+ <!--:lg="4"-->
+ <!--:md="4"-->
+ <!--:sm="24"-->
+ <!-->-->
+ <!--<a-form-item label="璁惧缂栧彿">-->
+ <!--<a-input-->
+ <!--placeholder="璇疯緭鍏ヨ澶囩紪鍙�"-->
+ <!--v-model="queryParam.equipmentId"-->
+ <!--></a-input>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
+ <!--<a-col-->
+ <!--:xl="4"-->
+ <!--:lg="4"-->
+ <!--:md="4"-->
+ <!--:sm="24"-->
+ <!-->-->
+ <!--<a-form-item label="璁惧鍚嶇О">-->
+ <!--<a-input-->
+ <!--placeholder="璇疯緭鍏ヨ澶囧悕绉�"-->
+ <!--v-model="queryParam.equipmentName"-->
+ <!--></a-input>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
<a-col
- :xl="4"
- :lg="4"
- :md="4"
+ :xl="6"
+ :lg="7"
+ :md="8"
:sm="24"
>
- <a-form-item label="璁惧缂栧彿">
- <a-input
- placeholder="璇疯緭鍏ヨ澶囩紪鍙�"
- v-model="queryParam.equipmentId"
- ></a-input>
+ <a-form-item label="鎺у埗绯荤粺绫诲瀷">
+ <!--<j-dict-select-tag-->
+ <!--placeholder="璇烽�夋嫨鎺у埗绯荤粺绫诲瀷"-->
+ <!--v-model="queryParam.driveType"-->
+ <!--dictCode="mdc_driveType"-->
+ <!--/>-->
+ <a-auto-complete
+ v-model="queryParam.driveType"
+ :data-source="driveTypeList"
+ placeholder="璇烽�夋嫨鎺у埗绯荤粺绫诲瀷"
+ :filter-option="filterOption"
+ />
</a-form-item>
</a-col>
- <a-col
- :xl="4"
- :lg="4"
- :md="4"
- :sm="24"
- >
- <a-form-item label="璁惧鍚嶇О">
- <a-input
- placeholder="璇疯緭鍏ヨ澶囧悕绉�"
- v-model="queryParam.equipmentName"
- ></a-input>
- </a-form-item>
- </a-col>
-
<a-col
:xl="4"
:lg="4"
@@ -53,10 +72,10 @@
:md="4"
:sm="24"
>
- <a-form-item label="鎶ヨ鎻忚堪">
+ <a-form-item label="鎶ヨ鍐呭">
<a-input
- placeholder="璇疯緭鍏ユ姤璀︽弿杩�"
- v-model="queryParam.alarmDescription"
+ placeholder="璇疯緭鍏ユ姤璀﹀唴瀹�"
+ v-model="queryParam.alarmContent"
></a-input>
</a-form-item>
</a-col>
@@ -102,12 +121,12 @@
@click="handleAddTRype"
type="primary"
icon="plus"
- >椹卞姩鏂板</a-button>
- <a-button
- @click="handleAdd"
- type="primary"
- icon="plus"
- >璁惧鏂板</a-button>
+ >鏂板</a-button>
+ <!--<a-button-->
+ <!--@click="handleAdd"-->
+ <!--type="primary"-->
+ <!--icon="plus"-->
+ <!-->璁惧鏂板</a-button>-->
<!--<a-upload-->
<!--name="file"-->
<!--:showUploadList="false"-->
@@ -164,10 +183,9 @@
@change="handleTableChange"
>
-
<span
slot="action"
- slot-scope="text, record"
+ slot-scope="text, record"
>
<a @click="handleEdit(record)">缂栬緫</a>
@@ -183,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>
@@ -200,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],
@@ -223,18 +242,18 @@
return parseInt(index) + 1;
}
},
- {
- title: '璁惧缂栧彿',
- align: "center",
- // sorter: true,
- dataIndex: 'equipmentId'
- },
- {
- title: '璁惧鍚嶇О',
- align: "center",
- // sorter: true,
- dataIndex: 'equipmentName'
- },
+ // {
+ // title: '璁惧缂栧彿',
+ // align: "center",
+ // // sorter: true,
+ // dataIndex: 'equipmentId'
+ // },
+ // {
+ // title: '璁惧鍚嶇О',
+ // align: "center",
+ // // sorter: true,
+ // dataIndex: 'equipmentName'
+ // },
{
title: '鎶ヨ鍙�',
align: "center",
@@ -242,10 +261,10 @@
dataIndex: 'alarmCode'
},
{
- title: '鎶ヨ鎻忚堪',
+ title: '鎶ヨ鍐呭',
align: "center",
// sorter: true,
- dataIndex: 'alarmDescription'
+ dataIndex: 'alarmContent'
},
{
@@ -254,11 +273,17 @@
// sorter: true,
dataIndex: 'driveType'
},
+ // {
+ // title: '鏄惁杩囨护',
+ // align: "center",
+ // dataIndex: 'isUse',
+ // customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isUse'], text) : ''),
+ // },
{
+ dataIndex:'isUse_dictText',
title: '鏄惁杩囨护',
align: "center",
- dataIndex: 'isUse',
- customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isUse'], text) : ''),
+ // dictCode:'alarm_is_use'
},
{
title: '鎿嶄綔',
@@ -270,19 +295,21 @@
}
],
url: {
- list: "/mdc/alarmInfo/page",
- delete: "/mdc/alarmInfo/delete",
- deleteBatch: "/mdc/alarmInfo/deleteBatch",
+ list: "/mdc/mdcAlarmInfo/list",
+ delete: "/mdc/mdcAlarmInfo/delete",
+ deleteBatch: "/mdc/mdcAlarmInfo/deleteBatch",
importExcelUrl: "mdc/mdcDriveTypeParamConfig/importExcel",
},
dictOptions: {},
superFieldList: [],
+ driveTypeList:[]
}
},
created() {
- this.$set(this.dictOptions, 'isUse', [{ text: '鏄�', value: '1' }, { text: '鍚�', value: '2' }])
+ this.$set(this.dictOptions, 'isUse', [{ text: '鏄�', value: '0' }, { text: '鍚�', value: '-1' }])
this.getSuperFieldList();
+ this.getDriveTypeByApi()
},
computed: {
// importExcelUrl: function () {
@@ -294,7 +321,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();
@@ -305,9 +331,8 @@
},
getSuperFieldList() {
let fieldList = [];
- fieldList.push({ type: 'string', value: 'equipmentId', text: '璁惧缂栧彿', dictCode: '' })
fieldList.push({ type: 'string', value: 'alarmCode', text: '鎶ヨ鍙�', dictCode: '' })
- fieldList.push({ type: 'string', value: 'alarmDescription', 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: '鏄惁杩囨护' })
this.superFieldList = fieldList
@@ -326,6 +351,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