gx

2024-09-25 16:41:01 +08:00 · 2024-09-25 16:41:01 +08:00 · 2df680eb54
parent f0af8c328e d6f3aa5ed5
commit 2df680eb54
7 changed files with 269 additions and 117 deletions
--- a/src/router/index.js
+++ b/src/router/index.js
@ -2,7 +2,6 @@ import { createRouter, createWebHashHistory } from "vue-router";
 import http from "@/utils/request.js";
 import tools from "@/utils/tools";
 import { namespaceContextKey } from "element-plus";
-
 const routerHistory = createWebHashHistory();

 const router = createRouter({
@ -126,13 +125,7 @@ router.beforeEach((to, form, next) => {
  //   tools.data.set('token', token)
  // next();
  // }
-  let type = tools.data.get("type");
-  if (type) {
  next();
-  } else {
-    window.location.href = "http://localhost:8080/#/guide";
-    next();
-  }
 });

 export default router;
--- a/src/utils/request.js
+++ b/src/utils/request.js
@ -33,9 +33,13 @@ axios.interceptors.response.use(
        // console.log(error.response,"响应拦截器失败")
        ElMessage.error("请重新登录!");
        // window.location.href = '/#/login?returnURL=' + window.location.href
-        window.location.href =
-          "http://220.191.238.50:996/api/login?returnURL=" +
-          window.location.href;
+        // window.location.href =
+        //   "http://220.191.238.50:996/api/login?returnURL=" +
+        //   window.location.href;
+        router.replace({
+          path: '/guide'
+        });
+      
      } else if (error.response.status == 404) {
        ElMessage.error("Status:404，正在请求不存在的服务器记录！");
      } else if (error.response.status == 500) {
--- a/src/view/guide.vue
+++ b/src/view/guide.vue
@ -63,7 +63,6 @@ import { ref, onMounted, onUnmounted, reactive } from "vue";
 import { useRouter, useRoute } from "vue-router";
 import http from "@/utils/request.js";
 import dd from "gdt-jsapi";
-
 import tab1 from "@/assets/guide/tab1.png";
 import tab2 from "@/assets/guide/tab2.png";
 import tab3 from "@/assets/guide/tab3.png";
@ -72,7 +71,6 @@ import tab5 from "@/assets/guide/tab5.png";
 import tab6 from "@/assets/guide/tab6.png";
 import tab7 from "@/assets/guide/tab7.png";
 import tab8 from "@/assets/guide/tab8.png";
-
 import png1 from "@/assets/guide/Dp/1.png";
 import png2 from "@/assets/guide/Dp/2.png";
 import png3 from "@/assets/guide/Dp/3.png";
@ -83,7 +81,6 @@ import png7 from "@/assets/guide/Dp/7.png";
 import png8 from "@/assets/guide/Dp/8.png";
 import { ElMessage } from "element-plus";
 import tools from "@/utils/tools";
-
 const router = useRouter();
 const routers = useRoute();

@ -139,16 +136,6 @@ const getCookie = (cname) => {
 };
 // 登录
 const login = () => {
-  // this.loading = true;
-  // let ua = navigator.userAgent.toLowerCase();
-  // let env = "pc";
-  // const isMobile =
-  //   /ipad|iphone|midp|rv:1.2.3.4|ucweb|android|windows ce|windows mobile/i.test(
-  //     ua
-  //   );
-  // env = isMobile ? "move" : "pc";
-  // console.log(ua, env, 333);
-  console.log(111, dd.getAuthCode);
  dd.getAuthCode()
    .then((res) => {
      // let auth__code = env == "pc" ? res.auth_code : res.code;
@ -157,8 +144,9 @@ const login = () => {
        .post(`/api/sign_in/one_click_login?authCode=${res.auth_code}`)
        .then((response) => {
          if (response.code == 200) {
-            console.log(1111, response);
            tools.data.set("token", response.data.token);
+            tools.data.set("type", 1);
+            // console.log(1111, response);
            // this.loading = false;
            // // 登录成功
            // if (!response.data.is_bind) {
@ -174,11 +162,11 @@ const login = () => {
            //   this.$message.success("登录成功");
            //   this.$router.replace("/home");
            // }
-            tools.data.set("type", 1);
+           
          } else {
            // 跳转未绑定页面
            router.push({
-              path: `error/noPermission.vue`,
+              path: `error/noPermission`,
            });
          }
        });
@ -186,6 +174,7 @@ const login = () => {
    .catch((err) => {
      console.log(err);
      var token = getCookie("lytoken");
+      // var token = '6b0e380b4a8f46baae4923f83faf670d';
      // console.log('token', token)
      if (!token) {
        window.location.href =
--- a/src/view/home.vue
+++ b/src/view/home.vue
@ -58,7 +58,7 @@ window.addEventListener("resize", function () {

 <style scoped lang="scss">
 .content {
-  background: url("../assets/bgImg.png") no-repeat 100% 100%;
+  background: url("../assets/bgImg.png") no-repeat 0/100% 100%;
  background-color: #254574;
  // background-image: url("../assets/bgImg.png");
  // background-size: 100% 100%;
--- a/src/view/sy.vue
+++ b/src/view/sy.vue
@ -1831,8 +1831,8 @@ const autoScroll = () => {
  }
 };
 onBeforeMount(async () => {
-  document.cookie='lytoken=6b0e380b4a8f46baae4923f83faf670d'
-  tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
+  // document.cookie='lytoken=6b0e380b4a8f46baae4923f83faf670d'
+  // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
  getData();
  getfw();
  setTimeout(() => {
--- a/src/view/sy_map.vue
+++ b/src/view/sy_map.vue
@ -1056,7 +1056,7 @@ const pagination = reactive({
 //--------定义方法----------------------------------------
 //地图初始化
 const initMap = () => {
-  map = new BMapGL.Map("map", { minZoom: 8, maxZoom: 18 });
+  map = new BMapGL.Map("map", { minZoom: 8, maxZoom: 19 });
  map.setMapType(BMAP_SATELLITE_MAP);
  map.enableScrollWheelZoom(true);
  goMapCenter([119.178783, 29.034583], 11);
@ -3232,22 +3232,22 @@ const createCustomOverlay = (polygon, indexx) => {
    content.style.justifyContent= "end";
    content.style.flexDirection = "column";
    content.style.alignItems = "center";
+    content.style.justifyContent = "end";
    content.style.height = "40px";
    content.style.width = "140px";
+    content.style.width = "140px";
    content.style.zIndex = BMapGL.Overlay.getZIndex(this.point.lat);

    var div = document.createElement("div");
    div.style.color = "#ddd";
    div.style.padding = `${polygon.padding}`;
    // div.style.whiteSpace = "nowrap";
+    div.style.maxWidth = "100px";
    div.style.MozUserSelect = "none";
    div.style.fontSize = "12px";
    div.style.borderRadius = "10px";
    div.style.display = "flex";
-   
-    div.style.flexWrap = "wrap"
-    div.style.maxWidth = "90px"
-
+    div.style.flexWrap = "wrap";
    div.style.justifyContent = "center";
    div.style.alignItems = "center";
    div.style.background = `url(${polygon.img}) no-repeat 0/100% 100%`;
@ -3259,6 +3259,7 @@ const createCustomOverlay = (polygon, indexx) => {
    title.style.fontSize = "14px";
    title.style.fontWeight = "700";
    title.style.marginLeft = "0px";
+    title.style.display = "flex";
    title.style.color = `${polygon.textColor}`;
    div.appendChild(title);
    title.appendChild(document.createTextNode(this.properties.title));
@ -3286,6 +3287,7 @@ const createCustomOverlay = (polygon, indexx) => {
    // offsetY: 0,
    offsetX: 10,
    offsetY: -15,
+    zIndex: 10,
    properties: {
      title: polygon.name,
      imgSrc2: polygon.img2,
@ -3326,7 +3328,6 @@ const addFwqCs = () => {
        fillColor: fillColor,
        fillOpacity: 0.6,
        name: item.name,
-        zIndex: 2,
      });
      map.addOverlay(fwq_dk.value[index]);
    }
@ -3373,6 +3374,7 @@ const addFwqCsCenter = (polygon, indexx) => {
  }
  fwq_center.value[indexx] = new BMapGL.CustomOverlay(createLabelDOM, {
    point: new BMapGL.Point(...polygon.center),
+    zIndex: 1,
    opacity: 0.5,
    offsetX: 10,
    offsetY: -15,
@ -3387,12 +3389,7 @@ const addFwqCsCenter = (polygon, indexx) => {
 //
 //服务点数据处理
 const updateFwqList = (data, townName, communityName) => {
-  // console.log(data, townName, communityName,'服务器数据');
  let updatedFwqList = [];
-  // jbfwqTotal.value.forEach((town) => {
-  //   if (town.name === townName) {
-  //     town.child.forEach((community, index) => {
-  //       if (community.name === communityName) {
  fwq_cslist.value.length = 0;
  fwq_jzdk.value.length = 0;
  fwq_centerList.value.length = 0;
@ -3414,8 +3411,75 @@ const updateFwqList = (data, townName, communityName) => {
    });
  });
  console.log(77, fwq_centerList.value);
+  //把坐标相同的合并
+  // let toP = [];//存放坐标
+  // let toName = [];//存放名称
+  // data.forEach((item, index) => {
+  //   if (toP.length == 0) {
+  //     toP.push([item.jd, item.wd]);
+  //     toName.push(item.zyysmc);
+  //   } else {
+  //     let b = [item.jd, item.wd];
+  //     let indexS = toP.findIndex((subArray) => {
+  //       return subArray.every((element, index) => element === b[index]);
+  //     });

-  updatedFwqList = data.map((item) => ({
+  //     if (indexS !== -1) {
+  //       toName[indexS] = toName[indexS] + "," + item.zyysmc;
+  //     } else {
+  //       toP.push(b);
+  //       toName.push(item.zyysmc);
+  //     }
+  //   }aa
+  // });
+  // let totalA = [];
+  // toP.forEach((item, index) => {
+  //   totalA.push({
+  //     zyysmc: toName[index],
+  //     jd: item[0],
+  //     wd: item[1],
+  //   });
+  // });
+  //根据字数来修改参数
+  updatedFwqList = data.map((item) => {
+    if (item.zyysmc.length > 21) {
+      return {
+        x: 53,
+        y: 0,
+        img: fwqbg1,
+        img2: b2,
+        name: item.zyysmc,
+        point: [item.jd, item.wd],
+        padding: "4px 8px 24px",
+        textColor: "#fff",
+        bgColor: "#00b050",
+      };
+    } else if (item.zyysmc.length > 14) {
+      return {
+        x: 53,
+        y: 0,
+        img: fwqbg1,
+        img2: b2,
+        name: item.zyysmc,
+        point: [item.jd, item.wd],
+        padding: "4px 8px 18px",
+        textColor: "#fff",
+        bgColor: "#00b050",
+      };
+    } else if (item.zyysmc.length > 7) {
+      return {
+        x: 53,
+        y: 0,
+        img: fwqbg1,
+        img2: b2,
+        name: item.zyysmc,
+        point: [item.jd, item.wd],
+        padding: "4px 8px 13px",
+        textColor: "#fff",
+        bgColor: "#00b050",
+      };
+    } else if (item.zyysmc.length > 4) {
+      return {
        x: 53,
        y: 0,
        img: fwqbg1,
@ -3425,7 +3489,21 @@ const updateFwqList = (data, townName, communityName) => {
        padding: "4px 8px 10px",
        textColor: "#fff",
        bgColor: "#00b050",
-  }));
+      };
+    } else {
+      return {
+        x: 30,
+        y: 0,
+        img: fwqbg1,
+        img2: b2,
+        name: item.zyysmc,
+        point: [item.jd, item.wd],
+        padding: "4px 8px 10px",
+        textColor: "#fff",
+        bgColor: "#00b050",
+      };
+    }
+  });
  // community.fwqList = updatedFwqList;
  //       }
  //     });
--- a/yarn.lock
+++ b/yarn.lock
@ -24,6 +24,111 @@
  resolved "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz"
  integrity sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==

+"@esbuild/android-arm64@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/android-arm64/-/android-arm64-0.17.14.tgz#4624cea3c8941c91f9e9c1228f550d23f1cef037"
+  integrity sha512-eLOpPO1RvtsP71afiFTvS7tVFShJBCT0txiv/xjFBo5a7R7Gjw7X0IgIaFoLKhqXYAXhahoXm7qAmRXhY4guJg==
+
+"@esbuild/android-arm@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.17.14.tgz#74fae60fcab34c3f0e15cb56473a6091ba2b53a6"
+  integrity sha512-0CnlwnjDU8cks0yJLXfkaU/uoLyRf9VZJs4p1PskBr2AlAHeEsFEwJEo0of/Z3g+ilw5mpyDwThlxzNEIxOE4g==
+
+"@esbuild/android-x64@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/android-x64/-/android-x64-0.17.14.tgz#f002fbc08d5e939d8314bd23bcfb1e95d029491f"
+  integrity sha512-nrfQYWBfLGfSGLvRVlt6xi63B5IbfHm3tZCdu/82zuFPQ7zez4XjmRtF/wIRYbJQ/DsZrxJdEvYFE67avYXyng==
+
+"@esbuild/darwin-arm64@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.14.tgz#b8dcd79a1dd19564950b4ca51d62999011e2e168"
+  integrity sha512-eoSjEuDsU1ROwgBH/c+fZzuSyJUVXQTOIN9xuLs9dE/9HbV/A5IqdXHU1p2OfIMwBwOYJ9SFVGGldxeRCUJFyw==
+
+"@esbuild/darwin-x64@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/darwin-x64/-/darwin-x64-0.17.14.tgz#4b49f195d9473625efc3c773fc757018f2c0d979"
+  integrity sha512-zN0U8RWfrDttdFNkHqFYZtOH8hdi22z0pFm0aIJPsNC4QQZv7je8DWCX5iA4Zx6tRhS0CCc0XC2m7wKsbWEo5g==
+
+"@esbuild/freebsd-arm64@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.14.tgz#480923fd38f644c6342c55e916cc7c231a85eeb7"
+  integrity sha512-z0VcD4ibeZWVQCW1O7szaLxGsx54gcCnajEJMdYoYjLiq4g1jrP2lMq6pk71dbS5+7op/L2Aod+erw+EUr28/A==
+
+"@esbuild/freebsd-x64@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.14.tgz#a6b6b01954ad8562461cb8a5e40e8a860af69cbe"
+  integrity sha512-hd9mPcxfTgJlolrPlcXkQk9BMwNBvNBsVaUe5eNUqXut6weDQH8whcNaKNF2RO8NbpT6GY8rHOK2A9y++s+ehw==
+
+"@esbuild/linux-arm64@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/linux-arm64/-/linux-arm64-0.17.14.tgz#1fe2f39f78183b59f75a4ad9c48d079916d92418"
+  integrity sha512-FhAMNYOq3Iblcj9i+K0l1Fp/MHt+zBeRu/Qkf0LtrcFu3T45jcwB6A1iMsemQ42vR3GBhjNZJZTaCe3VFPbn9g==
+
+"@esbuild/linux-arm@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/linux-arm/-/linux-arm-0.17.14.tgz#18d594a49b64e4a3a05022c005cb384a58056a2a"
+  integrity sha512-BNTl+wSJ1omsH8s3TkQmIIIQHwvwJrU9u1ggb9XU2KTVM4TmthRIVyxSp2qxROJHhZuW/r8fht46/QE8hU8Qvg==
+
+"@esbuild/linux-ia32@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/linux-ia32/-/linux-ia32-0.17.14.tgz#f7f0182a9cfc0159e0922ed66c805c9c6ef1b654"
+  integrity sha512-91OK/lQ5y2v7AsmnFT+0EyxdPTNhov3y2CWMdizyMfxSxRqHazXdzgBKtlmkU2KYIc+9ZK3Vwp2KyXogEATYxQ==
+
+"@esbuild/linux-loong64@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.17.14.tgz#5f5305fdffe2d71dd9a97aa77d0c99c99409066f"
+  integrity sha512-vp15H+5NR6hubNgMluqqKza85HcGJgq7t6rMH7O3Y6ApiOWPkvW2AJfNojUQimfTp6OUrACUXfR4hmpcENXoMQ==
+
+"@esbuild/linux-mips64el@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.14.tgz#a602e85c51b2f71d2aedfe7f4143b2f92f97f3f5"
+  integrity sha512-90TOdFV7N+fgi6c2+GO9ochEkmm9kBAKnuD5e08GQMgMINOdOFHuYLPQ91RYVrnWwQ5683sJKuLi9l4SsbJ7Hg==
+
+"@esbuild/linux-ppc64@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.14.tgz#32d918d782105cbd9345dbfba14ee018b9c7afdf"
+  integrity sha512-NnBGeoqKkTugpBOBZZoktQQ1Yqb7aHKmHxsw43NddPB2YWLAlpb7THZIzsRsTr0Xw3nqiPxbA1H31ZMOG+VVPQ==
+
+"@esbuild/linux-riscv64@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.14.tgz#38612e7b6c037dff7022c33f49ca17f85c5dec58"
+  integrity sha512-0qdlKScLXA8MGVy21JUKvMzCYWovctuP8KKqhtE5A6IVPq4onxXhSuhwDd2g5sRCzNDlDjitc5sX31BzDoL5Fw==
+
+"@esbuild/linux-s390x@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/linux-s390x/-/linux-s390x-0.17.14.tgz#4397dff354f899e72fd035d72af59a700c465ccb"
+  integrity sha512-Hdm2Jo1yaaOro4v3+6/zJk6ygCqIZuSDJHdHaf8nVH/tfOuoEX5Riv03Ka15LmQBYJObUTNS1UdyoMk0WUn9Ww==
+
+"@esbuild/linux-x64@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/linux-x64/-/linux-x64-0.17.14.tgz#6c5cb99891b6c3e0c08369da3ef465e8038ad9c2"
+  integrity sha512-8KHF17OstlK4DuzeF/KmSgzrTWQrkWj5boluiiq7kvJCiQVzUrmSkaBvcLB2UgHpKENO2i6BthPkmUhNDaJsVw==
+
+"@esbuild/netbsd-x64@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.14.tgz#5fa5255a64e9bf3947c1b3bef5e458b50b211994"
+  integrity sha512-nVwpqvb3yyXztxIT2+VsxJhB5GCgzPdk1n0HHSnchRAcxqKO6ghXwHhJnr0j/B+5FSyEqSxF4q03rbA2fKXtUQ==
+
+"@esbuild/openbsd-x64@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.14.tgz#74d14c79dcb6faf446878cc64284aa4e02f5ca6f"
+  integrity sha512-1RZ7uQQ9zcy/GSAJL1xPdN7NDdOOtNEGiJalg/MOzeakZeTrgH/DoCkbq7TaPDiPhWqnDF+4bnydxRqQD7il6g==
+
+"@esbuild/sunos-x64@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/sunos-x64/-/sunos-x64-0.17.14.tgz#5c7d1c7203781d86c2a9b2ff77bd2f8036d24cfa"
+  integrity sha512-nqMjDsFwv7vp7msrwWRysnM38Sd44PKmW8EzV01YzDBTcTWUpczQg6mGao9VLicXSgW/iookNK6AxeogNVNDZA==
+
+"@esbuild/win32-arm64@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/win32-arm64/-/win32-arm64-0.17.14.tgz#dc36ed84f1390e73b6019ccf0566c80045e5ca3d"
+  integrity sha512-xrD0mccTKRBBIotrITV7WVQAwNJ5+1va6L0H9zN92v2yEdjfAN7864cUaZwJS7JPEs53bDTzKFbfqVlG2HhyKQ==
+
+"@esbuild/win32-ia32@0.17.14":
+  version "0.17.14"
+  resolved "https://registry.npmmirror.com/@esbuild/win32-ia32/-/win32-ia32-0.17.14.tgz#0802a107afa9193c13e35de15a94fe347c588767"
+  integrity sha512-nXpkz9bbJrLLyUTYtRotSS3t5b+FOuljg8LgLdINWFs3FfqZMtbnBCZFUmBzQPyxqU87F8Av+3Nco/M3hEcu1w==
+
 "@esbuild/win32-x64@0.17.14":
  version "0.17.14"
  resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.14.tgz"
@ -59,7 +164,7 @@
  resolved "https://registry.npmmirror.com/@remax/mini-types/-/mini-types-0.1.0.tgz"
  integrity sha512-bVDcbUrp6p0PZwfS0xGVQS6k9f8B35BtZaYt/W/IGKh7VALYQ+tS2KcytLRmIJ/Vmohaw5ikIRN89I+frPdh4g==

-"@types/lodash-es@*", "@types/lodash-es@^4.17.6":
+"@types/lodash-es@^4.17.6":
  version "4.17.12"
  resolved "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.12.tgz"
  integrity sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==
@ -76,7 +181,7 @@
  resolved "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz"
  integrity sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==

-"@videojs/http-streaming@^3.13.2", "@videojs/http-streaming@3.13.2":
+"@videojs/http-streaming@3.13.2", "@videojs/http-streaming@^3.13.2":
  version "3.13.2"
  resolved "https://registry.npmmirror.com/@videojs/http-streaming/-/http-streaming-3.13.2.tgz"
  integrity sha512-eCfQp61w00hg7Y9npmLnsJ6UvDF+SsFYzu7mQJgVXxWpVm9AthYWA3KQEKA7F7Sy6yzlm/Sps8BHs5ItelNZgQ==
@ -90,19 +195,19 @@
    mux.js "7.0.3"
    video.js "^7 || ^8"

-"@videojs/vhs-utils@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.npmmirror.com/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz"
-  integrity sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==
+"@videojs/vhs-utils@4.0.0", "@videojs/vhs-utils@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/@videojs/vhs-utils/-/vhs-utils-4.0.0.tgz"
+  integrity sha512-xJp7Yd4jMLwje2vHCUmi8MOUU76nxiwII3z4Eg3Ucb+6rrkFVGosrXlMgGnaLjq724j3wzNElRZ71D/CKrTtxg==
  dependencies:
    "@babel/runtime" "^7.12.5"
    global "^4.4.0"
    url-toolkit "^2.2.1"

-"@videojs/vhs-utils@^4.0.0", "@videojs/vhs-utils@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmmirror.com/@videojs/vhs-utils/-/vhs-utils-4.0.0.tgz"
-  integrity sha512-xJp7Yd4jMLwje2vHCUmi8MOUU76nxiwII3z4Eg3Ucb+6rrkFVGosrXlMgGnaLjq724j3wzNElRZ71D/CKrTtxg==
+"@videojs/vhs-utils@^3.0.5":
+  version "3.0.5"
+  resolved "https://registry.npmmirror.com/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz"
+  integrity sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==
  dependencies:
    "@babel/runtime" "^7.12.5"
    global "^4.4.0"
@ -252,16 +357,6 @@
  resolved "https://registry.npmmirror.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz"
  integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==

-aes-decrypter@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-4.0.2.tgz"
-  integrity sha512-lc+/9s6iJvuaRe5qDlMTpCFjnwpkeOXp8qP3oiZ5jsj1MRg+SBVUmmICrhxHvc8OELSmc+fEyyxAuppY6hrWzw==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@videojs/vhs-utils" "^4.1.1"
-    global "^4.4.0"
-    pkcs7 "^1.0.4"
-
 aes-decrypter@1.0.3:
  version "1.0.3"
  resolved "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-1.0.3.tgz"
@ -279,6 +374,16 @@ aes-decrypter@4.0.1:
    global "^4.4.0"
    pkcs7 "^1.0.4"

+aes-decrypter@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-4.0.2.tgz"
+  integrity sha512-lc+/9s6iJvuaRe5qDlMTpCFjnwpkeOXp8qP3oiZ5jsj1MRg+SBVUmmICrhxHvc8OELSmc+fEyyxAuppY6hrWzw==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "^4.1.1"
+    global "^4.4.0"
+    pkcs7 "^1.0.4"
+
 anymatch@~3.1.2:
  version "3.1.3"
  resolved "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz"
@ -396,7 +501,7 @@ echarts-liquidfill@^3.1.0:
  resolved "https://registry.npmmirror.com/echarts-liquidfill/-/echarts-liquidfill-3.1.0.tgz"
  integrity sha512-5Dlqs/jTsdTUAsd+K5LPLLTgrbbNORUSBQyk8PSy1Mg2zgHDWm83FmvA4s0ooNepCJojFYRITTQ4GU1UUSKYLw==

-echarts@^5.0.1, echarts@^5.1.2, echarts@^5.4.2:
+echarts@^5.4.2:
  version "5.4.2"
  resolved "https://registry.npmjs.org/echarts/-/echarts-5.4.2.tgz"
  integrity sha512-2W3vw3oI2tWJdyAz+b8DuWS0nfXtSDqlDmqgin/lfzbkB01cuMEN66KWBlmur3YMp5nEDEEt5s23pllnAzB4EA==
@ -489,6 +594,11 @@ form-data@^4.0.0:
    combined-stream "^1.0.8"
    mime-types "^2.1.12"

+fsevents@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+
 function-bind@^1.1.1:
  version "1.1.1"
  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
@ -509,7 +619,7 @@ glob-parent@~5.1.2:
  dependencies:
    is-glob "^4.0.1"

-global@^4.3.0, global@4.3.2:
+global@4.3.2, global@^4.3.0, global@~4.3.0:
  version "4.3.2"
  resolved "https://registry.npmmirror.com/global/-/global-4.3.2.tgz"
  integrity sha512-/4AybdwIDU4HkCUbJkZdWpe4P6vuw/CUtu+0I1YlLIPe7OlUO7KNJ+q/rO70CW2/NW6Jc6I62++Hzsf5Alu6rQ==
@ -517,7 +627,7 @@ global@^4.3.0, global@4.3.2:
    min-document "^2.19.0"
    process "~0.5.1"

-global@^4.3.1, global@^4.4.0, global@~4.4.0, global@4.4.0:
+global@4.4.0, global@^4.3.1, global@^4.4.0, global@~4.4.0:
  version "4.4.0"
  resolved "https://registry.npmmirror.com/global/-/global-4.4.0.tgz"
  integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
@ -525,14 +635,6 @@ global@^4.3.1, global@^4.4.0, global@~4.4.0, global@4.4.0:
    min-document "^2.19.0"
    process "^0.11.10"

-global@~4.3.0:
-  version "4.3.2"
-  resolved "https://registry.npmmirror.com/global/-/global-4.3.2.tgz"
-  integrity sha512-/4AybdwIDU4HkCUbJkZdWpe4P6vuw/CUtu+0I1YlLIPe7OlUO7KNJ+q/rO70CW2/NW6Jc6I62++Hzsf5Alu6rQ==
-  dependencies:
-    min-document "^2.19.0"
-    process "~0.5.1"
-
 has@^1.0.3:
  version "1.0.3"
  resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
@ -586,7 +688,7 @@ is-number@^7.0.0:
  resolved "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz"
  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==

-lodash-es@*, lodash-es@^4.17.21:
+lodash-es@^4.17.21:
  version "4.17.21"
  resolved "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz"
  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
@ -596,11 +698,16 @@ lodash-unified@^1.0.2:
  resolved "https://registry.npmmirror.com/lodash-unified/-/lodash-unified-1.0.3.tgz"
  integrity sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==

-lodash@*, lodash@^4.17.21:
+lodash@^4.17.21:
  version "4.17.21"
  resolved "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz"
  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==

+m3u8-parser@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/m3u8-parser/-/m3u8-parser-2.1.0.tgz"
+  integrity sha512-WbEpQ2FUaNGbJ0YanSeyj9D9ruu4FUvz+ZvebIzI2bSME+PUwcPXO1kKXZkjcPUAFruDikoOI5fWQNIA6JCCOQ==
+
 m3u8-parser@^7.1.0:
  version "7.2.0"
  resolved "https://registry.npmmirror.com/m3u8-parser/-/m3u8-parser-7.2.0.tgz"
@ -610,11 +717,6 @@ m3u8-parser@^7.1.0:
    "@videojs/vhs-utils" "^4.1.1"
    global "^4.4.0"

-m3u8-parser@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmmirror.com/m3u8-parser/-/m3u8-parser-2.1.0.tgz"
-  integrity sha512-WbEpQ2FUaNGbJ0YanSeyj9D9ruu4FUvz+ZvebIzI2bSME+PUwcPXO1kKXZkjcPUAFruDikoOI5fWQNIA6JCCOQ==
-
 magic-string@^0.25.7:
  version "0.25.9"
  resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz"
@ -656,7 +758,12 @@ mpd-parser@^1.2.2, mpd-parser@^1.3.0:
    "@xmldom/xmldom" "^0.8.3"
    global "^4.4.0"

-mux.js@^7.0.1, mux.js@7.0.3:
+mux.js@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.npmmirror.com/mux.js/-/mux.js-4.3.2.tgz"
+  integrity sha512-g0q6DPdvb3yYcoK7ElBGobdSSrhY/RjPt19U7uUc733aqvc5bCS/aCvL9z+448y+IoCZnYDwyZfQBBXMSmGOaQ==
+
+mux.js@7.0.3, mux.js@^7.0.1:
  version "7.0.3"
  resolved "https://registry.npmmirror.com/mux.js/-/mux.js-7.0.3.tgz"
  integrity sha512-gzlzJVEGFYPtl2vvEiJneSWAWD4nfYRHD5XgxmB2gWvXraMPOYk+sxfvexmNfjQUFpmk6hwLR5C6iSFmuwCHdQ==
@ -664,11 +771,6 @@ mux.js@^7.0.1, mux.js@7.0.3:
    "@babel/runtime" "^7.11.2"
    global "^4.4.0"

-mux.js@4.3.2:
-  version "4.3.2"
-  resolved "https://registry.npmmirror.com/mux.js/-/mux.js-4.3.2.tgz"
-  integrity sha512-g0q6DPdvb3yYcoK7ElBGobdSSrhY/RjPt19U7uUc733aqvc5bCS/aCvL9z+448y+IoCZnYDwyZfQBBXMSmGOaQ==
-
 nanoid@^3.3.4:
  version "3.3.6"
  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz"
@ -787,7 +889,7 @@ safe-json-parse@4.0.0:
  dependencies:
    rust-result "^1.0.0"

-sass@*, sass@^1.60.0:
+sass@^1.60.0:
  version "1.62.0"
  resolved "https://registry.npmmirror.com/sass/-/sass-1.62.0.tgz"
  integrity sha512-Q4USplo4pLYgCi+XlipZCWUQz5pkg/ruSSgJ0WRDSb/+3z9tXUOkQ7QPYn4XrhZKYAK4HlpaQecRwKLJX6+DBg==
@ -796,7 +898,7 @@ sass@*, sass@^1.60.0:
    immutable "^4.0.0"
    source-map-js ">=0.6.2 <2.0.0"

-source-map-js@^1.0.2, "source-map-js@>=0.6.2 <2.0.0":
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
  version "1.0.2"
  resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
@ -838,7 +940,7 @@ url-toolkit@^2.1.3, url-toolkit@^2.2.1:
  resolved "https://registry.npmmirror.com/url-toolkit/-/url-toolkit-2.2.5.tgz"
  integrity sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg==

-"video.js@^5.17.0 || ^6.2.0":
+"video.js@^5.17.0 || ^6.2.0", "video.js@^5.19.1 || ^6.2.0":
  version "6.13.0"
  resolved "https://registry.npmmirror.com/video.js/-/video.js-6.13.0.tgz"
  integrity sha512-36/JR/GhPQSZj0o+GNbhcEYv/b0SkV9SQsjlodAnzMQYN0TA7VhmqrKPYMCi1NGRYu7S9W3OaFCFoUxkYfSVlg==
@ -852,21 +954,7 @@ url-toolkit@^2.1.3, url-toolkit@^2.2.1:
    videojs-vtt.js "0.12.6"
    xhr "2.4.0"

-"video.js@^5.19.1 || ^6.2.0":
-  version "6.13.0"
-  resolved "https://registry.npmmirror.com/video.js/-/video.js-6.13.0.tgz"
-  integrity sha512-36/JR/GhPQSZj0o+GNbhcEYv/b0SkV9SQsjlodAnzMQYN0TA7VhmqrKPYMCi1NGRYu7S9W3OaFCFoUxkYfSVlg==
-  dependencies:
-    babel-runtime "^6.9.2"
-    global "4.3.2"
-    safe-json-parse "4.0.0"
-    tsml "1.0.1"
-    videojs-font "2.1.0"
-    videojs-ie8 "1.1.2"
-    videojs-vtt.js "0.12.6"
-    xhr "2.4.0"
-
-"video.js@^7 || ^8", video.js@^8, video.js@^8.17.3:
+"video.js@^7 || ^8", video.js@^8.17.3:
  version "8.17.3"
  resolved "https://registry.npmmirror.com/video.js/-/video.js-8.17.3.tgz"
  integrity sha512-zhhmE0LNxJRA603/48oYzF7GYdT+rQRscvcsouYxFE71aKhalHLBP6S9/XjixnyjcrYgwIx8OQo6eSjcbbAW0Q==
@ -947,7 +1035,7 @@ videojs-vtt.js@0.15.5:
  dependencies:
    global "^4.3.1"

-vite@^4.0.0, vite@^4.2.0:
+vite@^4.2.0:
  version "4.2.1"
  resolved "https://registry.npmjs.org/vite/-/vite-4.2.1.tgz"
  integrity sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==
@ -971,7 +1059,7 @@ vue-router@^4.1.6:
  dependencies:
    "@vue/devtools-api" "^6.4.5"

-"vue@^3.0.0-0 || ^2.6.0", vue@^3.2.0, vue@^3.2.25, vue@^3.2.47, vue@3.2.47:
+vue@^3.2.47:
  version "3.2.47"
  resolved "https://registry.npmjs.org/vue/-/vue-3.2.47.tgz"
  integrity sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==
@ -1002,7 +1090,7 @@ xtend@^4.0.0:
  resolved "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz"
  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==

-zrender@^5.1.1, zrender@5.4.3:
+zrender@5.4.3, zrender@^5.1.1:
  version "5.4.3"
  resolved "https://registry.npmjs.org/zrender/-/zrender-5.4.3.tgz"
  integrity sha512-DRUM4ZLnoaT0PBVvGBDO9oWIDBKFdAVieNWxWwK0niYzJCMwGchRk21/hsE+RKkIveH3XHCyvXcJDkgLVvfizQ==