diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index abeca523f..487daf815 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -179,7 +179,10 @@
- {{$t('submit')}} + + {{$t('tempSave')}} + + {{$t('release')}}
@@ -601,7 +604,10 @@ this.formInline[this.uploadName] = attIdList.join(',') this.formInline = { ...this.formInline } }, - submit() { + tempSaveClick(){ + + }, + submit(releaseStatus) { this.$refs.ruleForm.validate(valid => { if (valid) { let formInline = JSON.parse(JSON.stringify(this.formInline)) @@ -633,6 +639,7 @@ }) }) } + formInline.releaseStatus = releaseStatus Action(url, formInline).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) @@ -784,6 +791,7 @@ .box-button { height: 38px; margin-top: 4px; + margin-left: 10px; } .box-button-index { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 78057a352..daab20b60 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -344,7 +344,8 @@ pageNo: this.pageNo, pageSize: this.pageSize, searchStr: this.searchStr, - problemTypes: selectedTags.join(',') + problemTypes: selectedTags.join(','), + releaseStatus:'Have released' } this.loading = true getAction(this.url.getInfoList, query).then((res) => { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index cc029a5c3..16bc05889 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -12,16 +12,40 @@
- -
-
- {{$t('searchContent')}} + + + +
+
+ {{$t('searchContent')}} +
+ +
+
+ +
+
+ {{$t('releaseStatus')}} +
+ + + + {{ item.name}} + + + +
+
+
+ {{$t('query')}} + {{$t('reset')}} +
- - {{$t('query')}} - {{$t('reset')}} -
+
@@ -41,6 +65,9 @@
{{item.contentOne}}
+
+ {{item.releaseStatus == 'Draft'?$t('draft'):$t('HaveReleased')}} +
{{$t('edit')}} @@ -85,7 +112,17 @@ conList: [], total: 0, pageSize: 10, - searchStr: '', + queryParam: {}, + releaseStatusList: [ + { + name: this.$t('draft'), + value: 'Draft' + }, + { + name: this.$t('HaveReleased'), + value: 'Have released' + } + ], loading: false, administrators: false, downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', @@ -126,7 +163,7 @@ this.getList() }, ResetSearch() { - this.searchStr = '' + this.queryParam = {} this.pageNo = 1 this.getList() }, @@ -140,7 +177,7 @@ pageNo: this.pageNo, pageSize: this.pageSize, createBy: this.userInfo().username, - searchStr: this.searchStr + ...this.queryParam } this.loading = true getAction(this.url.getInfoList, query).then((res) => { @@ -285,11 +322,21 @@ .text-text-right { padding: 19px 19px; - width: calc(100% - 180px); + width: calc(100% - 300px); box-sizing: border-box; /*margin-left: 38px;*/ } + .text-text-right-text-One { + width: 120px; + height: 100%; + text-align: center; + position: absolute; + right: 180px; + top: 50%; + transform: translate-Y(-50%); + } + .text-text-right-text { width: 180px; height: 100%; @@ -365,16 +412,13 @@ .search-detail-wrap { width: 100%; - margin: 0 auto; + margin-bottom: 16px; } .box-title-text { line-height: 1.4; display: flex; align-items: center; - margin-bottom: 10px; - text-align: center; - justify-content: center; } .title-text { @@ -394,7 +438,7 @@ .box-input { /*min-width: 200px;*/ display: inline-block; - width: 50%; + width: 100%; height: 38px; margin-top: 2px; margin-right: 16px;