diff --git a/frontend/src/api/device/error/index.ts b/frontend/src/api/device/error/index.ts index 5b7f13f..8959bb3 100644 --- a/frontend/src/api/device/error/index.ts +++ b/frontend/src/api/device/error/index.ts @@ -30,5 +30,7 @@ export const deletePqErrSys = (params: string[]) => { return http.post(`/pqErrSys/delete`, params) } - - +//复制误差体系 +export const copyPqErrSys = (params: ErrorSystem.ErrorSystemList) => { + return http.get(`/pqErrSys/copy?id=${params.id}`) +} \ No newline at end of file diff --git a/frontend/src/config/index.ts b/frontend/src/config/index.ts index 292df4d..6f96270 100644 --- a/frontend/src/config/index.ts +++ b/frontend/src/config/index.ts @@ -9,7 +9,8 @@ export const HOME_URL: string = "/home/index"; export const LOGIN_URL: string = "/login"; // 默认主题颜色 -export const DEFAULT_PRIMARY: string = "#003078"; +//export const DEFAULT_PRIMARY: string = "#003078"; +export const DEFAULT_PRIMARY: string = "#526ADE"; // 路由白名单地址（本地存在的路由 staticRouter.ts 中） export const ROUTER_WHITE_LIST: string[] = ["/500"]; diff --git a/frontend/src/layouts/LayoutTransverse/index.scss b/frontend/src/layouts/LayoutTransverse/index.scss index 3a99303..8e87766 100644 --- a/frontend/src/layouts/LayoutTransverse/index.scss +++ b/frontend/src/layouts/LayoutTransverse/index.scss @@ -39,7 +39,9 @@ } .el-menu-item:hover { color: #fff; //一级导航划过颜色 - background-color: #5274a5 !important; //一级导航划过背景色 + //background-color: #5274a5 !important; //一级导航划过背景色 + background-color: #7588e5 !important; + } .el-sub-menu__hide-arrow { width: 65px; @@ -47,7 +49,9 @@ } .el-menu-item.is-active { color: #fff !important; //一级导航文字选中颜色 - background-color: #5274a5 !important; //一级导航选中背景色 + //background-color: #5274a5 !important; //一级导航选中背景色 + background-color: #7588e5 !important; + border-bottom: 0 !important; } .el-sub-menu__title { @@ -67,7 +71,9 @@ color: #fff !important; //二级导航文字选中颜色 // background-color: var(--el-color-primary) !important; // background-color: #5274a5 !important;//二级导航选中背景色 - background-color: #5274a5 !important; + + background-color: #7588e5 !important; + border-bottom-color: var(--el-color-primary) !important; } } diff --git a/frontend/src/layouts/components/Footer/index.vue b/frontend/src/layouts/components/Footer/index.vue index 858afb2..c9798cd 100644 --- a/frontend/src/layouts/components/Footer/index.vue +++ b/frontend/src/layouts/components/Footer/index.vue @@ -30,7 +30,7 @@ -

+

2024 © 南京灿能电力自动化股份有限公司 @@ -117,10 +117,11 @@ const handelOpen = async (item: string) => { position: absolute; width: 100%; height: 100%; - text-align: center; + text-align: right; line-height: 40px; a { color: #fff; + margin-right: 25px; // 增加右边距 } } } diff --git a/frontend/src/layouts/components/Menu/SubMenu.vue b/frontend/src/layouts/components/Menu/SubMenu.vue index f5d8e20..4f1ef3b 100644 --- a/frontend/src/layouts/components/Menu/SubMenu.vue +++ b/frontend/src/layouts/components/Menu/SubMenu.vue @@ -33,14 +33,19 @@ const handleClickMenu = (subItem: Menu.MenuOptions) => { // color: var(--el-menu-hover-text-color) !important; // background-color: transparent !important; color: #fff !important;//一级导航文字选中颜色 - background-color: #5274a5 !important; //一级导航选中背景色 + //background-color: #5274a5 !important; //一级导航选中背景色 + + background-color: #7588e5 !important; + } .el-menu--collapse { .is-active { .el-sub-menu__title { color: #ffffff !important; // background-color: var(--el-color-primary) !important; - background-color: #5274a5 !important; + //background-color: #5274a5 !important; + background-color: #7588e5 !important; + border-bottom: 0 !important; } } @@ -53,7 +58,9 @@ const handleClickMenu = (subItem: Menu.MenuOptions) => { // color: var(--el-menu-active-color) !important; // background-color: var(--el-menu-active-bg-color) !important; color: #fff !important;//一级导航文字选中颜色 - background-color: #5274a5 !important; //一级导航选中背景色 + //background-color: #5274a5 !important; //一级导航选中背景色 + background-color: #7588e5 !important; + &::before { position: absolute; top: 0; diff --git a/frontend/src/main.ts b/frontend/src/main.ts index 554345c..79d1cc9 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -65,5 +65,6 @@ const setupAll = async () => { //挂载app setupAll().then(() => { + app.mount('#app') }) diff --git a/frontend/src/views/machine/errorSystem/index.vue b/frontend/src/views/machine/errorSystem/index.vue index 0b8a6f8..e59a3a7 100644 --- a/frontend/src/views/machine/errorSystem/index.vue +++ b/frontend/src/views/machine/errorSystem/index.vue @@ -16,6 +16,7 @@ @@ -36,7 +37,8 @@ import ErrorSystemPopup from '@/views/machine/errorSystem/components/errorSystem import ErrorStandardPopup from '@/views/machine/errorSystem/components/errorStandardPopup.vue' import type { ErrorSystem } from '@/api/device/interface/error' import { useDictStore } from '@/stores/modules/dict' -import { getPqErrSysList, deletePqErrSys} from '@/api/device/error/index' +import { getPqErrSysList, deletePqErrSys,copyPqErrSys} from '@/api/device/error/index' +import { ElMessageBox } from 'element-plus' defineOptions({ name: 'errorSystem' }) @@ -71,7 +73,7 @@ const columns = ref[]>([ search: { el: 'select', props: { filterable: true } }, fieldNames: { label: 'name', value: 'id' }, }, - { prop: 'operation', label: '操作', fixed: 'right' ,width: 250,}, + { prop: 'operation', label: '操作', fixed: 'right' ,width: 300,}, ]) // 打开 drawer(新增、编辑) @@ -86,19 +88,33 @@ const openDialog = (titleType: string, row: Partial } -// 批量删除设备 +// 批量误差体系 const batchDelete = async (id: string[]) => { await useHandleData(deletePqErrSys, id, '删除所选误差体系') proTable.value?.clearSelection() proTable.value?.getTableList() } -// 删除设备 +// 删除误差体系 const handleDelete = async (params: ErrorSystem.ErrorSystemList) => { await useHandleData(deletePqErrSys, [params.id], `删除【${params.name}】误差体系`) proTable.value?.getTableList() } + +// 复制误差体系 +const copy = async (params: ErrorSystem.ErrorSystemList) => { + ElMessageBox.confirm('是否复制当前误差体系?', '提示', { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: 'warning', + draggable: true + }).then(async () => { + copyPqErrSys(params).then(() => { + proTable.value?.getTableList() + }) + }) +}