diff --git a/src/views/safetyManagement/equipmentInspectionTask/index.vue b/src/views/safetyManagement/equipmentInspectionTask/index.vue index 3042c6c..575bd41 100644 --- a/src/views/safetyManagement/equipmentInspectionTask/index.vue +++ b/src/views/safetyManagement/equipmentInspectionTask/index.vue @@ -37,8 +37,7 @@ export default { query: { taskStatus: '2' }, - option: { - height: "auto", + option: { height: "auto", calcHeight: 32, tip: false, simplePage: true, @@ -49,18 +48,19 @@ export default { tree: false, border: true, index: true, - selection: true, + selection: false, viewBtn: false, delBtn: false, - editBtn: true, + addBtn: false, editBtnText: "修改", addBtnIcon: " ", viewBtnIcon: " ", delBtnIcon: " ", editBtnIcon: " ", + viewBtnText: "详情", labelWidth: 120, - menuWidth: 150, - dialogWidth: 600, + menuWidth: 120, + dialogWidth: 1040, dialogClickModal: false, searchEnter: true, excelBtn: false, @@ -72,7 +72,6 @@ export default { index: false, showOverflowTooltip: true, menu: false, - header: false, searchLabelPosition: "left", searchLabelPosition: "left", searchGutter: 24, @@ -83,20 +82,7 @@ export default { align: "center", column: [ - { - label: "任务状态", - prop: "taskStatus", - sortable: true, - filter: true, - search: true, - type: 'select', - value:'2', - dicData: [ - { label: '已检', value: '1' }, - { label: '待检', value: '2' }, //任务状态: 1、已检,2、待检,3、未准时完成 - { label: '未准时完成', value: '3' }, //任务状态: 1、已检,2、待检,3、未准时完成 - ] - }, + { label: "巡检点编号", prop: "insNum", @@ -217,6 +203,20 @@ export default { sortable: true, filter: true, search: false, + }, + { + label: "任务状态", + prop: "taskStatus", + sortable: true, + filter: true, + search: true, + type: 'select', + value:'2', + dicData: [ + { label: '已检', value: '1' }, + { label: '待检', value: '2' }, //任务状态: 1、已检,2、待检,3、未准时完成 + { label: '未准时完成', value: '3' }, //任务状态: 1、已检,2、待检,3、未准时完成 + ] }, ], }, diff --git a/src/views/safetyManagement/safetyInspectionTask/index.vue b/src/views/safetyManagement/safetyInspectionTask/index.vue index 85cea00..b398cd4 100644 --- a/src/views/safetyManagement/safetyInspectionTask/index.vue +++ b/src/views/safetyManagement/safetyInspectionTask/index.vue @@ -51,20 +51,22 @@ export default { tree: false, border: true, index: true, - selection: true, + selection: false, viewBtn: false, delBtn: false, - editBtn: true, + addBtn: false, editBtnText: "修改", addBtnIcon: " ", viewBtnIcon: " ", delBtnIcon: " ", editBtnIcon: " ", + viewBtnText: "详情", labelWidth: 120, - menuWidth: 150, - dialogWidth: 600, + menuWidth: 120, + dialogWidth: 1040, dialogClickModal: false, searchEnter: true, + excelBtn: false, filterBtn: true, searchShowBtn: false, columnSort: true, @@ -73,7 +75,6 @@ export default { index: false, showOverflowTooltip: true, menu: false, - header: false, searchLabelPosition: "left", searchGutter: 24, searchSpan: 6, diff --git a/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue b/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue index b62da20..1a407c1 100644 --- a/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue +++ b/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue @@ -53,7 +53,7 @@ export default { tree: false, border: true, index: true, - selection: true, + selection: false, viewBtn: false, delBtn: false, addBtn: false, diff --git a/src/views/safetyManagement/wastewater/components/dischargeRec.vue b/src/views/safetyManagement/wastewater/components/dischargeRec.vue index 9d47410..0e8c27b 100644 --- a/src/views/safetyManagement/wastewater/components/dischargeRec.vue +++ b/src/views/safetyManagement/wastewater/components/dischargeRec.vue @@ -175,6 +175,7 @@ export default { filter: true, span: 12, searchLabelWidth: 110, + type: 'number', rules: [ { required: true,