From fb1b9327ce3de41ccdd48320b629b021bf7a2dbc Mon Sep 17 00:00:00 2001
From: hucongqian <hucongqian1990@163.com>
Date: Thu, 30 Jun 2022 11:04:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=EF=BC=8C=E6=8E=A8=E8=8D=90=E8=83=BD=E5=8A=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/workBench/api.js       |  24 ++++
 .../workBench/components/bottom-view.vue      |  69 ++++++++++--
 .../workBench/components/content-title.vue    |  37 +++++++
 .../workBench/components/dynamic-view.vue     |  69 ++++++++++++
 .../workBench/components/recommend-view.vue   | 104 ++++++++++++++++++
 .../modules/workBench/images/bgIndex.png      | Bin 0 -> 1356 bytes
 6 files changed, 296 insertions(+), 7 deletions(-)
 create mode 100644 back/src/views/modules/workBench/components/content-title.vue
 create mode 100644 back/src/views/modules/workBench/components/dynamic-view.vue
 create mode 100644 back/src/views/modules/workBench/components/recommend-view.vue
 create mode 100644 back/src/views/modules/workBench/images/bgIndex.png

diff --git a/back/src/views/modules/workBench/api.js b/back/src/views/modules/workBench/api.js
index add2d7d7..c387c498 100644
--- a/back/src/views/modules/workBench/api.js
+++ b/back/src/views/modules/workBench/api.js
@@ -83,4 +83,28 @@ export const getRequire = (data, success, fail) => {
     }).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)
+    }).catch(err => {
+        fail && fail(err)
+    })
 }
\ No newline at end of file
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 @@
 <template>
-    <div class="bottom-view">
-       
+  <div class="bottom-view">
+    <div class="left container">
+      <content-title :title="title.dynamic"></content-title>
+      <dynamicView v-for="(item, index) in list" :key="index" :number="index + 1" :item="item"></dynamicView>
     </div>
+    <div class="right container">
+      <content-title :title="title.recommend"></content-title>
+      <recommendView></recommendView>
+    </div>
+  </div>
 </template>
 <script>
-import FrequencyTop5View from './frequency-top5-view.vue';
+import dynamicView from "./dynamic-view";
+import recommendView from "./recommend-view";
+import contentTitle from "./content-title";
+import * as Apis from '../api';
 export default {
-    components: { FrequencyTop5View }
+  components: {
+    dynamicView,
+    recommendView,
+    contentTitle
+  },
+  data() {
+    return {
+      title: { dynamic: "部门发布动态", recommend: "部门推荐能力" },
+      list: [
+       
+      ]
+    };
+  },
+  mounted() {
+    this.getResourceByDept();
+  },
+  methods: {
+    //发布动态
+    getResourceByDept() {
+      let data = {
+        limit: 5,
+        page: 1
+      };
+      Apis.getResourceByDept(
+        data,
+        res => {
+          if (res.data.code !== 0) {
+            return;
+          }
+          this.list = res.data.data.records || []
+        },
+        err => {
+          console.log("err", err);
+        }
+      );
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>
 .bottom-view {
-    width: 100%;
+  width: 100%;
+  height: 335px;
+  // background: green;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+  //   color: #fff;
+  .container {
+    background: #fff;
+    width: 800px;
     height: 335px;
-    background: green;
-    box-sizing: border-box;
+    padding: 0px 0 20px 10px;
+  }
 }
 </style>
\ 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 @@
+<template>
+  <div class="content-title">
+    <div>
+      {{ title }}
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "contentTitle",
+  props: {
+    title: String,
+  },
+  data() {
+
+  },
+  computed: {
+
+  },
+  methods: {
+   
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+
+.content-title {
+  height:48px;
+  line-height:48px;
+  font-size: 18px;
+  // color: #fff;
+
+}
+
+</style>
\ 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 @@
+<template>
+  <div class="dynamicView">
+    <div class="wrapper">
+      <div class="content">
+        <div class="left">{{ item.createDate }}</div>
+        <div class="right">{{ item.name }}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "dynamicView",
+  props: {
+    item: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    }
+  },
+  methods: {}
+};
+</script>
+
+<style lang="scss" scoped>
+.dynamicView {
+  cursor: pointer;
+  width: 770px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 7px;
+  
+  .wrapper {
+    height: 50px;
+    width: 770px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    background-image: url("../images/bgIndex.png");
+    background-repeat: no-repeat;
+    background-color:#f4f5f8;
+    border-radius:1px;
+
+    .content {
+      width: 760px;
+      padding-right: 20px;
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-start;
+      align-items: center;
+      margin-left: 12px;
+      font-size: 16px;
+      .left{
+        width:159px;
+        color:#2b2b2b;
+        font-size:14px;
+      }
+      .right {
+        font-size: 18px;
+        color:#464645
+      }
+    }
+  }
+}
+</style>
\ 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 @@
+<template>
+  <div class="recommendView">
+    <a-table :dataSource="data" :columns="columns" bordered :pagination="false" :scroll="maxSize" size="small" />
+  </div>
+</template>
+
+<script>
+import * as Apis from "../api";
+export default {
+  name: "recommendView",
+  props: {
+    item: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    }
+  },
+  data() {
+    return {
+      columns: [
+        {
+          title: "名称",
+          key: "name",
+          dataIndex: "name",
+          width: 220
+        },
+        {
+          title: "类型",
+          key: "type",
+          dataIndex: "type",
+          width: 76
+        },
+        {
+          title: "单位",
+          key: "deptContacts",
+          dataIndex: "deptContacts",
+          width: 114
+        },
+        {
+          title: "时间",
+          key: "createDate",
+          dataIndex: "createDate",
+          width: 153
+        },
+        {
+          title: "当前申请数",
+          key: "activityName",
+          dataIndex: "activityName",
+          width: 115
+        },
+        {
+          title: "调用数量",
+          key: "activityName",
+          dataIndex: "activityName",
+          width: 90
+        }
+      ],
+      data: [
+       
+      ],
+      maxSize: { y: 195 }
+    };
+  },
+  mounted() {
+    this.getApplyByDept();
+  },
+  methods: {
+    //发布动态
+    getApplyByDept() {
+      let data = {
+        limit: 5,
+        page: 1
+      };
+      Apis.getApplyByDept(
+        data,
+        res => {
+          if (res.data.code !== 0) {
+            return;
+          }
+          this.data = res.data.data.records || [];
+        },
+        err => {
+          console.log("err", err);
+        }
+      );
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.recommendView {
+  cursor: pointer;
+  width: 770px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 7px;
+}
+::v-deep .ant-table-thead{
+ background-color:#f4f5f8;
+}
+</style>
\ 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 0000000000000000000000000000000000000000..70320c8c60214b10655e0fb153a0de09abd8feea
GIT binary patch
literal 1356
zcmeAS@N?(olHy`uVBq!ia0vp^^MTlqgAGU?;jOL%Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?>3^Ln2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&r~<rz|cg&+)~fb
z)X>DjP)EVYz|dIVz*yhVSl7_V%D~df&{P2mlz_GsrKDK}xwt{?0`hE?GD=Dctn~HE
z%ggo3jrH=2()A53EiLs8jP#9+bb%^#i!1X=5-W7`ij`p|xTF>*7iAWdWaj57fJ{tG
z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg
z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu09svw}u=W?o8u
zd9fx~xv#I4XI^nhVqS8pr;Du;&;Y&6%oHmVM?+U<Q)6>CGiO&rAk)&t#l_Ll)Xdq^
z(8<Zj#Tcg7B|o_|H#M&WrZ)wl*8-<rP)f)x0NU)5T9jFqn&MWJpQ`}&u~jB+x0vEI
z52`l>w_D6`>eUB2MjsTfNbw940wx|16P{{;9C*4<%>yR(B4Dca<C-tWz`%IW)5S5Q
z;?|oxw))P25(hp$zZdr^cGd*8?uaAo2|~>hF3}rj>#8Lhbhox1IU%m_ah^b@3(pa6
z-ZE}y&ycQdnNwfKt#wgyN-j9p`{cj$`OS0x6rbOjS=<|O$WCw~ALGBcEf>O)4}5=n
zLB&SnN?cCHCi@Ru9~*x-)Gz=^hDXdF8IQ0(V(#ES!v1I0Q89<DuYZR>YBrzMmMpXT
zgNtstT}A5WnpF!Y{dmx-cX-0r!<`G}|5z~h{-k-wdp7U02}&1~-?B=}c<H75Z+0nj
zwq6X_>REF^t^SRd_k~HHf|O(8-$pCiWu!i1ev?zX{~K@5_v<?Q+$Ftl=tVQf8l7Kv
zCQo(g5hJk<{#&tkZyIf#=u`a0Y4x3MZEttU%yrw%I{9zi=sS^RqCG7$=lt6xY@Pg3
zJAR(N`_XmXhbOm7kM@4p#+|G8c$>=RbMu}~zHlb&l;)a`>%}ytR~2zTe9NwN=E8-V
zM^BUI{#bBl^IN$oQ>7;Ed->z?^U}W96=hM6CVPB;lKbm*!;b|~J96JVd$^nNqvO^e
z{>*g`8?xLs>Q82xr(h=_-@y+e9cmQp8sK4e_<x7~DKm$Oo0ATkGqN!xDdn%3Y`F9)
PsC@Hu^>bP0l+XkKTgLp~

literal 0
HcmV?d00001


From 1aa48bd4e61ffb0987c02e1b6f0668a1e44ca452 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Thu, 30 Jun 2022 11:42:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?318-=E8=AF=A6=E6=83=85=E9=A1=B5=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98tip=EF=BC=885=E4=B8=AA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Algorithm/AlgorithmTopDetails.vue         | 17 +++++++++++++++--
 .../Application/ApplicationTopDetails.vue     | 19 +++++++++++++++++--
 .../Business/BusinessTopDetails.vue           | 17 +++++++++++++++--
 .../Developer/DeveloperTopDetails.vue         | 17 +++++++++++++++--
 .../LayerService/LayerServiceTopDetails.vue   | 17 +++++++++++++++--
 5 files changed, 77 insertions(+), 10 deletions(-)

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 @@
   <div class="algorithm-top-details">
     <div class="left">
       <div class="top">
-        <span class="name">{{ props.dataList.name }}</span>
+        <a-tooltip placement="top">
+          <template #title>{{ props.dataList.name }}</template>
+          <span class="name">
+            {{ props.dataList.name }}
+          </span>
+        </a-tooltip>
+        <!-- <span class="name">{{ props.dataList.name }}</span> -->
         <div class="label-content">
           <p class="lable-father">
             <span class="label">
@@ -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 @@
   <div class="algorithm-top-details">
     <div class="left">
       <div class="top">
-        <span class="name">{{ props.dataList.name }}</span>
+        <a-tooltip placement="top">
+          <template #title>{{ props.dataList.name }}</template>
+          <span class="name">
+            {{ props.dataList.name }}
+          </span>
+        </a-tooltip>
+        <!-- <span class="name">{{ props.dataList.name }}</span> -->
         <div class="label-content">
           <p class="lable-father">
             <span class="label">{{ props.dataList.type }}</span>
@@ -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 @@
   <div class="algorithm-top-details">
     <div class="left">
       <div class="top">
-        <span class="name">{{ props.dataList.name }}</span>
+        <a-tooltip placement="top">
+          <template #title>{{ props.dataList.name }}</template>
+          <span class="name">
+            {{ props.dataList.name }}
+          </span>
+        </a-tooltip>
+        <!-- <span class="name">{{ props.dataList.name }}</span> -->
         <div class="label-content">
           <p class="lable-father">
             <span class="label">
@@ -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 @@
   <div class="algorithm-top-details">
     <div class="left">
       <div class="top">
-        <span class="name">{{ props.dataList.name }}</span>
+        <a-tooltip placement="top">
+          <template #title>{{ props.dataList.name }}</template>
+          <span class="name">
+            {{ props.dataList.name }}
+          </span>
+        </a-tooltip>
+        <!-- <span class="name">{{ props.dataList.name }}</span> -->
         <div class="label-content">
           <p class="lable-father">
             <span class="label">
@@ -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 @@
   <div class="algorithm-top-details">
     <div class="left">
       <div class="top">
-        <span class="name">{{ props.dataList.name }}</span>
+        <a-tooltip placement="top">
+          <template #title>{{ props.dataList.name }}</template>
+          <span class="name">
+            {{ props.dataList.name }}
+          </span>
+        </a-tooltip>
+        <!-- <span class="name">{{ props.dataList.name }}</span> -->
         <div class="label-content">
           <p class="lable-father">
             <span class="label">
@@ -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;