Merge branch 'qll' into dev

src/views/storagemodule/namedentity/character.scss

@@ -315,4 +315,31 @@
 // 		color: #303133;
 // 		font-weight:normal;
 // 	}
-// }
\ No newline at end of file
+// }
+$color:#bdd2f6;
+.circle-ripple {
+  background-color:$color;
+  width: 72%;
+	height: 400px;
+	font-size: 12px;
+	border-radius: 50%;
+	position: absolute;
+	top:50%;
+	left:50%;
+	transform: translate(-50%, -50%);
+  animation: ripple 0.7s linear infinite;
+}
+@keyframes ripple {
+  0% {
+    box-shadow: 0 0 0 0 rgba($color, 0.3),
+                0 0 0 1em rgba($color, 0.3),
+                0 0 0 3em rgba($color, 0.3),
+                // 0 0 0 5em rgba($color, 0.3);
+  }
+  100% {
+    box-shadow: 0 0 0 1em rgba($color, 0.3),
+                0 0 0 3em rgba($color, 0.3),
+                0 0 0 5em rgba($color, 0),
+                // 0 0 0 8em rgba($color, 0);
+  }
+}
\ No newline at end of file

src/views/storagemodule/namedentity/character.vue

@@ -188,7 +188,8 @@
 						<h2 v-else-if="entityTypeFlag == 3">>地点关键词</h2>
 						<h2 v-else-if="entityTypeFlag == 2">>组织机构关键词</h2>
 						<h2 v-else>>时间实体关系</h2>
-						<div>
+						<div style="position: relative;">
+							<div class="circle-ripple"></div>
 							<div id="myChart"></div>
 						</div>
 					</section>
@@ -777,6 +778,7 @@ export default {
         //重点：云彩图片的base64码
         maskImage.src = require('../../../assets/img/yuan_icon.png');
       let option = {
+				backgroundColor:'rgba(0,0,0,0)',
         title: {
           text: '',
           link: ''
@@ -803,10 +805,10 @@ export default {
           name: '',
 					type: 'wordCloud',
 					shape: 'circle',
-					rotationRange: [0,0],
-					sizeRange: [12, 50],
-					gridSize: 10,
-					maskImage: maskImage,
+					rotationRange: [0,0],//字体旋转的角度
+					sizeRange: [12, 50],//字体大小的范围
+					gridSize: 10,//字体分布的密集程度
+					maskImage: maskImage,//字体以图片形状分布，支持为 HTMLImageElement, HTMLCanvasElement，不支持路径字符串
 					textStyle: {
             normal: {
 							fontFamily: 'sans-serif',
@@ -818,10 +820,10 @@ export default {
 													Math.round(Math.random() * 160),
 													Math.round(Math.random() * 160),
 													Math.round(Math.random() * 160)
-											].join(',') + ')';
+											].join(',') + ')';//字体的随机颜色
 									}
 							},
-							emphasis: {
+							emphasis: {//鼠标移入的特效样式
 									shadowBlur: 10,
 									shadowColor: '#333'
 							}
@@ -1108,7 +1110,7 @@ export default {
 				&:nth-of-type(2) {
 					margin-left:24px;
 				}
-				div {
+				div:not(.circle-ripple) {
 					width:100%;
 					height:520px;
 					border:1px solid #ECEFF2;