Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/modules/ability/bsabilityai.vue

@@ -636,7 +636,7 @@ export default {
       this.showPutOnTheShelfFlag = true
       this.$http.get('/category/getCategoryTree').then((res) => {
         this.insertList = res.data.data.filter(
-          (item) => item.name === '组件服务一'
+          (item) => item.name === '组件服务'
         )[0]
       })
     },
@@ -887,7 +887,7 @@ export default {
     UpdateData (item) {
       this.$http.get('/category/getCategoryTree').then((res) => {
         this.insertList = res.data.data.filter(
-          (item) => item.name === '组件服务一'
+          (item) => item.name === '组件服务'
         )[0]
         this.radio = item.infoList.filter(
           (val) => val.attrType === '组件类型'

back/src/views/modules/ability/bsabilityservice.vue

@@ -577,7 +577,7 @@ export default {
     showPutOnTheShelf () {
       this.showPutOnTheShelfFlag2 = true
       this.$http.get('/category/getCategoryTree').then(res => {
-        this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0]
+        this.insertList = res.data.data.filter(item => item.name === '应用资源')[0]
         this.putOnTheShelfList = this.insertList.children
       })
     },
@@ -747,7 +747,7 @@ export default {
     // 新修改
     UpdateData (item) {
       this.$http.get('/category/getCategoryTree').then(res => {
-        this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0]
+        this.insertList = res.data.data.filter(item => item.name === '应用资源')[0]
         this.radio = '应用资源'
         // this.radio = item.infoList.filter(val => val.attrType === '应用资源')[0].attrValue
         this.putOnTheShelfList = this.insertList.children

front/src/views/abilityStatistics/components/AbilityRanking.vue

@@ -259,7 +259,7 @@
     padding-bottom: 0;
     .main {
       width: 100%;
-      margin-top: 10px;
+      margin-top: 60px;
       display: flex;
       flex-direction: column;
       align-items: center;

front/src/views/abilityStatistics/components/ResourceAggregation.vue

@@ -240,8 +240,8 @@
       },
       legend: {
         icon: 'emptyCircle',
-        height: 3,
+        itemGap: 20,
-        itemGap: 40,
+        padding: 20,
         // orient: 'horizontal',
         bottom: 0,
         formatter: function (name) {
@@ -261,8 +261,7 @@
         {
           center: ['50%', '40%'],
           type: 'pie',
-          selectedMode: 'single',
+          // selectedMode: 'single',
-          silent: true,
           radius: ['50%', '30%'],
           color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#FAC858'],
           top: '0',
@@ -290,7 +289,6 @@
           type: 'pie',
           center: ['50%', '40%'],
           radius: ['58%', '50%'],
-          silent: true,
           itemStyle: {
             normal: {
               color: '#c2c7d6',

front/src/views/abilityStatistics/components/SharingSituation.vue

@@ -97,6 +97,12 @@
     let myChart = echarts.init(chartDom)
     let option
     option = {
+      grid: {
+        top: '10%',
+        right: '5%',
+        bottom: '10%',
+        left: '5%',
+      },
       xAxis: {
         type: 'category',
         data: datas.time,
@@ -255,16 +261,21 @@
   }
 
   .situation {
-    font-weight: 600;
+    font-size: 30px;
-    font-style: normal;
+    color: #000;
-    font-size: 24px;
     text-align: center;
-  }
+    display: flex;
-  .line {
+    flex-direction: column;
-    width: 34px;
+    flex-wrap: wrap;
-    height: 3px;
+    justify-content: center;
-    background-color: #0058e1;
+    align-items: center;
-    margin-top: 8px;
+    margin-bottom: 26px;
+    .line {
+      width: 34px;
+      height: 3px;
+      background-color: #0058e1;
+      margin-top: 8px;
+    }
   }
 
   .SharingSituation {
@@ -321,8 +332,8 @@
 
     .Chart {
       flex: 1;
-      width: 598px;
+      width: 638px;
-      height: 286px;
+      height: 296px;
       background: #f7f7f7;
       text-align: center;
       margin: auto;

front/src/views/capacityOnTheShelf/Algorithm.vue

@@ -592,7 +592,7 @@ const init = () => {
   getCategoryTree().then((res) => {
     // console.clear()
     res.data.data = res.data.data
-      .filter((item) => item.name === '组件服务一')[0]
+      .filter((item) => item.name === '组件服务')[0]
       .children.filter((item) => item.name === '智能算法')[0]
     navList.value = []
     navList2.value = []

front/src/views/capacityOnTheShelf/Application.vue

@@ -480,7 +480,7 @@
     getCategoryTree().then((res) => {
       // console.clear()
       res.data.data = res.data.data.filter(
-        (item) => item.name === '应用资源一'
+        (item) => item.name === '应用资源'
       )[0]
       navList.value = []
       navList2.value = []

front/src/views/capacityOnTheShelf/BusinessComponent.vue

@@ -579,7 +579,7 @@
     getCategoryTree().then((res) => {
       // console.clear()
       res.data.data = res.data.data
-        .filter((item) => item.name === '组件服务一')[0]
+        .filter((item) => item.name === '组件服务')[0]
         .children.filter((item) => item.name === '业务组件')[0]
       navList.value = []
       navList2.value = []

front/src/views/capacityOnTheShelf/DevelopmentComponents.vue

@@ -577,7 +577,7 @@
     getCategoryTree().then((res) => {
       // console.clear()
       res.data.data = res.data.data
-        .filter((item) => item.name === '组件服务一')[0]
+        .filter((item) => item.name === '组件服务')[0]
         .children.filter((item) => item.name === '开发组件')[0]
       navList.value = []
       navList2.value = []

front/src/views/capacityOnTheShelf/LayerServices.vue

@@ -472,7 +472,7 @@
     getCategoryTree().then((res) => {
       // console.clear()
       res.data.data = res.data.data
-        .filter((item) => item.name === '组件服务一')[0]
+        .filter((item) => item.name === '组件服务')[0]
         .children.filter((item) => item.name === '图层服务')[0]
       navList.value = []
       navList2.value = []