From 11a2eb5602b3d76bd802493255e41a3a1b9953af Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Fri, 1 Jul 2022 11:24:19 +0800
Subject: [PATCH 1/6] bug

---
 .../modules/activiti/demo/putaway-process.vue | 33 +++++++++++++++----
 .../Algorithm/AlgorithmTopDetails.vue         | 14 +++++---
 .../Application/ApplicationTopDetails.vue     | 14 +++++---
 .../Business/BusinessTopDetails.vue           | 15 ++++++---
 .../Developer/DeveloperTopDetails.vue         | 14 +++++---
 .../LayerService/LayerServiceTopDetails.vue   | 15 ++++++---
 .../components/ApplyDetails.vue               | 31 +++++++++++++++--
 7 files changed, 105 insertions(+), 31 deletions(-)

diff --git a/back/src/views/modules/activiti/demo/putaway-process.vue b/back/src/views/modules/activiti/demo/putaway-process.vue
index b4915c25..d5c0086c 100644
--- a/back/src/views/modules/activiti/demo/putaway-process.vue
+++ b/back/src/views/modules/activiti/demo/putaway-process.vue
@@ -66,21 +66,35 @@
           </el-form-item>
         </div>
         <div v-if="!shifoushizujian">
-          <el-form-item label="组件名称">
+          <el-form-item label="组件名称" v-if="algorithmShow">
             <el-input
               v-model="dataForm.name"
               :disabled="fieldDisabled"
               placeholder="组件名称"
             ></el-input>
           </el-form-item>
-          <el-form-item label="应用描述">
+          <el-form-item label="算法名称" v-if="nameNotShow">
+            <el-input
+              v-model="dataForm.name"
+              :disabled="fieldDisabled"
+              placeholder="算法名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="应用描述" v-if="algorithmShow">
             <el-input
               v-model="dataForm.description"
               :disabled="fieldDisabled"
               placeholder="应用描述"
             ></el-input>
           </el-form-item>
-          <el-form-item label="部门联系人">
+          <el-form-item label="算法描述" v-if="nameNotShow">
+            <el-input
+              v-model="dataForm.description"
+              :disabled="fieldDisabled"
+              placeholder="算法描述"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="部门联系人" v-if="algorithmShow">
             <el-input
               v-model="dataForm.deptContacts"
               :disabled="fieldDisabled"
@@ -94,7 +108,7 @@
               placeholder="共享类型"
             ></el-input>
           </el-form-item>
-          <el-form-item label="共享方式"  v-if="coverageNotShow">
+          <el-form-item label="共享方式"  v-if="coverageNotShow && algorithmShow">
             <el-input
               v-model="dataForm.shareMode"
               :disabled="fieldDisabled"
@@ -180,7 +194,9 @@ export default {
       dataForm: [],
       id: '',
       shifoushizujian: true,
-      coverageNotShow: true
+      coverageNotShow: true,
+      nameNotShow: false,
+      algorithmShow: true
     }
   },
   watch: {},
@@ -209,13 +225,16 @@ export default {
         }
         this.dataForm = res.data.resourceDTO
         if (this.dataForm.type != '应用资源') {
+          this.shifoushizujian = false
           this.dataForm.infoList.forEach((val) => {
             if (val.attrValue === '图层服务') {
               this.coverageNotShow = false
-              console.log(this.coverageNotShow, 'wowowo')
+            } else if (val.attrValue === '智能算法') {
+              this.nameNotShow = true
+              this.algorithmShow = false
+              console.log(this.nameNotShow, 'wowowo')
             }
           })
-          this.shifoushizujian = false
         } else {
           this.shifoushizujian = true
         }
diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
index 6d2288af..89ab10e9 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
@@ -28,10 +28,16 @@
         <!-- <span class="label">免费</span> -->
       </div>
       <div class="main">
-        <div>应用领域：{{ applicationArea }}</div>
-        <div>
-          {{ props.dataList.description }}
-        </div>
+        <a-tooltip placement="top">
+          <template #title>应用领域：{{ applicationArea }}</template>
+          <div>应用领域：{{ applicationArea }}</div>
+        </a-tooltip>
+        <a-tooltip placement="top">
+          <template #title>{{ props.dataList.description }}</template>
+          <div>
+            {{ props.dataList.description }}
+          </div>
+        </a-tooltip>
       </div>
       <div class="bottom" v-if="props.dataList.id">
         <a-button type="primary" @click="toView()">
diff --git a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
index 42b48cc9..b63bb510 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
@@ -26,10 +26,16 @@
         <!-- <span class="label">免费</span> -->
       </div>
       <div class="main">
-        <div>应用领域：{{ applicationArea }}</div>
-        <div>
-          {{ props.dataList.description }}
-        </div>
+        <a-tooltip placement="top">
+          <template #title>应用领域：{{ applicationArea }}</template>
+          <div>应用领域：{{ applicationArea }}</div>
+        </a-tooltip>
+        <a-tooltip placement="top">
+          <template #title>{{ props.dataList.description }}</template>
+          <div>
+            {{ props.dataList.description }}
+          </div>
+        </a-tooltip>
       </div>
       <div class="bottom" v-if="props.dataList.id">
         <!-- <a-button type="primary" @click="toView()">
diff --git a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
index 33ffb300..7424ddf3 100644
--- a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
@@ -28,11 +28,16 @@
         <!-- <span class="label">免费</span> -->
       </div>
       <div class="main">
-        <div>应用领域：{{ businessArea }}</div>
-        <!-- 应用描述 -->
-        <div>
-          {{ props.dataList.description }}
-        </div>
+        <a-tooltip placement="top">
+          <template #title>应用领域：{{ applicationArea }}</template>
+          <div>应用领域：{{ applicationArea }}</div>
+        </a-tooltip>
+        <a-tooltip placement="top">
+          <template #title>{{ props.dataList.description }}</template>
+          <div>
+            {{ props.dataList.description }}
+          </div>
+        </a-tooltip>
       </div>
       <div class="bottom" v-if="props.dataList.id">
         <!-- <a-button type="primary" @click="toView()">
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
index e7c71332..3832d4e7 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
@@ -28,10 +28,16 @@
         <!-- <span class="label">免费</span> -->
       </div>
       <div class="main">
-        <div>应用领域：{{ applicationArea }}</div>
-        <div>
-          {{ props.dataList.description }}
-        </div>
+        <a-tooltip placement="top">
+          <template #title>应用领域：{{ applicationArea }}</template>
+          <div>应用领域：{{ applicationArea }}</div>
+        </a-tooltip>
+        <a-tooltip placement="top">
+          <template #title>{{ props.dataList.description }}</template>
+          <div>
+            {{ props.dataList.description }}
+          </div>
+        </a-tooltip>
       </div>
       <div class="bottom" v-if="props.dataList.id">
         <a-button type="primary" @click="toView()">
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
index c8c5b45b..e712a7ac 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
@@ -28,11 +28,16 @@
         <!-- <span class="label">免费</span> -->
       </div>
       <div class="main">
-        <div>应用领域：{{ businessArea }}</div>
-        <!-- 应用描述 -->
-        <div>
-          {{ props.dataList.description }}
-        </div>
+        <a-tooltip placement="top">
+          <template #title>应用领域：{{ applicationArea }}</template>
+          <div>应用领域：{{ applicationArea }}</div>
+        </a-tooltip>
+        <a-tooltip placement="top">
+          <template #title>{{ props.dataList.description }}</template>
+          <div>
+            {{ props.dataList.description }}
+          </div>
+        </a-tooltip>
       </div>
       <div class="bottom" v-if="props.dataList.id">
         <a-button type="primary" @click="toView()">
diff --git a/front/src/views/personalCenter/components/ApplyDetails.vue b/front/src/views/personalCenter/components/ApplyDetails.vue
index ab3d9294..b6c624da 100644
--- a/front/src/views/personalCenter/components/ApplyDetails.vue
+++ b/front/src/views/personalCenter/components/ApplyDetails.vue
@@ -367,20 +367,34 @@
         </a-form-item>
       </div>
       <div v-if="!shifoushizujian">
-        <a-form-item label="组件名称">
+        <a-form-item label="组件名称" v-if="algorithmShow">
           <a-input
             v-model:value="dataForm.data.name"
             disabled="true"
             placeholder="组件名称"
           ></a-input>
         </a-form-item>
-        <a-form-item label="应用描述">
+        <a-form-item label="算法名称" v-if="nameNotShow">
+          <a-input
+            v-model:value="dataForm.data.name"
+            disabled="true"
+            placeholder="算法名称"
+          ></a-input>
+        </a-form-item>
+        <a-form-item label="应用描述" v-if="algorithmShow">
           <a-input
             v-model:value="dataForm.data.description"
             disabled="true"
             placeholder="应用描述"
           ></a-input>
         </a-form-item>
+        <a-form-item label="算法描述" v-if="nameNotShow">
+          <a-input
+            v-model:value="dataForm.data.description"
+            disabled="true"
+            placeholder="算法描述"
+          ></a-input>
+        </a-form-item>
         <a-form-item label="部门联系人">
           <a-input
             v-model:value="dataForm.data.deptContacts"
@@ -551,6 +565,8 @@
     id: '',
   })
   let shifoushizujian = ref('')
+  let nameNotShow = ref('')
+  let algorithmShow = ref('')
   const dataForm = reactive({ data: {} })
   //流转详情
   const dataSource = reactive({ data: [] })
@@ -637,6 +653,17 @@
           shifoushizujian.value = true
         } else {
           shifoushizujian.value = false
+          console.log(res.data.data.resourceDTO)
+          debugger
+          res.data.data.resourceDTO.infoList.forEach((val) => {
+            console.log(val, '111111111111111111111111')
+            if (val.attrValue === '智能算法') {
+              nameNotShow.value = true
+              algorithmShow.value = false
+              console.log(nameNotShow.value, algorithmShow.value, 'wowowo')
+              debugger
+            }
+          })
         }
         console.log('222222222222', dataForm.data)
       })

From 930eae441d21646910cc95541ba250b0aaa76ba4 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Fri, 1 Jul 2022 13:29:38 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0:=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=20=E5=B7=B2=E5=8A=9E=20=E6=95=B0=E9=87=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workBench/components/dept-chart-view.vue  | 21 +++++++++++++----
 .../workBench/components/dept-todo-view.vue   |  4 +++-
 .../components/frequency-top5-view.vue        | 23 +++++++++++--------
 .../src/views/modules/workBench/workBench.vue |  4 ++--
 4 files changed, 34 insertions(+), 18 deletions(-)

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 400863a4..1714eb5f 100644
--- a/back/src/views/modules/workBench/components/dept-chart-view.vue
+++ b/back/src/views/modules/workBench/components/dept-chart-view.vue
@@ -98,7 +98,17 @@ export default {
                     },
                 ],
                 tooltip: {
-                    triagger: 'item'
+                    triagger: 'item',
+                    formatter: (params) => {
+                        let str = ''
+                        if (params.name == '线') {
+                            str = ''
+                        } else {
+                            str = `<span style="display:inline-block;margin-right:5px;
+                            border-radius:10px;width:10px;height:10px;background-color:${params.color};"></span>${params.name}: ${params.value}`
+                        }
+                        return str;
+                    }
                 },
                 "legend": {
                     type: 'scroll',
@@ -163,18 +173,19 @@ export default {
                     },
                     data: this.dataListCopy,
                 },
-
                 {
                     "type": "pie",
                     "center": ["50%", "40%"],
-                    "radius": ["35%", "36%"],
+                    "radius": ["38%", "39%"],
                     "label": {
                         "show": false
                     },
+                    hoverAnimation: false,
+                    showTooltip: false,
                     color: ['#d8dde8'],
                     "data": [{
-                        "value": 78,
-                        "name": "实例1",
+                        "value": 0,
+                        "name": "线",
                     }]
                 }
                 ]
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 21406fa1..083dd2c4 100644
--- a/back/src/views/modules/workBench/components/dept-todo-view.vue
+++ b/back/src/views/modules/workBench/components/dept-todo-view.vue
@@ -77,7 +77,8 @@ export default {
 .left-box {
     display: flex;
     justify-content: center;
-    width: 80px;
+    // width: 80px;
+    width: 100px;
     border-radius: 2px;
     height: 100%;
 }
@@ -100,6 +101,7 @@ export default {
     color: #000;
     margin-top: 25px;
     margin-bottom: 18px;
+    text-align: center;
 }
 
 .num {
diff --git a/back/src/views/modules/workBench/components/frequency-top5-view.vue b/back/src/views/modules/workBench/components/frequency-top5-view.vue
index 381a4a5b..9df85d3e 100644
--- a/back/src/views/modules/workBench/components/frequency-top5-view.vue
+++ b/back/src/views/modules/workBench/components/frequency-top5-view.vue
@@ -5,23 +5,23 @@
             <div class="no-box">
                 <div class="no no2">
                     <div class="name" :style="{ color: colorObj[2] }">{{ no2Obj.name || '--' }}</div>
-                    <div class="count">{{ no2Obj.count }}</div>
+                    <div class="count">{{ formatCount(no2Obj.count) }}</div>
                 </div>
                 <div class="no no1">
-                    <div class="name" :style="{ color: colorObj[1] }">{{ no1Obj.name }}</div>
-                    <div class="count">{{ no1Obj.count }}</div>
+                    <div class="name" :style="{ color: colorObj[1] }">{{ no1Obj.name || '--' }}</div>
+                    <div class="count">{{ formatCount(no1Obj.count) }}</div>
                 </div>
                 <div class="no no3">
-                    <div class="name" :style="{ color: colorObj[3] }">{{ no3Obj.name }}</div>
-                    <div class="count">{{ no3Obj.count }}</div>
+                    <div class="name" :style="{ color: colorObj[3] }">{{ no3Obj.name || '--' }}</div>
+                    <div class="count">{{ formatCount(no3Obj.count) }}</div>
                 </div>
             </div>
             <div class="flex-row-between row-name" v-for="(data, i) in listInfo" :key="i">
                 <div class="left">
                     <div class="row-index">{{ i + 3 }}</div>
-                    <div class="name-text">{{ data.name }}</div>
+                    <div class="name-text">{{ data.name || '--' }}</div>
                 </div>
-                <div class="count-text">{{ data.count }}</div>
+                <div class="count-text">{{ formatCount(data.count) }}</div>
             </div>
         </div>
         <div class="no-data" v-else>暂无数据</div>
@@ -84,14 +84,17 @@ export default {
                     this[`no${k}Obj`].count = _arr[i].count
                 }
                 this.listInfo = []
-                this.listInfo.push(_arr[3])
-                this.listInfo.push(_arr[4])
+                this.listInfo.push(_arr[3] || {})
+                this.listInfo.push(_arr[4] || {})
 
             }, err => {
                 this.loading = false;
                 this.$message.error(err);
             });
         },
+        formatCount(count) {
+            return count || count === 0 ? count : '--'
+        }
     },
     components: { contentTitle }
 }
@@ -188,7 +191,7 @@ export default {
 .num-text {
     font-size: 14px;
     color: #2b2b2b;
-   
+
 }
 
 .no-data {
diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue
index da4f3d82..96c7a140 100644
--- a/back/src/views/modules/workBench/workBench.vue
+++ b/back/src/views/modules/workBench/workBench.vue
@@ -105,7 +105,7 @@ export default {
                 }
                 console.log('res----待办-------->', res.data);
                 this.toToData.list = res.data.data.records || []
-                this.toToData.num = res.data.data.records.length || 0
+                this.toToData.num = res.data.data.total || 0
             }, err => {
                 this.$message.error(err);
                 this.loadingToDo = false;
@@ -125,7 +125,7 @@ export default {
                 }
                 console.log('res----已办-------->', res.data);
                 this.hasToDodoData.list = res.data.data.records || []
-                this.hasToDodoData.num = res.data.data.records.length || 0
+                this.hasToDodoData.num = res.data.data.total || 0
             }, err => {
                 this.$message.error(err)
                 this.loadingHasToDo = false;

From f30d67b7d473914699209034ae3510c53b071861 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Fri, 1 Jul 2022 13:46:49 +0800
Subject: [PATCH 3/6] =?UTF-8?q?bug=20=20=E6=8E=A5=E5=8F=A3=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/activiti/demo/putaway-process.vue |   2 +-
 .../components/ApplyDetails.vue               |   2 +-
 .../personalCenter/components/MyApply.vue     | 151 ++++++++++++------
 3 files changed, 104 insertions(+), 51 deletions(-)

diff --git a/back/src/views/modules/activiti/demo/putaway-process.vue b/back/src/views/modules/activiti/demo/putaway-process.vue
index d5c0086c..eb6d20c7 100644
--- a/back/src/views/modules/activiti/demo/putaway-process.vue
+++ b/back/src/views/modules/activiti/demo/putaway-process.vue
@@ -131,7 +131,7 @@
           </el-form-item>
           <el-form-item label="接口请求方式"  v-if="coverageNotShow">
             <el-input
-              v-model="dataForm.applyCount"
+              v-model="dataForm.apiMethodType"
               :disabled="fieldDisabled"
               placeholder="接口请求方式"
             ></el-input>
diff --git a/front/src/views/personalCenter/components/ApplyDetails.vue b/front/src/views/personalCenter/components/ApplyDetails.vue
index b6c624da..f8bf566b 100644
--- a/front/src/views/personalCenter/components/ApplyDetails.vue
+++ b/front/src/views/personalCenter/components/ApplyDetails.vue
@@ -432,7 +432,7 @@
         </a-form-item>
         <a-form-item label="接口请求方式">
           <a-input
-            v-model:value="dataForm.data.applyCount"
+            v-model:value="dataForm.data.apiMethodType"
             disabled="true"
             placeholder="接口请求方式"
           ></a-input>
diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index bc685583..e25c1d25 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -48,8 +48,13 @@
           <a-tooltip>
             <template #title>{{ item.name }}</template>
             <div class="content-body-title">
-              <span v-if="item.name ==='申请摄像头列表'" @click="showVideoList(item)"> 名称：{{ item.name }} </span>
-              <span v-else> 名称：{{ item.name }} </span>
+              <span
+                v-if="item.name === '申请摄像头列表'"
+                @click="showVideoList(item)"
+              >
+                名称：{{ item.name }}
+              </span>
+              <span v-else>名称：{{ item.name }}</span>
               <div></div>
             </div>
           </a-tooltip>
@@ -72,7 +77,18 @@
           </div>
           <div v-else>
             <p class="content-body-content-son">
-              <span v-if="item.name ==='申请摄像头列表'">申请结果：{{ '列表地址：' + backUrl +  'resource/getApplyCameraList/' + item.processInstanceId+';'+ '视频流地址：'+backUrl + '/resource/hls/getHls/?channelId='}}</span>
+              <span v-if="item.name === '申请摄像头列表'">
+                申请结果：{{
+                  '列表地址：' +
+                  backUrl +
+                  'resource/getApplyCameraList/' +
+                  item.processInstanceId +
+                  ';' +
+                  '视频流地址：' +
+                  backUrl +
+                  '/resource/hls/getHls/?channelId='
+                }}
+              </span>
               <span v-else>申请结果：{{ item.comment || '暂无' }}</span>
               <a-button
                 type="primary"
@@ -225,15 +241,20 @@
     <a-modal
       v-model:visible="videoVisible"
       title="已申请摄像头列表"
-      @ok="videoVisible=false"
+      @ok="videoVisible = false"
     >
-      <a-table :columns="columns" :data-source="xVideoList" bordered :pagination="{defaultPageSize: 6}">
-      <template #bodyCell="{ column, text }">
-      <!-- <template>
+      <a-table
+        :columns="columns"
+        :data-source="xVideoList"
+        bordered
+        :pagination="{ defaultPageSize: 6 }"
+      >
+        <template #bodyCell="{ column, text }">
+          <!-- <template>
         <a>{{ text }}</a>
       </template> -->
-      </template>
-  </a-table>
+        </template>
+      </a-table>
     </a-modal>
   </div>
 </template>
@@ -246,7 +267,12 @@
     getTaskHandleDetailInfo,
     // getProcDefBizRoute,
   } from '@/api/personalCenter'
-  import { updateRes, relaunch, selectOne,getApplyCameraList } from '@/api/home'
+  import {
+    updateRes,
+    relaunch,
+    selectOne,
+    getApplyCameraList,
+  } from '@/api/home'
   import { useRouter } from 'vue-router'
   import { message } from 'ant-design-vue'
   import ApplyDetails from '@/views/personalCenter/components/ApplyDetails'
@@ -257,39 +283,56 @@
   // let contentListLength = contentList.length
   let tabIndex = ref(0)
   const videoVisible = ref(false)
-  const columns = ref([{
-    title: '摄像头名称',
-    dataIndex: 'name'
-  }])
-  const xVideoList = ref([{
-    name: '111'
-  }, {
-    name: '222'
-  },{
-    name: '111'
-  }, {
-    name: '222'
-  },{
-    name: '111'
-  }, {
-    name: '222'
-  },{
-    name: '111'
-  }, {
-    name: '222'
-  },{
-    name: '111'
-  }, {
-    name: '222'
-  },{
-    name: '111'
-  }, {
-    name: '222'
-  },{
-    name: '111'
-  }, {
-    name: '222'
-  },])
+  const columns = ref([
+    {
+      title: '摄像头名称',
+      dataIndex: 'name',
+    },
+  ])
+  const xVideoList = ref([
+    {
+      name: '111',
+    },
+    {
+      name: '222',
+    },
+    {
+      name: '111',
+    },
+    {
+      name: '222',
+    },
+    {
+      name: '111',
+    },
+    {
+      name: '222',
+    },
+    {
+      name: '111',
+    },
+    {
+      name: '222',
+    },
+    {
+      name: '111',
+    },
+    {
+      name: '222',
+    },
+    {
+      name: '111',
+    },
+    {
+      name: '222',
+    },
+    {
+      name: '111',
+    },
+    {
+      name: '222',
+    },
+  ])
   function tabqiehuan(item, index) {
     // debugger
     tabIndex.value = index
@@ -636,13 +679,23 @@
           line-height: 16px;
           font-size: 12px;
           width: 100%;
-          text-overflow: -o-ellipsis-lastline;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          display: -webkit-box;
-          -webkit-line-clamp: 3;
-          -webkit-box-orient: vertical;
+          // text-overflow: -o-ellipsis-lastline;
+          // overflow: hidden;
+          // text-overflow: ellipsis;
+          // display: -webkit-box;
+          // -webkit-line-clamp: 3;
+          // -webkit-box-orient: vertical;
+          display: flex;
           color: #999999;
+          span {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+            max-width: 8.1rem;
+            line-height: 24px;
+          }
         }
         .content-body-bottom {
           display: flex;

From 96502e05c66731ea0164f57b899098687cb2736a Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Fri, 1 Jul 2022 13:47:32 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E4=BA=91=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/api/capabilityCloud.js              | 14 ++++++
 .../components/ComponentServices.vue          | 48 +++++++++++++++++--
 2 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/front/src/api/capabilityCloud.js b/front/src/api/capabilityCloud.js
index 109ccc44..03fac901 100644
--- a/front/src/api/capabilityCloud.js
+++ b/front/src/api/capabilityCloud.js
@@ -80,3 +80,17 @@ export function dataResourceInfo(params) {
     params,
   })
 }
+//能力云图-调用趋势
+export function callTheTrendPort(start, end, params) {
+  return request({
+    url: '/metrics/api/v1/query_range?query=sum(increase(apigateway_http_status%5B1d%5D))&start=' + start + '&end=' + end + '&step=' + params,
+    method: 'get',
+  })
+}
+//能力云图-调用次数
+export function totalCallsSnum(params) {
+  return request({
+    url: '/metrics/api/v1/query?query=sum(apigateway_http_status)&time=1655793262.495' + params,
+    method: 'get',
+  })
+}
diff --git a/front/src/views/capabilityCloud/components/ComponentServices.vue b/front/src/views/capabilityCloud/components/ComponentServices.vue
index 32fdaf2e..4003bd3b 100644
--- a/front/src/views/capabilityCloud/components/ComponentServices.vue
+++ b/front/src/views/capabilityCloud/components/ComponentServices.vue
@@ -117,6 +117,8 @@
   import {
     assemblerBaseStatic,
     componentServiceRank,
+    callTheTrendPort,
+    totalCallsSnum,
   } from '@/api/capabilityCloud'
   import * as moment from 'moment'
   let snum = ref([
@@ -145,20 +147,50 @@
           .subtract('days', 6 - i)
           .format('MM-DD')
         callTheTrendData.value.time.push(time)
-        callTheTrendData.value.snum.push('0')
         console.log('time', callTheTrendData.value, name)
       }
-      callTheTrend(callTheTrendData.value)
+      const start = parseInt(
+        (Date.parse(new Date()) - 168 * 60 * 60 * 1000) / 1000
+      )
+      const end = Date.parse(new Date()) / 1000
+      callTheTrendPort(start, end, 86400).then((res) => {
+        if (res.data.data.result) {
+          res.data.data.result[0].values.splice(0, 1)
+          res.data.data.result[0].values.map((item) => {
+            callTheTrendData.value.snum.push(parseInt(item[1]))
+          })
+          callTheTrend(callTheTrendData.value)
+        } else {
+          callTheTrendData.value.snum = ['0', '0', '0', '0', '0', '0', '0']
+          callTheTrend(callTheTrendData.value)
+        }
+      })
     } else {
       for (let i = 0; i < 31; i++) {
         let time = moment()
           .subtract('days', 30 - i)
           .format('MM-DD')
         callTheTrendData.value.time.push(time)
-        callTheTrendData.value.snum.push('0')
         console.log('time', callTheTrendData.value, name)
       }
-      callTheTrend(callTheTrendData.value)
+      const start = parseInt(
+        (Date.parse(new Date()) - 720 * 60 * 60 * 1000) / 1000
+      )
+      const end = Date.parse(new Date()) / 1000
+      callTheTrendPort(start, end, 86400).then((res) => {
+        if (res.data.data.result) {
+          // res.data.data.result.splice(0, 1)
+          res.data.data.result[0].values.map((item) => {
+            callTheTrendData.value.snum.push(parseInt(item[1]))
+          })
+          callTheTrend(callTheTrendData.value)
+        } else {
+          for (let i = 0; i < 30; i++) {
+            callTheTrendData.value.snum.push('0')
+          }
+          callTheTrend(callTheTrendData.value)
+        }
+      })
     }
   }
   //调用趋势echarts图
@@ -316,10 +348,18 @@
       })
     })
   }
+  //总调用次数接口
+  const TotalCallsAPI = () => {
+    const end = Date.parse(new Date()) / 1000
+    totalCallsSnum(end).then((res) => {
+      snum.value[1].num = res.data.data.result[0].value[1]
+    })
+  }
   const init = () => {
     timeSwitch(timeSwitchindex.value)
     NumberOfComponentServices()
     ranking(dataclick.value)
+    TotalCallsAPI()
   }
   onMounted(() => {
     init()

From e7bc4e8f0c95a29437116d1f8020cdb414e96fe8 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Fri, 1 Jul 2022 14:03:31 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=89=B2=E5=BA=A6?=
 =?UTF-8?q?=E5=80=BC=EF=BC=8C=E5=8E=BB=E6=8E=89=E8=B0=83=E7=94=A8=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workBench/components/dept-chart-view.vue   | 11 +++++++----
 .../workBench/components/dept-todo-view.vue    | 18 ++++++++++++++++--
 .../components/frequency-top5-view.vue         | 13 ++++++++++++-
 .../workBench/components/recommend-view.vue    | 12 +++---------
 back/src/views/modules/workBench/workBench.vue | 18 ++++++++++++------
 5 files changed, 50 insertions(+), 22 deletions(-)

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 1714eb5f..79291918 100644
--- a/back/src/views/modules/workBench/components/dept-chart-view.vue
+++ b/back/src/views/modules/workBench/components/dept-chart-view.vue
@@ -30,6 +30,12 @@ export default {
             type: Array,
             default: () => []
         },
+        colorArray: {
+            type: Array,
+            default: () => [
+                '#fe845e', '#ff3e55', '#d5c438', '#ff9999', '#9c78ed', '#48c760', '#48c6c7', '#0058e1',
+            ]
+        },
     },
     watch: {
         dataList: {
@@ -62,9 +68,6 @@ export default {
             this.myChart = chartDom && echarts.init(chartDom);
 
             let lengendArr = this.dataListCopy.filter(v => v.name);
-            let colorArray = [
-                '#fe845e', '#ff3e55', '#d5c438', '#ff9999', '#9c78ed', '#48c760', '#48c6c7', '#0058e1',
-            ]
 
             let total = 0;
             this.dataListCopy.map(v => {
@@ -129,7 +132,7 @@ export default {
                     "type": "pie",
                     "center": ["50%", "40%"],
                     "radius": ["50%", "63%"],
-                    "color": colorArray,
+                    "color": this.colorArray,
                     "startAngle": 135,
                     label: {
                         show: false
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 083dd2c4..2ee0baca 100644
--- a/back/src/views/modules/workBench/components/dept-todo-view.vue
+++ b/back/src/views/modules/workBench/components/dept-todo-view.vue
@@ -12,9 +12,16 @@
             </div>
         </div>
         <div class="list-box" v-if="dataInfo.list.length > 0">
-            <div class="list-item" v-for="(item, i) in dataInfo.list" :key="i">
-                {{ item[dataInfo.nameStr] || '--' }}
+
+            <div v-for="(item, i) in dataInfo.list" :key="i">
+
+                <el-tooltip effect="dark" :content="item[dataInfo.nameStr]" placement="top">
+                    <div class="list-item ellipsis">
+                        {{ item[dataInfo.nameStr] || '--' }}
+                    </div>
+                </el-tooltip>
             </div>
+
             <div class="more">
                 查看更多 >
             </div>
@@ -49,6 +56,13 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.ellipsis {
+    //超出一行省略号
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
 .no-margin-left {
     margin-left: 0;
 }
diff --git a/back/src/views/modules/workBench/components/frequency-top5-view.vue b/back/src/views/modules/workBench/components/frequency-top5-view.vue
index 9df85d3e..9764f74e 100644
--- a/back/src/views/modules/workBench/components/frequency-top5-view.vue
+++ b/back/src/views/modules/workBench/components/frequency-top5-view.vue
@@ -19,7 +19,9 @@
             <div class="flex-row-between row-name" v-for="(data, i) in listInfo" :key="i">
                 <div class="left">
                     <div class="row-index">{{ i + 3 }}</div>
-                    <div class="name-text">{{ data.name || '--' }}</div>
+                    <el-tooltip effect="dark" :content="data.name" placement="top">
+                        <div class="name-text ellipsis">{{ data.name || '--' }}</div>
+                    </el-tooltip>
                 </div>
                 <div class="count-text">{{ formatCount(data.count) }}</div>
             </div>
@@ -100,6 +102,13 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.ellipsis {
+    //超出一行省略号
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
 .flex-row-between {
     display: flex;
     width: 100%;
@@ -164,6 +173,7 @@ export default {
     font-size: 16px;
     margin-bottom: 10px;
     margin-top: 70px;
+    width: 150px;
 }
 
 .count {
@@ -185,6 +195,7 @@ export default {
     font-size: 16px;
     color: #464545;
     margin-left: 10px;
+    width: 430px;
 }
 
 
diff --git a/back/src/views/modules/workBench/components/recommend-view.vue b/back/src/views/modules/workBench/components/recommend-view.vue
index 3bd4e471..c07032b0 100644
--- a/back/src/views/modules/workBench/components/recommend-view.vue
+++ b/back/src/views/modules/workBench/components/recommend-view.vue
@@ -23,7 +23,7 @@ export default {
           title: "名称",
           key: "name",
           dataIndex: "name",
-          width: 220
+          width: 250
         },
         {
           title: "类型",
@@ -35,7 +35,7 @@ export default {
           title: "单位",
           key: "deptContacts",
           dataIndex: "deptContacts",
-          width: 114
+          width: 144
         },
         {
           title: "时间",
@@ -47,14 +47,8 @@ export default {
           title: "当前申请数",
           key: "applyCount",
           dataIndex: "applyCount",
-          width: 115
+          width: 145
         },
-        {
-          title: "调用数量",
-          key: "visit",
-          dataIndex: "visit",
-          width: 90
-        }
       ],
       data: [
        
diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue
index 96c7a140..95b6f0f8 100644
--- a/back/src/views/modules/workBench/workBench.vue
+++ b/back/src/views/modules/workBench/workBench.vue
@@ -8,11 +8,14 @@
                     style="margin-left: 0"></dept-todo-view>
             </div>
             <div class="flex-row-start dept-chart-box">
-                <dept-chart-view id="shelves" title="部门上架" v-loading="loadingResource" :dataList="resourceData">
+                <dept-chart-view id="shelves" title="部门上架" v-loading="loadingResource" :dataList="resourceData"
+                    :colorArray="resourceColor">
                 </dept-chart-view>
-                <dept-chart-view id="apply" title="部门申请" v-loading="loadingApply" :dataList="applyData">
+                <dept-chart-view id="apply" title="部门申请" v-loading="loadingApply" :dataList="applyData"
+                    :colorArray="applyColor">
                 </dept-chart-view>
-                <dept-chart-view id="demand" title="部门需求" v-loading="loadingRequire" :dataList="requireData">
+                <dept-chart-view id="demand" title="部门需求" v-loading="loadingRequire" :dataList="requireData"
+                    :colorArray="requireColor">
                 </dept-chart-view>
             </div>
         </div>
@@ -65,12 +68,15 @@ export default {
                 list: [],
                 nameStr: 'processDefinitionName'
             },
-            // 上架
+            // 部门申请
             resourceData: [],
-            // 上架
+            resourceColor: ['#7b2cff', '#fd5151', , '#2ca1ff', '#0adbfa', '#febe13', '#65e5dd', '#f071ff', '#85f67a'],
+            // 部门申请
             applyData: [],
-            // 上架
+            applyColor: ["#5085f2", "#e75fc3", "#f87be2", "#f2719a", "#fca4bb", "#f59a8f", "#fdb301", "#57e7ec", "#cf9ef1"],
+            // 部门需求
             requireData: [],
+            requireColor: ['#FD866A', '#9E87FF', '#58D5FF', '#73DDFF', '#73ACFF', '#FDD56A', '#FDB36A',],
             loadingToDo: false,
             loadingHasToDo: false,
             loadingResource: false,

From b9ed594f1c19e5d3534f2e7fbbb2472dee12dfda Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Fri, 1 Jul 2022 14:24:41 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E6=B1=87=E8=81=9A?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=9B=B4=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/newHome/components/CapabilityConvergence.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index 014021ee..4c35dc3b 100644
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@@ -284,6 +284,7 @@
           background-color: #fff;
           border-radius: 0.02rem;
           box-shadow: 0 0.05rem 0.2rem #ccc;
+          position: relative;
           div:nth-of-type(1) {
             height: 1.02rem;
             line-height: 1.02rem;
@@ -336,6 +337,8 @@
             text-align: center;
             margin-top: 0.1rem;
             margin-left: 0.85rem;
+            position: absolute;
+            bottom: 0.2rem;
           }
           .btn:hover {
             background: rgba(0, 88, 225, 0.3);