You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/03/24 11:40:14 UTC
[incubator-linkis] 03/07: Dev 1.1.1 web (#6)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 38357e06520aa8ae746bc15b1c24f417322e8920
Author: 李为 <12...@qq.com>
AuthorDate: Tue Mar 15 16:36:45 2022 +0800
Dev 1.1.1 web (#6)
* fix: issue 1650 and 1596
* change execID in viewHistory
* fix: bug
* change zh
Co-authored-by: liveipooli(李为) <li...@webank.com>
---
web/src/apps/linkis/i18n/common/zh.json | 4 ++--
web/src/apps/linkis/module/globalHistoryManagement/index.vue | 1 +
web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue | 4 +---
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/web/src/apps/linkis/i18n/common/zh.json b/web/src/apps/linkis/i18n/common/zh.json
index 0bb7189..92c6525 100644
--- a/web/src/apps/linkis/i18n/common/zh.json
+++ b/web/src/apps/linkis/i18n/common/zh.json
@@ -154,8 +154,8 @@
"placeholder": "请选择起始日期"
},
"creator": {
- "label": "创建人",
- "placeholder": "请输入创建人搜索"
+ "label": "应用",
+ "placeholder": "请输入应用搜索"
},
"engine": {
"label": "引擎"
diff --git a/web/src/apps/linkis/module/globalHistoryManagement/index.vue b/web/src/apps/linkis/module/globalHistoryManagement/index.vue
index b4b8ef7..a973a79 100644
--- a/web/src/apps/linkis/module/globalHistoryManagement/index.vue
+++ b/web/src/apps/linkis/module/globalHistoryManagement/index.vue
@@ -352,6 +352,7 @@ export default {
const query = {
taskID: params.row.taskID,
execID: params.row.strongerExecId,
+ status: params.row.status,
fileName
}
if (this.isAdminModel) {
diff --git a/web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue b/web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue
index 01ec0d8..51184ad 100644
--- a/web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue
+++ b/web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue
@@ -41,7 +41,6 @@
</div>
</template>
<script>
-import storage from '@/common/helper/storage'
import result from '@/components/consoleComponent/result.vue'
import log from '@/components/consoleComponent/log.vue'
import api from '@/common/service/api'
@@ -302,9 +301,8 @@ export default {
if (this.$route.query.proxyUser) {
params.proxyUser = this.$route.query.proxyUser
}
- const lastSearch = storage.get('last-searchbar-status')
let openLog = {}
- if (lastSearch && (lastSearch.status === 'Scheduled' || lastSearch.status === 'Running')) {
+ if (this.$route.query.status === 'Scheduled' || this.$route.query.status === 'Running') {
const tempParams = {
fromLine: this.fromLine,
size: -1,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org