Merge branch 'gn2.6' into debug

src/views/chartShow/index.less

@@ -95,13 +95,15 @@
 			}
 
 			.chart-source {
-				width: 30%;
+				flex: 1;
 				min-width: 150px;
+				width: 100%;
 			}
 			.chart-instruction {
-				max-width: 80%;
+				width: 100%;
 				flex: 1;
-				text-align: right;
+				margin-bottom: 10px;
+				text-align: left;
 				margin-left: auto;
 			}
 		}
@@ -115,6 +117,10 @@
 			}
 		}
 	}
+	.flex-align{
+		display: flex;
+		align-items: center;
+	}
 	@media (min-width: 1201px) {
 		.chart-header {
 			font-size: 24px;

src/views/chartShow/index.vue

@@ -44,20 +44,26 @@
     ">
 
       <!-- 图表说明 -->
-      <div 
-        class="chart-instruction text_oneLine" 
-        v-text="JSON.parse(chartInfo.Instructions).text"
-        :style="`
-          color: ${JSON.parse(chartInfo.Instructions).color};
-          font-size: ${ JSON.parse(chartInfo.Instructions).fontSize }px
-        `"
-      ></div>
+        <div 
+          class="chart-instruction text_oneLine" 
+          :style="`
+            color: ${JSON.parse(chartInfo.Instructions).color};
+            font-size: ${ JSON.parse(chartInfo.Instructions).fontSize }px
+          `"
+        >
+          <el-tooltip
+            effect="dark"
+            :content="JSON.parse(chartInfo.Instructions).text"
+            placement="top"
+          >
+            <em>{{ JSON.parse(chartInfo.Instructions).text}}</em>
+          </el-tooltip>
+      </div>
     </div>
 
     <div class="bootom-source">
-
       <!-- 自定义来源 -->
-      <div>
+      <div style="width: 90%;">
         <div class="chart-source text_oneLine" 
           v-if="chartInfo.SourcesFrom&&JSON.parse(chartInfo.SourcesFrom).isShow"
           :style="`
@@ -65,7 +71,14 @@
               font-size: ${ JSON.parse(chartInfo.SourcesFrom).fontSize }px;
           `"
         >
-            source：<em>{{ JSON.parse(chartInfo.SourcesFrom).text}}</em>
+        来源：
+          <el-tooltip
+              effect="dark"
+              :content="JSON.parse(chartInfo.SourcesFrom).text"
+              placement="top"
+            >
+            <em>{{ JSON.parse(chartInfo.SourcesFrom).text}}</em>
+          </el-tooltip>
         </div>
       </div>
 

src/views/sheetShow/index.vue

@@ -89,7 +89,14 @@ const refreshSheet = async()=>{
             font-size: ${ JSON.parse(info.SourcesFrom).fontSize }px;
         `"
       >
-          source：<em>{{ JSON.parse(info.SourcesFrom).text}}</em>
+        来源：
+          <el-tooltip
+              effect="dark"
+              :content="JSON.parse(info.SourcesFrom).text"
+              placement="top"
+            >
+            <em>{{ JSON.parse(info.SourcesFrom).text}}</em>
+          </el-tooltip>
       </div>
       <!-- 占位 -->
       <div v-else></div>
@@ -126,7 +133,7 @@ const refreshSheet = async()=>{
     white-space: nowrap;
     padding: 0 10px;
     .sheet-source{
-      width: 30%;
+      width: 90%;
       min-width: 150px;
       overflow: hidden;
       text-overflow: ellipsis;