diff --git a/nc_wms_web/.env.production b/nc_wms_web/.env.production index de3d95b..2fb326f 100644 --- a/nc_wms_web/.env.production +++ b/nc_wms_web/.env.production @@ -1,3 +1,3 @@ NODE_ENV=production -VITE_APP_TITLE='SmartAdmin V3.X' -VITE_APP_API_URL='http://123.60.65.29:8000' +VITE_APP_TITLE='YC WaMaS' +VITE_APP_API_URL='https://47.117.45.79:8000' diff --git a/nc_wms_web/package-lock.json b/nc_wms_web/package-lock.json index 50c6a6d..632c5cf 100644 --- a/nc_wms_web/package-lock.json +++ b/nc_wms_web/package-lock.json @@ -44,6 +44,7 @@ "@types/lodash": "^4.17.16", "@types/nprogress": "^0.2.3", "@types/pinyin": "^2.10.2", + "@types/ua-parser-js": "^0.7.39", "@vitejs/plugin-vue": "5.1.4", "@vitejs/plugin-vue-jsx": "4.0.1", "@vue/eslint-config-prettier": "^10.0.0", @@ -1636,6 +1637,12 @@ "integrity": "sha512-jLzlRkaLRLg+lgYPjOuP3HX2cozUkhXls5GTXopsKuKJ9lDGlIAb88OoIztH6TbNUsoJnl/7e/kjaumA5IKKJg==", "dev": true }, + "node_modules/@types/ua-parser-js": { + "version": "0.7.39", + "resolved": "https://registry.npmmirror.com/@types/ua-parser-js/-/ua-parser-js-0.7.39.tgz", + "integrity": "sha512-P/oDfpofrdtF5xw433SPALpdSchtJmY7nsJItf8h3KXqOslkbySh8zq4dSWXH2oTjRvJ5PczVEoCZPow6GicLg==", + "dev": true + }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "8.29.1", "resolved": "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.29.1.tgz", diff --git a/nc_wms_web/package.json b/nc_wms_web/package.json index 83caa8a..49bf397 100644 --- a/nc_wms_web/package.json +++ b/nc_wms_web/package.json @@ -52,6 +52,7 @@ "@types/lodash": "^4.17.16", "@types/nprogress": "^0.2.3", "@types/pinyin": "^2.10.2", + "@types/ua-parser-js": "^0.7.39", "@vitejs/plugin-vue": "5.1.4", "@vitejs/plugin-vue-jsx": "4.0.1", "@vue/eslint-config-prettier": "^10.0.0", diff --git a/nc_wms_web/server.crt b/nc_wms_web/server.crt new file mode 100644 index 0000000..3baa3bf --- /dev/null +++ b/nc_wms_web/server.crt @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIID/TCCAuWgAwIBAgIUEfEUMHxLXtdeJGj+9JqLoab6S+UwDQYJKoZIhvcNAQEL +BQAwgY0xCzAJBgNVBAYTAkNOMREwDwYDVQQIDAhTaGFuZ0hhaTERMA8GA1UEBwwI +U2hhbmdIYWkxETAPBgNVBAoMCHlvdWhjYWluMQswCQYDVQQLDAJJVDEXMBUGA1UE +AwwOMTkyLjE2OC41Ni4xNDkxHzAdBgkqhkiG9w0BCQEWEDc2ODg2MzYyMEBxcS5j +b20wHhcNMjUwNTIwMDIyOTEyWhcNMjYwNTIwMDIyOTEyWjCBjTELMAkGA1UEBhMC +Q04xETAPBgNVBAgMCFNoYW5nSGFpMREwDwYDVQQHDAhTaGFuZ0hhaTERMA8GA1UE +CgwIeW91aGNhaW4xCzAJBgNVBAsMAklUMRcwFQYDVQQDDA4xOTIuMTY4LjU2LjE0 +OTEfMB0GCSqGSIb3DQEJARYQNzY4ODYzNjIwQHFxLmNvbTCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBALX4nWD5vK8wrqKWATYyRs3yBN4VHAfb9e/dI2rd +vhMgzgAhK21M+EUM41W6RM2GpkAxEOq166520mDWba0gZiW/mOk/Kq0SPmmHeqLC +G07ryPHfadh9Qa7GBySKokudIBZ/iU4VTPxumCsGEpggtwlcDcetpwQ6BWyRc0cS +Jf6sWex2PGqyiIGPIsHL9102EBaTGMULgqdijG4N/BYnqfTrtCmUn61tW8N8fXxd +Q/MTmoEjgB6vPouFj9I9JeFf31Aw+TX+Nsv1iW/tvpsDAS/j5ctoEanuoZWFspWX +FfSzQOox0bHNS63sqi6riWxAgK4OG82m/2MeOjt/hwYy08kCAwEAAaNTMFEwHQYD +VR0OBBYEFPo2+QcfyJkJhokEvskLKYhCmYm1MB8GA1UdIwQYMBaAFPo2+QcfyJkJ +hokEvskLKYhCmYm1MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB +AGhXcvxbxSpXGic13FmeG22ucx3UvE3ZErmnkvmS+Pf+XFWAdEUMjbdfkuH1o6tw +WpzDeEyv/g7O1S+kPAUNm03TjWLGsSawEbDM0CpyUmhHP6WBQ4ncOP+mJqTvzGoe +ru0gKDZg4wkYYgBPbwDFT+LOeUh6kVaxvSRKP6fkoFQ0boAHhb6J+Kv0Q77x4wAg +2gPlED1rHoxEdTXP7SBXUD8XoZZGw7C1KXVXz7CkCSPsVwf0SQVCHJ8pTNh/8KZ9 +aYdFDRM/JCidnkn9WzML4omSG41FDtue0/N1jYxnfoNU2h9plfXINl1eCrufRv9t +2yj+lyi+qc1TR/QOPWycUOY= +-----END CERTIFICATE----- diff --git a/nc_wms_web/server.key b/nc_wms_web/server.key new file mode 100644 index 0000000..a8e450b --- /dev/null +++ b/nc_wms_web/server.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC1+J1g+byvMK6i +lgE2MkbN8gTeFRwH2/Xv3SNq3b4TIM4AISttTPhFDONVukTNhqZAMRDqteuudtJg +1m2tIGYlv5jpPyqtEj5ph3qiwhtO68jx32nYfUGuxgckiqJLnSAWf4lOFUz8bpgr +BhKYILcJXA3HracEOgVskXNHEiX+rFnsdjxqsoiBjyLBy/ddNhAWkxjFC4KnYoxu +DfwWJ6n067QplJ+tbVvDfH18XUPzE5qBI4Aerz6LhY/SPSXhX99QMPk1/jbL9Ylv +7b6bAwEv4+XLaBGp7qGVhbKVlxX0s0DqMdGxzUut7Kouq4lsQICuDhvNpv9jHjo7 +f4cGMtPJAgMBAAECggEAAZv4hMPH78DRqxI5xiXkb/5nSdsFZGgu9SokFWbY5iOa +KY8nGd7+WoQl7wJbiNKu2yj4yyoP8ACkSflnqLQALgpj3wCgiaGo8ZL+M1Xds/sX +X1o4SSPDZNIgAhxy7QEnGlSHK0Weq2ycetPLTSaGODZwCAVOVFjLOo0kcHZSWoBu +n6qL/KMZTTbiJdjcRnEGPqetC8fC29gdjpRdy37jRFr8zZqhf4Apf01OqRpeJMzQ +1i/S4/0m3HcQiNiqMnbBIpsnUgEnZXlz/ntJyNqyofcjOK7yKkQ0/8kCrx23lOsQ +l15A7jHEQDzdxsoy2wmr1W/Zs0JZohiZsl3PXJ7tjQKBgQDsc2jW3jW5Z8F1vcCC +arFfsrsAtKSAWjOfFTtNlixpACLKfeW4n/XO+GhJ5HZ6+ed0EZU/MYwqqQ+zze6l +xunFl3aNM8oYguTuBtisd2pzztOPdbK02/t10QFMIiME47iKJTzD2hZcxnlRRvH0 +o1GdKYYrlKJFuBL/OxqFIiRARQKBgQDFBB40eOKZsuzVX3kzDGEUG045E5zyFbaL +Z5O49wG4VEbi47K3salULNzwJ0T0mVJfsVKKqHjWw0pu/UV4MlqVsypx8yO1a6WD +VTwSnl46tXLjhLz7SVtDAin65fInCLbevA6pMicI1AMMPUIQuNGBTTe7nJ1MnY9c +s2amPUmHtQKBgCrGdiDo8i8oZgc23Ky7QHtfihUGmPvfVZdh7+iJUl9sdt7LB9Pu +nDllFvjHK+fzbbvBso5MGF9fVkfg6Vt0MLZeQEQrKlRk2aV195y7vbZVpFA/qqSt +Z0BZHzL2uf8YczoKooOL4J/ICAp8Gyl2oj0cVflsWi7irg0eVB3hn01BAoGAJJmq +PtdCSYlq5AzTiD9BfanA82uIWZTdD7LTR6ZjpGnLrXTdi7Cuo1ueQ+MXtVUSb4KS +sf2wTT2Eg2/7yuOX3n2lYfvoY1i3K9nWyiKvoLp6uHe9X/V1xdIOGHVFcij1SBWp +p5cQl1xDoK90qYScLyg4NVtYAZa3vmH5rOJv2Y0CgYBhTw9t4VkoCRFf9kLHw2w0 +aF0lx9IOpR8dB8fdP9toOUxTjkjosk203L6tRMhGIzyqLr5BGf6OF4q6BavHHfWV +yBoZzw5CanW2z6xD/c3RdBfa5UaLEB0LZ2EeVZGtM2XVDCyT9c8Ww1sIfE+zvJ6h +CR5pPLXFubs1VKv9yGmuIg== +-----END PRIVATE KEY----- diff --git a/nc_wms_web/src/views/business/wms/base/stock/stock-list.vue b/nc_wms_web/src/views/business/wms/base/stock/stock-list.vue index 5b47803..8879f27 100644 --- a/nc_wms_web/src/views/business/wms/base/stock/stock-list.vue +++ b/nc_wms_web/src/views/business/wms/base/stock/stock-list.vue @@ -226,7 +226,6 @@ import LocationSelect from "/@/views/business/wms/base/location/location-select. import DictLabel from "/@/components/support/dict-label/index.vue"; import {LoadingOutlined} from "@ant-design/icons-vue"; import {exportApi} from "/@/api/business/wms/export/export-api"; -import {itemApi} from "/@/api/business/wms/base/item/item-api"; // ---------------------------- 表格列 ---------------------------- let columns = ref([ @@ -530,7 +529,7 @@ const onExportStocks = async () => { // 发起导出请求 try { - itemApi.exportItems(taskId, queryForm, abortController.value.signal) + stockApi.exportStocks(taskId, queryForm, abortController.value.signal) } catch (error) { handleExportError(); } diff --git a/nc_wms_web/vite.config.ts b/nc_wms_web/vite.config.ts index 1e88b2d..33e5b50 100644 --- a/nc_wms_web/vite.config.ts +++ b/nc_wms_web/vite.config.ts @@ -9,6 +9,7 @@ import { resolve } from 'path'; import vue from '@vitejs/plugin-vue'; import customVariables from '/@/theme/custom-variables'; +import * as fs from "node:fs"; const pathResolve = (dir) => { return resolve(__dirname, '.', dir); @@ -36,8 +37,19 @@ export default { }, // 服务端渲染 server: { + https: { + key: fs.readFileSync('./server.key'), + cert: fs.readFileSync('./server.crt'), + }, host: '0.0.0.0', - port: 8080 + port: 8080, + proxy: { + '/api': { + target: 'https://localhost:8000', + changeOrigin: true, + secure: false, + } + } }, plugins: [vue()], optimizeDeps: {