Merge branch 'master' of http://git.quantgroup.cn/QA/qahome-diamond

src/router/index.js

@@ -245,8 +245,8 @@ export const asyncRouterMap = [
     redirect: 'cpu',
     name: 'Resources',
     meta: {
-      title: 'resources',
-      icon: 'pipeline'
+      title: '资源使用率',
+      icon: 'table'
     },
     children: [
       {

src/views/resources/cpuDetails.vue

@@ -28,7 +28,7 @@
       </el-table-column>
       <el-table-column label="服务名" prop="Action" align="center">
         <template slot-scope="scope">
-          <span >{{ scope.row.name }}</span>
+          <span >{{ scope.row._id }}</span>
         </template>
       </el-table-column>
       <el-table-column label="Cpu Used Limit" prop="Microservice Name" align="center">
@@ -93,7 +93,7 @@ export default {
       }
       getCpu({ startTime: this.startTime, endTime: this.endTime }).then((res) => {
         if (res.data.length > 0) {
-          this.memoryResources = res.data
+          this.cpuResources = res.data
         } else {
           this.$notify({
             title: '警告',