Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

src/components/table/table-um.vue

@@ -874,7 +874,7 @@ em {
 } */
 .el-table__placeholder {
   display: inline-block;
-  width: 40px;
+  width: 24px;
 }
 .th_pink {
   background-color: #faf2e2 !important;

src/pages/data-analysis/super-application.vue

@@ -193,11 +193,7 @@
       <el-col :span="6" class="in_right">
         <el-row>
           <el-col :span="24" class="in_block">
-            <block-radius
-              :show_header="true"
-              title="应用部署排名分析"
-              class="block"
-            >
+            <block-radius :show_header="true" title="应用部署排名分析" class="block">
               <toplist
                 class="block-radius-content"
                 :options="toplistData"

src/pages/data-analysis/super-service.vue

@@ -179,11 +179,7 @@
       <el-col :span="6" class="in_right">
         <el-row>
           <el-col :span="24" class="in_block">
-            <block-radius
-              :show_header="true"
-              title="服务调用排名分析"
-              class="block"
-            >
+            <block-radius :show_header="true" title="服务调用排名分析" class="block">
               <toplist
                 class="block-radius-content"
                 :options="toplistData"
@@ -618,8 +614,8 @@ export default {
               this.commentlistData = response.data.data.concat(
                 this.commentlistData
               );
+              this.last_id = this.commentlistData[0].last_id;
             }
-            this.last_id = this.commentlistData[0].last_id;
           }
         });
     },
@@ -630,13 +626,21 @@ export default {
         })
         .then((response) => {
           if (response.data.success == 1) {
+            let data = response.data.data;
+            this.serviceSpData = {
+              xAxisData: data.xAxis.data,
+              seriesData: data.series,
+            };
           }
         });
     },
     getServiceApprovalStatus() {
       this.$api.dataAnalysis.getServiceApprovalStatus().then((response) => {
         if (response.data.success == 1) {
-          this.fwsp_data = response.data.data;
+          this.fwsp_data = [
+            { name: "已审批", value: response.data.data.approval },
+            { name: "待审批", value: response.data.data.to_approval },
+          ];
         }
       });
     },

src/request/api/data-analysis.js

@@ -37,11 +37,11 @@ const dataAnalysis = {
   getServiceHotSearch() {
     return axios.get(`/apaas/service/v3/statistics/normal/service/search`);
   },
-  getServiceApprovalChanges() {
-    return axios.get(``);
+  getServiceApprovalChanges(params) {
+    return axios.get(`/apaas/service/v3/statistics/normal/service/approval/trend?type=${params.type == 0 ? 'day14' : 'day30'}`);
   },
   getServiceApprovalStatus() {
-    return axios.get(``);
+    return axios.get(`/apaas/service/v3/statistics/normal/service/approval/distribute`);
   },
 
   //app