bihuisong 11 місяців тому
батько
коміт
0fcb5cd9eb

+ 1 - 1
zhsq_qk-admin/src/main/java/zhsq_qk/web/controller/system/SysConfigController.java

@@ -124,7 +124,7 @@ public class SysConfigController extends BaseController {
     @Log(title = "获取超图服务信息", businessType = BusinessType.OTHER)
     @GetMapping("/getSuperMap")
     public AjaxResult getSuperMap() {
-        List<String> keys = Arrays.asList("superMapIServer","superMapIServerJilinshengAndQikaiMap", "superMapIServerJiedaoshequMap", "superMapIServerQiKaiQuMapCenterPoint", "superMapIServerJiedaoshequData","superMapIServerJilinshengYingxaingAndQikaiMap");
+        List<String> keys = Arrays.asList("superMapIServer","superMapIServerJilinshengAndQikaiMap", "superMapIServerJiedaoshequMap", "superMapIServerQiKaiQuMapCenterPoint", "superMapIServerJiedaoshequData","superMapIServerJilinshengYingxaingAndQikaiMap","superMapIServerQikaiOutlineMap");
         Map<String, String> resultMap = new HashMap<>();
         for (String key : keys) {
             resultMap.put(key, configService.selectConfigByKey(key));

+ 31 - 2
zhsq_qk-ui/src/views/fusion/index.vue

@@ -677,6 +677,7 @@ export default {
               loop: true,
               color: '#fff' //流光颜色
             },
+
             lineStyle: {
               width: 0,
               opacity: 0.6,
@@ -689,7 +690,7 @@ export default {
             type: 'bar',
             data: [52, 42, 12, 24],
             barWidth: 10,
-            barGap: 0.2,//柱间距离
+            barGap: 0.1,//柱间距离
             label: {//图形上的文本标签
               normal: {
                 show: true,
@@ -722,7 +723,35 @@ export default {
                 }])
               }
             },
-          }
+          },
+          {
+            type: 'lines',
+            coordinateSystem: 'cartesian2d',
+            data: [52, 42, 12, 24].map((item, index) => {
+              return {
+                coords: [
+                  [index, 0],
+                  [index, item - 4]
+                ]
+              };
+            }),
+            effect: {
+              show: true,
+              period: 2.5,// 周期 速度 2.5
+              trailLength: 0.5, //控制拖尾长度
+              symbolSize: [3, 10], // ⭐⭐星星大小
+              symbol: this.$store.state.common.echarts_baseStreamer,
+              loop: true,
+              color: '#fff' //流光颜色
+            },
+
+            lineStyle: {
+              width: 0,
+              opacity: 0.6,
+              curveness: 0
+            },
+            "zlevel": 2
+          },
         ]
       };
       myChart.setOption(option);

Різницю між файлами не показано, бо вона завелика
+ 51 - 61
zhsq_qk-ui/src/views/fusion/jczl.vue


+ 1 - 0
zhsq_qk-ui/src/views/fusion/yshj.vue

@@ -1332,6 +1332,7 @@ export default {
           },
           axisLabel: {
             inside: false,
+            rotate: 45,
             textStyle: {
               color: '#fff', // x轴颜色
               fontWeight: 'normal',

+ 21 - 6
zhsq_qk-ui/src/views/supermap/qkmap.vue

@@ -250,7 +250,10 @@ export default {
           tooltip: {
             trigger: 'item',
             formatter: function (params) {
-              return params.name + ' : ' + params.value;
+              var htmlText = `<div class='custom-tooltip-style'>
+                                ${params.name}:${params.value}
+                        </div>`
+              return htmlText
             }
           },
           graphic: [{
@@ -352,8 +355,10 @@ export default {
                 //地图名字
                 show: true,
                 textStyle: {
-                  color: "#fff",
+                  color: "#fff", // 字体颜色
                   fontSize: 14,
+                  textBorderColor: "#0033fd", // 字体边框颜色
+                  textBorderWidth: 1 // 边框宽度
                 },
               },
               emphasis: {
@@ -564,14 +569,14 @@ export default {
         // 数据展示
         data: data
       });
-      let timeOut4 = null
-      clearInterval(timeOut4)
+      let timeOut = null
+      clearInterval(timeOut)
       myChart.clear();
       if (option) {
         myChart.setOption(option);
       }
       var currentIndex = -1;
-      timeOut4 = setInterval(() => {
+      timeOut = setInterval(() => {
         var dataLen = option.series[0].data.length;
         myChart.dispatchAction({
           type: 'downplay',
@@ -587,8 +592,18 @@ export default {
         myChart.dispatchAction({
           type: 'showTip',
           seriesIndex: 0,
-          dataIndex: currentIndex
+          dataIndex: currentIndex,
+          tooltip: {
+            trigger: 'item',
+            formatter: function (params) {
+              var htmlText = `<div class='custom-tooltip-style'>
+                                ${params.name}:${params.value}
+                        </div>`
+              return htmlText
+            }
+          },
         });
+        myChart.setOption(option);
       }, 1500)
     }
   }