diff --git a/.env.development b/.env.development index 16218d7..8c75217 100644 --- a/.env.development +++ b/.env.development @@ -11,9 +11,10 @@ ENV = development # VITE_API_URL =http://yxfcfs.natappfree.cc/api/tenant # VITE_API_WS = ws://2pggyb.natappfree.cc/api/websocket -# VITE_API_URL = http://123.60.153.169:8104/api/tenant -# VITE_API_WS = ws://123.60.153.169:8104/api/websocket -# VITE_API_WPSADDIN = http://123.60.153.169:8101/wpsaddin/ +VITE_API_URL = http://123.60.153.169:8104/api/tenant +VITE_API_WS = ws://123.60.153.169:8104/api/websocket +VITE_API_WPSADDIN = http://123.60.153.169:8101/wpsaddin/ +VITE_API_CANKAO = https://cankao.cs.com.cn/apih5 # VITE_API_URL = https://test.smartjinrui.cn/api/tenant # VITE_API_WS = wss://test.smartjinrui.cn/api/websocket @@ -23,9 +24,10 @@ ENV = development # VITE_API_WS = wss://aicaibao.cs.com.cn/api/websocket # VITE_API_WPSADDIN = https://aicaibao.cs.com.cn/wpsaddin/ -VITE_API_URL = http://10.127.2.206:8104/api/tenant -VITE_API_WS = ws://10.127.2.206:8104/api/websocket -VITE_API_WPSADDIN =http://10.127.2.206:8104/wpsaddin/ +# VITE_API_URL = http://10.127.2.206:8104/api/tenant +# VITE_API_WS = ws://10.127.2.206:8104/api/websocket +# VITE_API_WPSADDIN =http://10.127.2.206:8104/wpsaddin/ +# VITE_API_CANKAO = https://cankao.cs.com.cn/apih5 # VITE_API_URL = https://aicaibao.cs.com.cn/api/tenant # VITE_API_WS = wss://aicaibao.cs.com.cn/api/websocket diff --git a/.env.production b/.env.production index c1e5cb1..a81eaf5 100644 --- a/.env.production +++ b/.env.production @@ -5,15 +5,19 @@ ENV = production # VITE_API_URL = http://123.60.153.169:8104/api/tenant # VITE_API_WS = ws://123.60.153.169:8104/api/websocket # VITE_API_WPSADDIN = http://123.60.153.169:8101/wpsaddin/ +# VITE_API_CANKAO = https://cankao.cs.com.cn/apih5 VITE_API_URL = https://aicaibao.cs.com.cn/api/tenant VITE_API_WS = wss://aicaibao.cs.com.cn/api/websocket VITE_API_WPSADDIN = https://aicaibao.cs.com.cn/wpsaddin/ +VITE_API_CANKAO = https://cankao.cs.com.cn/apih5 # VITE_API_URL = https://test.smartjinrui.cn/api/tenant # VITE_API_WS = wss://test.smartjinrui.cn/api/websocket # VITE_API_WPSADDIN =https://test.smartjinrui.cn/wpsaddin/ +# VITE_API_CANKAO = https://cankao.cs.com.cn/apih5 # VITE_API_URL = http://10.127.2.206:8104/api/tenant # VITE_API_WS = ws://10.127.2.206:8104/api/websocket -# VITE_API_WPSADDIN =http://10.127.2.206:8104/wpsaddin/ \ No newline at end of file +# VITE_API_WPSADDIN =http://10.127.2.206:8104/wpsaddin/ +# VITE_API_CANKAO = https://cankao.cs.com.cn/apih5 \ No newline at end of file diff --git a/src/components/Filter/HeadFilter.vue b/src/components/Filter/HeadFilter.vue index fa53716..9dc602d 100644 --- a/src/components/Filter/HeadFilter.vue +++ b/src/components/Filter/HeadFilter.vue @@ -10,7 +10,7 @@ - + - + diff --git a/src/components/Upload/UploadDialogKua.vue b/src/components/Upload/UploadDialogKua.vue index bca5fb3..c4eb497 100644 --- a/src/components/Upload/UploadDialogKua.vue +++ b/src/components/Upload/UploadDialogKua.vue @@ -9,7 +9,9 @@ - + diff --git a/src/components/Upload/UploadDialogMultiple.vue b/src/components/Upload/UploadDialogMultiple.vue index 4defcd9..a9ee43a 100644 --- a/src/components/Upload/UploadDialogMultiple.vue +++ b/src/components/Upload/UploadDialogMultiple.vue @@ -18,7 +18,7 @@ - + diff --git a/src/components/Upload/index.vue b/src/components/Upload/index.vue index 958d718..6139ead 100644 --- a/src/components/Upload/index.vue +++ b/src/components/Upload/index.vue @@ -143,6 +143,13 @@ async function onBeforeUpload(res) { canGo = false; ElMessage.error('请上传PDF或docx文件'); } + + // // 限制10M大小 + // if (res.size > 10 * 1024 * 1024) { + // canGo = false; + // ElMessage.error('文件大小不能超过10M'); + // } + // let { code, data } = await getWordFlag({}); // if (code == 200) { // console.log('🚀 ~ onBeforeUpload ~ data:', data); diff --git a/src/stores/dashboard.ts b/src/stores/dashboard.ts index 528fa5e..f314529 100644 --- a/src/stores/dashboard.ts +++ b/src/stores/dashboard.ts @@ -62,7 +62,7 @@ export const useDashboard = defineStore('dashboard', { daterange: '', headFilter: { year: '2025', - reportType: 1, + reportType: 0, type: type, }, firstFilter: { diff --git a/src/views/pages/dashboard/components/DashboardTable/index.vue b/src/views/pages/dashboard/components/DashboardTable/index.vue index b9c38b1..87bd127 100644 --- a/src/views/pages/dashboard/components/DashboardTable/index.vue +++ b/src/views/pages/dashboard/components/DashboardTable/index.vue @@ -1,7 +1,7 @@