XCKJ
/
hir_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

部分问题修复
continuous-integration/drone/push Build is failing Details

main
wangxiaoshuang 2024-05-06 15:46:30 +08:00
parent 21d4289f72
commit cea2a70344
12 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -7,7 +7,7 @@ VUE_APP_BASE_PATH = '/'
VUE_APP_IS_TEST = false
# base api
VUE_APP_BASE_API = 'http://123.56.94.154:7050'
VUE_APP_BASE_API = 'http://106.14.89.110:7050'
VUE_CLI_BABEL_TRANSPILE_MODULES = false
@ -37,7 +37,7 @@ VUE_APP_WORD_FOR_PERMISSION = false
# dicom文件地址
# VUE_APP_DICOM_PATH = 'http://123.56.94.154:7050'
# VUE_APP_DICOM_PATH = 'http://106.14.89.110:7050'
VUE_APP_DICOM_PATH = 'https://zyypacs.oss-cn-shanghai.aliyuncs.com'
VUE_APP_DICOM_USA_PATH = 'https://zyypacs-usa.oss-us-west-1.aliyuncs.com'

4
.env.production
View File

@ -33,10 +33,10 @@ VUE_APP_WORD_FOR_PERMISSION = false
# dicom文件地址
# VUE_APP_DICOM_PATH = 'http://123.56.94.154:7050'
# VUE_APP_DICOM_PATH = 'http://106.14.89.110:7050'
VUE_APP_DICOM_PATH = 'https://zyypacs.oss-cn-shanghai.aliyuncs.com'
#VUE_APP_DICOM_PATH = 'http://123.56.94.154:7000'
#VUE_APP_DICOM_PATH = 'http://106.14.89.110:7000'
#VUE_APP_DICOM_PATH = 'https://zyypacs-mdc.oss-cn-shanghai.aliyuncs.com'
VUE_APP_DICOM_USA_PATH = 'https://zyypacs-usa.oss-us-west-1.aliyuncs.com'

2
.env.prop
View File

@ -27,7 +27,7 @@ VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!
VUE_APP_WORD_FOR_PERMISSION = false
# dicom文件地址
VUE_APP_DICOM_PATH = 'http://123.56.94.154:7020'
VUE_APP_DICOM_PATH = 'http://106.14.89.110:7020'
VUE_APP_OSS_CONFIG_REGION = 'oss-cn-shanghai'

2
irc_vue_drone.yml
View File

@ -41,7 +41,7 @@ clone:
disable: true #禁用默认克隆
server:
host: 123.56.94.154
host: 106.14.89.110
user: root
password:
from_secret: local_pwd

2
src/permission.js
View File

@ -45,7 +45,7 @@ router.beforeEach(async (to, from, next) => {
NProgress.done()
} else {
OSSclient()
const hasGetUserInfo = store.getters.name
const hasGetUserInfo = store.getters.userId
if (hasGetUserInfo) {
next()
} else {

3
src/store/modules/user.js
View File

@ -104,6 +104,7 @@ const actions = {
zzSessionStorage.setItem('userName', data.BasicInfo.UserName)
commit('SET_TOKEN', data.JWTStr)
commit('SET_NAME', data.BasicInfo.RealName)
zzSessionStorage.setItem('realName', data.BasicInfo.RealName)
zzSessionStorage.setItem('isTestUser', data.BasicInfo.IsTestUser)
commit('SET_ISTESTUSER', data.BasicInfo.IsTestUser)
commit('SET_USERNAME', data.BasicInfo.UserName)
@ -158,7 +159,7 @@ const actions = {
commit('SET_PERMISSIONS', JSON.parse(zzSessionStorage.getItem('permissions')))
commit('SET_ISTESTUSER', zzSessionStorage.getItem('isTestUser'))
const user = JSON.parse(userString)
commit('SET_NAME', user.realName)
commit('SET_NAME', zzSessionStorage.getItem('realName'))
commit('SET_USERID', user.id)
commit('SET_USERNAME', zzSessionStorage.getItem('userName'))
commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignSystemDocCount')))

2
src/views/dicom-show/dicom-series.vue
View File

@ -128,7 +128,7 @@ export default {
// imageIds.push(`wadouri:/api/instance/content/${item}`)
// })
// seriesInfo.InstanceList.forEach((id) => {
// imageIds.push(`wadouri:http://123.56.94.154:7000/instance/content/${id}`)
// imageIds.push(`wadouri:http://106.14.89.110:7000/instance/content/${id}`)
// })
seriesInfo.InstancePathList.forEach((path) => {
imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${path}`)

4
src/views/dicom-show/dicom-study.vue
View File

@ -207,7 +207,7 @@ export default {
// imageIds.push(`wadouri:/api/instance/content/${id}`)
// })
// item.InstanceList.forEach((id) => {
// imageIds.push(`wadouri:http://123.56.94.154:7000/instance/content/${id}`)
// imageIds.push(`wadouri:http://106.14.89.110:7000/instance/content/${id}`)
// })
item.InstancePathList.forEach((path) => {
imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${path}`)
@ -376,7 +376,7 @@ export default {
// imageIds.push(`wadouri:/api/instance/content/${item}`)
// })
// seriesInfo.InstanceList.forEach((id) => {
// imageIds.push(`wadouri:http://123.56.94.154:7000/instance/content/${id}`)
// imageIds.push(`wadouri:http://106.14.89.110:7000/instance/content/${id}`)
// })
seriesInfo.InstancePathList.forEach((path) => {
imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${path}`)

1
src/views/system/hospital/index.vue
View File

@ -165,6 +165,7 @@ export default {
this.$message.success(this.$t("common:message:savedSuccessfully"));
}
} catch (err) {
this.btnLoading = false;
console.log(err);
}
},

11
src/views/system/notice/index.vue
View File

@ -259,9 +259,7 @@
show-overflow-tooltip
>
<template slot-scope="scope">
{{
scope.row.StartDate ? scope.row.StartDate : scope.row.CreateTime
}}
{{ scope.row.EndDate ? scope.row.EndDate : scope.row.CreateTime }}
</template>
</el-table-column>
<el-table-column
@ -507,4 +505,11 @@ export default {
background-color: cadetblue;
}
}
.el-upload-list__item-name {
display: inline-block;
width: 70%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
</style>

2
src/views/trials/trials-inspection/components/research-trials-list.vue
View File

@ -207,6 +207,7 @@ export default {
this.total = this.list.length;
}
} catch (err) {
this.loading = false;
console.log(err);
}
},
@ -250,6 +251,7 @@ export default {
this.$emit("getList");
}
} catch (err) {
this.loading = false;
console.log(err);
}
},

10
vue.config.js
View File

@ -39,8 +39,8 @@ module.exports = {
// target: 'http://123.56.181.144:8001', // 国内生产环境
// target: 'http://123.56.181.144:8060/api', // 国内测试环境1
// target: 'http://123.56.181.144:8000/api', // 国内测试环境
// target: 'http://123.56.94.154:8079', // 国内测试环境2
target: 'http://123.56.94.154:30010', // 国内测试环境2
// target: 'http://106.14.89.110:8079', // 国内测试环境2
target: 'http://106.14.89.110:30010', // 国内测试环境2
// target: 'http://123.56.181.144:7000',
changeOrigin: true,
secure: false,
@ -49,7 +49,7 @@ module.exports = {
}
},
'/IRaCISData': {
target: 'http://123.56.94.154:30010', // 国内测试环境2
target: 'http://106.14.89.110:30010', // 国内测试环境2
// target: 'http://123.56.181.144:7000',
changeOrigin: true,
pathRewrite: {
@ -60,8 +60,8 @@ module.exports = {
// target: 'http://123.56.181.144:8001', // 国内生产环境
// target: 'http://123.56.181.144:8060/api', // 国内测试环境1
// target: 'http://123.56.181.144:8000/api', // 国内测试环境
// target: 'http://123.56.94.154:8079', // 国内测试环境2
target: 'http://123.56.94.154:30020', // 国内测试环境2
// target: 'http://106.14.89.110:8079', // 国内测试环境2
target: 'http://106.14.89.110:30020', // 国内测试环境2
// target: 'http://123.56.181.144:7000',
changeOrigin: true,
secure: false,