Merge branch 'master' of http://8.136.199.33:3000/eta_front/eta_front into login_identification

src/App.vue

@@ -253,9 +253,9 @@ div::-webkit-scrollbar-corner {
   background: #666;
 }
 /*firefox*/
-div{
+/* div{
     scrollbar-width: thin;
-}
+} */
 .customName:hover {
   text-decoration: underline;
 }
@@ -305,9 +305,9 @@ ul::-webkit-scrollbar-corner {
   background: #666;
 }
 /*firefox*/
-ul{
+/* ul{
     scrollbar-width: thin;
-}
+} */
 
 textarea {
   font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB",

src/views/ppt_manage/mixins/pptMixins.js

@@ -554,8 +554,10 @@ export default {
           let minData=[],maxData=[];
           if([1,2,4,6].includes(MyChartType)) {
             options.series.forEach(item => {
-              minData.push(item.data[0][0])
-              maxData.push(item.data[item.data.length-1][0])
+              if(item.data&&item.data.length) {
+                minData.push(item.data[0][0])
+                maxData.push(item.data[item.data.length-1][0])
+              }
             })
           }
           
@@ -570,7 +572,8 @@ export default {
         let titleHTML = null
         //中英文发布页需设置title换行
         //一行可容纳的中文字体数
-        let count = parseInt($(`#${refName}`)[0].offsetWidth / 19)*2;
+        const fontSize = chartTheme?chartTheme.titleOptions.style.fontSize:16
+        let count = parseInt($(`#${refName}`)[0].offsetWidth / fontSize)*1.75
         let {total,newStr} = getStrSize(options.MyChartTitle,count)
         const isPublish = this.$route.path==='/pptpublish'||this.$route.path==='/pptenpublish'
         if(isShowTitle){
@@ -578,12 +581,11 @@ export default {
             text-align:${chartTheme&&chartTheme.titleOptions.align};
             font-size:${chartTheme&&chartTheme.titleOptions.style.fontSize}px;
             color:${chartTheme&&chartTheme.titleOptions.style.color};
-            height:18px;
+            min-height:18px;word-break: break-all;
           ">
             ${options.MyChartTitle}
           </div>`
         }
-        const titleOption = isPublish&&isShowTitle?{marginTop:25}:{}
         let SpecialOption = {
           chart: {
             ...defaultOpts.chart,
@@ -593,7 +595,6 @@ export default {
             backgroundColor: "rgba(0,0,0,0)",
             renderTo:$(`#${refName}`)[0],
             ...options.chart||{},
-            ...titleOption
           },
           legend: {
             ...defaultOpts.legend,
@@ -602,9 +603,8 @@ export default {
           colors: options.colors||chartTheme&&chartTheme.colorsOptions||defaultOpts.colors,
           title: isPublish?{
             text: isShowTitle?newStr:null,
-            margin:0,
+            margin:5,
             useHTML:false,
-            floating:true,
             style:{...chartTheme&&chartTheme.titleOptions.style},
             align: (chartTheme&&chartTheme.titleOptions.align) || (total>count?'left':'center'),
           }:{