diff --git a/src/views/specialEquipment/basic/FireFighthing.vue b/src/views/specialEquipment/basic/FireFighthing.vue index e7cf21db..0da17657 100644 --- a/src/views/specialEquipment/basic/FireFighthing.vue +++ b/src/views/specialEquipment/basic/FireFighthing.vue @@ -117,12 +117,12 @@ import moment from 'moment'; import basicPageMixin from '@/mixins/lb/basicPageMixin'; import EquipmentDrawer from '../components/firefightingDrawer'; +import BaseDialogWrapper from '../components/BaseDialogWrapper.vue'; import { createEquipment, updateEquipment, deleteEquipment, - getEquipment, getEquipmentPage, exportEquipmentExcel, } from '@/api/base/equipment'; @@ -134,6 +134,7 @@ export default { components: { Editor, EquipmentDrawer, + BaseDialog: BaseDialogWrapper }, mixins: [basicPageMixin], data() { diff --git a/src/views/specialEquipment/basic/Manage.vue b/src/views/specialEquipment/basic/Manage.vue index e8788d09..b8329090 100644 --- a/src/views/specialEquipment/basic/Manage.vue +++ b/src/views/specialEquipment/basic/Manage.vue @@ -116,12 +116,12 @@ import moment from 'moment'; import basicPageMixin from '@/mixins/lb/basicPageMixin'; import EquipmentDrawer from '../components/manageDrawer'; +import BaseDialogWrapper from '../components/BaseDialogWrapper.vue'; import { createEquipment, updateEquipment, deleteEquipment, - getEquipment, getEquipmentPage, exportEquipmentExcel, } from '@/api/base/equipment'; @@ -133,6 +133,7 @@ export default { components: { Editor, EquipmentDrawer, + BaseDialog: BaseDialogWrapper }, mixins: [basicPageMixin], data() { diff --git a/src/views/specialEquipment/basic/Safety.vue b/src/views/specialEquipment/basic/Safety.vue index cfcdb0f5..01a23622 100644 --- a/src/views/specialEquipment/basic/Safety.vue +++ b/src/views/specialEquipment/basic/Safety.vue @@ -126,12 +126,14 @@ import { } from '@/api/base/equipment'; import Editor from '@/components/Editor'; import AssetsUpload from '../components/AssetsUpload.vue'; +import BaseDialogWrapper from '../components/BaseDialogWrapper.vue'; export default { name: 'SpecialEquipmentForSafety', components: { Editor, EquipmentDrawer, + BaseDialog: BaseDialogWrapper, }, mixins: [basicPageMixin], data() { diff --git a/src/views/specialEquipment/components/BaseDialogWrapper.vue b/src/views/specialEquipment/components/BaseDialogWrapper.vue new file mode 100644 index 00000000..aa4f8efc --- /dev/null +++ b/src/views/specialEquipment/components/BaseDialogWrapper.vue @@ -0,0 +1,59 @@ + + + + + + + diff --git a/src/views/specialEquipment/components/SmallTitle.js b/src/views/specialEquipment/components/SmallTitle.js new file mode 100644 index 00000000..d517c97e --- /dev/null +++ b/src/views/specialEquipment/components/SmallTitle.js @@ -0,0 +1,32 @@ +// + +export default { + name: 'SmallTitle', + props: ['size'], + components: {}, + data() { + return {}; + }, + methods: {}, + render: function (h) { + return h( + 'span', + { + class: 'small-title', + style: { + fontSize: '18px', + lineHeight: + this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px', + fontWeight: 500, + fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif', + }, + }, + this.$slots.default + ); + }, +}; diff --git a/src/views/specialEquipment/components/firefightingDrawer.vue b/src/views/specialEquipment/components/firefightingDrawer.vue index 8339b653..78a2df74 100644 --- a/src/views/specialEquipment/components/firefightingDrawer.vue +++ b/src/views/specialEquipment/components/firefightingDrawer.vue @@ -121,35 +121,16 @@