Merge branch 'fix_20240123_UAT' into 'master'
Fix 20240123 uat See merge request laws-foton-slrs/foton-laws-system-front!151
This commit is contained in:
@@ -21,6 +21,7 @@
|
|||||||
title="其他起草人"
|
title="其他起草人"
|
||||||
:name.sync="roleForm.bussUser2Name"
|
:name.sync="roleForm.bussUser2Name"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
|
multiple
|
||||||
/>
|
/>
|
||||||
<TimeLineFormItem
|
<TimeLineFormItem
|
||||||
:id.sync="roleForm.bussUser3"
|
:id.sync="roleForm.bussUser3"
|
||||||
@@ -45,6 +46,7 @@
|
|||||||
title="各事业部标准化员(时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-刘金英),项目组各PMT/PAT"
|
title="各事业部标准化员(时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-刘金英),项目组各PMT/PAT"
|
||||||
:name.sync="roleForm.bussUser5Name"
|
:name.sync="roleForm.bussUser5Name"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
|
multiple
|
||||||
/>
|
/>
|
||||||
<TimeLineFormItem
|
<TimeLineFormItem
|
||||||
:id.sync="roleForm.bussUser6"
|
:id.sync="roleForm.bussUser6"
|
||||||
@@ -69,6 +71,7 @@
|
|||||||
title="总院项目总工、标准法规部高级经理/各事业部整车所产品经理、各事业部标准业务经理"
|
title="总院项目总工、标准法规部高级经理/各事业部整车所产品经理、各事业部标准业务经理"
|
||||||
:name.sync="roleForm.bussUser8Name"
|
:name.sync="roleForm.bussUser8Name"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
|
multiple
|
||||||
/>
|
/>
|
||||||
<TimeLineFormItem
|
<TimeLineFormItem
|
||||||
:id.sync="roleForm.bussUser10"
|
:id.sync="roleForm.bussUser10"
|
||||||
@@ -77,6 +80,7 @@
|
|||||||
title="产品工程经理、技术管理中心主任/事业部技术中心主任、标准法规部高级经理"
|
title="产品工程经理、技术管理中心主任/事业部技术中心主任、标准法规部高级经理"
|
||||||
:name.sync="roleForm.bussUser10Name"
|
:name.sync="roleForm.bussUser10Name"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
|
multiple
|
||||||
/>
|
/>
|
||||||
<TimeLineFormItem
|
<TimeLineFormItem
|
||||||
:id.sync="roleForm.bussUser12"
|
:id.sync="roleForm.bussUser12"
|
||||||
|
|||||||
+15
-13
@@ -1,5 +1,5 @@
|
|||||||
const theme = 'theme-one' // 主题(theme-one浅蓝色,theme-two深蓝色)
|
const theme = 'theme-one' // 主题(theme-one浅蓝色,theme-two深蓝色)
|
||||||
/*****************************************************************
|
/** ***************************************************************
|
||||||
<<<<<<<<< 主题修改 >>>>>>>>>
|
<<<<<<<<< 主题修改 >>>>>>>>>
|
||||||
1. 主题分为theme-one,theme-two两种
|
1. 主题分为theme-one,theme-two两种
|
||||||
2. 修改assets/styles/style.less文件,注释theme-one/theme-two
|
2. 修改assets/styles/style.less文件,注释theme-one/theme-two
|
||||||
@@ -21,11 +21,13 @@ const webLoginType = 'dev' // (后门登录、测试环境登录、本地环境
|
|||||||
|
|
||||||
// 配置kkFileView
|
// 配置kkFileView
|
||||||
const kkFileViewUrlDev = 'http://127.0.0.1:8012'
|
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
|
// 配置onlyOffice
|
||||||
const onlyOfficeUrlDev = 'http://127.0.0.1:8080'
|
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'
|
const devIp = 'localhost'
|
||||||
@@ -60,16 +62,16 @@ const baseUrl = protocol + IP + ':' + PORT
|
|||||||
const interfaceUrl = protocol + IP + ':' + PORT + '/api/' // 服务器端接口访问地址,
|
const interfaceUrl = protocol + IP + ':' + PORT + '/api/' // 服务器端接口访问地址,
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
baseUrl,
|
baseUrl,
|
||||||
interfaceUrl, // 服务器端接口访问地址,
|
interfaceUrl, // 服务器端接口访问地址,
|
||||||
simpleUploadPath, // 单文件上传地址
|
simpleUploadPath, // 单文件上传地址
|
||||||
multipleUploadPath, // 多文件上传地址
|
multipleUploadPath, // 多文件上传地址
|
||||||
|
|
||||||
webLoginType,
|
webLoginType,
|
||||||
ssoLogin,
|
ssoLogin,
|
||||||
ssoLogout,
|
ssoLogout,
|
||||||
|
|
||||||
kkFileViewUrl,
|
kkFileViewUrl,
|
||||||
onlyOfficeUrl,
|
onlyOfficeUrl,
|
||||||
theme, // 主题
|
theme, // 主题
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user