Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

汇总信息数据调用



See merge request !53

@@ -222,11 +222,11 @@ export const monitorSystemInformation = {
         relactiveDom: 'dataType',
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
         relactiveDomValue: 'staticData',
         value: [
         value: [
-          {"num":4,'name':'资源总量','code':'resources-total'},
-          {"num":6,'name':'小型机分区','code':'mini-partition'},
-          {"num":9,'name':'PC服务器','code':'PC-server'},
-          {"num":10,'name':'虚拟机','code':'virtual-machine'},
-          {"num":11,'name':'Oracle','code':'oracle'},
+          {"total":4,'resTypeName':'资源总量','resType':'resources-total'},
+          {"total":6,'naresTypeNameme':'小型机分区','resType':'mini-partition'},
+          {"total":9,'resTypeName':'PC服务器','resType':'PC-server'},
+          {"total":10,'resTypeName':'虚拟机','resType':'virtual-machine'},
+          {"total":11,'resTypeName':'Oracle','resType':'oracle'},
         ],
         ],
       },
       },
       {
       {
@@ -236,7 +236,7 @@ export const monitorSystemInformation = {
         required: false,
         required: false,
         placeholder: '',
         placeholder: '',
         relactiveDom: 'dataType',
         relactiveDom: 'dataType',
-        chartType: 'widget-piechart',
+        chartType: 'widget-table',
         dictKey: 'TEXT_PROPERTIES',
         dictKey: 'TEXT_PROPERTIES',
         relactiveDomValue: 'dynamicData',
         relactiveDomValue: 'dynamicData',
         value: '',
         value: '',

@@ -9,10 +9,10 @@
         <img :src="imgStyle.infoImageAdress" alt="">
         <img :src="imgStyle.infoImageAdress" alt="">
       </div>
       </div>
       <div class="system-item" :style="itemStyle"  v-for="(item,index) in systemData" :key="index">
       <div class="system-item" :style="itemStyle"  v-for="(item,index) in systemData" :key="index">
-        <div class="system-img"><img :src="'/src/assets/images/monitor/capacityAnalysis/'+item.code+'.png'" alt=""></div>
+        <div class="system-img"><img :src="'/src/assets/images/monitor/capacityAnalysis/'+item.resType+'.png'" alt=""></div>
         <div class="system-info" :style="titleProposalStyle">
         <div class="system-info" :style="titleProposalStyle">
-          <span>{{item.name}}：</span>
-          <span>{{item.num}}</span>
+          <span>{{item.resTypeName}}：</span>
+          <span>{{item.total}}</span>
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>
@@ -185,6 +185,7 @@ export default {
     getEchartData(val) {
     getEchartData(val) {
       const data = this.queryEchartsData(val);
       const data = this.queryEchartsData(val);
       data.then(res => {
       data.then(res => {
+        console.log("res",res)
         if(res && res.length>0){
         if(res && res.length>0){
           this.systemData=res;
           this.systemData=res;
         }
         }