diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index a68d521cf..b9b3e8584 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -773,4 +773,12 @@ module.exports = { adopt:'adopt', reviewedByThePersonInCharge:'Reviewed by the person in charge', onlyDeleted:'Only data whose list confirmation status is not initiated or rejected can be deleted', + experimentPassed:'Experiment passed', + experimentFailed:'Experiment failed', + toBeStarted:'To be started', + inProgress:'In Progress', + green:'green', + red:'red', + blue:'blue', + yellow:'yellow', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 4b9486900..5256016b6 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -778,4 +778,12 @@ module.exports = { adopt:'通过', reviewedByThePersonInCharge:'负责人审核', onlyDeleted:'只能删除清单确认状态为未发起或拒绝的数据', + experimentPassed:'实验通过', + experimentFailed:'实验失败', + toBeStarted:'待开始', + inProgress:'进行中', + green:'绿', + red:'红', + blue:'蓝', + yellow:'黄', } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index 6d4373b91..de9f8d171 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -431,12 +431,13 @@ this.bussLogList() }, DocumentSplitting() { - this.$router.push({ + let newUrl = this.$router.resolve({ path: '/docManage/splite', query: { serial_number: this.$route.query.serial_number } }) + window.open(newUrl.href, '_blank') }, detailClick(val) { let newUrl = this.$router.resolve({ diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 9d2c94df4..6b4257f52 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -39,10 +39,6 @@ {{$t('export')}} -
- - 发起1 -
- + 实验通过
-
+
+ + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationDirectory.vue b/jero-web/src/views/projectManagement/components/certificationDirectory.vue index d5c09b25b..a93c768c6 100644 --- a/jero-web/src/views/projectManagement/components/certificationDirectory.vue +++ b/jero-web/src/views/projectManagement/components/certificationDirectory.vue @@ -46,7 +46,6 @@ {{$t('submit')}} - diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue index 16bc52c35..d184c6aef 100644 --- a/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue +++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue @@ -321,7 +321,10 @@ export default { color: red; } } - +.drawer-bootom-button{ + display: flex; + justify-content: center; +} \ No newline at end of file