diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts index 19af2d3..3af7a85 100644 --- a/src/api/eqpt/device/info.ts +++ b/src/api/eqpt/device/info.ts @@ -4,11 +4,59 @@ import request from '@/api/index' const prefix = 'equipment/info' -// 区域查询 -export function getInfoListPage(params: object) { +// 设备列表 -分页 -（全部状态） +export function getInfoListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: `${prefix}/listPage`, + method: 'get', + params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/equipment/approval/approvedListPage', + method: 'get', + params, + }) + } + else { + return request({ + url: '/equipment/approval/listPage', + method: 'get', + params, + }) + } +} +// 设备列表聚合 +export function getInfoListTogether(params: object) { return request({ - url: `${prefix}/listPage`, + url: `${prefix}/groupByName`, method: 'get', params, }) } +// 获取设备列表 +export function getInfoList(params: object) { + return request({ + url: `${prefix}/list`, + method: 'get', + params, + }) +} +// 保存编辑 +export function editInfo(data: object) { + return request({ + url: '/equipment/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitInfo(data: object) { + return request({ + url: '/equipment/approval/submit', + method: 'post', + data, + }) +} diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts index 19af2d3..3af7a85 100644 --- a/src/api/eqpt/device/info.ts +++ b/src/api/eqpt/device/info.ts @@ -4,11 +4,59 @@ import request from '@/api/index' const prefix = 'equipment/info' -// 区域查询 -export function getInfoListPage(params: object) { +// 设备列表 -分页 -（全部状态） +export function getInfoListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: `${prefix}/listPage`, + method: 'get', + params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/equipment/approval/approvedListPage', + method: 'get', + params, + }) + } + else { + return request({ + url: '/equipment/approval/listPage', + method: 'get', + params, + }) + } +} +// 设备列表聚合 +export function getInfoListTogether(params: object) { return request({ - url: `${prefix}/listPage`, + url: `${prefix}/groupByName`, method: 'get', params, }) } +// 获取设备列表 +export function getInfoList(params: object) { + return request({ + url: `${prefix}/list`, + method: 'get', + params, + }) +} +// 保存编辑 +export function editInfo(data: object) { + return request({ + url: '/equipment/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitInfo(data: object) { + return request({ + url: '/equipment/approval/submit', + method: 'post', + data, + }) +} diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..7d34a4f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -25,10 +25,12 @@ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default'] CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/DetailPage/DetailBlock copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] + DetailBlockCom: typeof import('./components/DetailPage/DetailBlockCom.vue')['default'] DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts index 19af2d3..3af7a85 100644 --- a/src/api/eqpt/device/info.ts +++ b/src/api/eqpt/device/info.ts @@ -4,11 +4,59 @@ import request from '@/api/index' const prefix = 'equipment/info' -// 区域查询 -export function getInfoListPage(params: object) { +// 设备列表 -分页 -（全部状态） +export function getInfoListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: `${prefix}/listPage`, + method: 'get', + params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/equipment/approval/approvedListPage', + method: 'get', + params, + }) + } + else { + return request({ + url: '/equipment/approval/listPage', + method: 'get', + params, + }) + } +} +// 设备列表聚合 +export function getInfoListTogether(params: object) { return request({ - url: `${prefix}/listPage`, + url: `${prefix}/groupByName`, method: 'get', params, }) } +// 获取设备列表 +export function getInfoList(params: object) { + return request({ + url: `${prefix}/list`, + method: 'get', + params, + }) +} +// 保存编辑 +export function editInfo(data: object) { + return request({ + url: '/equipment/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitInfo(data: object) { + return request({ + url: '/equipment/approval/submit', + method: 'post', + data, + }) +} diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..7d34a4f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -25,10 +25,12 @@ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default'] CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/DetailPage/DetailBlock copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] + DetailBlockCom: typeof import('./components/DetailPage/DetailBlockCom.vue')['default'] DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue new file mode 100644 index 0000000..13bd2aa --- /dev/null +++ b/src/components/DetailPage/DetailBlockCom.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts index 19af2d3..3af7a85 100644 --- a/src/api/eqpt/device/info.ts +++ b/src/api/eqpt/device/info.ts @@ -4,11 +4,59 @@ import request from '@/api/index' const prefix = 'equipment/info' -// 区域查询 -export function getInfoListPage(params: object) { +// 设备列表 -分页 -（全部状态） +export function getInfoListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: `${prefix}/listPage`, + method: 'get', + params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/equipment/approval/approvedListPage', + method: 'get', + params, + }) + } + else { + return request({ + url: '/equipment/approval/listPage', + method: 'get', + params, + }) + } +} +// 设备列表聚合 +export function getInfoListTogether(params: object) { return request({ - url: `${prefix}/listPage`, + url: `${prefix}/groupByName`, method: 'get', params, }) } +// 获取设备列表 +export function getInfoList(params: object) { + return request({ + url: `${prefix}/list`, + method: 'get', + params, + }) +} +// 保存编辑 +export function editInfo(data: object) { + return request({ + url: '/equipment/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitInfo(data: object) { + return request({ + url: '/equipment/approval/submit', + method: 'post', + data, + }) +} diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..7d34a4f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -25,10 +25,12 @@ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default'] CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/DetailPage/DetailBlock copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] + DetailBlockCom: typeof import('./components/DetailPage/DetailBlockCom.vue')['default'] DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue new file mode 100644 index 0000000..13bd2aa --- /dev/null +++ b/src/components/DetailPage/DetailBlockCom.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 2479614..8625b38 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -6,6 +6,11 @@ // ------------------定义props、 emit------------------- const props = defineProps({ + // 是否显示表头 + showHeader: { + type: Boolean, + default: true, + }, // 是否显示多选表格 isShowmultiSelect: { type: Boolean, @@ -191,6 +196,7 @@ border stripe :size="size" + :show-header="showHeader" style="width: 100%;" @selection-change="handleSelectionChange" @select="selectClick" diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts index 19af2d3..3af7a85 100644 --- a/src/api/eqpt/device/info.ts +++ b/src/api/eqpt/device/info.ts @@ -4,11 +4,59 @@ import request from '@/api/index' const prefix = 'equipment/info' -// 区域查询 -export function getInfoListPage(params: object) { +// 设备列表 -分页 -（全部状态） +export function getInfoListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: `${prefix}/listPage`, + method: 'get', + params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/equipment/approval/approvedListPage', + method: 'get', + params, + }) + } + else { + return request({ + url: '/equipment/approval/listPage', + method: 'get', + params, + }) + } +} +// 设备列表聚合 +export function getInfoListTogether(params: object) { return request({ - url: `${prefix}/listPage`, + url: `${prefix}/groupByName`, method: 'get', params, }) } +// 获取设备列表 +export function getInfoList(params: object) { + return request({ + url: `${prefix}/list`, + method: 'get', + params, + }) +} +// 保存编辑 +export function editInfo(data: object) { + return request({ + url: '/equipment/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitInfo(data: object) { + return request({ + url: '/equipment/approval/submit', + method: 'post', + data, + }) +} diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..7d34a4f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -25,10 +25,12 @@ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default'] CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/DetailPage/DetailBlock copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] + DetailBlockCom: typeof import('./components/DetailPage/DetailBlockCom.vue')['default'] DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue new file mode 100644 index 0000000..13bd2aa --- /dev/null +++ b/src/components/DetailPage/DetailBlockCom.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 2479614..8625b38 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -6,6 +6,11 @@ // ------------------定义props、 emit------------------- const props = defineProps({ + // 是否显示表头 + showHeader: { + type: Boolean, + default: true, + }, // 是否显示多选表格 isShowmultiSelect: { type: Boolean, @@ -191,6 +196,7 @@ border stripe :size="size" + :show-header="showHeader" style="width: 100%;" @selection-change="handleSelectionChange" @select="selectClick" diff --git a/src/layouts/components/Breadcrumb/index.vue b/src/layouts/components/Breadcrumb/index.vue new file mode 100644 index 0000000..702d138 --- /dev/null +++ b/src/layouts/components/Breadcrumb/index.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts index 19af2d3..3af7a85 100644 --- a/src/api/eqpt/device/info.ts +++ b/src/api/eqpt/device/info.ts @@ -4,11 +4,59 @@ import request from '@/api/index' const prefix = 'equipment/info' -// 区域查询 -export function getInfoListPage(params: object) { +// 设备列表 -分页 -（全部状态） +export function getInfoListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: `${prefix}/listPage`, + method: 'get', + params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/equipment/approval/approvedListPage', + method: 'get', + params, + }) + } + else { + return request({ + url: '/equipment/approval/listPage', + method: 'get', + params, + }) + } +} +// 设备列表聚合 +export function getInfoListTogether(params: object) { return request({ - url: `${prefix}/listPage`, + url: `${prefix}/groupByName`, method: 'get', params, }) } +// 获取设备列表 +export function getInfoList(params: object) { + return request({ + url: `${prefix}/list`, + method: 'get', + params, + }) +} +// 保存编辑 +export function editInfo(data: object) { + return request({ + url: '/equipment/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitInfo(data: object) { + return request({ + url: '/equipment/approval/submit', + method: 'post', + data, + }) +} diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..7d34a4f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -25,10 +25,12 @@ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default'] CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/DetailPage/DetailBlock copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] + DetailBlockCom: typeof import('./components/DetailPage/DetailBlockCom.vue')['default'] DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue new file mode 100644 index 0000000..13bd2aa --- /dev/null +++ b/src/components/DetailPage/DetailBlockCom.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 2479614..8625b38 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -6,6 +6,11 @@ // ------------------定义props、 emit------------------- const props = defineProps({ + // 是否显示表头 + showHeader: { + type: Boolean, + default: true, + }, // 是否显示多选表格 isShowmultiSelect: { type: Boolean, @@ -191,6 +196,7 @@ border stripe :size="size" + :show-header="showHeader" style="width: 100%;" @selection-change="handleSelectionChange" @select="selectClick" diff --git a/src/layouts/components/Breadcrumb/index.vue b/src/layouts/components/Breadcrumb/index.vue new file mode 100644 index 0000000..702d138 --- /dev/null +++ b/src/layouts/components/Breadcrumb/index.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue index 8feb9d6..2f8f39c 100644 --- a/src/layouts/components/Topbar/index.vue +++ b/src/layouts/components/Topbar/index.vue @@ -54,18 +54,18 @@ >
-
+ +
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts index 19af2d3..3af7a85 100644 --- a/src/api/eqpt/device/info.ts +++ b/src/api/eqpt/device/info.ts @@ -4,11 +4,59 @@ import request from '@/api/index' const prefix = 'equipment/info' -// 区域查询 -export function getInfoListPage(params: object) { +// 设备列表 -分页 -（全部状态） +export function getInfoListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: `${prefix}/listPage`, + method: 'get', + params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/equipment/approval/approvedListPage', + method: 'get', + params, + }) + } + else { + return request({ + url: '/equipment/approval/listPage', + method: 'get', + params, + }) + } +} +// 设备列表聚合 +export function getInfoListTogether(params: object) { return request({ - url: `${prefix}/listPage`, + url: `${prefix}/groupByName`, method: 'get', params, }) } +// 获取设备列表 +export function getInfoList(params: object) { + return request({ + url: `${prefix}/list`, + method: 'get', + params, + }) +} +// 保存编辑 +export function editInfo(data: object) { + return request({ + url: '/equipment/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitInfo(data: object) { + return request({ + url: '/equipment/approval/submit', + method: 'post', + data, + }) +} diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..7d34a4f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -25,10 +25,12 @@ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default'] CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/DetailPage/DetailBlock copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] + DetailBlockCom: typeof import('./components/DetailPage/DetailBlockCom.vue')['default'] DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue new file mode 100644 index 0000000..13bd2aa --- /dev/null +++ b/src/components/DetailPage/DetailBlockCom.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 2479614..8625b38 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -6,6 +6,11 @@ // ------------------定义props、 emit------------------- const props = defineProps({ + // 是否显示表头 + showHeader: { + type: Boolean, + default: true, + }, // 是否显示多选表格 isShowmultiSelect: { type: Boolean, @@ -191,6 +196,7 @@ border stripe :size="size" + :show-header="showHeader" style="width: 100%;" @selection-change="handleSelectionChange" @select="selectClick" diff --git a/src/layouts/components/Breadcrumb/index.vue b/src/layouts/components/Breadcrumb/index.vue new file mode 100644 index 0000000..702d138 --- /dev/null +++ b/src/layouts/components/Breadcrumb/index.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue index 8feb9d6..2f8f39c 100644 --- a/src/layouts/components/Topbar/index.vue +++ b/src/layouts/components/Topbar/index.vue @@ -54,18 +54,18 @@ >
-
+ +
diff --git a/src/layouts/index.vue b/src/layouts/index.vue index 2cb0d56..d67d0eb 100644 --- a/src/layouts/index.vue +++ b/src/layouts/index.vue @@ -4,6 +4,7 @@ import MainSidebar from './components/MainSidebar/index.vue' import SubSidebar from './components/SubSidebar/index.vue' import Topbar from './components/Topbar/index.vue' +import Breadcrumb from './components/Breadcrumb/index.vue' import Search from './components/Search/index.vue' import AppSetting from './components/AppSetting/index.vue' import HotkeysIntro from './components/HotkeysIntro/index.vue' @@ -68,6 +69,7 @@
+
@@ -187,7 +189,7 @@ } .topbar-container + .main { - margin: var(--g-topbar-height) 0 0; + // margin: var(--g-topbar-height) 0 0; } } } diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts index 19af2d3..3af7a85 100644 --- a/src/api/eqpt/device/info.ts +++ b/src/api/eqpt/device/info.ts @@ -4,11 +4,59 @@ import request from '@/api/index' const prefix = 'equipment/info' -// 区域查询 -export function getInfoListPage(params: object) { +// 设备列表 -分页 -（全部状态） +export function getInfoListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: `${prefix}/listPage`, + method: 'get', + params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/equipment/approval/approvedListPage', + method: 'get', + params, + }) + } + else { + return request({ + url: '/equipment/approval/listPage', + method: 'get', + params, + }) + } +} +// 设备列表聚合 +export function getInfoListTogether(params: object) { return request({ - url: `${prefix}/listPage`, + url: `${prefix}/groupByName`, method: 'get', params, }) } +// 获取设备列表 +export function getInfoList(params: object) { + return request({ + url: `${prefix}/list`, + method: 'get', + params, + }) +} +// 保存编辑 +export function editInfo(data: object) { + return request({ + url: '/equipment/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitInfo(data: object) { + return request({ + url: '/equipment/approval/submit', + method: 'post', + data, + }) +} diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..7d34a4f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -25,10 +25,12 @@ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default'] CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/DetailPage/DetailBlock copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] + DetailBlockCom: typeof import('./components/DetailPage/DetailBlockCom.vue')['default'] DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue new file mode 100644 index 0000000..13bd2aa --- /dev/null +++ b/src/components/DetailPage/DetailBlockCom.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 2479614..8625b38 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -6,6 +6,11 @@ // ------------------定义props、 emit------------------- const props = defineProps({ + // 是否显示表头 + showHeader: { + type: Boolean, + default: true, + }, // 是否显示多选表格 isShowmultiSelect: { type: Boolean, @@ -191,6 +196,7 @@ border stripe :size="size" + :show-header="showHeader" style="width: 100%;" @selection-change="handleSelectionChange" @select="selectClick" diff --git a/src/layouts/components/Breadcrumb/index.vue b/src/layouts/components/Breadcrumb/index.vue new file mode 100644 index 0000000..702d138 --- /dev/null +++ b/src/layouts/components/Breadcrumb/index.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue index 8feb9d6..2f8f39c 100644 --- a/src/layouts/components/Topbar/index.vue +++ b/src/layouts/components/Topbar/index.vue @@ -54,18 +54,18 @@ >
-
+ +
diff --git a/src/layouts/index.vue b/src/layouts/index.vue index 2cb0d56..d67d0eb 100644 --- a/src/layouts/index.vue +++ b/src/layouts/index.vue @@ -4,6 +4,7 @@ import MainSidebar from './components/MainSidebar/index.vue' import SubSidebar from './components/SubSidebar/index.vue' import Topbar from './components/Topbar/index.vue' +import Breadcrumb from './components/Breadcrumb/index.vue' import Search from './components/Search/index.vue' import AppSetting from './components/AppSetting/index.vue' import HotkeysIntro from './components/HotkeysIntro/index.vue' @@ -68,6 +69,7 @@
+
@@ -187,7 +189,7 @@ } .topbar-container + .main { - margin: var(--g-topbar-height) 0 0; + // margin: var(--g-topbar-height) 0 0; } } } diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index d6876e3..c105f62 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -255,6 +255,18 @@ activeMenu: '/devicelist', }, }, + { + path: '/dinfo/:type', + name: 'DeviceEdit', + component: () => import('@/views/tested/device/info/components/edit.vue'), + meta: { + title: '设备信息编辑', + auth: '/tested/device/info', + sidebar: false, + breadcrumb: false, + activeMenu: '/devicelist', + }, + }, ], }, { diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts index 19af2d3..3af7a85 100644 --- a/src/api/eqpt/device/info.ts +++ b/src/api/eqpt/device/info.ts @@ -4,11 +4,59 @@ import request from '@/api/index' const prefix = 'equipment/info' -// 区域查询 -export function getInfoListPage(params: object) { +// 设备列表 -分页 -（全部状态） +export function getInfoListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: `${prefix}/listPage`, + method: 'get', + params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/equipment/approval/approvedListPage', + method: 'get', + params, + }) + } + else { + return request({ + url: '/equipment/approval/listPage', + method: 'get', + params, + }) + } +} +// 设备列表聚合 +export function getInfoListTogether(params: object) { return request({ - url: `${prefix}/listPage`, + url: `${prefix}/groupByName`, method: 'get', params, }) } +// 获取设备列表 +export function getInfoList(params: object) { + return request({ + url: `${prefix}/list`, + method: 'get', + params, + }) +} +// 保存编辑 +export function editInfo(data: object) { + return request({ + url: '/equipment/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitInfo(data: object) { + return request({ + url: '/equipment/approval/submit', + method: 'post', + data, + }) +} diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..7d34a4f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -25,10 +25,12 @@ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default'] CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/DetailPage/DetailBlock copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] + DetailBlockCom: typeof import('./components/DetailPage/DetailBlockCom.vue')['default'] DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue new file mode 100644 index 0000000..13bd2aa --- /dev/null +++ b/src/components/DetailPage/DetailBlockCom.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 2479614..8625b38 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -6,6 +6,11 @@ // ------------------定义props、 emit------------------- const props = defineProps({ + // 是否显示表头 + showHeader: { + type: Boolean, + default: true, + }, // 是否显示多选表格 isShowmultiSelect: { type: Boolean, @@ -191,6 +196,7 @@ border stripe :size="size" + :show-header="showHeader" style="width: 100%;" @selection-change="handleSelectionChange" @select="selectClick" diff --git a/src/layouts/components/Breadcrumb/index.vue b/src/layouts/components/Breadcrumb/index.vue new file mode 100644 index 0000000..702d138 --- /dev/null +++ b/src/layouts/components/Breadcrumb/index.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue index 8feb9d6..2f8f39c 100644 --- a/src/layouts/components/Topbar/index.vue +++ b/src/layouts/components/Topbar/index.vue @@ -54,18 +54,18 @@ >
-
+ +
diff --git a/src/layouts/index.vue b/src/layouts/index.vue index 2cb0d56..d67d0eb 100644 --- a/src/layouts/index.vue +++ b/src/layouts/index.vue @@ -4,6 +4,7 @@ import MainSidebar from './components/MainSidebar/index.vue' import SubSidebar from './components/SubSidebar/index.vue' import Topbar from './components/Topbar/index.vue' +import Breadcrumb from './components/Breadcrumb/index.vue' import Search from './components/Search/index.vue' import AppSetting from './components/AppSetting/index.vue' import HotkeysIntro from './components/HotkeysIntro/index.vue' @@ -68,6 +69,7 @@
+
@@ -187,7 +189,7 @@ } .topbar-container + .main { - margin: var(--g-topbar-height) 0 0; + // margin: var(--g-topbar-height) 0 0; } } } diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index d6876e3..c105f62 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -255,6 +255,18 @@ activeMenu: '/devicelist', }, }, + { + path: '/dinfo/:type', + name: 'DeviceEdit', + component: () => import('@/views/tested/device/info/components/edit.vue'), + meta: { + title: '设备信息编辑', + auth: '/tested/device/info', + sidebar: false, + breadcrumb: false, + activeMenu: '/devicelist', + }, + }, ], }, { diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 49d2fec..e7a6597 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -2,28 +2,5 @@ * 流程字典， 流程代号：流程id-对应表单中的formId */ export enum SCHEDULE { - FILE_APPROVAL = 'jlglwjsp', // 文件审批, - TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批 - SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批 - STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请 - STANDARD_PAUSE_APPROVAL = 'sbglbzzzztsq', // 标准装置暂停申请 - STANDARD_REVERT_APPROVAL = 'sbglbzzzcxsq', // 标准装置撤销申请 - STANDARD_RESUME_APPROVAL = 'sbglbzzzhfsq', // 标准装置恢复申请 - STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请 - DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请 - DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请 - DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请 - DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请 - DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请 - DEVICE_CONSUMING_APPROVAL = 'clsblysp', // 设备领用申请 - DEVICE_BORROW_APPROVAL = 'clsbjysp', // 设备借用申请 - DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请 - DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单 - BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印 - BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告 - BUSINESS_SUBPACKAGE_APPLY = 'ywglfbxmsq', // 分包项目申请 - BUSINESS_SUBPACKAGE_CHECK = 'ywglfbxmys', // 分包项目验收 - BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案 - BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批 - BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理 + DEVICE_INFO_APPROVAL = 'sbxxgl', // 设备信息管理, } diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts index 19af2d3..3af7a85 100644 --- a/src/api/eqpt/device/info.ts +++ b/src/api/eqpt/device/info.ts @@ -4,11 +4,59 @@ import request from '@/api/index' const prefix = 'equipment/info' -// 区域查询 -export function getInfoListPage(params: object) { +// 设备列表 -分页 -（全部状态） +export function getInfoListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: `${prefix}/listPage`, + method: 'get', + params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/equipment/approval/approvedListPage', + method: 'get', + params, + }) + } + else { + return request({ + url: '/equipment/approval/listPage', + method: 'get', + params, + }) + } +} +// 设备列表聚合 +export function getInfoListTogether(params: object) { return request({ - url: `${prefix}/listPage`, + url: `${prefix}/groupByName`, method: 'get', params, }) } +// 获取设备列表 +export function getInfoList(params: object) { + return request({ + url: `${prefix}/list`, + method: 'get', + params, + }) +} +// 保存编辑 +export function editInfo(data: object) { + return request({ + url: '/equipment/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitInfo(data: object) { + return request({ + url: '/equipment/approval/submit', + method: 'post', + data, + }) +} diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..7d34a4f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -25,10 +25,12 @@ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default'] CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/DetailPage/DetailBlock copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] + DetailBlockCom: typeof import('./components/DetailPage/DetailBlockCom.vue')['default'] DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue new file mode 100644 index 0000000..13bd2aa --- /dev/null +++ b/src/components/DetailPage/DetailBlockCom.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 2479614..8625b38 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -6,6 +6,11 @@ // ------------------定义props、 emit------------------- const props = defineProps({ + // 是否显示表头 + showHeader: { + type: Boolean, + default: true, + }, // 是否显示多选表格 isShowmultiSelect: { type: Boolean, @@ -191,6 +196,7 @@ border stripe :size="size" + :show-header="showHeader" style="width: 100%;" @selection-change="handleSelectionChange" @select="selectClick" diff --git a/src/layouts/components/Breadcrumb/index.vue b/src/layouts/components/Breadcrumb/index.vue new file mode 100644 index 0000000..702d138 --- /dev/null +++ b/src/layouts/components/Breadcrumb/index.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue index 8feb9d6..2f8f39c 100644 --- a/src/layouts/components/Topbar/index.vue +++ b/src/layouts/components/Topbar/index.vue @@ -54,18 +54,18 @@ >
-
+ +
diff --git a/src/layouts/index.vue b/src/layouts/index.vue index 2cb0d56..d67d0eb 100644 --- a/src/layouts/index.vue +++ b/src/layouts/index.vue @@ -4,6 +4,7 @@ import MainSidebar from './components/MainSidebar/index.vue' import SubSidebar from './components/SubSidebar/index.vue' import Topbar from './components/Topbar/index.vue' +import Breadcrumb from './components/Breadcrumb/index.vue' import Search from './components/Search/index.vue' import AppSetting from './components/AppSetting/index.vue' import HotkeysIntro from './components/HotkeysIntro/index.vue' @@ -68,6 +69,7 @@
+
@@ -187,7 +189,7 @@ } .topbar-container + .main { - margin: var(--g-topbar-height) 0 0; + // margin: var(--g-topbar-height) 0 0; } } } diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index d6876e3..c105f62 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -255,6 +255,18 @@ activeMenu: '/devicelist', }, }, + { + path: '/dinfo/:type', + name: 'DeviceEdit', + component: () => import('@/views/tested/device/info/components/edit.vue'), + meta: { + title: '设备信息编辑', + auth: '/tested/device/info', + sidebar: false, + breadcrumb: false, + activeMenu: '/devicelist', + }, + }, ], }, { diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 49d2fec..e7a6597 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -2,28 +2,5 @@ * 流程字典， 流程代号：流程id-对应表单中的formId */ export enum SCHEDULE { - FILE_APPROVAL = 'jlglwjsp', // 文件审批, - TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批 - SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批 - STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请 - STANDARD_PAUSE_APPROVAL = 'sbglbzzzztsq', // 标准装置暂停申请 - STANDARD_REVERT_APPROVAL = 'sbglbzzzcxsq', // 标准装置撤销申请 - STANDARD_RESUME_APPROVAL = 'sbglbzzzhfsq', // 标准装置恢复申请 - STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请 - DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请 - DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请 - DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请 - DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请 - DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请 - DEVICE_CONSUMING_APPROVAL = 'clsblysp', // 设备领用申请 - DEVICE_BORROW_APPROVAL = 'clsbjysp', // 设备借用申请 - DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请 - DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单 - BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印 - BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告 - BUSINESS_SUBPACKAGE_APPLY = 'ywglfbxmsq', // 分包项目申请 - BUSINESS_SUBPACKAGE_CHECK = 'ywglfbxmys', // 分包项目验收 - BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案 - BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批 - BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理 + DEVICE_INFO_APPROVAL = 'sbxxgl', // 设备信息管理, } diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue new file mode 100644 index 0000000..f113eb4 --- /dev/null +++ b/src/views/tested/device/info/components/edit.vue @@ -0,0 +1,467 @@ + + + + + + diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts index 19af2d3..3af7a85 100644 --- a/src/api/eqpt/device/info.ts +++ b/src/api/eqpt/device/info.ts @@ -4,11 +4,59 @@ import request from '@/api/index' const prefix = 'equipment/info' -// 区域查询 -export function getInfoListPage(params: object) { +// 设备列表 -分页 -（全部状态） +export function getInfoListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: `${prefix}/listPage`, + method: 'get', + params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/equipment/approval/approvedListPage', + method: 'get', + params, + }) + } + else { + return request({ + url: '/equipment/approval/listPage', + method: 'get', + params, + }) + } +} +// 设备列表聚合 +export function getInfoListTogether(params: object) { return request({ - url: `${prefix}/listPage`, + url: `${prefix}/groupByName`, method: 'get', params, }) } +// 获取设备列表 +export function getInfoList(params: object) { + return request({ + url: `${prefix}/list`, + method: 'get', + params, + }) +} +// 保存编辑 +export function editInfo(data: object) { + return request({ + url: '/equipment/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitInfo(data: object) { + return request({ + url: '/equipment/approval/submit', + method: 'post', + data, + }) +} diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..7d34a4f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -25,10 +25,12 @@ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default'] CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/DetailPage/DetailBlock copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] + DetailBlockCom: typeof import('./components/DetailPage/DetailBlockCom.vue')['default'] DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue new file mode 100644 index 0000000..13bd2aa --- /dev/null +++ b/src/components/DetailPage/DetailBlockCom.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 2479614..8625b38 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -6,6 +6,11 @@ // ------------------定义props、 emit------------------- const props = defineProps({ + // 是否显示表头 + showHeader: { + type: Boolean, + default: true, + }, // 是否显示多选表格 isShowmultiSelect: { type: Boolean, @@ -191,6 +196,7 @@ border stripe :size="size" + :show-header="showHeader" style="width: 100%;" @selection-change="handleSelectionChange" @select="selectClick" diff --git a/src/layouts/components/Breadcrumb/index.vue b/src/layouts/components/Breadcrumb/index.vue new file mode 100644 index 0000000..702d138 --- /dev/null +++ b/src/layouts/components/Breadcrumb/index.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue index 8feb9d6..2f8f39c 100644 --- a/src/layouts/components/Topbar/index.vue +++ b/src/layouts/components/Topbar/index.vue @@ -54,18 +54,18 @@ >
-
+ +
diff --git a/src/layouts/index.vue b/src/layouts/index.vue index 2cb0d56..d67d0eb 100644 --- a/src/layouts/index.vue +++ b/src/layouts/index.vue @@ -4,6 +4,7 @@ import MainSidebar from './components/MainSidebar/index.vue' import SubSidebar from './components/SubSidebar/index.vue' import Topbar from './components/Topbar/index.vue' +import Breadcrumb from './components/Breadcrumb/index.vue' import Search from './components/Search/index.vue' import AppSetting from './components/AppSetting/index.vue' import HotkeysIntro from './components/HotkeysIntro/index.vue' @@ -68,6 +69,7 @@
+
@@ -187,7 +189,7 @@ } .topbar-container + .main { - margin: var(--g-topbar-height) 0 0; + // margin: var(--g-topbar-height) 0 0; } } } diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index d6876e3..c105f62 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -255,6 +255,18 @@ activeMenu: '/devicelist', }, }, + { + path: '/dinfo/:type', + name: 'DeviceEdit', + component: () => import('@/views/tested/device/info/components/edit.vue'), + meta: { + title: '设备信息编辑', + auth: '/tested/device/info', + sidebar: false, + breadcrumb: false, + activeMenu: '/devicelist', + }, + }, ], }, { diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 49d2fec..e7a6597 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -2,28 +2,5 @@ * 流程字典， 流程代号：流程id-对应表单中的formId */ export enum SCHEDULE { - FILE_APPROVAL = 'jlglwjsp', // 文件审批, - TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批 - SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批 - STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请 - STANDARD_PAUSE_APPROVAL = 'sbglbzzzztsq', // 标准装置暂停申请 - STANDARD_REVERT_APPROVAL = 'sbglbzzzcxsq', // 标准装置撤销申请 - STANDARD_RESUME_APPROVAL = 'sbglbzzzhfsq', // 标准装置恢复申请 - STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请 - DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请 - DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请 - DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请 - DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请 - DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请 - DEVICE_CONSUMING_APPROVAL = 'clsblysp', // 设备领用申请 - DEVICE_BORROW_APPROVAL = 'clsbjysp', // 设备借用申请 - DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请 - DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单 - BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印 - BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告 - BUSINESS_SUBPACKAGE_APPLY = 'ywglfbxmsq', // 分包项目申请 - BUSINESS_SUBPACKAGE_CHECK = 'ywglfbxmys', // 分包项目验收 - BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案 - BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批 - BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理 + DEVICE_INFO_APPROVAL = 'sbxxgl', // 设备信息管理, } diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue new file mode 100644 index 0000000..f113eb4 --- /dev/null +++ b/src/views/tested/device/info/components/edit.vue @@ -0,0 +1,467 @@ + + + + + + diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index 7afc46c..1fd7b6d 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -2,19 +2,27 @@