Merge remote-tracking branch 'origin/master'

dcit-hcsystem-hcsystem-master/src/views/qyMap/qyMap.vue

@@ -1019,6 +1019,7 @@
         background-color: RGBA(17, 59, 89, 0.7);
         font-size: 100% 100%;
         margin-top: 30px;
+        cursor:pointer;
     }
 
     .markbox-span {

dcit-hcsystem-hcsystem-master/src/views/qyMap/qyMapone.vue

@@ -321,7 +321,7 @@ export default {
           }
         },
         legend: {
-          data: ['隐患', '风险'],
+          data: ['隐患', '风险控制'],
           textStyle: { //图例文字的样式
                             color: '#fff',
                         }
@@ -388,7 +388,7 @@ export default {
             ]
           },
           {
-            name: '风险',
+            name: '风险控制',
             type: 'line',
             // symbol:'circle',
             symbolSize:6,