bugfix zentao 1

src/views/base/equipmentGroupAlarm/index.vue

@@ -37,7 +37,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
+			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
 		</base-dialog>
 	</div>
 </template>
@@ -54,10 +54,11 @@ import {
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import moment from 'moment';
 import { publicFormatter } from '@/utils/dict';
+import DialogForm from './dialogForm.vue';
 
 export default {
 	name: 'EquipmentGroupAlarm',
-	components: {},
+	components: { DialogForm },
 	mixins: [basicPageMixin],
 	data() {
 		return {
@@ -84,22 +85,27 @@ export default {
 					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ prop: 'code', label: '报警编码', align: 'center' },
-				{ prop: 'type', label: '报警类型', align: 'center' },
+				{  width: 240, prop: 'code', label: '报警编码' },
+				{
+					prop: 'type',
+					label: '报警类型',
+					filter: (val) =>
+						val != null ? ['-', '字符型', '布尔型', '-'][val] : '-',
+				},
 				{
 					prop: 'grade',
 					label: '报警级别',
-					align: 'center',
 					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
 				},
-				{ prop: 'alarmCode', label: '设备报警编码', align: 'center' },
-				{ prop: 'plcParamName', label: '参数列名', align: 'center' },
-				{ prop: 'alarmContent', label: '报警内容', align: 'center' },
+				{ prop: 'alarmCode', label: '设备报警编码' },
+				{ prop: 'plcParamName', label: '参数列名' },
+				{ prop: 'alarmContent', label: '报警内容' },
 			],
 			searchBarFormConfig: [
 				{
 					type: 'input',
 					label: '设备分组编码',
+					width: '220',
 					placeholder: '/',
 					param: 'equipmentGroupCode',
 					defaultSelect: null,
@@ -181,14 +187,14 @@ export default {
 			},
 			// 表单参数
 			form: {
-				id: undefined,
-				equipmentGroupId: undefined,
-				code: undefined,
-				type: undefined,
-				grade: undefined,
-				alarmCode: undefined,
-				alarmContent: undefined,
-				plcParamName: undefined,
+				id: null,
+				equipmentGroupId: null,
+				code: null,
+				type: null,
+				grade: null,
+				alarmCode: null,
+				alarmContent: null,
+				plcParamName: null,
 			},
 			// // 表单校验
 			// rules: {
@@ -249,14 +255,14 @@ export default {
 		/** 表单重置 */
 		reset() {
 			this.form = {
-				id: undefined,
-				equipmentGroupId: undefined,
-				code: undefined,
-				type: undefined,
-				grade: undefined,
-				alarmCode: undefined,
-				alarmContent: undefined,
-				plcParamName: undefined,
+				id: null,
+				equipmentGroupId: null,
+				code: null,
+				type: null,
+				grade: null,
+				alarmCode: null,
+				alarmContent: null,
+				plcParamName: null,
 			};
 			this.resetForm('form');
 		},
@@ -321,7 +327,7 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除设备分组报警明细编号为"' + id + '"的数据项?')
+				.confirm('是否确认删除该报警?')
 				.then(function () {
 					return deleteEquipmentGroupAlarm(id);
 				})