FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'fix_foton' 到 'FOTON'

Browse Source 
Fix foton

查看合并请求 laws-foton-slrs/foton-laws-system-front!8
This commit is contained in:
陈栋
2022-12-27 16:55:17 +08:00
parent 7aa09afa1a 46231403fd
commit 851a4b31db
6 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/roleManage/index.vue
+6 -3
View File
@@ -171,7 +171,7 @@
:data="treeData3" :data="treeData3"
:props="defaultProps3" :props="defaultProps3"
:default-checked-keys="nodeList2" :default-checked-keys="nodeList2"
default-expand-all :default-expanded-keys="defaultExpandedKeys"
highlight-current highlight-current
:expand-on-click-node="false" :expand-on-click-node="false"
:show-checkbox="true" :show-checkbox="true"
@@ -202,7 +202,7 @@
:data="treeData4" :data="treeData4"
:props="defaultProps3" :props="defaultProps3"
:default-checked-keys="nodeList4" :default-checked-keys="nodeList4"
default-expand-all :default-expanded-keys="defaultExpandedKeys"
highlight-current highlight-current
:expand-on-click-node="false" :expand-on-click-node="false"
:show-checkbox="true" :show-checkbox="true"
@@ -468,7 +468,8 @@ export default {
children: 'children', children: 'children',
label: 'menuName' label: 'menuName'
}, },
nodeList: [] nodeList: [],
defaultExpandedKeys:[]//默认展开的key
} }
}, },
methods: { methods: {
@@ -685,6 +686,8 @@ export default {
this.treeData4 = this.sortByKey(list1,"displaySeq") this.treeData4 = this.sortByKey(list1,"displaySeq")
} }
// 默认展开的key
this.defaultExpandedKeys = list1.map(item=>item.id)
}, },
sortByKey(ary, key) { sortByKey(ary, key) {
src/pages/details/otherStandardDetails/index.vue
+4 -1
View File
@@ -2161,7 +2161,10 @@ export default {
child6Func(child6) { child6Func(child6) {
const list = [] const list = []
if (child6 && child6.length > 1) { if (child6 && child6.length > 1) {
list.push(child6[0]) for(let i = 0 ; i < child6.length ; i++){
list.push(child6[i])
}
// list.push(child6[0])
return list return list
} }
return child6 return child6
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+2
View File
@@ -756,6 +756,7 @@
:disabled="formdisableflag" :disabled="formdisableflag"
:show-modify-name="true" :show-modify-name="true"
@fileSuccess="fileSuccess" @fileSuccess="fileSuccess"
:limit="['FBGBJBD','FBGYWBD','XDB','KWJ','ZBJBD'].some(item => item===field.attrField) ? 20 : 8"
></custom-file> ></custom-file>
</template> </template>
<template v-else-if="field.attrType === 'TEXTAREA'"> <template v-else-if="field.attrType === 'TEXTAREA'">
@@ -3732,6 +3733,7 @@ export default {
}) })
this.dynamicFormField = displayLocation this.dynamicFormField = displayLocation
this.loading = false this.loading = false
console.log(this.dynamicFormField)
}) })
}) })
}) })
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+2
View File
@@ -854,6 +854,7 @@
v-model="sarBussionessStandEO[field.attrField]" v-model="sarBussionessStandEO[field.attrField]"
:disabled="formdisableflag" :disabled="formdisableflag"
:show-modify-name="true" :show-modify-name="true"
:limit="['FBGBJBD','FBGYWBD','XDB','KWJ','ZBJBD'].some(item => item===field.attrField) ? 20 : 8"
></custom-file> ></custom-file>
</template> </template>
<template v-else-if="field.attrType === 'TEXTAREA'"> <template v-else-if="field.attrType === 'TEXTAREA'">
@@ -3874,6 +3875,7 @@ export default {
}) })
this.dynamicFormField = displayLocation this.dynamicFormField = displayLocation
this.loading = false this.loading = false
console.log(this.dynamicFormField)
}) })
this.sarBussionessStandEO = JSON.parse(JSON.stringify(item)) this.sarBussionessStandEO = JSON.parse(JSON.stringify(item))
this.sarBussionessStandEO["XCSJBUSS"] = this.dateFormatter() this.sarBussionessStandEO["XCSJBUSS"] = this.dateFormatter()
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+4
View File
@@ -951,6 +951,7 @@
:disabled="formdisableflag" :disabled="formdisableflag"
:show-modify-name="true" :show-modify-name="true"
@fileSuccess="fileSuccess" @fileSuccess="fileSuccess"
:limit="20"
></custom-file> ></custom-file>
</template> </template>
<template v-else-if="field.attrType === 'FILE' && field.attrField === 'FBGYWBD'"> <template v-else-if="field.attrType === 'FILE' && field.attrField === 'FBGYWBD'">
@@ -960,6 +961,7 @@
:disabled="formdisableflag" :disabled="formdisableflag"
:show-modify-name="true" :show-modify-name="true"
@fileSuccess="fileSuccess" @fileSuccess="fileSuccess"
:limit="20"
></custom-file> ></custom-file>
</template> </template>
</template> </template>
@@ -1207,6 +1209,7 @@
v-model="sarStandardsInfoEO[field.attrField]" v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag" :disabled="formdisableflag"
@fileSuccess="fileSuccess" @fileSuccess="fileSuccess"
:limit="['XDB','KWJ','ZBJBD'].some(item => item===field.attrField) ? 20 : 8"
></custom-file> ></custom-file>
</template> </template>
<template v-else-if="field.attrType === 'TEXTAREA'"> <template v-else-if="field.attrType === 'TEXTAREA'">
@@ -3136,6 +3139,7 @@ export default {
}) })
this.dynamicFormField = displayLocation this.dynamicFormField = displayLocation
this.loading = false this.loading = false
console.log(this.dynamicFormField)
}) })
}) })
}) })
src/sysConfig/index.js
+22 -22
View File
@@ -5,26 +5,26 @@
*/ */
// 服务器地址 // 服务器地址
// const devIp = '39.98.140.126' // const devIp = '39.98.140.126'
// const devInterfacePORT = '10005' // const devInterfacePORT = '4202'
// const devIp = '192.168.10.6' // const devIp = '192.168.1.42'
// const devInterfacePORT = '9999'
const devIp = '10.10.10.46'
const devInterfacePORT = '4202'
// const devIp = '10.0.3.11'
// const devIp = 'localhost'
// const devInterfacePORT = '10086'
// const devIp = '62.234.136.153' // const devIp = '62.234.136.153'
// const devInterfacePORT = '8033' // const devInterfacePORT = '8033'
const devIp = '10.19.11.243'
const devInterfacePORT = '4304'
// 配置 idm 认证 // 配置 idm 认证
const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri=' const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
const ssoLogout = 'http://sso.foton.com.cn/logout?service='
// 配置 前端服务 // 配置 前端服务
const devWebUrl = 'https://srms.foton.com.cn/#/' const devWebUrl = 'http://62.234.136.153:8038/#/'
// webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录) // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
const webLoginType = 'idm' const webLoginType = 'dev'
// 配置onlyOffice 前端服务 // 配置onlyOffice 前端服务
const onlyOfficeUrl = 'http://10.100.5.116:8088' // const onlyOfficeUrl = 'http://127.0.0.1:8080'
const onlyOfficeUrl = 'http://10.10.10.46:8889'
// 配置 kkFileView 前端服务
const kkFileViewUrl = 'https://srms.foton.com.cn/preview'
// 云端端口号 // 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -48,10 +48,12 @@ const processPort = '17210'
*****************************************************************/ *****************************************************************/
// 生产环境配置 // 生产环境配置
// const prodIp = '62.234.136.153' // const prodIp = '39.98.140.126'
// const prodInterfacePORT = '8033' // const prodInterfacePORT = '4201'
const prodIp = 'srms.foton.com.cn' const prodIp = '10.10.10.46'
const prodInterfacePORT = '' const prodInterfacePORT = '4202'
// const prodIp = 'slrs.foton.com.cn'
// const prodInterfacePORT = ''
// 判断环境 // 判断环境
const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp
@@ -59,16 +61,14 @@ const interfacePORT = process.env.NODE_ENV === 'production' ? prodInterfacePORT
const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLOUD_RES_INTERFACE_PORT : DEV_CLOUD_RES_INTERFACE_PORT const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLOUD_RES_INTERFACE_PORT : DEV_CLOUD_RES_INTERFACE_PORT
module.exports = { module.exports = {
baseUrl: 'https://' + serverIP + ':' + interfacePORT, baseUrl: 'http://' + serverIP + ':' + interfacePORT,
webLoginType: webLoginType, webLoginType: webLoginType,
ssoLoginUrlDev: ssoLogin + devWebUrl, ssoLoginUrlDev: ssoLogin + devWebUrl,
ssoLogoutUrlDev: ssoLogout + devWebUrl,
ssoLoginUrl: ssoLogin, ssoLoginUrl: ssoLogin,
onlyOfficeUrl: onlyOfficeUrl, onlyOfficeUrl: onlyOfficeUrl,
kkFileViewUrl: kkFileViewUrl,
devWebUrl: devWebUrl, devWebUrl: devWebUrl,
serverUrl: 'https://' + serverIP, // 服务器IP地址 serverUrl: 'http://' + serverIP, // 服务器IP地址
interfaceUrl: 'https://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,
cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址, cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址,
simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址 simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址
multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址 multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址
@@ -78,4 +78,4 @@ module.exports = {
enterprise: enterprise, // GQ广汽 SJZX数据中心 enterprise: enterprise, // GQ广汽 SJZX数据中心
theme: theme, // 主题 theme: theme, // 主题
processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow` processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow`
} }