diff --git a/back/src/views/modules/workBench/api.js b/back/src/views/modules/workBench/api.js index 52da4412..add2d7d7 100644 --- a/back/src/views/modules/workBench/api.js +++ b/back/src/views/modules/workBench/api.js @@ -43,4 +43,44 @@ export const getHasToDoTask = (data, success, fail) => { }).catch(err => { fail && fail(err) }) +} + +// 上架统计《====》饼图 +export const getTotalByDept = (data, success, fail) => { + Request({ + methods: 'get', + url: '/resource/selectTotalByDept', + data + }).then(res => { + success && success(res) + }).catch(err => { + fail && fail(err) + }) +} + + +// 部门申请 +export const getApply = (data, success, fail) => { + Request({ + methods: 'get', + url: '/resource/selectTotalApplyByDept', + data + }).then(res => { + success && success(res) + }).catch(err => { + fail && fail(err) + }) +} + +// 部门需求 +export const getRequire = (data, success, fail) => { + Request({ + methods: 'get', + url: '/demanData/selectFlagCountByDepts', + data + }).then(res => { + success && success(res) + }).catch(err => { + fail && fail(err) + }) } \ No newline at end of file diff --git a/back/src/views/modules/workBench/components/dept-chart-view.vue b/back/src/views/modules/workBench/components/dept-chart-view.vue index 126c5706..fd740ca1 100644 --- a/back/src/views/modules/workBench/components/dept-chart-view.vue +++ b/back/src/views/modules/workBench/components/dept-chart-view.vue @@ -1,22 +1,208 @@ \ No newline at end of file diff --git a/back/src/views/modules/workBench/components/dept-todo-view.vue b/back/src/views/modules/workBench/components/dept-todo-view.vue index a500f1b8..74394017 100644 --- a/back/src/views/modules/workBench/components/dept-todo-view.vue +++ b/back/src/views/modules/workBench/components/dept-todo-view.vue @@ -114,6 +114,7 @@ export default { .list-box { width: 314px; height: 252px; + padding: 0 16px; } .list-item { diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue index a8033a0e..7f80c24f 100644 --- a/back/src/views/modules/workBench/workBench.vue +++ b/back/src/views/modules/workBench/workBench.vue @@ -4,9 +4,13 @@
- + +
+
+ + +
-
@@ -21,14 +25,16 @@ @@ -114,17 +184,19 @@ export default { .top { height: 284px; margin-bottom: 16px; - background: #fff; + } .dept-left { width: 836px; + background: #fff; + margin-right: 16px; } .dept-chart-box { width: 780px; height: 100%; - background: orange; + background: #fff; } } \ No newline at end of file diff --git a/front/src/views/detailsAll/components/Business/BusinessNavigation.vue b/front/src/views/detailsAll/components/Business/BusinessNavigation.vue index fa9f6e76..2c48888b 100644 --- a/front/src/views/detailsAll/components/Business/BusinessNavigation.vue +++ b/front/src/views/detailsAll/components/Business/BusinessNavigation.vue @@ -57,7 +57,7 @@ selectNow: { type: String, default: '' }, dataList: { type: Object, default: null }, }) - const select = ref('algorithm-display') + const select = ref('business-presentation') const list = ref([]) const selectNav = (key) => { select.value = key diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue index cdaa2258..9ccd0217 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue @@ -61,7 +61,7 @@ selectNow: { type: String, default: '' }, dataList: { type: Object, default: null }, }) - const select = ref('algorithm-display') + const select = ref('service-presentation') const list = ref([]) const selectNav = (key) => { select.value = key @@ -197,8 +197,6 @@ } }) list.value.push('关联能力') - list.value.push('图层信息') - list.value.push('使用方式') navList.value.forEach((item) => { console.log(item) if (list.value.indexOf(item.name) > -1) { diff --git a/front/src/views/home/components/KnowledgeBase.vue b/front/src/views/home/components/KnowledgeBase.vue index f4d0cc60..d3724da5 100644 --- a/front/src/views/home/components/KnowledgeBase.vue +++ b/front/src/views/home/components/KnowledgeBase.vue @@ -51,6 +51,7 @@