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

自定义折现堆叠图-样式修改



See merge request !27

@@ -146,3 +146,10 @@ export  function  getDetailTableDataNoPage(params,urlObj){
     method: 'get',
     method: 'get',
   })
   })
 }
 }
+//下载表格
+export  function  getBResourcePage(params,urlObj){
+  return request({
+    url: 'api-web/detail/table/notpage?resId='+params.resId+'&access_token='+urlObj.token,
+    method: 'get',
+  })
+}

@@ -120,6 +120,8 @@ export default {
         fontWeight: optionsSetup.subTextFontWeight,
         fontWeight: optionsSetup.subTextFontWeight,
         fontSize: optionsSetup.subTextFontSize
         fontSize: optionsSetup.subTextFontSize
       };
       };
+      title.top='8px';
+      title.left='8px';
       this.options.title = title;
       this.options.title = title;
     },
     },
     // X轴设置
     // X轴设置
@@ -228,6 +230,7 @@ export default {
           color: optionsSetup.lineColor,
           color: optionsSetup.lineColor,
           fontSize: optionsSetup.tipsFontSize,
           fontSize: optionsSetup.tipsFontSize,
         },
         },
+        extraCssText:'z-index:2',
         formatter:function (param) {
         formatter:function (param) {
           let kpiName=optionsSetup.titleText;
           let kpiName=optionsSetup.titleText;
           let kpiUnit=that.kpiUnit;
           let kpiUnit=that.kpiUnit;

@@ -1293,7 +1293,7 @@ export default {
   -webkit-box-orient: vertical;*/
   -webkit-box-orient: vertical;*/
 }
 }
 .width-80{
 .width-80{
-  max-width:80%;
+  max-width:85%;
 }
 }
 .padding-10{
 .padding-10{
   padding:5px;
   padding:5px;