diff --git a/.env b/.env index 5ad279d..c0d6bec 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ VITE_PORT = 3100 # 网站标题 -VITE_GLOB_APP_TITLE = JeecgBoot 企业级低代码平台 +VITE_GLOB_APP_TITLE = 国研咨询 # 简称，用于配置文件名字 不要出现空格、数字开头等特殊字符 VITE_GLOB_APP_SHORT_NAME = JeecgBootAdmin diff --git a/.env.development b/.env.development index 5560e19..67517eb 100644 --- a/.env.development +++ b/.env.development @@ -6,13 +6,13 @@ VITE_PUBLIC_PATH = / # 跨域代理，您可以配置多个 ,请注意，没有换行符 -VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]] +VITE_PROXY = [["/guoyan","http://localhost:8080/guoyan"],["/upload","http://localhost:3300/upload"]] #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=http://localhost:8080/jeecg-boot +VITE_GLOB_DOMAIN_URL=http://localhost:8080/guoyan #后台接口父地址(必填) -VITE_GLOB_API_URL=/jeecgboot +VITE_GLOB_API_URL=/guoyan # 接口前缀 VITE_GLOB_API_URL_PREFIX= diff --git a/.env.production b/.env.production index 82ba21a..f64da53 100644 --- a/.env.production +++ b/.env.production @@ -13,10 +13,10 @@ VITE_BUILD_COMPRESS = 'gzip' VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false #后台接口父地址(必填) -VITE_GLOB_API_URL=/jeecgboot +VITE_GLOB_API_URL=/guoyan #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=http://jeecg-boot-system:8080/jeecg-boot +VITE_GLOB_DOMAIN_URL=http://localhost:8080/guoyan # 接口父路径前缀 VITE_GLOB_API_URL_PREFIX= diff --git a/package.json b/package.json index 8c717d9..aeebac1 100644 --- a/package.json +++ b/package.json @@ -21,23 +21,22 @@ "husky:install": "husky install" }, "dependencies": { - "@jeecg/online": "3.6.2-beta", - "@iconify/iconify": "^3.1.1", "@ant-design/colors": "^7.0.0", "@ant-design/icons-vue": "^7.0.1", + "@iconify/iconify": "^3.1.1", + "@jeecg/online": "3.6.2-beta", "@logicflow/core": "^1.2.12", "@logicflow/extension": "^1.2.13", + "@tinymce/tinymce-vue": "^4.0.7", "@vue/runtime-core": "^3.3.4", "@vue/shared": "^3.3.4", - "@vueuse/shared": "^10.4.1", "@vueuse/core": "^10.4.1", - "@tinymce/tinymce-vue": "^4.0.7", + "@vueuse/shared": "^10.4.1", "@zxcvbn-ts/core": "^3.0.3", "ant-design-vue": "^4.0.8", "axios": "^1.5.0", "china-area-data": "^5.0.1", "clipboard": "^2.0.11", - "element-plus": "2.2.28", "codemirror": "^5.65.3", "cron-parser": "^4.9.0", "cropperjs": "^1.5.13", @@ -45,6 +44,7 @@ "dayjs": "^1.11.9", "dom-align": "^1.12.4", "echarts": "^5.4.3", + "element-plus": "2.2.28", "emoji-mart-vue-fast": "^15.0.0", "enquire.js": "^2.1.6", "intro.js": "^7.2.0", @@ -56,9 +56,9 @@ "path-to-regexp": "^6.2.1", "pinia": "2.1.6", "print-js": "^1.6.0", - "qs": "^6.11.2", "qrcode": "^1.5.3", "qrcodejs2": "0.0.2", + "qs": "^6.11.2", "resize-observer-polyfill": "^1.5.1", "showdown": "^2.1.0", "sortablejs": "^1.15.0", @@ -69,6 +69,7 @@ "vue-cropperjs": "^5.0.0", "vue-i18n": "9.2.2", "vue-infinite-scroll": "^2.0.2", + "vue-json-pretty": "^2.2.4", "vue-print-nb-jeecg": "^1.0.12", "vue-router": "^4.2.4", "vue-types": "^5.1.1", @@ -76,7 +77,6 @@ "vxe-table": "4.5.12", "vxe-table-plugin-antd": "3.1.0", "xe-utils": "3.5.13", - "vue-json-pretty": "^2.2.4", "xss": "^1.0.14" }, "devDependencies": { @@ -84,6 +84,7 @@ "@commitlint/config-conventional": "^17.7.0", "@iconify/json": "^2.2.107", "@purge-icons/generated": "^0.9.0", + "@rys-fe/vite-plugin-theme": "^0.8.6", "@types/codemirror": "^5.60.9", "@types/crypto-js": "^4.1.1", "@types/fs-extra": "^11.0.1", @@ -145,6 +146,7 @@ "ts-jest": "^29.1.1", "ts-node": "^10.9.1", "typescript": "^4.9.5", + "unocss": "^0.55.3", "vite": "^4.4.9", "vite-plugin-compression": "^0.5.1", "vite-plugin-html": "^3.2.0", @@ -152,9 +154,8 @@ "vite-plugin-mock": "^2.9.6", "vite-plugin-purge-icons": "^0.9.2", "vite-plugin-svg-icons": "^2.0.1", - "@rys-fe/vite-plugin-theme": "^0.8.6", + "vite-plugin-top-level-await": "^1.4.1", "vite-plugin-vue-setup-extend-plus": "^0.1.0", - "unocss": "^0.55.3", "vue-eslint-parser": "^9.3.1", "vue-tsc": "^1.8.8" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aa76ccd..946defc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -400,6 +400,9 @@ devDependencies: vite-plugin-svg-icons: specifier: ^2.0.1 version: 2.0.1(vite@4.5.1) + vite-plugin-top-level-await: + specifier: ^1.4.1 + version: 1.4.1(rollup@3.29.4)(vite@4.5.1) vite-plugin-vue-setup-extend-plus: specifier: ^0.1.0 version: 0.1.0 @@ -2150,6 +2153,18 @@ packages: '@iconify/iconify': 3.1.1 dev: true + /@rollup/plugin-virtual@3.0.2(rollup@3.29.4): + resolution: {integrity: sha512-10monEYsBp3scM4/ND4LNH5Rxvh3e/cVeL3jWTgZ2SrQ+BmUoQcopVQvnaMcOnykb1VkxUFuDAN+0FnpTFRy2A==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + rollup: 3.29.4 + dev: true + /@rollup/pluginutils@4.2.1: resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==} engines: {node: '>= 8.0.0'} @@ -2226,6 +2241,133 @@ packages: '@sinonjs/commons': 1.8.6 dev: false + /@swc/core-darwin-arm64@1.3.107: + resolution: {integrity: sha512-47tD/5vSXWxPd0j/ZllyQUg4bqalbQTsmqSw0J4dDdS82MWqCAwUErUrAZPRjBkjNQ6Kmrf5rpCWaGTtPw+ngw==} + engines: {node: '>=10'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@swc/core-darwin-x64@1.3.107: + resolution: {integrity: sha512-hwiLJ2ulNkBGAh1m1eTfeY1417OAYbRGcb/iGsJ+LuVLvKAhU/itzsl535CvcwAlt2LayeCFfcI8gdeOLeZa9A==} + engines: {node: '>=10'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@swc/core-linux-arm-gnueabihf@1.3.107: + resolution: {integrity: sha512-I2wzcC0KXqh0OwymCmYwNRgZ9nxX7DWnOOStJXV3pS0uB83TXAkmqd7wvMBuIl9qu4Hfomi9aDM7IlEEn9tumQ==} + engines: {node: '>=10'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@swc/core-linux-arm64-gnu@1.3.107: + resolution: {integrity: sha512-HWgnn7JORYlOYnGsdunpSF8A+BCZKPLzLtEUA27/M/ZuANcMZabKL9Zurt7XQXq888uJFAt98Gy+59PU90aHKg==} + engines: {node: '>=10'} + cpu: [arm64] + os: [linux] + libc: [glibc] + requiresBuild: true + dev: true + optional: true + + /@swc/core-linux-arm64-musl@1.3.107: + resolution: {integrity: sha512-vfPF74cWfAm8hyhS8yvYI94ucMHIo8xIYU+oFOW9uvDlGQRgnUf/6DEVbLyt/3yfX5723Ln57U8uiMALbX5Pyw==} + engines: {node: '>=10'} + cpu: [arm64] + os: [linux] + libc: [musl] + requiresBuild: true + dev: true + optional: true + + /@swc/core-linux-x64-gnu@1.3.107: + resolution: {integrity: sha512-uBVNhIg0ip8rH9OnOsCARUFZ3Mq3tbPHxtmWk9uAa5u8jQwGWeBx5+nTHpDOVd3YxKb6+5xDEI/edeeLpha/9g==} + engines: {node: '>=10'} + cpu: [x64] + os: [linux] + libc: [glibc] + requiresBuild: true + dev: true + optional: true + + /@swc/core-linux-x64-musl@1.3.107: + resolution: {integrity: sha512-mvACkUvzSIB12q1H5JtabWATbk3AG+pQgXEN95AmEX2ZA5gbP9+B+mijsg7Sd/3tboHr7ZHLz/q3SHTvdFJrEw==} + engines: {node: '>=10'} + cpu: [x64] + os: [linux] + libc: [musl] + requiresBuild: true + dev: true + optional: true + + /@swc/core-win32-arm64-msvc@1.3.107: + resolution: {integrity: sha512-J3P14Ngy/1qtapzbguEH41kY109t6DFxfbK4Ntz9dOWNuVY3o9/RTB841ctnJk0ZHEG+BjfCJjsD2n8H5HcaOA==} + engines: {node: '>=10'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@swc/core-win32-ia32-msvc@1.3.107: + resolution: {integrity: sha512-ZBUtgyjTHlz8TPJh7kfwwwFma+ktr6OccB1oXC8fMSopD0AxVnQasgun3l3099wIsAB9eEsJDQ/3lDkOLs1gBA==} + engines: {node: '>=10'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@swc/core-win32-x64-msvc@1.3.107: + resolution: {integrity: sha512-Eyzo2XRqWOxqhE1gk9h7LWmUf4Bp4Xn2Ttb0ayAXFp6YSTxQIThXcT9kipXZqcpxcmDwoq8iWbbf2P8XL743EA==} + engines: {node: '>=10'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@swc/core@1.3.107: + resolution: {integrity: sha512-zKhqDyFcTsyLIYK1iEmavljZnf4CCor5pF52UzLAz4B6Nu/4GLU+2LQVAf+oRHjusG39PTPjd2AlRT3f3QWfsQ==} + engines: {node: '>=10'} + requiresBuild: true + peerDependencies: + '@swc/helpers': ^0.5.0 + peerDependenciesMeta: + '@swc/helpers': + optional: true + dependencies: + '@swc/counter': 0.1.2 + '@swc/types': 0.1.5 + optionalDependencies: + '@swc/core-darwin-arm64': 1.3.107 + '@swc/core-darwin-x64': 1.3.107 + '@swc/core-linux-arm-gnueabihf': 1.3.107 + '@swc/core-linux-arm64-gnu': 1.3.107 + '@swc/core-linux-arm64-musl': 1.3.107 + '@swc/core-linux-x64-gnu': 1.3.107 + '@swc/core-linux-x64-musl': 1.3.107 + '@swc/core-win32-arm64-msvc': 1.3.107 + '@swc/core-win32-ia32-msvc': 1.3.107 + '@swc/core-win32-x64-msvc': 1.3.107 + dev: true + + /@swc/counter@0.1.2: + resolution: {integrity: sha512-9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw==} + dev: true + + /@swc/types@0.1.5: + resolution: {integrity: sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw==} + dev: true + /@sxzz/popperjs-es@2.11.7: resolution: {integrity: sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==} dev: false @@ -11122,6 +11264,11 @@ packages: hasBin: true dev: true + /uuid@9.0.1: + resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==} + hasBin: true + dev: true + /v8-compile-cache-lib@3.0.1: resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==} @@ -11263,6 +11410,20 @@ packages: - supports-color dev: true + /vite-plugin-top-level-await@1.4.1(rollup@3.29.4)(vite@4.5.1): + resolution: {integrity: sha512-hogbZ6yT7+AqBaV6lK9JRNvJDn4/IJvHLu6ET06arNfo0t2IsyCaon7el9Xa8OumH+ESuq//SDf8xscZFE0rWw==} + peerDependencies: + vite: '>=2.8' + dependencies: + '@rollup/plugin-virtual': 3.0.2(rollup@3.29.4) + '@swc/core': 1.3.107 + uuid: 9.0.1 + vite: 4.5.1(@types/node@20.10.6)(less@4.2.0) + transitivePeerDependencies: + - '@swc/helpers' + - rollup + dev: true + /vite-plugin-vue-setup-extend-plus@0.1.0: resolution: {integrity: sha512-pa27KIsHIBvBMv4xz9uB3UCfAuP2tr7PLlFhCS9vw+aXd326LEHsvhqd3hCQDOR5MjlQVyQH6vwuGr3u+KRiiw==} dev: true diff --git a/public/logo.png b/public/logo.png index 8072ced..067645e 100644 Binary files a/public/logo.png and b/public/logo.png differ diff --git a/public/logo.png.bak b/public/logo.png.bak new file mode 100644 index 0000000..8072ced Binary files /dev/null and b/public/logo.png.bak differ diff --git a/public/resource/img/logo.png b/public/resource/img/logo.png index 8072ced..067645e 100644 Binary files a/public/resource/img/logo.png and b/public/resource/img/logo.png differ diff --git a/public/resource/img/logo.png.bak b/public/resource/img/logo.png.bak new file mode 100644 index 0000000..8072ced Binary files /dev/null and b/public/resource/img/logo.png.bak differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index 8072ced..067645e 100644 Binary files a/src/assets/images/logo.png and b/src/assets/images/logo.png differ diff --git a/src/assets/images/logo.png.bak b/src/assets/images/logo.png.bak new file mode 100644 index 0000000..8072ced Binary files /dev/null and b/src/assets/images/logo.png.bak differ diff --git a/src/assets/loginmini/icon/jeecg_ad_text.png b/src/assets/loginmini/icon/jeecg_ad_text.png index 8725482..e14bb88 100644 Binary files a/src/assets/loginmini/icon/jeecg_ad_text.png and b/src/assets/loginmini/icon/jeecg_ad_text.png differ diff --git a/src/assets/loginmini/icon/jeecg_ad_text.png.bak b/src/assets/loginmini/icon/jeecg_ad_text.png.bak new file mode 100644 index 0000000..8725482 Binary files /dev/null and b/src/assets/loginmini/icon/jeecg_ad_text.png.bak differ diff --git a/src/assets/loginmini/icon/jeecg_logo.png b/src/assets/loginmini/icon/jeecg_logo.png index 109687f..7d8db95 100644 Binary files a/src/assets/loginmini/icon/jeecg_logo.png and b/src/assets/loginmini/icon/jeecg_logo.png differ diff --git a/src/assets/loginmini/icon/jeecg_logo.png.bak b/src/assets/loginmini/icon/jeecg_logo.png.bak new file mode 100644 index 0000000..109687f Binary files /dev/null and b/src/assets/loginmini/icon/jeecg_logo.png.bak differ diff --git a/src/assets/loginmini/icon/logo.png b/src/assets/loginmini/icon/logo.png index ad1cb65..067645e 100644 Binary files a/src/assets/loginmini/icon/logo.png and b/src/assets/loginmini/icon/logo.png differ diff --git a/src/assets/loginmini/icon/logo.png,bak b/src/assets/loginmini/icon/logo.png,bak new file mode 100644 index 0000000..ad1cb65 Binary files /dev/null and b/src/assets/loginmini/icon/logo.png,bak differ diff --git a/src/components/Modal/src/BasicModal.vue b/src/components/Modal/src/BasicModal.vue index 95332d2..4d0bfb7 100644 --- a/src/components/Modal/src/BasicModal.vue +++ b/src/components/Modal/src/BasicModal.vue @@ -1,5 +1,5 @@