From a1e3850f811db67168d5a07159246cfd111f35be Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 6 Nov 2025 15:12:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 3 +-- src/layout/components/Navbar.vue | 2 +- src/layout/index.vue | 5 ++++- src/router/index.js | 2 +- src/utils/request_formdata.js | 2 +- .../sub-manage/sub-entry-and-exit/entry-form.vue | 4 ++-- .../entry-and-exit-manage/person-entry/index.vue | 2 +- .../red-green-light-mange/dishonesty-person/index.vue | 2 +- vue.config.js | 2 +- 9 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.env.production b/.env.production index dab7dc0..12852c4 100644 --- a/.env.production +++ b/.env.production @@ -6,5 +6,4 @@ ENV = 'production' VUE_APP_ENV = 'production' # 安薪宝一体化平台/生产环境 -VUE_APP_BASE_API = '/gs-real-name-prod-api -' +VUE_APP_BASE_API = '/gs-real-name' diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 54ae816..f0a3954 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -114,7 +114,7 @@ export default { this.$store.dispatch('LogOut').then(() => { location.href = process.env.VUE_APP_ENV === 'production' - ? '/gs-real-name/index' + ? '/gs-realname/index' : '/index' }) }) diff --git a/src/layout/index.vue b/src/layout/index.vue index 1aec99d..8465fe1 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -201,7 +201,10 @@ export default { }, close() { this.$store.dispatch('LogOut').then(() => { - location.href = '/index' + location.href = + process.env.VUE_APP_ENV === 'production' + ? '/gs-realname/index' + : '/index' }) }, diff --git a/src/router/index.js b/src/router/index.js index 4141f2a..3117d14 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -266,5 +266,5 @@ export default new Router({ mode: 'history', // 去掉url中的# scrollBehavior: () => ({ y: 0 }), routes: constantRoutes, - base: process.env.VUE_APP_ENV === 'production' ? '/gs-real-name' : '', + base: process.env.VUE_APP_ENV === 'production' ? '/gs-realname' : '', }) diff --git a/src/utils/request_formdata.js b/src/utils/request_formdata.js index 9422111..774b353 100644 --- a/src/utils/request_formdata.js +++ b/src/utils/request_formdata.js @@ -221,7 +221,7 @@ service.interceptors.response.use( // location.href = '/index' location.href = process.env.VUE_APP_ENV === 'production' - ? '/gs-real-name/index' + ? '/gs-realname/index' : '/index' }) }) diff --git a/src/views/basic-manage/sub-manage/sub-entry-and-exit/entry-form.vue b/src/views/basic-manage/sub-manage/sub-entry-and-exit/entry-form.vue index 690b23d..27beb1a 100644 --- a/src/views/basic-manage/sub-manage/sub-entry-and-exit/entry-form.vue +++ b/src/views/basic-manage/sub-manage/sub-entry-and-exit/entry-form.vue @@ -76,7 +76,7 @@ - + diff --git a/src/views/construction-person/entry-and-exit-manage/person-entry/index.vue b/src/views/construction-person/entry-and-exit-manage/person-entry/index.vue index 32bd241..a07a3b0 100644 --- a/src/views/construction-person/entry-and-exit-manage/person-entry/index.vue +++ b/src/views/construction-person/entry-and-exit-manage/person-entry/index.vue @@ -317,7 +317,7 @@ export default { // 判断是否为测试环境 if (process.env.VUE_APP_ENV === 'production') { window.open( - window.origin + '/gs-real-name' + '/人员入场-模版.xlsx', + window.origin + '/gs-realname' + '/人员入场-模版.xlsx', ) } else { window.open(window.origin + '/人员入场-模版.xlsx') diff --git a/src/views/construction-person/red-green-light-mange/dishonesty-person/index.vue b/src/views/construction-person/red-green-light-mange/dishonesty-person/index.vue index bf49aca..fe60bbf 100644 --- a/src/views/construction-person/red-green-light-mange/dishonesty-person/index.vue +++ b/src/views/construction-person/red-green-light-mange/dishonesty-person/index.vue @@ -478,7 +478,7 @@ export default { // 判断是否为测试环境 if (process.env.VUE_APP_ENV === 'production') { window.open( - window.origin + '/gs-real-name' + '/失信人员-模板.xlsx', + window.origin + '/gs-realname' + '/失信人员-模板.xlsx', ) } else { window.open(window.origin + '/失信人员-模板.xlsx') diff --git a/vue.config.js b/vue.config.js index 2b1f501..2bbd2da 100644 --- a/vue.config.js +++ b/vue.config.js @@ -18,7 +18,7 @@ module.exports = { // 部署生产环境和开发环境下的URL。 // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 例如 https://www.bonus.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.bonus.vip/admin/，则设置 baseUrl 为 /admin/。 - publicPath: process.env.NODE_ENV === 'production' ? '/gs-real-name' : '/', + publicPath: process.env.NODE_ENV === 'production' ? '/gs-realname' : '/', // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） outputDir: 'dist', // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） From 29646b41c201278accd4d43f7536eea04a37d249 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 6 Nov 2025 15:18:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=88=86=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=9C=BA=E7=9A=84=E6=B3=95=E4=BA=BA=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sub-manage/sub-entry-and-exit/config.js | 2 +- .../sub-entry-and-exit/entry-details.vue | 19 +------ .../sub-entry-and-exit/entry-form.vue | 50 +++++++++---------- 3 files changed, 28 insertions(+), 43 deletions(-) diff --git a/src/views/basic-manage/sub-manage/sub-entry-and-exit/config.js b/src/views/basic-manage/sub-manage/sub-entry-and-exit/config.js index acf533f..5ad9e13 100644 --- a/src/views/basic-manage/sub-manage/sub-entry-and-exit/config.js +++ b/src/views/basic-manage/sub-manage/sub-entry-and-exit/config.js @@ -52,7 +52,7 @@ export const columnsList = [ t_props: 'subEinTime', t_label: '分包入场时间', }, - { t_label: '授权委托书', t_slot: 'file-1' }, + // { t_label: '授权委托书', t_slot: 'file-1' }, { t_props: 'subExitTime', t_label: '分包出场时间', diff --git a/src/views/basic-manage/sub-manage/sub-entry-and-exit/entry-details.vue b/src/views/basic-manage/sub-manage/sub-entry-and-exit/entry-details.vue index 5adbaeb..64e2559 100644 --- a/src/views/basic-manage/sub-manage/sub-entry-and-exit/entry-details.vue +++ b/src/views/basic-manage/sub-manage/sub-entry-and-exit/entry-details.vue @@ -78,27 +78,12 @@ - + - - -
- + --> diff --git a/src/views/basic-manage/sub-manage/sub-entry-and-exit/entry-form.vue b/src/views/basic-manage/sub-manage/sub-entry-and-exit/entry-form.vue index 27beb1a..19db52b 100644 --- a/src/views/basic-manage/sub-manage/sub-entry-and-exit/entry-form.vue +++ b/src/views/basic-manage/sub-manage/sub-entry-and-exit/entry-form.vue @@ -221,35 +221,35 @@ export default { if (id) { params.id = id let reserveFileList = [] - businessLicense.forEach((item) => { - if (item.id) { - reserveFileList.push(item.id) - } - }) + // businessLicense.forEach((item) => { + // if (item.id) { + // reserveFileList.push(item.id) + // } + // }) - if (reserveFileList.length > 0) { - fileIdList = this.editUploadFileList - .filter( - (item) => - !reserveFileList.includes(item.id), - ) - .map((j) => j.id) + // if (reserveFileList.length > 0) { + // fileIdList = this.editUploadFileList + // .filter( + // (item) => + // !reserveFileList.includes(item.id), + // ) + // .map((j) => j.id) - if (fileIdList.length > 0) { - params.fileIdList = fileIdList - } - } + // if (fileIdList.length > 0) { + // params.fileIdList = fileIdList + // } + // } } - businessLicense.forEach((item) => { - if (!item.id) { - formData.append('files', item.raw) - fileMsg.push({ - type: 1, - name: '法定代表人授权书', - }) - } - }) + // businessLicense.forEach((item) => { + // if (!item.id) { + // formData.append('files', item.raw) + // fileMsg.push({ + // type: 1, + // name: '法定代表人授权书', + // }) + // } + // }) formData.append('fileMsg', JSON.stringify(fileMsg)) formData.append('params', JSON.stringify(params))