diff --git a/back/src/views/modules/workBench/api.js b/back/src/views/modules/workBench/api.js index 283b2e2a..a7e698ec 100644 --- a/back/src/views/modules/workBench/api.js +++ b/back/src/views/modules/workBench/api.js @@ -85,12 +85,37 @@ export const getRequire = (data, success, fail) => { }) } - // 频率top5 export const getFrequence = (data, success, fail) => { Request({ methods: 'get', - url: '/resource/selectDeptResourceByApplyNum', + url: '/resource/selectDeptResourceByApplyNum', + data + }).then(res => { + success && success(res) + }).catch(err => { + fail && fail(err) + }) +} + +// 部门发布动态 +export const getResourceByDept = (data, success, fail) => { + Request({ + methods: 'get', + url: '/resource/getByDept', + data + }).then(res => { + success && success(res) + }).catch(err => { + fail && fail(err) + }) +} + +// 部门能力推荐 +export const getApplyByDept = (data, success, fail) => { + Request({ + methods: 'get', + url: '/resource/getApplyByDept', data }).then(res => { success && success(res) diff --git a/back/src/views/modules/workBench/components/bottom-view.vue b/back/src/views/modules/workBench/components/bottom-view.vue index b73cc86e..cf6da540 100644 --- a/back/src/views/modules/workBench/components/bottom-view.vue +++ b/back/src/views/modules/workBench/components/bottom-view.vue @@ -1,19 +1,74 @@ \ No newline at end of file diff --git a/back/src/views/modules/workBench/components/content-title.vue b/back/src/views/modules/workBench/components/content-title.vue new file mode 100644 index 00000000..063ee4aa --- /dev/null +++ b/back/src/views/modules/workBench/components/content-title.vue @@ -0,0 +1,37 @@ + + + + + \ No newline at end of file diff --git a/back/src/views/modules/workBench/components/dynamic-view.vue b/back/src/views/modules/workBench/components/dynamic-view.vue new file mode 100644 index 00000000..fea8cda8 --- /dev/null +++ b/back/src/views/modules/workBench/components/dynamic-view.vue @@ -0,0 +1,69 @@ + + + + + \ No newline at end of file diff --git a/back/src/views/modules/workBench/components/recommend-view.vue b/back/src/views/modules/workBench/components/recommend-view.vue new file mode 100644 index 00000000..64702109 --- /dev/null +++ b/back/src/views/modules/workBench/components/recommend-view.vue @@ -0,0 +1,104 @@ + + + + + \ No newline at end of file diff --git a/back/src/views/modules/workBench/images/bgIndex.png b/back/src/views/modules/workBench/images/bgIndex.png new file mode 100644 index 00000000..70320c8c Binary files /dev/null and b/back/src/views/modules/workBench/images/bgIndex.png differ diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue index d52206ab..f7ed512b 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue @@ -9,7 +9,13 @@
- {{ props.dataList.name }} + + + + {{ props.dataList.name }} + + +

@@ -137,12 +143,19 @@ } .name { display: inline-block; - width: 10.2rem; + // width: 10.2rem; // overflow: hidden; // text-overflow: ellipsis; // white-space: nowrap; font-size: 40px; margin-right: 20px; + max-width: 7rem; + text-overflow: -o-ellipsis-lastline; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 1; + -webkit-box-orient: vertical; } .label-content { position: relative; diff --git a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue index 5026f8d8..1e3c06f0 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue @@ -9,7 +9,13 @@

- {{ props.dataList.name }} + + + + {{ props.dataList.name }} + + +

{{ props.dataList.type }} @@ -124,9 +130,18 @@ // max-width: 3.3rem; // overflow: hidden; // text-overflow: ellipsis; - white-space: nowrap; + // white-space: nowrap; font-size: 0.4rem; margin-right: 0.2rem; + font-size: 0.4rem; + margin-right: 0.2rem; + max-width: 7rem; + text-overflow: -o-ellipsis-lastline; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 1; + -webkit-box-orient: vertical; } .label-content { position: relative; diff --git a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue index fa6b83e2..42bea3df 100644 --- a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue +++ b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue @@ -9,7 +9,13 @@

- {{ props.dataList.name }} + + + + {{ props.dataList.name }} + + +

@@ -140,9 +146,16 @@ // max-width: 3.3rem; // overflow: hidden; // text-overflow: ellipsis; - white-space: nowrap; + // white-space: nowrap; font-size: 0.4rem; margin-right: 0.2rem; + max-width: 7rem; + text-overflow: -o-ellipsis-lastline; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 1; + -webkit-box-orient: vertical; } .label-content { position: relative; diff --git a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue index f0734a64..2fc2e974 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue @@ -9,7 +9,13 @@

- {{ props.dataList.name }} + + + + {{ props.dataList.name }} + + +

@@ -139,9 +145,16 @@ // max-width: 3.3rem; // overflow: hidden; // text-overflow: ellipsis; - white-space: nowrap; + // white-space: nowrap; font-size: 0.4rem; margin-right: 0.2rem; + max-width: 7rem; + text-overflow: -o-ellipsis-lastline; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 1; + -webkit-box-orient: vertical; } .label-content { position: relative; diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue index 3fb2b33a..f307a4fe 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue @@ -9,7 +9,13 @@

- {{ props.dataList.name }} + + + + {{ props.dataList.name }} + + +

@@ -140,9 +146,16 @@ // max-width: 3.3rem; // overflow: hidden; // text-overflow: ellipsis; - white-space: nowrap; + // white-space: nowrap; font-size: 0.4rem; margin-right: 0.2rem; + max-width: 7rem; + text-overflow: -o-ellipsis-lastline; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 1; + -webkit-box-orient: vertical; } .label-content { position: relative;