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

虚拟化容量分析及云平台容量分析二级页面趋势图样式调整



See merge request !59

@@ -184,6 +184,18 @@ export const monitorCustomBarLineChart = {
               value: 'left'
             },
             {
+              type: 'el-select',
+              label: '标题垂直位置',
+              name: 'textAlignVertical',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'top', name: '靠上'},
+                {code: 'bottom', name: '靠下'},
+              ],
+              value: 'top'
+            },
+            {
               type: 'el-input-text',
               label: '副标题',
               name: 'subText',

@@ -170,6 +170,18 @@ export const monitorCustomLineTrend =   {
               value: 'left'
             },
             {
+              type: 'el-select',
+              label: '标题垂直位置',
+              name: 'textAlignVertical',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'top', name: '靠上'},
+                {code: 'bottom', name: '靠下'},
+              ],
+              value: 'top'
+            },
+            {
               type: 'el-input-text',
               label: '副标题',
               name: 'subText',

@@ -268,7 +268,7 @@
             imgSizeStyle() {
                 return {
                     "width": this.transStyle.pictureSize + "px",
-                    "height" : $(".basic-ul-right").height()
+                    // "height" : $(".basic-ul-right").height()
                 }
             },
             //监控地址
@@ -369,7 +369,6 @@
             getEchartData(val) {
                 const data = this.queryEchartsData(val);
                 data.then(res => {
-                  console.log("1111",res)
                     if (res && res[0].code == 0){
                       this.informationDataAll = res[0].data;
                       if (this.informationDataAll && this.informationDataAll.length > 0) {

@@ -189,7 +189,11 @@ export default {
         fontWeight: optionsSetup.subTextFontWeight,
         fontSize: optionsSetup.subTextFontSize
       };
-      title.top='8px';
+      if(optionsSetup.textAlignVertical=='bottom'){
+        title.bottom='0';
+      }else{
+        title.top='8px';
+      }
       this.options.title = title;
     },
     // X轴设置

@@ -142,7 +142,11 @@ export default {
         fontWeight: optionsSetup.subTextFontWeight,
         fontSize: optionsSetup.subTextFontSize
       };
-      title.top='8px';
+      if(optionsSetup.textAlignVertical=='bottom'){
+        title.bottom='0';
+      }else{
+        title.top='8px';
+      }
       this.options.title = title;
     },
     // X轴设置

@@ -14,7 +14,8 @@
             </div>
           </div>
         </div>
-        <div class="wave-title" :style="subTitleStyle">当前使用率</div>
+        <div class="wave-title" :style="subTitleStyle" v-if="index==0">当前使用率</div>
+        <div class="wave-title" :style="subTitleStyle" v-if="index==1">使用增长率</div>
       </div>
     </div>
 
@@ -161,7 +162,7 @@ export default {
       return {
      /*   width: width + "px",
         height: width + "px",*/
-        margin:this.optionsSetup.flexFlow=='column'?'5px 10px':'10px'
+        margin:this.optionsSetup.flexFlow=='column'?'5px 10px':'10px 15px'
       }
     },
     //波纹样式
@@ -307,9 +308,13 @@ export default {
   justify-content: space-around;
 }
 .fill-item{
-  width:100%;height:100%;
+  //width:100%;
+  height:100%;
   //flex: 1;
   margin:10px;
+  align-items: start;
+  display: flex;
+  flex-flow: column;
 }
 .circle{
   background-image: linear-gradient(20deg,  #5a8ef5 , #aeedf1);
@@ -358,9 +363,11 @@ export default {
   font-size: 20px;
 }
 .wave-title{
-  padding:10px;
+  padding:10px 0;
+  margin-top:10px;
 }
 .fillContainer-title{
   padding:15px;
+  margin-bottom:15px;
 }
 </style>