diff --git a/.env.development b/.env.development index 1b31e81..15ae6a5 100644 --- a/.env.development +++ b/.env.development @@ -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' diff --git a/.env.production b/.env.production index 60e960b..68f45f4 100644 --- a/.env.production +++ b/.env.production @@ -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' diff --git a/.env.prop b/.env.prop index dfac3e1..4357c5d 100644 --- a/.env.prop +++ b/.env.prop @@ -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' diff --git a/README.md b/README.md index 66a9bff..6e2c219 100644 --- a/README.md +++ b/README.md @@ -1,2 +1 @@ -# hir_web - +[![Build Status](https://drone.frp.extimaging.com/api/badges/XCKJ/hir_web/status.svg)](https://drone.frp.extimaging.com/XCKJ/hir_web) diff --git a/src/permission.js b/src/permission.js index 1ae0024..746107b 100644 --- a/src/permission.js +++ b/src/permission.js @@ -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 { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 1b228ad..b24735c 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -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'))) diff --git a/src/utils/uploadZip.js b/src/utils/uploadZip.js index 5b01b3e..0e3a63d 100644 --- a/src/utils/uploadZip.js +++ b/src/utils/uploadZip.js @@ -15,6 +15,7 @@ export const downloadImage = async (id, id2) => { SubjectVisitId: id2 } let res = await requestPackageAndAnonymizImage(params); + flag[id2] = false; if (res.IsSuccess) { if (!res.Result) { Vue.prototype.$message.warning(Vue.prototype.$t("trials:upload:message:not")) @@ -28,10 +29,11 @@ export const downloadImage = async (id, id2) => { a.href = href; a.click(); URL.revokeObjectURL(href); - this.$nextTick(() => { + let timer = setTimeout(() => { a = null; href = null; - }); + timer = null; + }, 500) return 2; } else { return false; diff --git a/src/views/dicom-show/dicom-series.vue b/src/views/dicom-show/dicom-series.vue index f7f04cd..8d805dd 100644 --- a/src/views/dicom-show/dicom-series.vue +++ b/src/views/dicom-show/dicom-series.vue @@ -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}`) diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue index 3fabacb..5434ada 100644 --- a/src/views/dicom-show/dicom-study.vue +++ b/src/views/dicom-show/dicom-study.vue @@ -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}`) diff --git a/src/views/system/dicomAE/components/edit-dicom.vue b/src/views/system/dicomAE/components/edit-dicom.vue index e5b01e4..7682174 100644 --- a/src/views/system/dicomAE/components/edit-dicom.vue +++ b/src/views/system/dicomAE/components/edit-dicom.vue @@ -147,7 +147,7 @@ export default { Port: [ { required: true, - message: this.$t("common:ruleMessage:specify"), + message: this.$t("common:ruleMessage:portPattern"), trigger: "blur", }, { @@ -157,6 +157,20 @@ export default { message: this.$t("common:ruleMessage:portPattern"), trigger: "blur", }, + { + validator: (rule, value, callback) => { + if ( + value && + (String(value).includes(".") || + new RegExp(/\D/g).test(String(value))) + ) { + callback(new Error(this.$t("common:ruleMessage:portPattern"))); + } else { + callback(); + } + }, + trigger: "blur", + }, ], }, btnLoading: false, diff --git a/src/views/system/dicomAE/index.vue b/src/views/system/dicomAE/index.vue index 5261bb3..d9d3e51 100644 --- a/src/views/system/dicomAE/index.vue +++ b/src/views/system/dicomAE/index.vue @@ -92,6 +92,13 @@ }} + + diff --git a/src/views/trials/trials-inspection/components/research-trials-list.vue b/src/views/trials/trials-inspection/components/research-trials-list.vue index 34920c2..b9c9d7e 100644 --- a/src/views/trials/trials-inspection/components/research-trials-list.vue +++ b/src/views/trials/trials-inspection/components/research-trials-list.vue @@ -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); } }, diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue index 543bfac..a558ec8 100644 --- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue +++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue @@ -283,9 +283,13 @@ - {{ - $t("trials:trials-panel:hirVisit:EvaluationReport") - }} + {{ + $t("trials:trials-panel:hirVisit:EvaluationReport") + }} {{ $t("trials:reading:button:uploadImages") diff --git a/vue.config.js b/vue.config.js index f1e8e5d..bb553e3 100644 --- a/vue.config.js +++ b/vue.config.js @@ -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,