diff --git a/src/layout/component/aside.vue b/src/layout/component/aside.vue index fd32d3d..bb33c32 100644 --- a/src/layout/component/aside.vue +++ b/src/layout/component/aside.vue @@ -1,8 +1,9 @@ diff --git a/src/layout/component/main.vue b/src/layout/component/main.vue index 0abd8fc..c1d309f 100644 --- a/src/layout/component/main.vue +++ b/src/layout/component/main.vue @@ -1,16 +1,13 @@ @@ -18,6 +15,7 @@ import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes'; import { useThemeConfig } from '/@/stores/themeConfig'; import { NextLoading } from '/@/utils/loading'; +import { usePanel } from "/@/stores/panel" // 引入组件 const LayoutParentView = defineAsyncComponent(() => import('/@/layout/routerView/parent.vue')); @@ -32,6 +30,9 @@ const storesThemeConfig = useThemeConfig(); const { themeConfig } = storeToRefs(storesThemeConfig); const { isTagsViewCurrenFull } = storeToRefs(storesTagsViewRoutes); +const storesPanel = usePanel() +const { isFromPanel } = storeToRefs(storesPanel); + // 设置 header 固定 const isFixedHeader = computed(() => { return themeConfig.value.isFixedHeader; diff --git a/src/stores/panel.ts b/src/stores/panel.ts new file mode 100644 index 0000000..ae9ecf9 --- /dev/null +++ b/src/stores/panel.ts @@ -0,0 +1,15 @@ +import { defineStore } from 'pinia'; + +export const usePanel = defineStore('panel', { + state: () => ({ + isFromPanel: false, + }), + actions: { + openFromPanel() { + this.isFromPanel = true; + }, + closeFromPanel() { + this.isFromPanel = false; + } + }, +}); diff --git a/src/views/door/components/doorTableDialog.vue b/src/views/door/components/doorTableDialog.vue index d0935b0..28fb45c 100644 --- a/src/views/door/components/doorTableDialog.vue +++ b/src/views/door/components/doorTableDialog.vue @@ -10,7 +10,7 @@ - diff --git a/src/views/door/doorAlarm/index.vue b/src/views/door/doorAlarm/index.vue index 049fad8..e8d5448 100644 --- a/src/views/door/doorAlarm/index.vue +++ b/src/views/door/doorAlarm/index.vue @@ -15,9 +15,9 @@ - + + type="datetimerange" /> @@ -136,6 +136,9 @@ import { BasicTableProps, useTable } from "/@/hooks/table"; import { useMessage, useMessageBox } from "/@/hooks/message"; import { useDict } from '/@/hooks/dict'; import { parseTime } from "/@/utils/formatTime" +import { usePanel } from "/@/stores/panel" + +const storesPanel = usePanel() import * as DoorRecordApi from "/@/api/door/doorRecord"; @@ -181,6 +184,25 @@ const resetQuery = () => { getDataList() } +onBeforeMount(() => { + const query: any = useRoute().query + if (query && query.action == 'panel') { + if (query.params) { + Object.assign(state.queryForm, JSON.parse(query.params)) + getDataList() + } + storesPanel.openFromPanel() + } +}) + +onBeforeUnmount(() => { + const query = useRoute().query + if (query && query.action == 'panel') { + storesPanel.closeFromPanel() + } +}) + + // 导出excel const exportExcel = () => { downBlobFile('/door/doorRecord/export', Object.assign(state.queryForm, { ids: selectObjs }), 'doorRecord.xlsx') diff --git a/src/views/door/doorBeLate/index.vue b/src/views/door/doorBeLate/index.vue index 9e6d6f5..4a666f1 100644 --- a/src/views/door/doorBeLate/index.vue +++ b/src/views/door/doorBeLate/index.vue @@ -138,7 +138,7 @@ const getSummaries = (param: any) => { function openDoorTableDialogRef(row: any) { const query = { - swingTimeList: [row.time, addDays(row.time, 1)], + swingTimeList: [row.time + " 00:00:00", addDays(row.time, 1) + " 00:00:00"], openTypeList: ['61', '62'], } doorTableDialogRef.value.openDialog(query) diff --git a/src/views/door/doorRecord/index.vue b/src/views/door/doorRecord/index.vue index 9b07624..1372241 100644 --- a/src/views/door/doorRecord/index.vue +++ b/src/views/door/doorRecord/index.vue @@ -12,9 +12,9 @@ - + + type="datetimerange" /> @@ -122,6 +122,9 @@ import { BasicTableProps, useTable } from "/@/hooks/table"; import { fetchList, delObjs } from "/@/api/door/doorRecord"; import { useMessage, useMessageBox } from "/@/hooks/message"; import { useDict } from '/@/hooks/dict'; +import { usePanel } from "/@/stores/panel" + +const storesPanel = usePanel() // 引入组件 const FormDialog = defineAsyncComponent(() => import('./form.vue')); @@ -161,6 +164,24 @@ const resetQuery = () => { getDataList() } +onBeforeMount(() => { + const query: any = useRoute().query + if (query && query.action == 'panel') { + if (query.params) { + Object.assign(state.queryForm, JSON.parse(query.params)) + getDataList() + } + storesPanel.openFromPanel() + } +}) + +onBeforeUnmount(() => { + const query = useRoute().query + if (query && query.action == 'panel') { + storesPanel.closeFromPanel() + } +}) + // 导出excel const exportExcel = () => { downBlobFile('/door/doorRecord/export', Object.assign(state.queryForm, { ids: selectObjs }), 'doorRecord.xlsx') diff --git a/src/views/home/widgets/index.vue b/src/views/home/widgets/index.vue index 03b422e..70ff575 100644 --- a/src/views/home/widgets/index.vue +++ b/src/views/home/widgets/index.vue @@ -17,29 +17,22 @@ - - + + @@ -54,26 +47,32 @@
添加部件
- + + +
-
+
-
+
-
+
@@ -98,7 +97,8 @@

{{ item.description }}

- +
@@ -124,7 +124,7 @@ const defaultGrid = ref({ copmsList: [ ['current-user', 'flow-data', 'audit-log', 'sys-log-line'], ['news', 'sys-log', 'demo-chart1'], - ['calendar', 'favorite-menu','favorite-flow', 'demo-chart2'], + ['calendar', 'favorite-menu', 'favorite-flow', 'demo-chart2'], ], }); const customizing = ref(false); @@ -209,8 +209,8 @@ const backDefaul = () => { widgets.value.style.removeProperty('transform'); grid.value = defaultGrid.value; Local.remove(widgetsKey.value); - // 重新加载页面 - window.location.reload(); + // 重新加载页面 + window.location.reload(); }; const close = () => { @@ -306,7 +306,7 @@ onMounted(() => { .customizing .widgets-wrapper { margin-right: -360px; - width: 100%; + width: 100%; } .customizing .widgets-wrapper .el-col { @@ -470,6 +470,7 @@ onMounted(() => { .customizing .widgets { transform: scale(1) !important; } + .customizing .widgets-aside { width: 100%; position: absolute; @@ -477,6 +478,7 @@ onMounted(() => { right: 0; bottom: 0; } + .customizing .widgets-wrapper { margin-right: 0; }