服务器管理详情添加内存详细信息tab栏，联调内存详细信息列表

src/api/disRevenue/resource.js

@@ -791,6 +791,14 @@ export function removeServer(query) {
     data: query
   })
 }
+// 内存详细信息
+export function initialMemoryDetails(query) {
+  return request({
+    url: '/rocketmq/initialMemoryDetailsInfo/list',
+    method: 'post',
+    data: query
+  })
+}
 
 export function bindBusByClient(query) {
   return request({

src/views/resource/serverRegister/details.vue

@@ -97,6 +97,10 @@
         <el-tab-pane label="出省流量统计" name="出省流量统计">
           <flowForm v-if="activeName === '出省流量统计'" :key="activeName" :activeName="activeName" :clientId="paramsData.clientId"></flowForm>
         </el-tab-pane>
+        <!--    内存详细     -->
+        <el-tab-pane label="内存详细信息" name="内存详细信息">
+          <serRegisTable v-if="activeName === '内存详细信息'" :key="activeName" :activeName="activeName" :modelVal="mapDataList['内存详细信息']" @fnPaging="fnPaging"></serRegisTable>
+        </el-tab-pane>
       </el-tabs>
     </div>
   </div>
@@ -111,7 +115,7 @@
   import diskSizeImg from '@/assets/images/diskSize.png';
   import {getHandle, trafficSerDetails, agentIsNew, virNetInterfaceChild, frpMsgByClient, getPppoeConfig, updateAgentManage, postInterFaceName,
     mountNameList, diskNameList, diskAllNames, trafficEcharts, spaceRate, speedEcharts, trafficIPv4Echarts, trafficIPv6Echarts,cpuTemperatureChartData,
-    cpuLoadData, memoryUtilization, usedSpacechartsData, networkList, pingDroppedEchars, getAlarmLogServerMsg} from "@/api/disRevenue/resource";
+    cpuLoadData, memoryUtilization, usedSpacechartsData, networkList, pingDroppedEchars, getAlarmLogServerMsg, initialMemoryDetails} from "@/api/disRevenue/resource";
   import {listBandWidth} from "@/api/disRevenue/earnManage";
   import serRegisFormOther from './formOther';
   import serRegisTable from './table';
@@ -390,13 +394,19 @@
           this.serverBandWidth(this.activeName);
         } else if (this.activeName === 'PPPoE配置') {
           this.fnPppoeConfig(this.activeName);
+        } else if (this.activeName === '内存详细信息') {
+          this.fnInitialMemory(this.activeName);
         }
         // if (!this.mapDataList[this.activeName] || this.mapDataList[this.activeName].length <= 0) {
         // }
       },
       // 收益信息的分页回调
       fnPaging(val) {
-        this.serverBandWidth(this.activeName,val);
+        if (this.activeName === '收益查看') {
+          this.serverBandWidth(this.activeName,val);
+        } else if (this.activeName === '内存详细信息') {
+          this.fnInitialMemory(this.activeName,val);
+        }
       },
       // 收益信息
       serverBandWidth(keyName, val) {
@@ -406,6 +416,14 @@
           this.$set(this.mapDataList, keyName, [{tableList: res && res.rows, queryParams: newParams}]);
         })
       },
+      // 内存详细信息
+      fnInitialMemory(keyName, val) {
+        let newParams = Object.assign({}, {pageNum: 1, pageSize: 10, clientId: this.paramsData.clientId}, val);
+        initialMemoryDetails(newParams).then(res => {
+          newParams['total'] = res && res.total;
+          this.$set(this.mapDataList, keyName, [{tableList: res && res.rows, queryParams: newParams}]);
+        });
+      },
       // FRP信息
       fnFRPData(keyName) {
         frpMsgByClient({clientId: this.paramsData.clientId}).then(res => {
@@ -978,4 +996,7 @@
     border: 1px solid #ddd;
     padding: 15px 5px 15px 15px;
   }
+  ::v-deep .el-tabs__item {
+    padding: 0 18px!important;
+  }
 </style>

src/views/resource/serverRegister/table.vue

@@ -24,6 +24,12 @@
       <template #tempOmountFlag="{ row, column }">
         <dict-tag :options="dict.type.disk_omount_flag" :value="row.omountFlag"/>
       </template>
+      <template #tempHealthStatus="{ row, column }">
+        <dict-tag :options="dict.type.mem_health_status" :value="row.omountFlag"/>
+      </template>
+      <template #tempAddUnit="{ valueKey, row, column }">
+        <span v-if="row && row[valueKey] || row[valueKey] === 0">{{row[valueKey]}} {{column.unit}}</span>
+      </template>
     </TableList>
     <el-dialog title="相关数据" :visible.sync="listOpen" width="900px" append-to-body style="padding-bottom: 20px;">
       <relevantData :rowDataList="rowDataList" @closeDialog="closeDialog"></relevantData>
@@ -37,7 +43,7 @@
   import {diskIssuanceOperat, delDiskName} from "@/api/disRevenue/resource";
   export default {
     name: "serRegisTable",
-    dicts: ['disk_status', 'disk_omount_flag'],
+    dicts: ['disk_status', 'disk_omount_flag', 'mem_health_status'],
     components: {TableList, relevantData},
     props: {
       activeName: {
@@ -194,6 +200,28 @@
               ]
             }
           };
+        } else if (this.activeName === '内存详细信息') {
+          // 列显隐信息
+          this.columns = {
+            id: {label: `ID`, width: '50'},
+            clientId: {label: `clientID`, minWidth: '280'},
+            name: {label: `名称`, minWidth: '90', visible: true},
+            location: {label: `位置`, minWidth: '90', visible: true},
+            manufacturer: {label: `厂商`, minWidth: '90',visible: true},
+            capacity: {label: `容量`, minWidth: '90', slotName: 'tempAddUnit', unit: 'MB', visible: true},
+            frequency: {label: `主频`, minWidth: '90', slotName: 'tempAddUnit', unit: 'MHz', visible: true},
+            serialNumber: {label: `序列号`, minWidth: '110',visible: true},
+            type: {label: `类型`, minWidth: '70',visible: true},
+            minVoltage: {label: `最小电压`, minWidth: '90', slotName: 'tempAddUnit', unit: 'mV', visible: true},
+            rank: {label: `RANK(列)`, minWidth: '80',visible: true},
+            bitWidth: {label: `位宽`, minWidth: '60',visible: true},
+            technology: {label: `技术`, minWidth: '90', visible: true},
+            healthStatus: {label: `健康状态`, minWidth: '80', slotName: 'tempHealthStatus', visible: true},
+            partNumber: {label: `部件编码`, minWidth: '90', visible: true},
+          };
+          this.config = {
+            colHiddenCheck: true, colTopHiddenIcon: true,
+          };
         }
         this.$nextTick(() => {
           if (this.$refs.tabref) {