From 15d0c850c46e3c0300851827c9e6c6fc8285a3fb Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Mon, 5 Dec 2022 15:40:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9jire=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/mixins/view-module.js | 42 ++++++++++-------- .../views/modules/bscatalogue/bscatalogue.vue | 4 +- .../views/modules/notice/notice-user-view.vue | 2 + .../workBench/components/bottom-view.vue | 20 +++++++-- .../workBench/components/trend-view.vue | 7 +-- front/src/views/assertReport/image/jump.png | Bin 0 -> 464 bytes front/src/views/assertReport/index.vue | 18 ++++++-- .../Algorithm/AlgorithmTopDetails.vue | 8 ++-- .../Application/ApplicationTopDetails.vue | 4 +- .../Business/BusinessTopDetails.vue | 6 +-- .../Developer/DeveloperTopDetails.vue | 4 +- .../LayerService/LayerServiceTopDetails.vue | 4 +- 12 files changed, 76 insertions(+), 43 deletions(-) create mode 100644 front/src/views/assertReport/image/jump.png diff --git a/back/src/mixins/view-module.js b/back/src/mixins/view-module.js index a6a4c534..e65d2d34 100644 --- a/back/src/mixins/view-module.js +++ b/back/src/mixins/view-module.js @@ -71,26 +71,30 @@ export default { return this.$message.error(res.msg) } this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data - this.dataList.map((item, index) => { - if (this.dataList[index].type != null) { - switch (item.type) { - case 1: this.dataList[index].type = '省'; break - case 2: this.dataList[index].type = '市'; break - case 3: this.dataList[index].type = '区'; break - case 4: this.dataList[index].type = '企业'; break - } - } - if (item.children != null) { - item.children.map((item2, index2) => { - switch (item2.type) { - case 1: this.dataList[index].children[index2].type = '省'; break - case 2: this.dataList[index].children[index2].type = '市'; break - case 3: this.dataList[index].children[index2].type = '区'; break - case 4: this.dataList[index].children[index2].type = '企业'; break + if(!['/sys/notice/page','/sys/notice/mynotice/page'].includes(this.mixinViewModuleOptions.getDataListURL)){//我得通知、通知管理不需要特殊处理 + this.dataList.map((item, index) => { + if (this.dataList[index].type != null) { + switch (item.type) { + case 1: this.dataList[index].type = '省'; break + case 2: this.dataList[index].type = '市'; break + case 3: this.dataList[index].type = '区'; break + case 4: this.dataList[index].type = '企业'; break } - }) - } - }) + } + if (item.children != null) { + item.children.map((item2, index2) => { + switch (item2.type) { + case 1: this.dataList[index].children[index2].type = '省'; break + case 2: this.dataList[index].children[index2].type = '市'; break + case 3: this.dataList[index].children[index2].type = '区'; break + case 4: this.dataList[index].children[index2].type = '企业'; break + } + }) + } + }) + + } + // 我的代办特殊处理 if (this.mixinViewModuleOptions.getDataListURL === '/act/task/myToDoTaskPage') { this.$http.get('/sys/user/info').then(userRes => { diff --git a/back/src/views/modules/bscatalogue/bscatalogue.vue b/back/src/views/modules/bscatalogue/bscatalogue.vue index e35fda0a..9040892e 100644 --- a/back/src/views/modules/bscatalogue/bscatalogue.vue +++ b/back/src/views/modules/bscatalogue/bscatalogue.vue @@ -65,12 +65,12 @@ -
+
- {{ + {{ isRemoveCard ? '完成' : '编辑' }}
diff --git a/back/src/views/modules/notice/notice-user-view.vue b/back/src/views/modules/notice/notice-user-view.vue index abbb5c5c..e12543d4 100644 --- a/back/src/views/modules/notice/notice-user-view.vue +++ b/back/src/views/modules/notice/notice-user-view.vue @@ -48,10 +48,12 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg) } + this.dataForm = { ...this.dataForm, ...res.data } + console.log("========================this.dataForm",this.dataForm) }).catch(() => {}) } } diff --git a/back/src/views/modules/workBench/components/bottom-view.vue b/back/src/views/modules/workBench/components/bottom-view.vue index 4e0b1e4e..d52be568 100644 --- a/back/src/views/modules/workBench/components/bottom-view.vue +++ b/back/src/views/modules/workBench/components/bottom-view.vue @@ -3,8 +3,8 @@
-
-
+
+
{{ item.createDate }}
@@ -16,6 +16,13 @@
查看更多 >
+
+ 暂无数据 +
@@ -156,7 +163,14 @@ export default { box-sizing: border-box; display: flex; justify-content: space-between; - + .no-data { + width: 800px; + height: 335px; + line-height: 335px; + font-size: 16px; + color: #212121; + text-align: center; +} .container { background: #fff; width: 800px; diff --git a/back/src/views/modules/workBench/components/trend-view.vue b/back/src/views/modules/workBench/components/trend-view.vue index f19d4dc1..51a5b004 100644 --- a/back/src/views/modules/workBench/components/trend-view.vue +++ b/back/src/views/modules/workBench/components/trend-view.vue @@ -68,7 +68,7 @@ export default { const valueItem = y + '-' + m + '-' + d // 组合 days.unshift(valueItem) // 添加至数组 } - console.log('最近七天日期：', days) + return days }, @@ -88,6 +88,7 @@ export default { endDate: this.endDate }, (res) => { + // if (res.data.code !== 0) { // return // } @@ -111,7 +112,7 @@ export default { ydata: [] } } - + this.$nextTick(() => { trendLineChart('trendId', this.trendChartData) }) @@ -124,7 +125,7 @@ export default { handleTitleSwitch (idx) { this.selectedTitle = idx this.startDate = this.getData(this.selectedTitle == 0 ? 7 : 30) - console.log(this.startDate) + this.initChart() }, getData (aa) { diff --git a/front/src/views/assertReport/image/jump.png b/front/src/views/assertReport/image/jump.png new file mode 100644 index 0000000000000000000000000000000000000000..69351b985a93a7ce0644fefa242ca011ebcb1a1f GIT binary patch literal 464 zcmV;>0WbcEP)Px$ib+I4R7gv;l)+H~K@dg%Z%Vvw2zU{_5dlsH5W(*dfg#m7`=3Pv(`Px*c@~{Z4EA~L677k3H_mJ7A zmNd!v7}t$puY&jSWmoS6*;r(kK{uEP@S?z2fYOJRsz0Xjb`_>n9Z+P(`#7uNx*V3I z6m`Pyb-8=yAUI_eok)K%*0*8gt&CkudkYgKGN1M_*Bl0SP}PG;LoqG9O8m+2)k$TfkEpFa@O!{ z6>>Fu0<2NT(zyMS}wQ`m@RcQo0zUI$g}^ON3V@5oG( z-AMU$DGqh;3+xxcV54*0kP?D(KE!Dqds4;i619msA?6E}`7b7aL3$ei0000累计节省财政资金
-