Merge branch 'master' into debug

src/views/chartShow/index.vue

@@ -55,40 +55,17 @@
     <div class="bootom-source">
 
       <!-- 自定义来源 -->
-      <div class="chart-source text_oneLine" 
-        v-if="chartInfo.SourcesFrom&&JSON.parse(chartInfo.SourcesFrom).isShow"
-        :style="`
-            color: ${ JSON.parse(chartInfo.SourcesFrom).color };
-            font-size: ${ JSON.parse(chartInfo.SourcesFrom).fontSize }px;
-        `"
-      >
-          source：<em>{{ JSON.parse(chartInfo.SourcesFrom).text}}</em>
-      </div>
-
-      <temeplate v-else>
-        <div 
-          v-if="$route.query.source=='smartReportGetImg'" 
-          class="text_oneLine"
+      <div>
+        <div class="chart-source text_oneLine" 
+          v-if="chartInfo.SourcesFrom&&JSON.parse(chartInfo.SourcesFrom).isShow"
           :style="`
-              color: ${chartInfo.ChartThemeStyle&&JSON.parse(chartInfo.ChartThemeStyle).markerOptions.style.color };
-              font-size: ${chartInfo.ChartThemeStyle&&JSON.parse(chartInfo.ChartThemeStyle).markerOptions.style.fontSize }px;
+              color: ${ JSON.parse(chartInfo.SourcesFrom).color };
+              font-size: ${ JSON.parse(chartInfo.SourcesFrom).fontSize }px;
           `"
         >
-          source:<span style="display:inline">{{language === 'ch' ? chartInfo.ChartSource : chartInfo.ChartSourceEn}}</span>
+            source：<em>{{ JSON.parse(chartInfo.SourcesFrom).text}}</em>
         </div>
-        <strong 
-          v-else 
-          class="text_oneLine" 
-          :style="`
-              flex:1;
-              color: ${chartInfo.ChartThemeStyle&&JSON.parse(chartInfo.ChartThemeStyle).markerOptions.style.color };
-              font-size: ${chartInfo.ChartThemeStyle&&JSON.parse(chartInfo.ChartThemeStyle).markerOptions.style.fontSize }px;
-          `"
-        >
-          source:  <em> {{language === 'ch' ? chartInfo.ChartSource : chartInfo.ChartSourceEn}}</em>
-        </strong>
-      </temeplate>
-
+      </div>
 
 
       <ul class="right-action" @click.stop>