From f1e6740b0da2ca42857ef2dc040ace6d3ccdb201 Mon Sep 17 00:00:00 2001 From: wangzenghua <1048523306@qq.com> Date: Thu, 27 Feb 2025 01:24:25 +0000 Subject: [PATCH] fix:sug-gas --- .../.env.development | 1 + .../.env.production | 1 + sub-government-affairs-service/index.html | 2 +- sub-government-affairs-service/package.json | 3 +- .../src/apis/login.js | 43 -- .../src/apis/plan.js | 61 +++ .../src/components/code-dialog/index.vue | 54 +++ .../src/layouts/component/Avatar/index.vue | 6 +- sub-government-affairs-service/src/main.js | 53 ++- .../src/plugins/micro.js | 2 +- .../src/router/index.js | 20 +- .../src/router/modules/resource.js | 12 +- .../src/store/modules/user.js | 8 +- .../src/utils/axios.js | 2 +- .../src/utils/permission.js | 19 +- .../src/views/resource/grid/index.vue | 18 +- .../src/views/resource/plan/index.vue | 383 ++++++++++++++++++ .../src/views/trace/breeding/coding/index.vue | 15 +- .../views/trace/breeding/quality/index.vue | 14 +- sub-government-affairs-service/vite.config.js | 74 ++-- 20 files changed, 645 insertions(+), 146 deletions(-) delete mode 100644 sub-government-affairs-service/src/apis/login.js create mode 100644 sub-government-affairs-service/src/apis/plan.js create mode 100644 sub-government-affairs-service/src/components/code-dialog/index.vue create mode 100644 sub-government-affairs-service/src/views/resource/plan/index.vue diff --git a/sub-government-affairs-service/.env.development b/sub-government-affairs-service/.env.development index 952a19a..187aabc 100644 --- a/sub-government-affairs-service/.env.development +++ b/sub-government-affairs-service/.env.development @@ -2,6 +2,7 @@ VITE_PORT = 9528 VITE_MODE = 'DEV' VITE_APP_MIAN = 'daimp-front-main' +VITE_APP_MIAN_URL = 'http://localhost:9000' VITE_APP_NAME = 'sub-government-affairs-service' VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = 'http://192.168.18.99:8080' diff --git a/sub-government-affairs-service/.env.production b/sub-government-affairs-service/.env.production index d6aa6aa..a889d2f 100644 --- a/sub-government-affairs-service/.env.production +++ b/sub-government-affairs-service/.env.production @@ -1,6 +1,7 @@ # 生产环境 VITE_MODE = 'PRO' VITE_APP_MIAN = 'daimp-front-main' +VITE_APP_MIAN_URL = 'http://192.168.18.99:88' VITE_APP_NAME = 'sub-government-affairs-service' # 接口 VITE_APP_BASE_API = '/apis' diff --git a/sub-government-affairs-service/index.html b/sub-government-affairs-service/index.html index 965338c..5bc92df 100644 --- a/sub-government-affairs-service/index.html +++ b/sub-government-affairs-service/index.html @@ -7,7 +7,7 @@ 政务服务 -
+
diff --git a/sub-government-affairs-service/package.json b/sub-government-affairs-service/package.json index a073b05..eb69f44 100644 --- a/sub-government-affairs-service/package.json +++ b/sub-government-affairs-service/package.json @@ -6,8 +6,7 @@ "scripts": { "dev": "vite --mode development", "build": "vite build --mode production", - "build:dev": "vite build --mode dev", - "build:qa": "vite build --mode qa", + "test": "vite build --mode test", "preview": "vite preview", "format": "prettier --write 'src/**/*.{vue,ts,tsx,js,jsx,css,less,scss,json,md}'", "eslint": "npx eslint --init", diff --git a/sub-government-affairs-service/src/apis/login.js b/sub-government-affairs-service/src/apis/login.js deleted file mode 100644 index 3a08a9c..0000000 --- a/sub-government-affairs-service/src/apis/login.js +++ /dev/null @@ -1,43 +0,0 @@ -import request from '@/utils/axios'; - -/** - * @Title: 登录 - */ -export function Login(params, token) { - return request('/store/login', { - method: 'POST', - data: null, - params: params, - headers: { - 'fairies-auth-token': token, - }, - }); -} - -/** - * @Title: 登出 - */ -export function LogOut() { - return request('/store/logout', { - method: 'POST', - }); -} - -/** - * @Title: 验证码 - */ -export function GetCaptcha() { - return request('/store/login-captcha', { - method: 'GET', - responseType: 'arraybuffer', - }); -} - -/** - * @Title: 获取菜单 - */ -export function GetMenus() { - return request('/store/self/menu', { - method: 'GET', - }); -} diff --git a/sub-government-affairs-service/src/apis/plan.js b/sub-government-affairs-service/src/apis/plan.js new file mode 100644 index 0000000..617d29c --- /dev/null +++ b/sub-government-affairs-service/src/apis/plan.js @@ -0,0 +1,61 @@ +import request from '@/utils/axios'; + +/** + * @Title: 列表 + */ +export function GetEntityList(params = {}) { + return request('/land-resource/annualManage/page', { + method: 'GET', + params, + }); +} + +/** + * @Title: 新增 + */ +export function AddEntity(data = {}) { + return request('/land-resource/annualManage/save', { + method: 'POST', + data, + }); +} + +/** + * @Title: 修改 + */ +export function UpdateEntity(data = {}) { + return request('/land-resource/annualManage/edit', { + method: 'PUT', + data, + }); +} + +/** + * @Title: 审核 + */ +export function AuditEntity(data = {}) { + return request('/land-resource/annualManage/exam', { + method: 'PUT', + data, + }); +} + +/** + * @Title: 删除 + */ +export function DeleteEntity(params = {}) { + return request(`/land-resource/annualManage/delete/${params.id}`, { + method: 'DELETE', + }); +} + +/** + * @Title: 导出 + */ +export function ExportEntity(params = {}) { + return request('/land-resource/annualManage/export', { + method: 'GET', + params, + responseType: 'blob', + }); +} diff --git a/sub-government-affairs-service/src/components/code-dialog/index.vue b/sub-government-affairs-service/src/components/code-dialog/index.vue new file mode 100644 index 0000000..2a6a5bd --- /dev/null +++ b/sub-government-affairs-service/src/components/code-dialog/index.vue @@ -0,0 +1,54 @@ + + + diff --git a/sub-government-affairs-service/src/layouts/component/Avatar/index.vue b/sub-government-affairs-service/src/layouts/component/Avatar/index.vue index 0bb9d45..d85310a 100644 --- a/sub-government-affairs-service/src/layouts/component/Avatar/index.vue +++ b/sub-government-affairs-service/src/layouts/component/Avatar/index.vue @@ -3,7 +3,7 @@ * @Author: zenghua.wang * @Date: 2023-06-20 14:29:45 * @LastEditors: zenghua.wang - * @LastEditTime: 2025-02-14 11:39:56 + * @LastEditTime: 2025-02-18 09:48:18 --> + + @@ -68,6 +74,7 @@ const UserStore = useUserStore(); const crudRef = ref(null); const importExcelRef = ref(null); const qualityAddRef = ref(null); +const codeRef = ref(null); const state = reactive({ loading: false, query: { @@ -87,7 +94,6 @@ const state = reactive({ addDisplay: false, editDisplay: false, viewDisplay: true, - width: 200, }, { label: '采收批次', @@ -273,7 +279,7 @@ const state = reactive({ label: '原产地详细地址', prop: 'originAddressDetail', hide: true, - // span: 24, + viewDisplay: false, }, // { // label: '经营主体', @@ -607,4 +613,9 @@ const onExport = () => { state.loading = false; }); }; + +const onViewCode = (row) => { + state.currentRow = row; + codeRef?.value && codeRef.value.show(); +}; diff --git a/sub-government-affairs-service/src/views/trace/breeding/quality/index.vue b/sub-government-affairs-service/src/views/trace/breeding/quality/index.vue index 9836549..c4408a5 100644 --- a/sub-government-affairs-service/src/views/trace/breeding/quality/index.vue +++ b/sub-government-affairs-service/src/views/trace/breeding/quality/index.vue @@ -22,6 +22,10 @@ 批量删除 + + + + diff --git a/sub-government-affairs-service/vite.config.js b/sub-government-affairs-service/vite.config.js index 39091db..d67a68f 100644 --- a/sub-government-affairs-service/vite.config.js +++ b/sub-government-affairs-service/vite.config.js @@ -3,7 +3,7 @@ * @Author: zenghua.wang * @Date: 2022-09-18 21:24:29 * @LastEditors: zenghua.wang - * @LastEditTime: 2025-02-17 10:58:12 + * @LastEditTime: 2025-02-27 09:16:00 */ import { defineConfig, loadEnv } from 'vite'; @@ -23,46 +23,37 @@ import { resolve } from 'path'; const useDevMode = true; export default defineConfig(({ command, mode }) => { - const { - VITE_PORT, - VITE_APP_NAME, - VITE_APP_BASE_API, - VITE_APP_BASE_URL, - VITE_APP_UPLOAD_API, - VITE_APP_UPLOAD_URL, - VITE_APP_SYSTEM_API, - VITE_APP_SYSTEM_URL, - } = loadEnv(mode, process.cwd()); + const { VITE_PORT, VITE_APP_NAME, VITE_APP_BASE_API, VITE_APP_BASE_URL, VITE_APP_UPLOAD_API, VITE_APP_UPLOAD_URL } = loadEnv(mode, process.cwd()); const config = { base: '/sub-government-affairs-service/', build: { target: 'ESNext', outDir: 'dist', minify: 'terser', - // terserOptions: { - // compress: { - // drop_console: true, - // drop_debugger: true, - // pure_funcs: ['console.log'], - // }, - // output: { - // comments: true, - // }, - // }, - // reportCompressedSize: false, - // chunkSizeWarningLimit: 2000, - // rollupOptions: { - // output: { - // manualChunks(id) { - // if (id.includes('node_modules')) { - // return id.toString().split('node_modules/')[1].split('/')[1].toString(); - // } - // }, - // chunkFileNames: 'assets/js/[name]-[hash].js', - // entryFileNames: 'assets/js/[name]-[hash].js', - // assetFileNames: 'assets/[ext]/[name]-[hash].[ext]', - // }, - // }, + terserOptions: { + compress: { + drop_console: true, + drop_debugger: true, + pure_funcs: ['console.log'], + }, + output: { + comments: true, + }, + }, + reportCompressedSize: false, + chunkSizeWarningLimit: 2000, + rollupOptions: { + output: { + manualChunks(id) { + if (id.includes('node_modules')) { + return id.toString().split('node_modules/')[1].split('/')[1].toString(); + } + }, + chunkFileNames: 'assets/js/[name]-[hash].js', + entryFileNames: 'assets/js/[name]-[hash].js', + assetFileNames: 'assets/[ext]/[name]-[hash].[ext]', + }, + }, }, server: { host: '0.0.0.0', @@ -83,11 +74,6 @@ export default defineConfig(({ command, mode }) => { changeOrigin: true, rewrite: (path) => path.replace(/^\/uploadApis/, ''), }, - [VITE_APP_SYSTEM_API]: { - target: VITE_APP_SYSTEM_URL, - changeOrigin: true, - rewrite: (path) => path.replace(/^\/systemApis/, ''), - }, }, }, resolve: { @@ -142,13 +128,5 @@ export default defineConfig(({ command, mode }) => { }), ], }; - if (mode === 'production') { - config.build.terserOptions = { - compress: { - drop_console: true, - drop_debugger: true, - }, - }; - } return config; });