diff --git a/mayfly_go_web/src/App.vue b/mayfly_go_web/src/App.vue
index 6999c57d..2bc3b6ca 100644
--- a/mayfly_go_web/src/App.vue
+++ b/mayfly_go_web/src/App.vue
@@ -101,7 +101,7 @@ const refreshWatermarkTime = () => {
} else {
clearInterval(refreshWatermarkTimeInterval);
}
- }, 10000);
+ }, 60000);
};
// 页面销毁时,关闭监听布局配置
diff --git a/mayfly_go_web/src/common/use.ts b/mayfly_go_web/src/common/use.ts
new file mode 100644
index 00000000..90bd83a4
--- /dev/null
+++ b/mayfly_go_web/src/common/use.ts
@@ -0,0 +1,17 @@
+import { ref } from 'vue';
+
+const vw = ref(document.documentElement.clientWidth);
+const vh = ref(document.documentElement.clientHeight);
+
+window.addEventListener('resize', () => {
+ vw.value = document.documentElement.clientWidth;
+ vh.value = document.documentElement.clientHeight;
+});
+
+/**
+ * 获取视图宽高
+ * @returns 视图宽高
+ */
+export function useViewport() {
+ return { vw, vh };
+}
diff --git a/mayfly_go_web/src/common/utils/export.ts b/mayfly_go_web/src/common/utils/export.ts
index d5fdc12c..f4430477 100644
--- a/mayfly_go_web/src/common/utils/export.ts
+++ b/mayfly_go_web/src/common/utils/export.ts
@@ -29,15 +29,19 @@ export function exportCsv(filename: string, columns: string[], datas: []) {
cvsData.push(dataValueArr);
}
const csvString = cvsData.map((e) => e.join(',')).join('\n');
+ exportFile(`${filename}.csv`, csvString);
+}
+
+export function exportFile(filename: string, content: string) {
// 导出
let link = document.createElement('a');
let exportContent = '\uFEFF';
- let blob = new Blob([exportContent + csvString], {
+ let blob = new Blob([exportContent + content], {
type: 'text/plain;charset=utf-8',
});
- link.id = 'download-csv';
+ link.id = 'download-file';
link.setAttribute('href', URL.createObjectURL(blob));
- link.setAttribute('download', `${filename}.csv`);
+ link.setAttribute('download', `${filename}`);
document.body.appendChild(link);
link.click();
}
diff --git a/mayfly_go_web/src/components/contextmenu/index.ts b/mayfly_go_web/src/components/contextmenu/index.ts
index 4b7f3f85..949e44a8 100644
--- a/mayfly_go_web/src/components/contextmenu/index.ts
+++ b/mayfly_go_web/src/components/contextmenu/index.ts
@@ -1,4 +1,6 @@
-export class ContextmenuItem {
+import Contextmenu from './index.vue';
+
+class ContextmenuItem {
clickId: any;
txt: string;
@@ -53,3 +55,5 @@ export class ContextmenuItem {
return false;
}
}
+
+export { Contextmenu, ContextmenuItem };
diff --git a/mayfly_go_web/src/components/contextmenu/index.vue b/mayfly_go_web/src/components/contextmenu/index.vue
index 0d0e3322..52aea8d2 100644
--- a/mayfly_go_web/src/components/contextmenu/index.vue
+++ b/mayfly_go_web/src/components/contextmenu/index.vue
@@ -1,11 +1,11 @@
-
+
@@ -33,6 +33,8 @@
-