From e085a5f230b060ae7bfdcf47a30ecec77f1bfb4a Mon Sep 17 00:00:00 2001 From: dengweisheng Date: Mon, 10 Jul 2023 17:30:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FormDialog/FormDialog.vue | 31 +- src/components/FormDialog/example.vue | 2 +- src/components/TableBody/TableHeader.vue | 2 +- src/components/TableBody/example.vue | 1 + src/views/projectManage/index.vue | 430 +++++++++++++---------- vite.config.js | 3 +- 6 files changed, 263 insertions(+), 206 deletions(-) diff --git a/src/components/FormDialog/FormDialog.vue b/src/components/FormDialog/FormDialog.vue index 8bdc1f1..3343003 100644 --- a/src/components/FormDialog/FormDialog.vue +++ b/src/components/FormDialog/FormDialog.vue @@ -27,12 +27,13 @@ - + @@ -52,7 +53,7 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/components/FormDialog/example.vue b/src/components/FormDialog/example.vue index 5bdf57e..f016395 100644 --- a/src/components/FormDialog/example.vue +++ b/src/components/FormDialog/example.vue @@ -45,7 +45,7 @@ const FormDialogData = reactive({ formJosnElement: [ { type: 'input', // 元素类型 - cloSpan: '24', // 栅格布局所占份数 (默认24) + cloSpan: 24, // 栅格布局所占份数 (默认24) disabled: false, // 元素是否禁用(默认为false) label: '姓名', // 元素的 label placeholder: '请填写姓名', // 元素的 placeholder diff --git a/src/components/TableBody/TableHeader.vue b/src/components/TableBody/TableHeader.vue index 20a20d2..9dff5a1 100644 --- a/src/components/TableBody/TableHeader.vue +++ b/src/components/TableBody/TableHeader.vue @@ -17,7 +17,7 @@ 详情 + v-permission="tableHeader[2]?.detail" @click="emit('handle', 'detail ')" :key="index">详情 - + diff --git a/vite.config.js b/vite.config.js index 27b1864..83d4d6c 100644 --- a/vite.config.js +++ b/vite.config.js @@ -27,8 +27,9 @@ export default defineConfig({ host: '0.0.0.0', // 解决“vite use `--host` to expose”-- 0.0.0.0 将监听所有地址 proxy: { '/api': { - target: 'http://10.0.0.29:9999', + // target: 'http://10.0.0.29:9999', // target: 'https://fywz.btdit.cn/', + target: 'http://10.0.0.74:7777/', // 刘进 changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '') // ws: true,// 开启webSocket From ab21195e4b9f078967f714c92092eb92f8dd0b99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=85=88=E7=94=9F?= <1780089502@qq.com> Date: Tue, 11 Jul 2023 12:02:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/codemirror/index copy.vue | 105 ---------------------------- src/views/page-editor/crud.vue | 2 +- 2 files changed, 1 insertion(+), 106 deletions(-) delete mode 100644 src/views/codemirror/index copy.vue diff --git a/src/views/codemirror/index copy.vue b/src/views/codemirror/index copy.vue deleted file mode 100644 index 10770e7..0000000 --- a/src/views/codemirror/index copy.vue +++ /dev/null @@ -1,105 +0,0 @@ - - - diff --git a/src/views/page-editor/crud.vue b/src/views/page-editor/crud.vue index e18ba60..72e9061 100644 --- a/src/views/page-editor/crud.vue +++ b/src/views/page-editor/crud.vue @@ -70,7 +70,7 @@