From 9c30a3c93469963c833a35f6180e4c4012807c31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 19 Jun 2023 18:01:54 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=88=86=E4=BA=AB-=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BA=BA=E6=97=B6=EF=BC=8C=E4=B9=9F=E8=83=BD?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=AB=E4=BA=BA=E7=9A=84=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/phoneView/problemKnowledgeBase.vue | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/phoneView/problemKnowledgeBase.vue b/jero-web/src/views/phoneView/problemKnowledgeBase.vue index fe61bb78e..9853edf6e 100644 --- a/jero-web/src/views/phoneView/problemKnowledgeBase.vue +++ b/jero-web/src/views/phoneView/problemKnowledgeBase.vue @@ -83,7 +83,9 @@ {{$t('answer')}} -
+
{{$t('delete')}}
@@ -107,7 +109,9 @@
-
+
@@ -152,11 +156,22 @@ isDisplay: false, commentQuery: {}, sendDisplay: true, - num: 1 + num: 1, + userInfoQuery:{}, + administrators:false, } }, mounted() { document.title = 'NIO GRP' + this.administrators = false + this.userInfoQuery = this.userInfo() + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + this.userInfo().userRoleList.forEach(res => { + if (res.roleCode == 'admin') { + this.administrators = true + } + }) + } window.addEventListener('scroll', this.scrolling) window.addEventListener('mousedown', this.handleonmousedown) this.getQueryBy() From 021c10a1167303772a0a5e53d5476cca46c3c68b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 20 Jun 2023 10:06:07 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8A=9E=E7=90=86?= =?UTF-8?q?=E7=9A=84=E5=9C=B0=E6=96=B9=20=20=E7=BB=9F=E4=B8=80=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=20=E4=BB=BB=E5=8A=A1=E5=8A=9E=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + jero-web/src/views/phoneView/preHomoMangement.vue | 11 ++++++++--- jero-web/src/views/phoneView/processManagement.vue | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 8fd7bc99d..b8f690cc8 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1883,4 +1883,5 @@ module.exports = { nearlyYear:'Nearly a Year', browsingTime:'Browsing Time', pleaseViewOnPc:'Please view on PC', + taskHandling:'Task Handling', } \ 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 719ef3f71..49ec8d011 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1984,4 +1984,5 @@ module.exports = { nearlyYear:'近一年', browsingTime:'浏览时间', pleaseViewOnPc:'请在pc的查看', + taskHandling:'任务办理', } \ No newline at end of file diff --git a/jero-web/src/views/phoneView/preHomoMangement.vue b/jero-web/src/views/phoneView/preHomoMangement.vue index d84b7a3ec..763eada8c 100644 --- a/jero-web/src/views/phoneView/preHomoMangement.vue +++ b/jero-web/src/views/phoneView/preHomoMangement.vue @@ -91,14 +91,19 @@ {{queryForm.deliveryResult}}
- +
{{$t('resultofhandling')}} - * + + *
- +
{{$t('resultofhandling')}} From 1a819c836f6d052d53bdffcc15d8dca9312febed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 20 Jun 2023 11:54:04 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E6=A1=86=E5=90=8E=EF=BC=8C=E7=9B=B4=E6=8E=A5=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E9=94=AE=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/phoneView/problemKnowledgeBase.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-web/src/views/phoneView/problemKnowledgeBase.vue b/jero-web/src/views/phoneView/problemKnowledgeBase.vue index 9853edf6e..eb75acd8f 100644 --- a/jero-web/src/views/phoneView/problemKnowledgeBase.vue +++ b/jero-web/src/views/phoneView/problemKnowledgeBase.vue @@ -157,8 +157,8 @@ commentQuery: {}, sendDisplay: true, num: 1, - userInfoQuery:{}, - administrators:false, + userInfoQuery: {}, + administrators: false } }, mounted() { @@ -194,9 +194,9 @@ }, methods: { ...mapGetters(['userInfo']), - scrolling() { - this.isDisplay = false - }, + // scrolling() { + // this.isDisplay = false + // }, handleonmousedown(e) { if (e.srcElement.type == 'textarea' || e.target.type == 'textarea') { From 97ce536da85579489053a45a79f2bd55759ff00f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 20 Jun 2023 14:10:13 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83-=E7=AD=9B=E9=80=89=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=B8=8D=E7=BE=8E=E8=A7=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/phoneView/toDoCenter.vue | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/phoneView/toDoCenter.vue b/jero-web/src/views/phoneView/toDoCenter.vue index 1f0d79f4b..b8729d847 100644 --- a/jero-web/src/views/phoneView/toDoCenter.vue +++ b/jero-web/src/views/phoneView/toDoCenter.vue @@ -14,9 +14,9 @@ -
- -
+
+
+
@@ -731,6 +731,8 @@ margin-top: 0.38rem; position: relative; background: #fff; + display: flex; + overflow: hidden; } ::v-deep .van-tabs__line { @@ -756,12 +758,14 @@ ::v-deep .van-tabs { padding: 0 0.4rem; width: calc(100% - 1rem); + display: inline-block; } .search-right { position: absolute; + /*margin-right: 0.4rem;*/ + top: 1.55rem; right: 0.4rem; - top: 0; } .search-right-icon { From c386cc0af656e4e8fd7564561907433532a6adad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 20 Jun 2023 15:12:16 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83-=E7=AD=9B=E9=80=89=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=B8=8D=E7=BE=8E=E8=A7=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/phoneView/search.vue | 2 ++ jero-web/src/views/phoneView/searchList.vue | 17 ++++++++++------- jero-web/src/views/phoneView/toDoCenter.vue | 10 ++++++---- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/jero-web/src/views/phoneView/search.vue b/jero-web/src/views/phoneView/search.vue index 0cf965ecc..fd76a09c1 100644 --- a/jero-web/src/views/phoneView/search.vue +++ b/jero-web/src/views/phoneView/search.vue @@ -5,8 +5,10 @@ NIO GRP
+
+
diff --git a/jero-web/src/views/phoneView/searchList.vue b/jero-web/src/views/phoneView/searchList.vue index 29a555f81..1de911054 100644 --- a/jero-web/src/views/phoneView/searchList.vue +++ b/jero-web/src/views/phoneView/searchList.vue @@ -16,11 +16,13 @@ - +
+ +
@@ -348,11 +350,12 @@ } }) } else if (item.module_type_flag == 'WTZSK' || item.module_type_flag == 'ZSFX') { - this.recentBrowseAdd('Knowledge sharing', item.id) + let id = item.id.replace('base','') + this.recentBrowseAdd('Knowledge sharing', id) this.$router.push({ path: '/phoneProblemKnowledgeBase', query: { - id: item.id + id: id } }) } else if (item.module_type_flag == 'FGYB') { diff --git a/jero-web/src/views/phoneView/toDoCenter.vue b/jero-web/src/views/phoneView/toDoCenter.vue index b8729d847..0f0106c99 100644 --- a/jero-web/src/views/phoneView/toDoCenter.vue +++ b/jero-web/src/views/phoneView/toDoCenter.vue @@ -3,10 +3,12 @@
- +
+ +
From eb98dfe9975b6dffbe31971285ba7dc1cb513484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 20 Jun 2023 15:40:02 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=A0=E9=99=A4=E5=90=8E=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E5=86=8D=E6=98=BE=E7=A4=BA=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/phoneView/documentDetails.vue | 10 ++++++++-- .../src/views/phoneView/problemKnowledgeBase.vue | 8 +++++++- jero-web/src/views/phoneView/searchList.vue | 14 +++++++++----- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/phoneView/documentDetails.vue b/jero-web/src/views/phoneView/documentDetails.vue index 38bf80073..54f55a5da 100644 --- a/jero-web/src/views/phoneView/documentDetails.vue +++ b/jero-web/src/views/phoneView/documentDetails.vue @@ -148,7 +148,13 @@ }, methods: { iconClick() { - this.$router.go(-1) + if (this.$route.query.goRouter) { + this.$router.push({ + path: this.$route.query.goRouter + }) + } else { + this.$router.go(-1) + } }, getWdkCollectAndSubscribeInfoByUser() { getAction('/phone/search/getWdkCollectAndSubscribeInfoByUser', { id: this.$route.query.id }).then((res) => { @@ -528,6 +534,6 @@ } .header-right-text-color { - color: #01A0AC!important; + color: #01A0AC !important; } \ No newline at end of file diff --git a/jero-web/src/views/phoneView/problemKnowledgeBase.vue b/jero-web/src/views/phoneView/problemKnowledgeBase.vue index eb75acd8f..586df8389 100644 --- a/jero-web/src/views/phoneView/problemKnowledgeBase.vue +++ b/jero-web/src/views/phoneView/problemKnowledgeBase.vue @@ -207,7 +207,13 @@ } }, iconClick() { - this.$router.go(-1) + if (this.$route.query.goRouter) { + this.$router.push({ + path: this.$route.query.goRouter + }) + } else { + this.$router.go(-1) + } }, viewAdd() { let query = { diff --git a/jero-web/src/views/phoneView/searchList.vue b/jero-web/src/views/phoneView/searchList.vue index 1de911054..ed702c677 100644 --- a/jero-web/src/views/phoneView/searchList.vue +++ b/jero-web/src/views/phoneView/searchList.vue @@ -16,7 +16,7 @@ -
+ Date: Tue, 20 Jun 2023 15:45:30 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AFproHomo=E7=9A=84=E4=BA=A4=E4=BB=98=E7=89=A9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/phoneView/preHomoMangement.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/phoneView/preHomoMangement.vue b/jero-web/src/views/phoneView/preHomoMangement.vue index 763eada8c..1dc26f59f 100644 --- a/jero-web/src/views/phoneView/preHomoMangement.vue +++ b/jero-web/src/views/phoneView/preHomoMangement.vue @@ -51,7 +51,7 @@
{{$t('typeOfDeliverables')}} - {{queryForm.typeOfDeliverables || '--'}} + {{queryForm.deliverableTypeName || '--'}}
{{$t('deliverableTemplate')}}