From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/AlarmManager.vue | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/views/mdc/base/AlarmManager.vue b/src/views/mdc/base/AlarmManager.vue
index acd894f..04620a2 100644
--- a/src/views/mdc/base/AlarmManager.vue
+++ b/src/views/mdc/base/AlarmManager.vue
@@ -50,6 +50,7 @@
:data-source="driveTypeList"
placeholder="璇烽�夋嫨鎺у埗绯荤粺绫诲瀷"
:filter-option="filterOption"
+ :allowClear="true"
/>
</a-form-item>
</a-col>
@@ -230,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: [
{
@@ -284,7 +297,7 @@
// },
{
dataIndex:'isUse_dictText',
- title: '鏄惁杩囨护',
+ title: '鏄惁鍚敤',
align: "center",
width:380
// dictCode:'alarm_is_use'
@@ -338,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
},
--
Gitblit v1.9.3