From 82b72fd5f634a7c9e2ee2550bca416efc8499f1b Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 1 Jul 2022 20:22:51 +0800
Subject: [PATCH 1/9] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/components/searchResultList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 5a638ac4..a17ce205 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -62,7 +62,7 @@
         <div class="left jcss" v-else></div>
         <div class="right">
           <div class="header">
-            <span style="display: block; width: 680px">
+            <span style="display: flex; align-items: center; width: 680px">
               {{ item.name }}
               <svg
                 t="1652322568870"

From 18463562729a281b63bd3a569a4585f50b311238 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 4 Jul 2022 09:27:52 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/capacityOnTheShelf/components/PutOnTheShelf.vue   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index 5178bdfd..c6c19bdc 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-17 14:11:08
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-01 20:11:33
+ * @LastEditTime: 2022-07-01 20:34:36
  * @Description: 上架
 -->
 <template>
@@ -110,13 +110,13 @@
               :options="item.options"
             />
             <a-input
-              v-if="item.type == 'text'"
+              v-else-if="item.type == 'text'"
               v-model:value="item.note1"
               :placeholder="'请输入' + item.name"
               :disabled="true"
             />
             <a-input
-              v-if="item.type == 'text2'"
+              v-else-if="item.type == 'text2'"
               v-model:value="item.note1"
               :placeholder="'请输入' + item.name"
               :disabled="true"

From 5f0aec483b759e0727200d94904ce07087decc49 Mon Sep 17 00:00:00 2001
From: gaoxiaolong <327091900@qq.com>
Date: Mon, 4 Jul 2022 09:37:14 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../abilityStatistics/componentUsed.vue       | 28 ++++++-------
 .../views/modules/abilityStatistics/index.vue | 40 +++++++++++--------
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/componentUsed.vue b/back/src/views/modules/abilityStatistics/componentUsed.vue
index 3c44cb1e..4beff5d9 100644
--- a/back/src/views/modules/abilityStatistics/componentUsed.vue
+++ b/back/src/views/modules/abilityStatistics/componentUsed.vue
@@ -21,7 +21,7 @@
             </div>
              <div class='container-body4'>
                 <div style='margin-bottom:30px'>
-                     <span style='font-size:18px;color;#000000;'>被调用组件及数量</span>
+                     <span style='font-size:18px;color;#000000;'>Top5使用组件</span>
                       <img src="@/assets/img/TOP5.png" style='margin-left:10px'>
                 </div>
                 <div v-for="(item,index) in usedList" :key='index' >
@@ -30,13 +30,13 @@
                             <span style='font-weight:bold' :style="{color:numColorList[index%5]}">{{index+1}}</span>
                         </div>
                         <span class='num-style'>{{item.name}}</span>
-                        <span class='count-style' :style="{color:numColorList[index%5]}">{{item.resourceCarNum}}</span>
+                        <span class='count-style' :style="{color:numColorList[index%5]}">{{item.useNum}}</span>
                     </div>
                 </div>
             </div>
              <div class='container-body5'>
                 <div style='margin-bottom:30px'>
-                     <span style='font-size:18px;color;#000000;'>被申请组件及数量</span>
+                     <span style='font-size:18px;color;#000000;'>使用组件评分Top5</span>
                       <img src="@/assets/img/TOP5.png" style='margin-left:10px'>
                 </div>
                 <div v-for="(item,index) in applicationList" :key='index' >
@@ -45,7 +45,7 @@
                             <span style='font-weight:bold' :style="{color:numColorList[index%5]}">{{index+1}}</span>
                         </div>
                         <span class='num-style'>{{item.name}}</span>
-                        <span class='count-style' :style="{color:numColorList[index%5]}">{{item.resourceCarNum}}</span>
+                        <span class='count-style' :style="{color:numColorList[index%5]}">{{item.score}}</span>
                     </div>
                 </div>
             </div>
@@ -86,8 +86,8 @@ export default {
             colorList:['linear-gradient(to right, rgba(251, 59, 5,0.6),transparent)', 'linear-gradient(to right,rgba(251, 123, 5),transparent)','linear-gradient(to right,rgba(250, 179, 2,.6),transparent)','linear-gradient(to right,rgba(82, 106, 255,.6),transparent','linear-gradient(to right,rgba(82, 106, 255,.6),transparent)',],
             widthList:['90px','80px','70px','60px','50px'],
             numColorList:['#fc5656','#ff8a00','#f9af0a','#808fff','#808fff'],
-            usedList:[{name:'组件名称一',resourceCarNum:111},{name:'组件名称一',resourceCarNum:111},{name:'组件名称一',resourceCarNum:111},{name:'组件名称四',resourceCarNum:111},{name:'组件名称五',resourceCarNum:111},],
-            applicationList:[{name:'组件名称一',resourceCarNum:111},{name:'组件名称一',resourceCarNum:111},{name:'组件名称一',resourceCarNum:111},{name:'组件名称四',resourceCarNum:111},{name:'组件名称五',resourceCarNum:111},]
+            usedList:[{name:'组件名称一',useNum:111},{name:'组件名称一',useNum:111},{name:'组件名称一',useNum:111},{name:'组件名称四',useNum:111},{name:'组件名称五',useNum:111},],
+            applicationList:[{name:'组件名称一',score:111},{name:'组件名称一',score:111},{name:'组件名称一',score:111},{name:'组件名称四',score:111},{name:'组件名称五',score:111},]
         }
     },
     created(){
@@ -161,10 +161,10 @@ export default {
             },
              // 应用领域分布
         getDistributed () {               
-            this.$http.get('/census/center/v3/applicationAreaCapabilityList' ,{
+            this.$http.get('/census/center/v3/applicationUsedAreaCapabilityList' ,{
                   params : {
                   id:this.tableId,
-                   resourceType:"应用资源"
+                   resourceType:"组件服务"
                     }                    
             }).then(res => {
                 let arry=[]
@@ -182,22 +182,22 @@ export default {
             })            
             
             },
-     // 被调用组件及数量
+     // top5使用组件
         getBeCalled () {               
-            this.$http.get('/census/center/v3/assemblerCaredTopInfo' ,{
+            this.$http.get('/census/center/v3/assemblerUseTopInfo' ,{
                   params : {
                   id:this.tableId,
-                   resourceType:"应用资源"
+                   resourceType:"组件服务"
                     // pageNo: pageNo || 1,
                     // pageSize: 20
                     }                    
             }).then(res => {
-                this.applicationList =res.data.data
+                this.usedList =res.data.data
             })
             },
-        // 被申请组件及数量
+        // 使用组件评分5
         getBeApplied () {               
-            this.$http.get('/census/center/v3/assemblerCaredTopInfo' ,{
+            this.$http.get('/census/center/v3/assemblerUseScoreTopInfo' ,{
                   params : {
                    id:this.tableId,
                    resourceType:"应用资源"
diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index ac0dd287..df327370 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -50,46 +50,56 @@
             label="部门名称"
             min-width="100%">
         </el-table-column>
-        <el-table-column
+        <el-table-column v-if='this.departmentId===1'
             prop="resourceNum"
             label="发布总数"
             min-width="100%">
         </el-table-column>
-        <el-table-column v-if="this.choseId===0"
+        <el-table-column v-if="this.choseId===0 && this.departmentId===1 "
             prop="resourceCarNum"
             label="被申请总数"
             min-width="100%">
         </el-table-column>
-        <el-table-column
+        <el-table-column v-if="this.departmentId===1"
             prop="resourceBrowseNum"
             label="浏览总量"
             min-width="100%">
         </el-table-column>
-        <el-table-column
+        <el-table-column v-if="this.departmentId===1"
             prop="resourceCollectionNum"
             label="收藏量"
             min-width="100%">
         </el-table-column>
-        <el-table-column v-if="this.choseId===0"
+        <el-table-column v-if="this.choseId===0 && this.departmentId===1 "
             prop="resourceVisits"
             label="被调用总数"
             min-width="100%">
         </el-table-column>
-        <el-table-column v-if="this.choseId===0"
+        <el-table-column v-if="this.choseId===0 && this.departmentId===1 "
             prop="resourceRelNum"
             label="被应用总数"
             min-width="100%">
         </el-table-column>
-        <el-table-column v-if="this.choseId===0"
+        <el-table-column v-if="this.choseId===0 && this.departmentId===1 "
             prop="resourceShareNum" 
             label="需申请数量"
             min-width="100%">
         </el-table-column>
-        <el-table-column v-if="this.choseId===0"
+        <el-table-column v-if="this.choseId===0 && this.departmentId===1 "
             prop="resourceShareNonNum"
             label="免批数量"
             min-width="100%">
         </el-table-column>
+        <el-table-column v-if="this.departmentId===2"
+            prop="resourceUseNum"
+            label="使用总数"
+            min-width="100%">
+        </el-table-column>
+        <el-table-column v-if="this.departmentId===2"
+            prop="resourceCarNum"
+            label="申请总数"
+            min-width="100%">
+        </el-table-column>
         <el-table-column
             label="操作"
             min-width="92%">
@@ -118,7 +128,6 @@
 </template>
 <script>
 import componentServices from './componentServices.vue'
-import componentUsed from './componentUsed.vue'
 import applicationResources from './applicationResources.vue'
 import ComponentUsed from './componentUsed.vue'
 export default {
@@ -216,7 +225,7 @@ export default {
                     // pageSize: 20
                     }                    
             }).then(res => {
-                // this.tableData =res.data.data
+                this.tableData =res.data.data
             })
             },
         //  // 获取部门列表
@@ -244,7 +253,7 @@ export default {
                     resourceType:'组件服务'
                     }                    
             }).then(res => {
-                // this.tableData =res.data.data.list
+                this.tableData =res.data.data.list
                 this.total = res.data.data.total            
             })
             },
@@ -258,7 +267,7 @@ export default {
                     resourceType:'组件服务'
                     }                     
             }).then(res => {
-                // this.tableData =res.data.data.list
+                this.tableData =res.data.data.list
             
             })
             },
@@ -272,7 +281,7 @@ export default {
                     resourceType:'应用资源'
                     }                     
             }).then(res => {
-                // this.tableData =res.data.data.list
+                this.tableData =res.data.data.list
                 this.total = res.data.data.total
             
             })
@@ -287,7 +296,7 @@ export default {
                     resourceType:'应用资源'
                     }                     
             }).then(res => {
-                // this.tableData =res.data.data.list
+                this.tableData =res.data.data.list
             
             })
             },
@@ -304,13 +313,12 @@ export default {
                     this.tableId=row.deptId
                     this.fatherId=1
                 }
-            else if(this.choseId===1){
+            } else if(this.choseId===1){
                     this.homeIsShow=false
                     this.resourcesIsShow=true
                     this.tableId=row.deptId
                     this.fatherId=2
                 }
-            }
            
        
       },

From e849f37f1ec5daa09d953eb9038c17ca7c3f6ede Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Mon, 4 Jul 2022 10:38:50 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/detailsAll/ApplicationDetails.vue   |  2 ++
 .../Algorithm/AlgorithmNavigation.vue         |  1 -
 .../ApplicationAssociatedAbility.vue          |  6 +++-
 .../Application/ApplicationNavigation.vue     | 33 +++++++++++++++----
 ...tionOwningDepartmentAndServiceProvider.vue | 14 +++++---
 5 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/front/src/views/detailsAll/ApplicationDetails.vue b/front/src/views/detailsAll/ApplicationDetails.vue
index 32fc2079..904c5c29 100644
--- a/front/src/views/detailsAll/ApplicationDetails.vue
+++ b/front/src/views/detailsAll/ApplicationDetails.vue
@@ -14,6 +14,7 @@
     <!-- 导航 -->
     <application-navigation
       :dataList="dataList.data"
+      :associatedComponents="associatedComponents"
       :class="{ fixed: scrollTop >= 600 }"
       :selectNow="selectNow"
     ></application-navigation>
@@ -28,6 +29,7 @@
       :dataList="dataList.data"
       id="application-associated-components"
       class="scrollBox"
+      v-if="false"
     ></application-associated-components>
     <!-- 关联能力 -->
     <application-associated-ability
diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue
index 9658235f..f613518f 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue
@@ -125,7 +125,6 @@
       navList.value.filter((item) => item.name === list.value[0])
     )
     if (navList.value.filter((item) => item.name === list.value[0])[0]) {
-      debugger
       select.value = navList.value.filter(
         (item) => item.name === list.value[0]
       )[0].key
diff --git a/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue b/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue
index f907d4bb..d2c19f96 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue
@@ -46,7 +46,11 @@
       },
     })
   }
-  if (props.associatedComponents) {
+  if (
+    props.associatedComponents[0].dataList.length > 0 ||
+    props.associatedComponents[1].dataList.length > 0 ||
+    props.associatedComponents[2].dataList.length > 0
+  ) {
     flag.value = true
     dataFrom.value = props.associatedComponents
     console.log('dataFrom.value', dataFrom.value)
diff --git a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
index 9a224818..bb92e834 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
@@ -32,10 +32,10 @@
       name: '功能介绍',
       key: 'function-introduction',
     },
-    {
-      name: '关联组件',
-      key: 'application-associated-components',
-    },
+    // {
+    //   name: '关联组件',
+    //   key: 'application-associated-components',
+    // },
     {
       name: '关联组件',
       key: 'application-associated-ability',
@@ -60,6 +60,7 @@
   const props = defineProps({
     selectNow: { type: String, default: '' },
     dataList: { type: Object, default: null },
+    associatedComponents: { type: Array, default: null },
   })
   const select = ref('algorithm-display')
   const list = ref([])
@@ -85,7 +86,17 @@
     navList.value.forEach((item) => {
       console.log(item)
       if (list.value.indexOf(item.name) > -1) {
-        item.show = true
+        if (item.name == '关联组件') {
+          if (
+            props.associatedComponents[0].dataList.length != 0 ||
+            props.associatedComponents[1].dataList.length != 0 ||
+            props.associatedComponents[2].dataList.length != 0
+          ) {
+            item.show = true
+          }
+        } else {
+          item.show = true
+        }
       }
     })
     select.value = navList.value.filter(
@@ -122,7 +133,17 @@
         navList.value.forEach((item) => {
           console.log(item)
           if (list.value.indexOf(item.name) > -1) {
-            item.show = true
+            if (item.name == '关联组件') {
+              if (
+                props.associatedComponents[0].dataList.length != 0 ||
+                props.associatedComponents[1].dataList.length != 0 ||
+                props.associatedComponents[2].dataList.length != 0
+              ) {
+                item.show = true
+              }
+            } else {
+              item.show = true
+            }
           }
         })
         if (list.value.length > 0) {
diff --git a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
index e9787da0..2a6f75bc 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
@@ -73,9 +73,12 @@
         item.attrType === '服务商' ||
         item.attrType === '服务商联系人' ||
         item.attrType === '服务商联系电话' ||
-        item.attrType === '服务商名'
+        item.attrType.indexOf('服务商名') != -1
       ) {
-        if (item.attrType === '服务商' || item.attrType === '服务商名') {
+        if (
+          item.attrType === '服务商' ||
+          item.attrType.indexOf('服务商名') != -1
+        ) {
           dataFrom.value.content[1].childrenContent[0] = item
           if (dataFrom.value.content[1].childrenContent[0].attrValue == '') {
             dataFrom.value.content[1].childrenContent[0].attrValue = '------'
@@ -121,9 +124,12 @@
             item.attrType === '服务商' ||
             item.attrType === '服务商联系人' ||
             item.attrType === '服务商联系电话' ||
-            item.attrType === '服务商名'
+            item.attrType.indexOf('服务商名') != -1
           ) {
-            if (item.attrType === '服务商' || item.attrType === '服务商名') {
+            if (
+              item.attrType === '服务商' ||
+              item.attrType.indexOf('服务商名') != -1
+            ) {
               dataFrom.value.content[1].childrenContent.push(item)
               if (
                 dataFrom.value.content[1].childrenContent[0].attrValue == ''

From d4ecfc74a448c1b0049f59b5cbd1b142e8589cbe Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Mon, 4 Jul 2022 11:24:29 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E5=85=B3=E8=81=94=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/detailsAll/ApplicationDetails.vue   | 11 +++++-
 .../ApplicationAssociatedAbility.vue          | 37 +++++++++++++------
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/front/src/views/detailsAll/ApplicationDetails.vue b/front/src/views/detailsAll/ApplicationDetails.vue
index 904c5c29..5589ab37 100644
--- a/front/src/views/detailsAll/ApplicationDetails.vue
+++ b/front/src/views/detailsAll/ApplicationDetails.vue
@@ -33,7 +33,7 @@
     ></application-associated-components>
     <!-- 关联能力 -->
     <application-associated-ability
-      :associatedComponents="associatedComponents"
+      :associatedComponents="associatedComponentsFunction()"
       id="application-associated-ability"
       class="scrollBox"
     ></application-associated-ability>
@@ -172,6 +172,15 @@
       console.log('预览==============', obj)
     }
   }
+  const associatedComponentsFunction = () => {
+    if (
+      associatedComponents.value[0].dataList.length > 0 ||
+      associatedComponents.value[1].dataList.length > 0 ||
+      associatedComponents.value[2].dataList.length > 0
+    ) {
+      return associatedComponents.value
+    }
+  }
   init(id)
   onBeforeUnmount(() => {
     mybus.off('flyToView')
diff --git a/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue b/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue
index d2c19f96..e73ed586 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue
@@ -46,24 +46,37 @@
       },
     })
   }
-  if (
-    props.associatedComponents[0].dataList.length > 0 ||
-    props.associatedComponents[1].dataList.length > 0 ||
-    props.associatedComponents[2].dataList.length > 0
-  ) {
-    flag.value = true
-    dataFrom.value = props.associatedComponents
-    console.log('dataFrom.value', dataFrom.value)
+  if (props.associatedComponents) {
+    if (
+      props.associatedComponents[0].dataList.length > 0 ||
+      props.associatedComponents[1].dataList.length > 0 ||
+      props.associatedComponents[2].dataList.length > 0
+    ) {
+      flag.value = true
+      dataFrom.value = props.associatedComponents
+      console.log('dataFrom.value', dataFrom.value)
+    } else {
+      flag.value = false
+    }
   } else {
     flag.value = false
   }
+
   watch(
     () => props.associatedComponents,
     (val) => {
-      if (val) {
-        flag.value = true
-        dataFrom.value = props.associatedComponents
-        console.log('dataFrom.value', dataFrom.value)
+      if (props.associatedComponents) {
+        if (
+          val[0].dataList.length > 0 ||
+          val[1].dataList.length > 0 ||
+          val[2].dataList.length > 0
+        ) {
+          flag.value = true
+          dataFrom.value = props.associatedComponents
+          // console.log('dataFrom.value', dataFrom.value)
+        } else {
+          flag.value = false
+        }
       } else {
         flag.value = false
       }

From d87bf2ded97ee7b0ce7f429b8729601f23b7783f Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Mon, 4 Jul 2022 11:27:21 +0800
Subject: [PATCH 6/9] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/index.html        | 22 +++++++++++-----------
 front/src/views/home/apply.vue |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/front/public/index.html b/front/public/index.html
index 43013a4e..e49bb306 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 16:45:25
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-01 17:06:39
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-02 00:01:06
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -28,10 +28,10 @@
      <!-- 站点配置 -->
   <script>
     window.SITE_CONFIG = {};
-    // window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
-    // window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
-    // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
-    // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
+    window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
+    window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
+    window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
+    window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
     // 包头
     // window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001';
     // window.SITE_CONFIG['previewUrl'] = 'http://10.110.205.1:8002/';
@@ -44,11 +44,11 @@
     // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
     // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
     // 开发
-    window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
-    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
-    window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
+    // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
+    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 穿透版本
     // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
     // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index af30afdb..ba4e45b2 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -423,7 +423,7 @@
                 applySuccess.value = false
                 message.success('操作成功！')
                 console.log('能力申请================>', res)
-                if (ids) {
+                if (ids && ids.length>0) {
                   sgcDel({ ids: ids }).then((res) => {
                     if (res.data.msg === 'success') {
                       mybus.emit('getSgcNum')

From 5ffeb562dacc3d2cef67aca6768f77b20cce84a4 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 4 Jul 2022 11:56:45 +0800
Subject: [PATCH 7/9] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Algorithm/AlgorithmNavigation.vue         |  32 ++--
 front/src/views/home/AbilityToApplyFor.vue    | 139 +++++++++++++-----
 front/src/views/home/apply.vue                | 117 +++++++--------
 .../home/components/searchResultList.vue      |   3 +
 4 files changed, 169 insertions(+), 122 deletions(-)

diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue
index 9658235f..c66d5ed0 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 14:54:01
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-30 17:09:40
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-04 10:08:10
  * @Description: 算法详情页导航
 -->
 <template>
@@ -65,19 +65,21 @@
   ])
   const list = ref([])
   // 根据能力id查询是否存在关联应用
-  queryPartAppByKeyId2({ keyId: keyId }).then((res) => {
-    console.log('ressssssss', res)
-    if (res.data.data.length > 0) {
-      // 存在关联应用时在导航栏加入关联应用
-      navList.value.unshift({
-        name: '关联应用',
-        key: 'algorithm-associated-ability',
-        show: true,
-      })
-      // list.value.push('关联应用')
-      console.log('navList', navList)
-    }
-  })
+  if (keyId) {
+    queryPartAppByKeyId2({ keyId: keyId }).then((res) => {
+      console.log('ressssssss', res)
+      if (res.data.data.length > 0) {
+        // 存在关联应用时在导航栏加入关联应用
+        navList.value.unshift({
+          name: '关联应用',
+          key: 'algorithm-associated-ability',
+          show: true,
+        })
+        // list.value.push('关联应用')
+        console.log('navList', navList)
+      }
+    })
+  }
   const props = defineProps({
     selectNow: { type: String, default: '' },
     dataList: { type: Object, default: null },
diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue
index 7fd3236b..4653565c 100644
--- a/front/src/views/home/AbilityToApplyFor.vue
+++ b/front/src/views/home/AbilityToApplyFor.vue
@@ -1,6 +1,10 @@
 <template>
-  <div class="ability-to-apply-for">
-    <div class="title">申请能力</div>
+  <div class="ability-to-apply-for" :class="{ all: falg }">
+    <div class="title">
+      <span>申请能力</span>
+      <span class="btn" @click="falg = !falg" v-show="!falg">展开</span>
+      <span class="btn" @click="falg = !falg" v-show="falg">收起</span>
+    </div>
     <div
       v-for="(item, index) in dataForm"
       :key="index"
@@ -12,20 +16,38 @@
       </div>
       <template v-for="val in item.arr" :key="val.resourceId">
         <div class="item">
-          <div class="name">
-            <span>{{ val.resourceName }}</span>
-            <span>{{ val.type }}</span>
-          </div>
-          <div class="description">
-            {{
-              val.description ||
-              (val.note1 &&
-                JSON.parse(val.note1)[0].channelName +
-                  '等' +
-                  JSON.parse(val.note1).length +
-                  '个摄像头') ||
-              '--'
-            }}
+          <div
+            class="tx"
+            :class="
+              val.type == '基础设施'
+                ? 'sxt'
+                : val.componentType == '智能算法'
+                ? 'znsf'
+                : val.componentType == '图层服务'
+                ? 'tcfw'
+                : val.componentType == '开发组件'
+                ? 'kfzj'
+                : val.componentType == '业务组件'
+                ? 'ywzj'
+                : ''
+            "
+          ></div>
+          <div class="text">
+            <div class="name">
+              <span>{{ val.resourceName }}</span>
+              <span>{{ val.type }}</span>
+            </div>
+            <div class="description">
+              {{
+                val.description ||
+                (val.note1 &&
+                  JSON.parse(val.note1)[0].channelName +
+                    '等' +
+                    JSON.parse(val.note1).length +
+                    '个摄像头') ||
+                '--'
+              }}
+            </div>
           </div>
           <div class="remove" @click="removeFunction(val)"></div>
         </div>
@@ -35,27 +57,29 @@
 </template>
 
 <script setup>
-  import { useRouter } from 'vue-router'
+  // import { useRouter } from 'vue-router'
   import { message } from 'ant-design-vue'
   import { ref, defineProps } from 'vue'
-  import mybus from '@/myplugins/mybus'
+  // import mybus from '@/myplugins/mybus'
   const props = defineProps({
     dataList: { type: Array, default: null },
   })
+  const falg = ref(false)
   let dataForm = ref([])
   // eslint-disable-next-line vue/no-setup-props-destructure
   dataForm.value = props.dataList
-  const router = useRouter()
-  const arr =
-    router.currentRoute.value.query.name instanceof Array
-      ? router.currentRoute.value.query.name
-      : [router.currentRoute.value.query.name]
-  const dataResourceId = router.currentRoute.value.query.resourceId
+  console.log(dataForm.value)
+  // const router = useRouter()
+  // const arr =
+  //   router.currentRoute.value.query.name instanceof Array
+  //     ? router.currentRoute.value.query.name
+  //     : [router.currentRoute.value.query.name]
+  // const dataResourceId = router.currentRoute.value.query.resourceId
 
-  const depList = ref({
-    Name: [],
-    depID: [],
-  })
+  // const depList = ref({
+  //   Name: [],
+  //   depID: [],
+  // })
   //移除方法
   const removeFunction = (data) => {
     dataForm.value.map((val) => {
@@ -71,25 +95,26 @@
 
 <style scoped lang="less">
   .ability-to-apply-for {
+    height: 290px;
+    overflow: hidden;
     .title {
       font-size: 0.16rem;
       color: #212121;
       border-bottom: 0.01rem #dddee1 solid;
       padding-bottom: 0.1rem;
       margin-bottom: 0.2rem;
+      display: flex;
+      justify-content: space-between;
     }
     .ability-to-apply-for-content {
-      // margin-bottom: 0.3rem;
-      // border-bottom: 0.01rem #dddee1 solid;
-      // padding-bottom: 0.3rem;
       padding-right: 0.5rem;
       position: relative;
       .dep-name {
         color: #0558e1;
-        font-size: 0.18rem;
+        font-size: 0.22rem;
         display: flex;
         align-items: center;
-        line-height: 0.18rem;
+        line-height: 0.22rem;
         margin-bottom: 0.2rem;
         span {
           display: inline-block;
@@ -104,14 +129,19 @@
         padding-bottom: 0.1rem;
         margin-bottom: 0.1rem;
         border-bottom: 1px solid #dddee1;
-        position: relative;
+        display: flex;
+        align-items: center;
+        .text {
+          margin-left: 0.2rem;
+          width: 8.8rem;
+        }
       }
       .name {
         margin-bottom: 0.2rem;
         span:first-child {
           display: inline-block;
           margin-right: 0.08rem;
-          font-size: 0.2rem;
+          font-size: 0.18rem;
           color: #000000;
         }
         span:last-child {
@@ -122,16 +152,13 @@
         }
       }
       .description {
-        width: 10rem;
+        width: 8.8rem;
         color: rgba(0, 0, 0, 0.45);
       }
       .remove {
+        margin-left: 0.1rem;
         width: 0.32rem;
         height: 0.32rem;
-        position: absolute;
-        right: 0;
-        top: 50%;
-        margin-top: -0.16rem;
         background: url('~@/assets/home/remove.png') no-repeat;
         background-size: cover;
         cursor: pointer;
@@ -142,4 +169,36 @@
       }
     }
   }
+  .all {
+    height: unset;
+  }
+  .btn {
+    cursor: pointer;
+  }
+  .tx {
+    display: inline-block;
+    width: 0.8rem;
+    height: 0.8rem;
+    margin-left: 0.1rem;
+  }
+  .sxt {
+    background: url('~@/assets/home/sxt_square.png') no-repeat;
+    background-size: 100%;
+  }
+  .znsf {
+    background: url('~@/assets/home/znsf_square.png') no-repeat;
+    background-size: 100%;
+  }
+  .tcfw {
+    background: url('~@/assets/home/tcfw_square.png') no-repeat;
+    background-size: 100%;
+  }
+  .kfzj {
+    background: url('~@/assets/home/kfzj_square.png') no-repeat;
+    background-size: 100%;
+  }
+  .ywzj {
+    background: url('~@/assets/home/ywzj_square.png') no-repeat;
+    background-size: 100%;
+  }
 </style>
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index af30afdb..d3d6a256 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -118,9 +118,10 @@
                   name="applicationBackground"
                   :rules="[{ required: true, message: '请输入应用背景' }]"
                 >
-                  <a-input
+                  <a-textarea
                     placeholder="请输入应用背景"
                     v-model:value="formName.applicationBackground"
+                    :rows="4"
                   />
                 </a-form-item>
               </div>
@@ -130,9 +131,10 @@
                   name="effectWish"
                   :rules="[{ required: true, message: '请输入期望效果' }]"
                 >
-                  <a-input
+                  <a-textarea
                     placeholder="请输入期望效果"
                     v-model:value="formName.effectWish"
+                    :rows="4"
                   />
                 </a-form-item>
               </div>
@@ -173,7 +175,7 @@
                 </a-upload>
               </a-form-item>
 
-              <a-form-item :wrapper-col="{ offset: 8, span: 16 }">
+              <div class="bottom-btn">
                 <a-button
                   style="
                     width: 80px;
@@ -211,7 +213,7 @@
                 >
                   提交申请
                 </a-button>
-              </a-form-item>
+              </div>
             </a-form>
           </div>
           <div class="success" v-else>
@@ -504,6 +506,7 @@
         },
       ])
       const systemOptions = ref([])
+      const systemOptions2 = ref([])
 
       const handleChange = (info) => {
         if (info.file.status !== 'uploading') {
@@ -536,83 +539,50 @@
         return isPNG || Upload.LIST_IGNORE
       }
       const fileList = ref([])
-      //删除改变arr
-      // mybus.on('reomveOldData', (item) => {
-      //   debugger
-      //   arr = []
-      //   formName.system = []
-      //   record.value = record.value + '1'
-      //   arr = item.Name
-      //   // dataResourceId = item.depID
-      //   if (arr && arr.length !== 0) {
-      //     disabled.value = true
-      //     let str = ''
-      //     arr.forEach((val, index) => {
-      //       str += val
-      //       if (index < arr.length - 1) {
-      //         str += '、'
-      //       }
-      //     })
-      //     formName.formNameSystem = str
-      //   }
-      //   arr.forEach((val, index) => {
-      //     formName.system.push({
-      //       resourceName: val,
-      //       // resourceId: dataResourceId[index],
-      //     })
-      //   })
-      // })
       // 应用系统下拉
-      const flag = ref(true)
       const systemHandleChange = (value) => {
         console.log(`selected ${value}`)
       }
       const systemHandleSearch = (value) => {
         console.log(`search ${value}`)
         text.value = value
-        systemOptions.value = []
-        window.setTimeout(() => {
-          if (flag.value && text.value == value && text.value !== '') {
-            console.log('1秒未输入~~~~~~~~~~~~~~~~~~~~~~~~~~')
-            pageWithAttrs({
-              pageNum: 99999,
-              pageSize: 5,
-              type: '应用资源',
-              name: text.value,
-              infoList: [],
-            }).then((res) => {
-              if (res.data.code == 0) {
-                if (res.data.data.records.length == 0) {
-                  message.warning('该关键词，暂无应用资源！')
-                } else {
-                  res.data.data.records.map((val) => {
-                    systemOptions.value.push({
-                      value: val.name,
-                      label: val.name,
-                    })
-                  })
-                  console.log(
-                    '第一次获取===================>',
-                    systemOptions.value
-                  )
-                }
-              } else {
-                message.error('获取数据失败!')
-              }
-            })
-          }
-        }, 2000)
+        systemOptions.value = systemOptions2.value.filter(
+          (item) => item.label.search(text.value) > -1
+        )
       }
-
+      pageWithAttrs({
+        pageNum: 1,
+        pageSize: 99999,
+        type: '应用资源',
+        name: '',
+        infoList: [],
+      }).then((res) => {
+        if (res.data.code == 0) {
+          if (res.data.data.records.length == 0) {
+            message.warning('该关键词，暂无应用资源！')
+          } else {
+            res.data.data.records.map((val) => {
+              systemOptions2.value.push({
+                value: val.name,
+                label: val.name,
+              })
+            })
+            // console.log('第一次获取===================>', systemOptions2.value)
+          }
+        } else {
+          message.error('应用系统获取数据失败!')
+        }
+      })
       const handleBlur = () => {
         console.log('blur')
-        flag.value = false
       }
 
       const handleFocus = () => {
         console.log('focus')
-        flag.value = true
-        systemOptions.value = []
+        // console.log(formName.applicationSystem)
+        // formName.applicationSystem = []
+        systemOptions.value = systemOptions2.value
+        // systemOptions.value = []
       }
 
       // const filterOption = (input, option) => {
@@ -727,4 +697,17 @@
       flex-wrap: nowrap;
     }
   }
+  textarea {
+    resize: none;
+    font-size: 14px;
+  }
+  .bottom-btn {
+    display: flex;
+    justify-content: center;
+    // position: fixed;
+  }
+  :deep(.ant-form-item-control-input-content) {
+    display: flex;
+    justify-content: space-around;
+  }
 </style>
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index a17ce205..52309ca7 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -437,6 +437,9 @@
                       resourceName: item.name,
                       time: item.createDate,
                       type: item.type,
+                      componentType: item.infoList.filter(
+                        (val) => val.attrType == '组件类型'
+                      )[0].attrValue,
                     },
                   ],
                   deptId: item.deptId,

From c35d5789fcf8f8e81c3d20359fe653b961ea0414 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 4 Jul 2022 17:02:00 +0800
Subject: [PATCH 8/9] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myAgent/demo/competency-application.vue   |  3 +-
 front/public/index.html                       | 20 ++++++-------
 .../components/AssignCaseDetailPage.vue       |  6 ++--
 .../views/assignCase/components/queryPage.vue |  5 +++-
 front/src/views/home/AbilityToApplyFor.vue    |  3 +-
 front/src/views/home/apply.vue                | 30 ++++++++++++++-----
 .../home/components/searchResultList.vue      |  2 +-
 front/src/views/home/infrastructurePage.vue   | 30 +++++++++++--------
 .../personalCenter/components/MyApply.vue     |  2 +-
 .../components/PurchaseVehicle.vue            |  4 ++-
 10 files changed, 68 insertions(+), 37 deletions(-)

diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 709f0fcc..0c29bfbd 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-01 09:29:57
+ * @LastEditTime: 2022-07-04 16:17:22
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -157,6 +157,7 @@ export default {
       })
     },
     downloadFile2 (url) {
+      console.log(window.SITE_CONFIG.previewUrl)
       window.open(
         window.SITE_CONFIG.previewUrl +
         'hisense_office/onlinePreview?url=' +
diff --git a/front/public/index.html b/front/public/index.html
index e49bb306..9b1c0049 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 16:45:25
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-02 00:01:06
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-04 14:13:57
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -28,10 +28,10 @@
      <!-- 站点配置 -->
   <script>
     window.SITE_CONFIG = {};
-    window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
-    window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
+    // window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
+    // window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
     // 包头
     // window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001';
     // window.SITE_CONFIG['previewUrl'] = 'http://10.110.205.1:8002/';
@@ -44,10 +44,10 @@
     // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
     // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
     // 开发
-    // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
-    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
-    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
-    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
+    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
+    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
+    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
     window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 穿透版本
     // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
diff --git a/front/src/views/assignCase/components/AssignCaseDetailPage.vue b/front/src/views/assignCase/components/AssignCaseDetailPage.vue
index 795b597c..dd6bf0a5 100644
--- a/front/src/views/assignCase/components/AssignCaseDetailPage.vue
+++ b/front/src/views/assignCase/components/AssignCaseDetailPage.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.zhangfeihu
  * @Date: 2022-06-13 10:22:27
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-20 18:58:40
+ * @LastEditTime: 2022-07-04 15:32:52
  * @Description: 赋能案例-详情页
 -->
 <template>
@@ -172,7 +172,9 @@
   watch(
     () => router.currentRoute.value.query.id,
     () => {
-      init()
+      if (router.currentRoute.value.name == 'AssignCaseDetailPage') {
+        init()
+      }
     },
     { immediate: true }
   )
diff --git a/front/src/views/assignCase/components/queryPage.vue b/front/src/views/assignCase/components/queryPage.vue
index 50aef2b0..cb55bcba 100644
--- a/front/src/views/assignCase/components/queryPage.vue
+++ b/front/src/views/assignCase/components/queryPage.vue
@@ -315,7 +315,6 @@
             height: 20px;
             background: url(../../../assets/assignCase/left.png) no-repeat
               center;
-
             margin-top: 30px;
             transform: rotate(-90deg);
           }
@@ -343,6 +342,10 @@
             color: #333333;
             margin-right: 30px;
             cursor: pointer;
+            display: inline-block;
+            line-height: 30px;
+            padding: 5px 10px;
+            border-radius: 0.16rem;
           }
           span:nth-of-type(8n) {
             margin-right: 50px;
diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue
index 4653565c..84b73888 100644
--- a/front/src/views/home/AbilityToApplyFor.vue
+++ b/front/src/views/home/AbilityToApplyFor.vue
@@ -95,7 +95,7 @@
 
 <style scoped lang="less">
   .ability-to-apply-for {
-    height: 290px;
+    height: 2.9rem;
     overflow: hidden;
     .title {
       font-size: 0.16rem;
@@ -171,6 +171,7 @@
   }
   .all {
     height: unset;
+    min-height: 2.9rem;
   }
   .btn {
     cursor: pointer;
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index bcd709dc..f4fc6801 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -267,11 +267,32 @@
     setup() {
       const router = useRouter()
       const disabled = ref(false)
+      const list = ref(JSON.parse(localStorage.getItem('applyList')))
+      const num = ref(0)
+      list.value.map((item) => {
+        if (item.checkedList) {
+          console.log(item)
+          num.value += Number(item.checkedList.length)
+        }
+      })
+      console.log(
+        'list',
+        list.value,
+        list.value[0].children.filter(
+          (val) => val.id == list.value[0].checkedList[0]
+        )[0].resourceName
+      )
       const baseURL = window.SITE_CONFIG.apiURL
       let record = ref('1')
       const text = ref('')
       const formName = reactive({
-        title: '', // 标题
+        title: list.value[0].children
+          .filter((val) => val.id == list.value[0].checkedList[0])[0]
+          .resourceName.concat(
+            list.value[0].checkedList.length > 0
+              ? '等能力申请' + num.value + '个'
+              : '能力申请'
+          ), // 标题
         applicationSystem: [], // 应用系统
         applicationScene: [], // 应用场景
         applicationBackground: '', // 应用背景
@@ -294,7 +315,6 @@
           formName.unit = res.data.data.deptName
         })
       })
-      const list = ref(JSON.parse(localStorage.getItem('applyList')))
       // console.log('本地存储====================》', list.value)
       const businessKey = ref(router.currentRoute.value.query.id)
       const taskId = ref(router.currentRoute.value.query.taskId)
@@ -425,7 +445,7 @@
                 applySuccess.value = false
                 message.success('操作成功！')
                 console.log('能力申请================>', res)
-                if (ids && ids.length>0) {
+                if (ids && ids.length > 0) {
                   sgcDel({ ids: ids }).then((res) => {
                     if (res.data.msg === 'success') {
                       mybus.emit('getSgcNum')
@@ -706,8 +726,4 @@
     justify-content: center;
     // position: fixed;
   }
-  :deep(.ant-form-item-control-input-content) {
-    display: flex;
-    justify-content: space-around;
-  }
 </style>
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 52309ca7..db9ced7a 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -131,7 +131,7 @@
               <div v-if="selectCardsname !== '数据资源'">
                 浏览量：{{ item.visits || 0 }}次
               </div>
-              <div>申请量：{{ item.applyCount || 0 }}次</div>
+              <div>申购量：{{ item.applyCount || 0 }}次</div>
               <div v-if="selectCardsname === '数据资源'">
                 数据量：{{ item.sjlCount || 0 }}
               </div>
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 342cc39d..7060d2e3 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -61,9 +61,9 @@
           </a-button>
         </div>
         <i class="boundary"></i>
-        <!-- 添加至购物车 -->
+        <!-- 添加至申购车 -->
         <a-button type="primary" @click="addShoppingCart" class="buttonAdd">
-          添加至购物车
+          添加至申购车
         </a-button>
         <!-- 一键申请 -->
         <a-button type="primary" @click="apply" class="buttonAdd">
@@ -253,6 +253,8 @@
   let tableHeight = ref('600')
   //tab切换点击事件
   const tabClick = (indexFather, name) => {
+    selectedRowKeys.value = []
+    selectedList.value = []
     if (clickList.value[indexFather].content.indexOf(name) != -1) {
       if (name == '视频资源') {
         tableHeight.value = 330
@@ -404,16 +406,20 @@
   }
   //加入申购车
   const addShoppingCart = () => {
-    sgcInsert({
-      delFlag: '0',
-      resourceId: '8888888880000000001',
-      note1: selectedList.value,
-      // userId: userId.value,
-    }).then((res) => {
-      console.log(res)
-      message.success('添加申购车成功！')
-      mybus.emit('getSgcNum')
-    })
+    if (selectedList.value.length > 0) {
+      sgcInsert({
+        delFlag: '0',
+        resourceId: '8888888880000000001',
+        note1: selectedList.value,
+        // userId: userId.value,
+      }).then((res) => {
+        console.log(res)
+        message.success('添加申购车成功！')
+        mybus.emit('getSgcNum')
+      })
+    } else {
+      message.error('请选择需要添加申购车的数据')
+    }
   }
   // 表格
   const dataSource = ref([])
diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 08f0d019..3b50a675 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -49,7 +49,7 @@
             <template #title>{{ item.name }}</template>
             <div class="content-body-title">
               <span
-                v-if="item.name === '申请摄像头列表'"
+                v-if="item.name === '申请摄像头列表' && item.ended"
                 @click="showVideoList(item)"
               >
                 名称：{{ item.name }}
diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue
index 63d78168..14faff0e 100644
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@@ -108,7 +108,9 @@
                 >
                   <template #title>
                     <span
-                      @click="showItem(item.id, item.type, item.delFlag)"
+                      @click="
+                        showItem(item.resourceId, item.type, item.delFlag)
+                      "
                       style="cursor: pointer"
                       class="name"
                     >

From 854eaef183c514127d030c37c16033f9aaaac450 Mon Sep 17 00:00:00 2001
From: gaoxiaolong <327091900@qq.com>
Date: Mon, 4 Jul 2022 17:07:07 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applicationResources.vue                  | 27 ++++++++++---------
 .../abilityStatistics/componentServices.vue   | 12 ++++-----
 .../abilityStatistics/componentUsed.vue       | 23 +++++++++-------
 .../views/modules/abilityStatistics/index.vue | 12 +++++++--
 4 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/applicationResources.vue b/back/src/views/modules/abilityStatistics/applicationResources.vue
index aea5855f..cc2acede 100644
--- a/back/src/views/modules/abilityStatistics/applicationResources.vue
+++ b/back/src/views/modules/abilityStatistics/applicationResources.vue
@@ -48,7 +48,7 @@
             </div>
              <div class='container-body8'>
                 <span style='font-size:18px;color;#000000;'>应用领域分布情况</span>
-                <div id="main8" style="width: 300px;height:200px;"></div>
+                <div id="main8" style="width: 300px;height:200px;margin-left:-20px;"></div>
             </div>
              <div class='container-body9'>
                 <span style='font-size:18px;color;#000000;'>应用状态分布情况</span>
@@ -114,8 +114,9 @@ export default {
             getDistributedList () {               
             this.$http.get('/census/center/v3/assemblerUseProjectInfo/' ,{
                   params : {
-                    keyId:'1522550195034857476'
-                    // this.tableId
+                    id:
+                    // '1522550195034857476'
+                    this.tableId
                     }                     
             }).then(res => {
                 let arry=[]
@@ -147,8 +148,8 @@ export default {
                 arry=res.data.data
                 arry.forEach((item)=>{                   
                     const single={
-                        value:item.useNum,
-                        name:item.name
+                        value:item.appNum,
+                        name:item.attr_value
                     }
                    this.data3.push(single.name)
                    this.data4.push(single.value)
@@ -377,7 +378,7 @@ export default {
             var total = 0;
             var tarValue;
             for (var i = 0; i < data.length; i++) {
-              total += data[i].value;
+              total += Number(data[i].value);
               if (data[i].name == name) {
                 tarValue = data[i].value;
               }
@@ -599,7 +600,7 @@ export default {
         },
         series: [
             {
-           data: [5, 5, 5, 5, 5, 5],
+           data: [1, 1, 1, 1, 1, 1],
             type: 'bar',
             barWidth: 14,
             stack: '1',
@@ -654,7 +655,7 @@ export default {
             var total = 0;
             var tarValue;
             for (var i = 0; i < data.length; i++) {
-              total += data[i].value;
+              total += Number(data[i].value);
               if (data[i].name == name) {
                 tarValue = data[i].value;
               }
@@ -725,7 +726,7 @@ export default {
             var total = 0;
             var tarValue;
             for (var i = 0; i < data.length; i++) {
-              total += data[i].value;
+             total += Number(data[i].value);
               if (data[i].name == name) {
                 tarValue = data[i].value;
               }
@@ -804,7 +805,7 @@ export default {
                     var total = 0;
                     var tarValue;
                     for (var i = 0; i < data.length; i++) {
-                    total += data[i].value;
+                    total += Number(data[i].value);
                     if (data[i].name == name) {
                         tarValue = data[i].value;
                     }
@@ -822,9 +823,9 @@ export default {
                     a: {
                         // 设置文字、数学、英语这一列的样式
                         width: 80,
-                        color: "#000000",
+                        color: "#666666",
                         fontSize: 12,
-                        fontWeight: "bolder",
+                        // fontWeight: "bolder",
                     },
                     b: {
                         // 设置10分、20分、30分这一列的样式
@@ -899,7 +900,7 @@ export default {
                     var total = 0;
                     var tarValue;
                     for (var i = 0; i < data.length; i++) {
-                    total += data[i].value;
+                    total += Number(data[i].value);
                     if (data[i].name == name) {
                         tarValue = data[i].value;
                     }
diff --git a/back/src/views/modules/abilityStatistics/componentServices.vue b/back/src/views/modules/abilityStatistics/componentServices.vue
index 01c866bb..e39f577c 100644
--- a/back/src/views/modules/abilityStatistics/componentServices.vue
+++ b/back/src/views/modules/abilityStatistics/componentServices.vue
@@ -200,7 +200,7 @@ export default {
             this.$http.get('/census/center/v3/assemblerCaredTopInfo' ,{
                   params : {
                    id:this.tableId,
-                   resourceType:"应用资源"
+                   resourceType:"组件服务"
                     // pageNo: pageNo || 1,
                     // pageSize: 20
                     }                    
@@ -231,7 +231,7 @@ export default {
                 var total = 0;
                 var tarValue;
                 for (var i = 0; i < data.length; i++) {
-                total += data[i].value;
+                total += Number(data[i].value);
                 if (data[i].name == name) {
                     tarValue = data[i].value;
                 }
@@ -295,7 +295,7 @@ export default {
                 var total = 0;
                 var tarValue;
                 for (var i = 0; i < data.length; i++) {
-                total += data[i].value;
+                total += Number(data[i].value);
                 if (data[i].name == name) {
                     tarValue = data[i].value;
                 }
@@ -361,7 +361,7 @@ export default {
                     var total = 0;
                     var tarValue;
                     for (var i = 0; i < data.length; i++) {
-                    total += data[i].value;
+                    total += Number(data[i].value);
                     if (data[i].name == name) {
                         tarValue = data[i].value;
                     }
@@ -377,9 +377,9 @@ export default {
                     a: {
                         // 设置文字、数学、英语这一列的样式
                         width: 100,
-                        color: "#000000",
+                        color: "#666666",
                         fontSize: 12,
-                        fontWeight: "bolder",
+                        // fontWeight: "bolder",
                     },
                     b: {
                         // 设置10分、20分、30分这一列的样式
diff --git a/back/src/views/modules/abilityStatistics/componentUsed.vue b/back/src/views/modules/abilityStatistics/componentUsed.vue
index 4beff5d9..de68a125 100644
--- a/back/src/views/modules/abilityStatistics/componentUsed.vue
+++ b/back/src/views/modules/abilityStatistics/componentUsed.vue
@@ -17,7 +17,7 @@
             </div>
             <div class='container-body3'>
                 <span style='font-size:18px;color;#000000;'>使用组件应用领域分布情况</span>
-                <div id="main8" style="width: 400px;height:200px;"></div>
+                <div id="main3" style="width: 400px;height:200px;"></div>
             </div>
              <div class='container-body4'>
                 <div style='margin-bottom:30px'>
@@ -36,7 +36,7 @@
             </div>
              <div class='container-body5'>
                 <div style='margin-bottom:30px'>
-                     <span style='font-size:18px;color;#000000;'>使用组件评分Top5</span>
+                     <span style='font-size:18px;color;#000000;'>使用组件评分</span>
                       <img src="@/assets/img/TOP5.png" style='margin-left:10px'>
                 </div>
                 <div v-for="(item,index) in applicationList" :key='index' >
@@ -174,9 +174,7 @@ export default {
                         value:item.total,
                         name:item.type
                     }
-                    const newList=[]
                     this.data3.push(single)
-                    // this.data2=newList
                     this.myEcharts3()
                })             
             })            
@@ -231,7 +229,7 @@ export default {
                 var total = 0;
                 var tarValue;
                 for (var i = 0; i < data.length; i++) {
-                total += data[i].value;
+                total += Number(data[i].value);
                 if (data[i].name == name) {
                     tarValue = data[i].value;
                 }
@@ -295,7 +293,7 @@ export default {
                 var total = 0;
                 var tarValue;
                 for (var i = 0; i < data.length; i++) {
-                total += data[i].value;
+               total += Number(data[i].value);
                 if (data[i].name == name) {
                     tarValue = data[i].value;
                 }
@@ -361,13 +359,14 @@ export default {
                     var total = 0;
                     var tarValue;
                     for (var i = 0; i < data.length; i++) {
-                    total += data[i].value;
+                    total += Number(data[i].value);
                     if (data[i].name == name) {
                         tarValue = data[i].value;
                     }
                     }
-                    var v = tarValue;
+                    // var v = tarValue;
                     var p = Math.round(((tarValue / total) * 100));
+                    console.log('@@@@', tarValue, total)
                     return `{a|${name}}  {b|${p}%}`;
                 },
                 itemStyle:{},
@@ -428,7 +427,7 @@ export default {
             option && myChart.setOption(option);
                 },
         backBtn(){
-            this.$emit('closeChild')
+            this.$emit('closeChild2')
         }
    }
 }
@@ -541,9 +540,13 @@ export default {
          position:absolute;
          display: flex;
          margin-left:90px;
+         width:200px;
          margin-top:5px;
          color:#333333;
-         font-size: 16px;        
+         font-size: 16px;
+         overflow: hidden;
+         white-space: nowrap;
+         text-overflow: ellipsis;        
     }   
     .count-style{
          position:absolute;
diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index df327370..2ff30249 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -96,7 +96,7 @@
             min-width="100%">
         </el-table-column>
         <el-table-column v-if="this.departmentId===2"
-            prop="resourceCarNum"
+            prop="resourceCallNum"
             label="申请总数"
             min-width="100%">
         </el-table-column>
@@ -121,7 +121,7 @@
     </div>   
   </el-card>
     </div>
-   <component-used v-if='UsedIsShow' :tableId='tableId' :fatherId='fatherId' @closeChild='closeChild'></component-used>
+   <component-used v-if='UsedIsShow' :tableId='tableId' :fatherId='fatherId' @closeChild2='closeChild2'></component-used>
    <component-services v-if='servicesIsShow' :tableId='tableId' :fatherId='fatherId' @closeChild='closeChild'></component-services>
    <application-resources  v-if='resourcesIsShow'  :tableId='tableId' :fatherId='fatherId' @closeApplication='closeApplication'></application-resources>
 </div>  
@@ -362,10 +362,18 @@ export default {
       closeChild(){
         this.homeIsShow=true
         this.servicesIsShow=false
+        this. handleCurrentChange(1)
+        
+      },
+       closeChild2(){
+        this.homeIsShow=true
+        this.UsedIsShow=false
+        this. handleCurrentChange(1)
       },
        closeApplication(){
         this.homeIsShow=true
         this.resourcesIsShow=false
+        this. handleCurrentChange(1)
       }
     },