驾驶舱地图修改

src/components/Echarts/commonChartsChinaMap.vue

@@ -13,6 +13,7 @@
 <script>
 // 饼图初始数据
 import ChartsChinaMap from '../mixin/commonChartsChinaMap'
+import { markRaw } from "vue"
 import * as _ from 'lodash'
 import * as echarts from "echarts";
 export default {
@@ -36,13 +37,26 @@ export default {
       desc: 300 // 防抖时间
     }
   },
+  watch: {
+    // 监听数据变化，重绘折线图
+    option: {
+      deep: true,
+      handler (newVal) {
+        const chartDom = document.getElementById(this.id);
+        // 先移除之前的实例，保证重绘的流畅性
+        chartDom.removeAttribute("_echarts_instance_");
+        this.myChart = markRaw(echarts.init(chartDom));
+        this.myChart.setOption(_.cloneDeep(newVal));
+      },
+    },
+  },
   mounted () {
     // 初始数据和额外的配置数据耦合
     const objData = _.merge(this.options, this.option)
     // 饼图dom
     const chartDom = document.getElementById(this.id)
     // 饼图初始化
-    this.myChart = echarts.init(chartDom)
+    this.myChart = markRaw(echarts.init(chartDom))
     // 生成饼图
     this.myChart.setOption(objData)
     // 监听页面缩放 防止dom重复渲染

src/components/mixin/commonChartsChinaMap.js

@@ -291,8 +291,7 @@ export default {
               areaColor: '#255caf'
             }
           }
-        },
-        series: series
+        }
       }
     }
   }

src/views/dashboard/hooks/usePublic.ts

@@ -571,6 +571,224 @@ export function usePublic() {
       console.error(error)
     }
   }
+  const geoCoordMap = {
+    上海: [121.4648, 31.2891],
+    东莞: [113.8953, 22.901],
+    东营: [118.7073, 37.5513],
+    中山: [113.4229, 22.478],
+    临汾: [111.4783, 36.1615],
+    临沂: [118.3118, 35.2936],
+    丹东: [124.541, 40.4242],
+    丽水: [119.5642, 28.1854],
+    乌鲁木齐: [87.9236, 43.5883],
+    佛山: [112.8955, 23.1097],
+    保定: [115.0488, 39.0948],
+    兰州: [103.5901, 36.3043],
+    包头: [110.3467, 41.4899],
+    北京: [116.4551, 40.2539],
+    北海: [109.314, 21.6211],
+    南京: [118.8062, 31.9208],
+    南宁: [108.479, 23.1152],
+    南昌: [116.0046, 28.6633],
+    南通: [121.1023, 32.1625],
+    厦门: [118.1689, 24.6478],
+    台州: [121.1353, 28.6688],
+    合肥: [117.29, 32.0581],
+    呼和浩特: [111.4124, 40.4901],
+    咸阳: [108.4131, 34.8706],
+    哈尔滨: [127.9688, 45.368],
+    唐山: [118.4766, 39.6826],
+    嘉兴: [120.9155, 30.6354],
+    大同: [113.7854, 39.8035],
+    大连: [122.2229, 39.4409],
+    天津: [117.4219, 39.4189],
+    太原: [112.3352, 37.9413],
+    威海: [121.9482, 37.1393],
+    宁波: [121.5967, 29.6466],
+    宝鸡: [107.1826, 34.3433],
+    宿迁: [118.5535, 33.7775],
+    常州: [119.4543, 31.5582],
+    广州: [113.5107, 23.2196],
+    廊坊: [116.521, 39.0509],
+    延安: [109.1052, 36.4252],
+    张家口: [115.1477, 40.8527],
+    徐州: [117.5208, 34.3268],
+    德州: [116.6858, 37.2107],
+    惠州: [114.6204, 23.1647],
+    成都: [103.9526, 30.7617],
+    扬州: [119.4653, 32.8162],
+    承德: [117.5757, 41.4075],
+    拉萨: [91.1865, 30.1465],
+    无锡: [120.3442, 31.5527],
+    日照: [119.2786, 35.5023],
+    昆明: [102.9199, 25.4663],
+    杭州: [119.5313, 29.8773],
+    枣庄: [117.323, 34.8926],
+    柳州: [109.3799, 24.9774],
+    株洲: [113.5327, 27.0319],
+    武汉: [114.3896, 30.6628],
+    汕头: [117.1692, 23.3405],
+    江门: [112.6318, 22.1484],
+    沈阳: [123.1238, 42.1216],
+    沧州: [116.8286, 38.2104],
+    河源: [114.917, 23.9722],
+    泉州: [118.3228, 25.1147],
+    泰安: [117.0264, 36.0516],
+    泰州: [120.0586, 32.5525],
+    济南: [117.1582, 36.8701],
+    济宁: [116.8286, 35.3375],
+    海口: [110.3893, 19.8516],
+    淄博: [118.0371, 36.6064],
+    淮安: [118.927, 33.4039],
+    深圳: [114.5435, 22.5439],
+    清远: [112.9175, 24.3292],
+    温州: [120.498, 27.8119],
+    渭南: [109.7864, 35.0299],
+    湖州: [119.8608, 30.7782],
+    湘潭: [112.5439, 27.7075],
+    滨州: [117.8174, 37.4963],
+    潍坊: [119.0918, 36.524],
+    烟台: [120.7397, 37.5128],
+    玉溪: [101.9312, 23.8898],
+    珠海: [113.7305, 22.1155],
+    盐城: [120.2234, 33.5577],
+    盘锦: [121.9482, 41.0449],
+    石家庄: [114.4995, 38.1006],
+    福州: [119.4543, 25.9222],
+    秦皇岛: [119.2126, 40.0232],
+    绍兴: [120.564, 29.7565],
+    聊城: [115.9167, 36.4032],
+    肇庆: [112.1265, 23.5822],
+    舟山: [122.2559, 30.2234],
+    苏州: [120.6519, 31.3989],
+    莱芜: [117.6526, 36.2714],
+    菏泽: [115.6201, 35.2057],
+    营口: [122.4316, 40.4297],
+    葫芦岛: [120.1575, 40.578],
+    衡水: [115.8838, 37.7161],
+    衢州: [118.6853, 28.8666],
+    西宁: [101.4038, 36.8207],
+    西安: [109.1162, 34.2004],
+    贵阳: [106.6992, 26.7682],
+    连云港: [119.1248, 34.552],
+    邢台: [114.8071, 37.2821],
+    邯郸: [114.4775, 36.535],
+    郑州: [113.4668, 34.6234],
+    鄂尔多斯: [108.9734, 39.2487],
+    重庆: [107.7539, 30.1904],
+    金华: [120.0037, 29.1028],
+    铜川: [109.0393, 35.1947],
+    银川: [106.3586, 38.1775],
+    镇江: [119.4763, 31.9702],
+    长春: [125.8154, 44.2584],
+    长沙: [113.0823, 28.2568],
+    长治: [112.8625, 36.4746],
+    阳泉: [113.4778, 38.0951],
+    青岛: [120.4651, 36.3373],
+    韶关: [113.7964, 24.7028],
+  }
+  const convertData = (data) => {
+    const res: any = []
+    for (let i = 0; i < data.length; i++) {
+      const dataItem = data[i]
+      const fromCoord = geoCoordMap[dataItem[0].name]
+      const toCoord = geoCoordMap[dataItem[1].name]
+      if (fromCoord && toCoord) {
+        res.push({
+          fromName: dataItem[0].name,
+          toName: dataItem[1].name,
+          coords: [fromCoord, toCoord],
+          value: dataItem[1].value,
+        })
+      }
+    }
+    return res
+  }
+  const getMapData = (arr: any[]) => {
+    const series: any = []
+    const color = ['#a6c84c', '#ffa022', '#46bee9']
+    const planePath =
+      'path://M1705.06,1318.313v-89.254l-319.9-221.799l0.073-208.063c0.521-84.662-26.629-121.796-63.961-121.491c-37.332-0.305-64.482,36.829-63.961,121.491l0.073,208.063l-319.9,221.799v89.254l330.343-157.288l12.238,241.308l-134.449,92.931l0.531,42.034l175.125-42.917l175.125,42.917l0.531-42.034l-134.449-92.931l12.238-241.308L1705.06,1318.313z'
+    arr.forEach(function (item: any, i) {
+      //console.log(item,i);
+      series.push(
+        {
+          name: item[0] + ' Top10',
+          type: 'lines',
+          zlevel: 1,
+          effect: {
+            show: true,
+            period: 6,
+            trailLength: 0.7,
+            color: '#fff',
+            symbolSize: 3,
+          },
+          lineStyle: {
+            normal: {
+              color: color[i],
+              width: 0,
+              curveness: 0.2,
+            },
+          },
+          data: convertData(item[1]),
+        },
+        {
+          name: item[0] + ' Top10',
+          type: 'lines',
+          zlevel: 2,
+          symbol: ['none', 'arrow'],
+          symbolSize: 10,
+          effect: {
+            show: true,
+            period: 6,
+            trailLength: 0,
+            symbol: planePath,
+            symbolSize: 15,
+          },
+          lineStyle: {
+            normal: {
+              color: color[i],
+              width: 1,
+              opacity: 0.6,
+              curveness: 0.2,
+            },
+          },
+          data: convertData(item[1]),
+        },
+        {
+          name: item[0] + ' Top10',
+          type: 'effectScatter',
+          coordinateSystem: 'geo',
+          zlevel: 2,
+          rippleEffect: {
+            brushType: 'stroke',
+          },
+          label: {
+            normal: {
+              show: true,
+              position: 'right',
+              formatter: '{b}',
+            },
+          },
+          symbolSize: function (val) {
+            return val[2] / 8
+          },
+          itemStyle: {
+            normal: {
+              color: color[i],
+            },
+          },
+          data: item[1].map(function (dataItem) {
+            return {
+              name: dataItem[1].name,
+              value: geoCoordMap[dataItem[1].name].concat([dataItem[1].value]),
+            }
+          }),
+        }
+      )
+    })
+    return series
+  }
   return {
     optionLeft,
     airlineAbnormalBaggage,
@@ -579,5 +797,6 @@ export function usePublic() {
     nodeEfficiency,
     hourPeak,
     getPublicData,
+    getMapData,
   }
 }

src/views/dashboard/index.vue

@@ -55,7 +55,7 @@
                 运单数：{{ stockNums }}
               </div>
             </div>
-            <EchartsMap id="ww2" />
+            <EchartsMap :option="mapOptions" id="ww2" />
           </div>
         </div>
         <div class="dashboard-content-top-right">
@@ -177,6 +177,7 @@ const {
   nodeEfficiency,
   hourPeak,
   getPublicData,
+  getMapData,
 } = usePublic();
 const timePickerName = ref<number>(0);
 const flag = ref<boolean>(false);
@@ -184,6 +185,46 @@ const hourlyPeakObj = ref<any>({});
 const waybillTrendObj = ref<any>({});
 const nodePeakObj = ref<any>({});
 const airlineTrafficObj = ref<any>({});
+const mapOptions = ref<any>({
+  tooltip: {
+    trigger: "item",
+    formatter: function (params, ticket, callback) {
+      if (params.seriesType == "effectScatter") {
+        return "线路：" + params.data.name + "" + params.data.value[2];
+      } else if (params.seriesType == "lines") {
+        return (
+          params.data.fromName +
+          ">" +
+          params.data.toName +
+          "<br />" +
+          params.data.value
+        );
+      } else {
+        return params.name;
+      }
+    },
+  },
+  geo: {
+    map: "china",
+    label: {
+      emphasis: {
+        show: true,
+        color: "#fff",
+      },
+    },
+    roam: true,
+    itemStyle: {
+      normal: {
+        areaColor: "#154186",
+        borderColor: "#255caf",
+      },
+      emphasis: {
+        areaColor: "#255caf",
+      },
+    },
+  },
+  series: [],
+});
 const flightNums = ref<number>(0);
 const stockNums = ref<number>(0);
 const form = ref({
@@ -377,6 +418,31 @@ onMounted(() => {
   numbersFunc();
   airlineTrafficFunc();
   airlineAbnormalFunc();
+  setTimeout(() => {
+    var BJData = [
+      [{ name: "北京" }, { name: "深圳", value: 95 }],
+      [{ name: "成都" }, { name: "深圳", value: 95 }],
+      [{ name: "重庆" }, { name: "深圳", value: 95 }],
+      [{ name: "西安" }, { name: "深圳", value: 95 }],
+      [{ name: "太原" }, { name: "深圳", value: 95 }],
+    ];
+    var GZData = [
+      [{ name: "深圳" }, { name: "福州", value: 95 }],
+      [{ name: "深圳" }, { name: "太原", value: 90 }],
+      [{ name: "深圳" }, { name: "长春", value: 80 }],
+      [{ name: "深圳" }, { name: "重庆", value: 70 }],
+      [{ name: "深圳" }, { name: "西安", value: 60 }],
+      [{ name: "深圳" }, { name: "成都", value: 50 }],
+      [{ name: "深圳" }, { name: "常州", value: 40 }],
+      [{ name: "深圳" }, { name: "北京", value: 30 }],
+      [{ name: "深圳" }, { name: "北海", value: 20 }],
+      [{ name: "深圳" }, { name: "海口", value: 10 }],
+    ];
+    mapOptions.value.series = getMapData([
+      ["北京", BJData],
+      ["深圳", GZData],
+    ]);
+  }, 0);
 });
 </script>
 

src/views/dashboard/indexHomeOut.vue

@@ -55,7 +55,7 @@
                 运单数：{{ stockNums }}
               </div>
             </div>
-            <EchartsMap id="ww2" />
+            <EchartsMap :option="mapOptions" id="ww2" />
           </div>
         </div>
         <div class="dashboard-content-top-right">
@@ -177,6 +177,7 @@ const {
   nodeEfficiency,
   hourPeak,
   getPublicData,
+  getMapData,
 } = usePublic();
 const timePickerName = ref<number>(0);
 const flag = ref<boolean>(false);
@@ -186,6 +187,46 @@ const nodePeakObj = ref<any>({});
 const airlineTrafficObj = ref<any>({});
 const flightNums = ref<number>(0);
 const stockNums = ref<number>(0);
+const mapOptions = ref<any>({
+  tooltip: {
+    trigger: "item",
+    formatter: function (params, ticket, callback) {
+      if (params.seriesType == "effectScatter") {
+        return "线路：" + params.data.name + "" + params.data.value[2];
+      } else if (params.seriesType == "lines") {
+        return (
+          params.data.fromName +
+          ">" +
+          params.data.toName +
+          "<br />" +
+          params.data.value
+        );
+      } else {
+        return params.name;
+      }
+    },
+  },
+  geo: {
+    map: "china",
+    label: {
+      emphasis: {
+        show: true,
+        color: "#fff",
+      },
+    },
+    roam: true,
+    itemStyle: {
+      normal: {
+        areaColor: "#154186",
+        borderColor: "#255caf",
+      },
+      emphasis: {
+        areaColor: "#255caf",
+      },
+    },
+  },
+  series: [],
+});
 const form = ref({
   startDate: parseTime(Date.now(), "{y}-{m}-{d}"),
   endDate: parseTime(Date.now(), "{y}-{m}-{d}"),
@@ -377,6 +418,31 @@ onMounted(() => {
   numbersFunc();
   airlineTrafficFunc();
   airlineAbnormalFunc();
+  setTimeout(() => {
+    var BJData = [
+      [{ name: "北京" }, { name: "深圳", value: 95 }],
+      [{ name: "成都" }, { name: "深圳", value: 95 }],
+      [{ name: "重庆" }, { name: "深圳", value: 95 }],
+      [{ name: "西安" }, { name: "深圳", value: 95 }],
+      [{ name: "太原" }, { name: "深圳", value: 95 }],
+    ];
+    var GZData = [
+      [{ name: "深圳" }, { name: "福州", value: 95 }],
+      [{ name: "深圳" }, { name: "太原", value: 90 }],
+      [{ name: "深圳" }, { name: "长春", value: 80 }],
+      [{ name: "深圳" }, { name: "重庆", value: 70 }],
+      [{ name: "深圳" }, { name: "西安", value: 60 }],
+      [{ name: "深圳" }, { name: "成都", value: 50 }],
+      [{ name: "深圳" }, { name: "常州", value: 40 }],
+      [{ name: "深圳" }, { name: "北京", value: 30 }],
+      [{ name: "深圳" }, { name: "北海", value: 20 }],
+      [{ name: "深圳" }, { name: "海口", value: 10 }],
+    ];
+    mapOptions.value.series = getMapData([
+      ["北京", BJData],
+      ["深圳", GZData],
+    ]);
+  }, 0);
 });
 </script>
 

src/views/dashboard/indexIn.vue

@@ -55,7 +55,7 @@
                 运单数：{{ stockNums }}
               </div>
             </div>
-            <EchartsMap id="ww2" />
+            <EchartsMap :option="mapOptions" id="ww2" />
           </div>
         </div>
         <div class="dashboard-content-top-right">
@@ -177,6 +177,7 @@ const {
   nodeEfficiency,
   hourPeak,
   getPublicData,
+  getMapData,
 } = usePublic();
 const timePickerName = ref<number>(0);
 const flag = ref<boolean>(false);
@@ -186,6 +187,46 @@ const nodePeakObj = ref<any>({});
 const airlineTrafficObj = ref<any>({});
 const flightNums = ref<number>(0);
 const stockNums = ref<number>(0);
+const mapOptions = ref<any>({
+  tooltip: {
+    trigger: "item",
+    formatter: function (params, ticket, callback) {
+      if (params.seriesType == "effectScatter") {
+        return "线路：" + params.data.name + "" + params.data.value[2];
+      } else if (params.seriesType == "lines") {
+        return (
+          params.data.fromName +
+          ">" +
+          params.data.toName +
+          "<br />" +
+          params.data.value
+        );
+      } else {
+        return params.name;
+      }
+    },
+  },
+  geo: {
+    map: "china",
+    label: {
+      emphasis: {
+        show: true,
+        color: "#fff",
+      },
+    },
+    roam: true,
+    itemStyle: {
+      normal: {
+        areaColor: "#154186",
+        borderColor: "#255caf",
+      },
+      emphasis: {
+        areaColor: "#255caf",
+      },
+    },
+  },
+  series: [],
+});
 const form = ref({
   startDate: parseTime(Date.now(), "{y}-{m}-{d}"),
   endDate: parseTime(Date.now(), "{y}-{m}-{d}"),
@@ -377,6 +418,31 @@ onMounted(() => {
   numbersFunc();
   airlineTrafficFunc();
   airlineAbnormalFunc();
+  setTimeout(() => {
+    var BJData = [
+      [{ name: "北京" }, { name: "深圳", value: 95 }],
+      [{ name: "成都" }, { name: "深圳", value: 95 }],
+      [{ name: "重庆" }, { name: "深圳", value: 95 }],
+      [{ name: "西安" }, { name: "深圳", value: 95 }],
+      [{ name: "太原" }, { name: "深圳", value: 95 }],
+    ];
+    var GZData = [
+      [{ name: "深圳" }, { name: "福州", value: 95 }],
+      [{ name: "深圳" }, { name: "太原", value: 90 }],
+      [{ name: "深圳" }, { name: "长春", value: 80 }],
+      [{ name: "深圳" }, { name: "重庆", value: 70 }],
+      [{ name: "深圳" }, { name: "西安", value: 60 }],
+      [{ name: "深圳" }, { name: "成都", value: 50 }],
+      [{ name: "深圳" }, { name: "常州", value: 40 }],
+      [{ name: "深圳" }, { name: "北京", value: 30 }],
+      [{ name: "深圳" }, { name: "北海", value: 20 }],
+      [{ name: "深圳" }, { name: "海口", value: 10 }],
+    ];
+    mapOptions.value.series = getMapData([
+      ["北京", BJData],
+      ["深圳", GZData],
+    ]);
+  }, 0);
 });
 </script>
 

src/views/dashboard/indexOut.vue

@@ -55,7 +55,7 @@
                 运单数：{{ stockNums }}
               </div>
             </div>
-            <EchartsMap id="ww2" />
+            <EchartsMap :option="mapOptions" id="ww2" />
           </div>
         </div>
         <div class="dashboard-content-top-right">
@@ -177,6 +177,7 @@ const {
   nodeEfficiency,
   hourPeak,
   getPublicData,
+  getMapData,
 } = usePublic();
 const timePickerName = ref<number>(0);
 const flag = ref<boolean>(false);
@@ -186,6 +187,46 @@ const nodePeakObj = ref<any>({});
 const airlineTrafficObj = ref<any>({});
 const flightNums = ref<number>(0);
 const stockNums = ref<number>(0);
+const mapOptions = ref<any>({
+  tooltip: {
+    trigger: "item",
+    formatter: function (params, ticket, callback) {
+      if (params.seriesType == "effectScatter") {
+        return "线路：" + params.data.name + "" + params.data.value[2];
+      } else if (params.seriesType == "lines") {
+        return (
+          params.data.fromName +
+          ">" +
+          params.data.toName +
+          "<br />" +
+          params.data.value
+        );
+      } else {
+        return params.name;
+      }
+    },
+  },
+  geo: {
+    map: "china",
+    label: {
+      emphasis: {
+        show: true,
+        color: "#fff",
+      },
+    },
+    roam: true,
+    itemStyle: {
+      normal: {
+        areaColor: "#154186",
+        borderColor: "#255caf",
+      },
+      emphasis: {
+        areaColor: "#255caf",
+      },
+    },
+  },
+  series: [],
+});
 const form = ref({
   startDate: parseTime(Date.now(), "{y}-{m}-{d}"),
   endDate: parseTime(Date.now(), "{y}-{m}-{d}"),
@@ -377,6 +418,31 @@ onMounted(() => {
   numbersFunc();
   airlineTrafficFunc();
   airlineAbnormalFunc();
+  setTimeout(() => {
+    var BJData = [
+      [{ name: "北京" }, { name: "深圳", value: 95 }],
+      [{ name: "成都" }, { name: "深圳", value: 95 }],
+      [{ name: "重庆" }, { name: "深圳", value: 95 }],
+      [{ name: "西安" }, { name: "深圳", value: 95 }],
+      [{ name: "太原" }, { name: "深圳", value: 95 }],
+    ];
+    var GZData = [
+      [{ name: "深圳" }, { name: "福州", value: 95 }],
+      [{ name: "深圳" }, { name: "太原", value: 90 }],
+      [{ name: "深圳" }, { name: "长春", value: 80 }],
+      [{ name: "深圳" }, { name: "重庆", value: 70 }],
+      [{ name: "深圳" }, { name: "西安", value: 60 }],
+      [{ name: "深圳" }, { name: "成都", value: 50 }],
+      [{ name: "深圳" }, { name: "常州", value: 40 }],
+      [{ name: "深圳" }, { name: "北京", value: 30 }],
+      [{ name: "深圳" }, { name: "北海", value: 20 }],
+      [{ name: "深圳" }, { name: "海口", value: 10 }],
+    ];
+    mapOptions.value.series = getMapData([
+      ["北京", BJData],
+      ["深圳", GZData],
+    ]);
+  }, 0);
 });
 </script>