From af65d8ca34b988ecf68f677d28cd8392d2873c3e Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 25 Jan 2024 09:15:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?build:=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sysConfig/index.js | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index dfc5a60a0..45778edf7 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -1,5 +1,5 @@ const theme = 'theme-one' // 主题(theme-one浅蓝色,theme-two深蓝色) -/***************************************************************** +/** *************************************************************** <<<<<<<<< 主题修改 >>>>>>>>> 1. 主题分为theme-one,theme-two两种 2. 修改assets/styles/style.less文件,注释theme-one/theme-two @@ -21,11 +21,13 @@ const webLoginType = 'dev' // (后门登录、测试环境登录、本地环境 // 配置kkFileView const kkFileViewUrlDev = 'http://127.0.0.1:8012' -const kkFileViewUrlProd = 'https://srms.foton.com.cn/preview' +const kkFileViewUrlProd = 'https://srms.foton.com.cn/preview' // 线上 +// const kkFileViewUrlProd = 'http://47.92.92.38:8013/preview' // 39测试 // 配置onlyOffice const onlyOfficeUrlDev = 'http://127.0.0.1:8080' -const onlyOfficeUrlProd = 'http://10.100.5.116:8088' +const onlyOfficeUrlProd = 'http://10.100.5.116:8088' // 线上 +// const onlyOfficeUrlProd = 'http://39.98.140.126:8889' // 39测试 // 本地环境 const devIp = 'localhost' @@ -60,16 +62,16 @@ const baseUrl = protocol + IP + ':' + PORT const interfaceUrl = protocol + IP + ':' + PORT + '/api/' // 服务器端接口访问地址, module.exports = { - baseUrl, - interfaceUrl, // 服务器端接口访问地址, - simpleUploadPath, // 单文件上传地址 - multipleUploadPath, // 多文件上传地址 + baseUrl, + interfaceUrl, // 服务器端接口访问地址, + simpleUploadPath, // 单文件上传地址 + multipleUploadPath, // 多文件上传地址 - webLoginType, - ssoLogin, - ssoLogout, + webLoginType, + ssoLogin, + ssoLogout, - kkFileViewUrl, - onlyOfficeUrl, - theme, // 主题 + kkFileViewUrl, + onlyOfficeUrl, + theme, // 主题 } From c5a9a573e404fb4df67ae4421b146bedf1072593 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 25 Jan 2024 09:20:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86):?= =?UTF-8?q?=20=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk-product/components/PersonInfo.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/components/PersonInfo.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/components/PersonInfo.vue index a98801e28..4ad988da9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/components/PersonInfo.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/components/PersonInfo.vue @@ -21,6 +21,7 @@ title="其他起草人" :name.sync="roleForm.bussUser2Name" :disabled="disabled" + multiple />