From 470c2528182137aafd78005d183156e59a7a27be Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Sun, 27 Apr 2025 09:39:53 +0800 Subject: [PATCH] up --- .env.development | 4 ++-- src/components/Tinymce/components/EditorImage.vue | 2 +- src/utils/common.js | 2 +- src/views/accident/index.vue | 2 +- src/views/daily/index.vue | 2 +- src/views/dashboard/components/addArticle.vue | 2 +- src/views/improvement/rule.vue | 4 ++-- src/views/improvement/score.vue | 3 ++- src/views/lawsfile/index/article.vue | 2 +- src/views/oafile/components/achieve.vue | 2 +- src/views/objective/meet.vue | 2 +- src/views/objective/standbook.vue | 2 +- src/views/objective/targetindex.vue | 2 +- src/views/practise/deal.vue | 2 +- src/views/practise/index.vue | 2 +- src/views/practise/plan.vue | 2 +- src/views/risk/hazardindex.vue | 2 +- src/views/risk/hiddendangerindex.vue | 2 +- src/views/risk/riskindex.vue | 4 ++-- src/views/site/equipment.vue | 2 +- src/views/site/health.vue | 2 +- src/views/site/safetyitem.vue | 2 +- src/views/task/list/components/addBackPlan.vue | 2 +- src/views/task/list/components/addPatrol copy.vue | 2 +- src/views/task/list/components/addPatrol.vue | 2 +- src/views/task/list/components/addPlan.vue | 2 +- src/views/task/list/components/addUnit.vue | 2 +- src/views/task/list/components/openLoad.vue | 2 +- src/views/task/list/components/showPatrol.vue | 2 +- src/views/training/event.vue | 2 +- src/views/training/record.vue | 2 +- vue.config.js | 2 +- 32 files changed, 36 insertions(+), 35 deletions(-) diff --git a/.env.development b/.env.development index 66b04d2..fd7eb91 100644 --- a/.env.development +++ b/.env.development @@ -2,6 +2,6 @@ ENV = 'development' # base api -#VUE_APP_BASE_API = 'http://192.168.60.99:8001/' +#VUE_APP_BASE_API = 'http://192.168.60.99:8001' VUE_APP_OUT_URL = 'http://192.168.60.24' -VUE_APP_BASE_API = http://192.168.60.99:9001/ +VUE_APP_BASE_API = http://192.168.60.99:9001 diff --git a/src/components/Tinymce/components/EditorImage.vue b/src/components/Tinymce/components/EditorImage.vue index bec7ddd..aa67197 100644 --- a/src/components/Tinymce/components/EditorImage.vue +++ b/src/components/Tinymce/components/EditorImage.vue @@ -37,7 +37,7 @@ }, data() { return { - action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + action: `${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, dialogVisible: false, listObj: {}, fileList: [], diff --git a/src/utils/common.js b/src/utils/common.js index 16a1e52..8af1e57 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -3,7 +3,7 @@ import { } from '@/utils/auth' let base = { downLoadFileUrl(id){ - window.open(process.env.VUE_APP_BASE_API + 'api/admin/download-file?id='+id+'&token='+getToken(),'_blank') + window.open(process.env.VUE_APP_BASE_API + '/api/admin/download-file?id='+id+'&token='+getToken(),'_blank') // return process.env.VUE_APP_BASE_API + 'api/admin/download-file?id='+id+'&token='+getToken() }, isPhone (val) { diff --git a/src/views/accident/index.vue b/src/views/accident/index.vue index 24c88e1..efb42a5 100644 --- a/src/views/accident/index.vue +++ b/src/views/accident/index.vue @@ -256,7 +256,7 @@ data() { return { - action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + action: `${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, touploadType: "", checkAll: false, isIndeterminate: true, diff --git a/src/views/daily/index.vue b/src/views/daily/index.vue index da9dbe0..c9fc324 100644 --- a/src/views/daily/index.vue +++ b/src/views/daily/index.vue @@ -207,7 +207,7 @@ "1": "已保存", "2": "已上报" }, - action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + action: `${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, checkAll: false, isIndeterminate: true, paginations: { diff --git a/src/views/dashboard/components/addArticle.vue b/src/views/dashboard/components/addArticle.vue index aba433c..e088de5 100644 --- a/src/views/dashboard/components/addArticle.vue +++ b/src/views/dashboard/components/addArticle.vue @@ -114,7 +114,7 @@ type: 'add', id: '', showTinymce:false, - action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + action: `${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, uploadOther: { token: "" }, diff --git a/src/views/improvement/rule.vue b/src/views/improvement/rule.vue index 2aa3e91..938626f 100644 --- a/src/views/improvement/rule.vue +++ b/src/views/improvement/rule.vue @@ -183,8 +183,8 @@ Tinymce }, data() { - return { - action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + return { + action:`${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, touploadType: "", checkAll: false, isIndeterminate: true, diff --git a/src/views/improvement/score.vue b/src/views/improvement/score.vue index a1ea5ee..070b4cc 100644 --- a/src/views/improvement/score.vue +++ b/src/views/improvement/score.vue @@ -221,7 +221,8 @@ Tinymce }, data() { - return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + return { + action:`${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, touploadType: "", checkAll: false, isIndeterminate: true, diff --git a/src/views/lawsfile/index/article.vue b/src/views/lawsfile/index/article.vue index dfc5937..e975a85 100644 --- a/src/views/lawsfile/index/article.vue +++ b/src/views/lawsfile/index/article.vue @@ -152,7 +152,7 @@ mounted() {}, data() { return { - action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + action: `${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, defaultProps: { children: 'children', label: 'name' diff --git a/src/views/oafile/components/achieve.vue b/src/views/oafile/components/achieve.vue index 1167b48..f997fd4 100644 --- a/src/views/oafile/components/achieve.vue +++ b/src/views/oafile/components/achieve.vue @@ -86,7 +86,7 @@ uploadOther: { token: "" }, - action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + action: `${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, upload_link:'', allMenus:[], normalizer: { diff --git a/src/views/objective/meet.vue b/src/views/objective/meet.vue index b740aba..34a2b32 100644 --- a/src/views/objective/meet.vue +++ b/src/views/objective/meet.vue @@ -209,7 +209,7 @@ }, data() { return { - action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + action: `${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, checkAll: false, isIndeterminate: true, infoFormVisible: false, diff --git a/src/views/objective/standbook.vue b/src/views/objective/standbook.vue index bd7bb06..6b1290d 100644 --- a/src/views/objective/standbook.vue +++ b/src/views/objective/standbook.vue @@ -118,7 +118,7 @@ Tinymce }, data() { - return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + return { action:`${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, paginations: { page: 1, page_size: 15, diff --git a/src/views/objective/targetindex.vue b/src/views/objective/targetindex.vue index 34cd143..2868cf2 100644 --- a/src/views/objective/targetindex.vue +++ b/src/views/objective/targetindex.vue @@ -242,7 +242,7 @@ Tinymce }, data() { - return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + return { action:`${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, checkAll: false, isIndeterminate: true, infoFormVisible: false, diff --git a/src/views/practise/deal.vue b/src/views/practise/deal.vue index 4d26ebb..8068b58 100644 --- a/src/views/practise/deal.vue +++ b/src/views/practise/deal.vue @@ -175,7 +175,7 @@ Tinymce }, data() { - return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + return { action:`${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, parameters: { practiseLevel: [], }, diff --git a/src/views/practise/index.vue b/src/views/practise/index.vue index 35d82a0..3bade5e 100644 --- a/src/views/practise/index.vue +++ b/src/views/practise/index.vue @@ -251,7 +251,7 @@ Tinymce }, data() { - return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + return { action:`${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, parameters: { practiseLevel: [], }, diff --git a/src/views/practise/plan.vue b/src/views/practise/plan.vue index f0c1370..dfd20db 100644 --- a/src/views/practise/plan.vue +++ b/src/views/practise/plan.vue @@ -150,7 +150,7 @@ Tinymce }, data() { - return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + return { action:`${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, parameters: { practiseLevel: [], }, diff --git a/src/views/risk/hazardindex.vue b/src/views/risk/hazardindex.vue index 28cbf47..21e70ea 100644 --- a/src/views/risk/hazardindex.vue +++ b/src/views/risk/hazardindex.vue @@ -141,7 +141,7 @@ Tinymce }, data() { - return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + return { action:`${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, parameters: { hazardLevel: [] }, diff --git a/src/views/risk/hiddendangerindex.vue b/src/views/risk/hiddendangerindex.vue index d3bc372..b32aeee 100644 --- a/src/views/risk/hiddendangerindex.vue +++ b/src/views/risk/hiddendangerindex.vue @@ -183,7 +183,7 @@ Tinymce }, data() { - return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + return { action:`${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, parameters: { hiddenLevel: [], hiddenType: [] diff --git a/src/views/risk/riskindex.vue b/src/views/risk/riskindex.vue index 04cf230..03e0800 100644 --- a/src/views/risk/riskindex.vue +++ b/src/views/risk/riskindex.vue @@ -182,7 +182,7 @@ Tinymce }, data() { - return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + return { action:`${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, checkAll: false, isIndeterminate: true, infoFormVisible:false, @@ -270,7 +270,7 @@ type: "level", width: 120, align:"center" - + }, { field: "overview", diff --git a/src/views/site/equipment.vue b/src/views/site/equipment.vue index ce6b597..97a15a7 100644 --- a/src/views/site/equipment.vue +++ b/src/views/site/equipment.vue @@ -177,7 +177,7 @@ Tinymce }, data() { - return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + return { action:`${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, parameters: { defectType: [], equipmentStatus:[] diff --git a/src/views/site/health.vue b/src/views/site/health.vue index 6790b69..b732ac3 100644 --- a/src/views/site/health.vue +++ b/src/views/site/health.vue @@ -190,7 +190,7 @@ Tinymce }, data() { - return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + return { action:`${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, checkAll: false, isIndeterminate: true, infoFormVisible:false, diff --git a/src/views/site/safetyitem.vue b/src/views/site/safetyitem.vue index 40931df..5b6dc5e 100644 --- a/src/views/site/safetyitem.vue +++ b/src/views/site/safetyitem.vue @@ -169,7 +169,7 @@ Tinymce }, data() { - return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + return { action:`${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, checkAll: false, isIndeterminate: true, infoFormVisible:false, diff --git a/src/views/task/list/components/addBackPlan.vue b/src/views/task/list/components/addBackPlan.vue index b6c13b2..3ea6aa8 100644 --- a/src/views/task/list/components/addBackPlan.vue +++ b/src/views/task/list/components/addBackPlan.vue @@ -116,7 +116,7 @@ uploadOther: { token: "" }, - action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + action: `${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, upload_link: '', allMenus: [], selsectMenu: [], diff --git a/src/views/task/list/components/addPatrol copy.vue b/src/views/task/list/components/addPatrol copy.vue index 81e7521..b073eae 100644 --- a/src/views/task/list/components/addPatrol copy.vue +++ b/src/views/task/list/components/addPatrol copy.vue @@ -230,7 +230,7 @@ groupObj:{}, showgroups:false, showCasc:true, - action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + action: `${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, pictureList: [], showPic: false, showPicUrl: '', diff --git a/src/views/task/list/components/addPatrol.vue b/src/views/task/list/components/addPatrol.vue index 294cf7a..78cd82a 100644 --- a/src/views/task/list/components/addPatrol.vue +++ b/src/views/task/list/components/addPatrol.vue @@ -194,7 +194,7 @@ groupObj:{}, showgroups:false, showCasc:true, - action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + action: `${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, pictureList: [], showPic: false, showPicUrl: '', diff --git a/src/views/task/list/components/addPlan.vue b/src/views/task/list/components/addPlan.vue index d219719..bd3cf41 100644 --- a/src/views/task/list/components/addPlan.vue +++ b/src/views/task/list/components/addPlan.vue @@ -156,7 +156,7 @@ uploadOther: { token: "" }, - action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + action: `${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, pictureList: [], deptOptions: [], userdata: [], diff --git a/src/views/task/list/components/addUnit.vue b/src/views/task/list/components/addUnit.vue index fda667b..b631eac 100644 --- a/src/views/task/list/components/addUnit.vue +++ b/src/views/task/list/components/addUnit.vue @@ -456,7 +456,7 @@ uploadOther: { token: "" }, - action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + action: `${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, pictureList: [], deptOptions: [], userOptions: [], diff --git a/src/views/task/list/components/openLoad.vue b/src/views/task/list/components/openLoad.vue index adf8cb8..ed3ba68 100644 --- a/src/views/task/list/components/openLoad.vue +++ b/src/views/task/list/components/openLoad.vue @@ -208,7 +208,7 @@ uploadOther: { token: "" }, - action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + action: `${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, fileList: [], formObj: {}, unitStartDate: '', diff --git a/src/views/task/list/components/showPatrol.vue b/src/views/task/list/components/showPatrol.vue index 736194a..436fe23 100644 --- a/src/views/task/list/components/showPatrol.vue +++ b/src/views/task/list/components/showPatrol.vue @@ -862,7 +862,7 @@ import elSelectTree from '@/components/selectTree' uploadOther: { token: "" }, - action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + action: `${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, pictureList: [], showPic: false, showPicUrl: '', diff --git a/src/views/training/event.vue b/src/views/training/event.vue index 361fb73..b5092ad 100644 --- a/src/views/training/event.vue +++ b/src/views/training/event.vue @@ -243,7 +243,7 @@ }, data() { return { - action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + action:`${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, paginations: { page: 1, page_size: 15, diff --git a/src/views/training/record.vue b/src/views/training/record.vue index f9bf4e4..3673b52 100644 --- a/src/views/training/record.vue +++ b/src/views/training/record.vue @@ -180,7 +180,7 @@ }, data() { return { - action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, + action: `${process.env.VUE_APP_BASE_API}/api/admin/upload-file`, evaluateOptions: [{ id: 1, name: "考试" diff --git a/vue.config.js b/vue.config.js index 8b49cd5..c1b0b04 100644 --- a/vue.config.js +++ b/vue.config.js @@ -25,7 +25,7 @@ module.exports = { * Detail: https://cli.vuejs.org/config/#publicpath */ publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin', - outputDir: '/Users/mac/Documents/朗业/2024/h-河道处项目/a-安全生产/safety-manage-service/public/admin_test', + outputDir: '/Users/mac/Documents/朗业/2024/h-河道处项目/a-安全生产/safety-manage-service/public/admin', assetsDir: 'static', lintOnSave: process.env.NODE_ENV === 'development', productionSourceMap: false,