mifei 1 月之前
父節點
當前提交
8754ec30fc
共有 6 個文件被更改,包括 13 次插入147 次删除
  1. 0 72
      package-lock.json
  2. 2 2
      src/components/VideoJs.vue
  3. 0 2
      src/components/left.vue
  4. 8 24
      src/components/right.vue
  5. 0 2
      src/main.js
  6. 3 45
      yarn.lock

+ 0 - 72
package-lock.json

@@ -15,13 +15,11 @@
15 15
         "hls.js": "^1.4.12",
16 16
         "leader-line": "^1.0.7",
17 17
         "postcss-pxtorem": "^6.0.0",
18
-        "swiper": "^11.2.5",
19 18
         "terser": "^5.29.1",
20 19
         "video.js": "^8.6.1",
21 20
         "videojs-contrib-hls": "^5.15.0",
22 21
         "vue": "^3.2.25",
23 22
         "vue-router": "^4.2.5",
24
-        "vue-scrolling": "^1.0.1",
25 23
         "vue3-count-to": "^1.1.2",
26 24
         "vue3-number-roll-plus": "^0.1.3",
27 25
         "vue3-seamless-scroll": "^3.0.2",
@@ -1743,21 +1741,6 @@
1743 1741
         "postcss": "^8.0.0"
1744 1742
       }
1745 1743
     },
1746
-    "node_modules/prettier": {
1747
-      "version": "2.8.8",
1748
-      "resolved": "https://registry.npmmirror.com/prettier/-/prettier-2.8.8.tgz",
1749
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
1750
-      "optional": true,
1751
-      "bin": {
1752
-        "prettier": "bin-prettier.js"
1753
-      },
1754
-      "engines": {
1755
-        "node": ">=10.13.0"
1756
-      },
1757
-      "funding": {
1758
-        "url": "https://github.com/prettier/prettier?sponsor=1"
1759
-      }
1760
-    },
1761 1744
     "node_modules/process": {
1762 1745
       "version": "0.11.10",
1763 1746
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -1976,24 +1959,6 @@
1976 1959
         "url": "https://github.com/sponsors/ljharb"
1977 1960
       }
1978 1961
     },
1979
-    "node_modules/swiper": {
1980
-      "version": "11.2.5",
1981
-      "resolved": "https://registry.npmmirror.com/swiper/-/swiper-11.2.5.tgz",
1982
-      "integrity": "sha512-nG0kbIyBfeE2BPFt9nPUX03qUBF75o6+enzjIT/DfCmbh8ORlwhc4eZz1+4H/yseAgb3H+OoEYzmb64i0tYNnQ==",
1983
-      "funding": [
1984
-        {
1985
-          "type": "patreon",
1986
-          "url": "https://www.patreon.com/swiperjs"
1987
-        },
1988
-        {
1989
-          "type": "open_collective",
1990
-          "url": "http://opencollective.com/swiper"
1991
-        }
1992
-      ],
1993
-      "engines": {
1994
-        "node": ">= 4.7.0"
1995
-      }
1996
-    },
1997 1962
     "node_modules/terser": {
1998 1963
       "version": "5.29.1",
1999 1964
       "resolved": "https://registry.npmmirror.com/terser/-/terser-5.29.1.tgz",
@@ -2524,43 +2489,6 @@
2524 2489
         "vue": "^3.2.0"
2525 2490
       }
2526 2491
     },
2527
-    "node_modules/vue-scrolling": {
2528
-      "version": "1.0.1",
2529
-      "resolved": "https://registry.npmmirror.com/vue-scrolling/-/vue-scrolling-1.0.1.tgz",
2530
-      "integrity": "sha512-E9USTNpvNm033pE3kSvs9RUlPlyVXcutziNn1nyDjLDWrLG32jCjEdGhqy6/nOeGfls5Lg8wafPLgDJ/Ul8oow==",
2531
-      "dependencies": {
2532
-        "core-js": "^3.8.3",
2533
-        "vue": "^2.6.14"
2534
-      }
2535
-    },
2536
-    "node_modules/vue-scrolling/node_modules/@vue/compiler-sfc": {
2537
-      "version": "2.7.16",
2538
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
2539
-      "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
2540
-      "dependencies": {
2541
-        "@babel/parser": "^7.23.5",
2542
-        "postcss": "^8.4.14",
2543
-        "source-map": "^0.6.1"
2544
-      },
2545
-      "optionalDependencies": {
2546
-        "prettier": "^1.18.2 || ^2.0.0"
2547
-      }
2548
-    },
2549
-    "node_modules/vue-scrolling/node_modules/csstype": {
2550
-      "version": "3.1.3",
2551
-      "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz",
2552
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
2553
-    },
2554
-    "node_modules/vue-scrolling/node_modules/vue": {
2555
-      "version": "2.7.16",
2556
-      "resolved": "https://registry.npmmirror.com/vue/-/vue-2.7.16.tgz",
2557
-      "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
2558
-      "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.",
2559
-      "dependencies": {
2560
-        "@vue/compiler-sfc": "2.7.16",
2561
-        "csstype": "^3.1.0"
2562
-      }
2563
-    },
2564 2492
     "node_modules/vue3-count-to": {
2565 2493
       "version": "1.1.2",
2566 2494
       "resolved": "https://registry.npmjs.org/vue3-count-to/-/vue3-count-to-1.1.2.tgz",

+ 2 - 2
src/components/VideoJs.vue

@@ -42,8 +42,8 @@ const initPlay = async () => {
42 42
               console.log('sadnuq21',res.data);
43 43
               console.log('sadnuq2121',res.data.httpFlv);
44 44
               // shiping2.value='http://kbs-dokdo.gscdn.com/dokdo_300/_definst_/dokdo_300.stream/playlist.m3u8'
45
-              // shiping2.value=res.data.httpFlv
46
-              shiping2.value="https://weizhi.huanghuai.edu.cn/jk/hls/c7a1e790-b3bc-4092-a975-40d0e35d54c2.m3u8"
45
+              shiping2.value=res.data.httpFlv
46
+              // shiping2.value="https://weizhi.huanghuai.edu.cn/jk/hls/c7a1e790-b3bc-4092-a975-40d0e35d54c2.m3u8"
47 47
             
48 48
 
49 49
               setTimeout(() => {

+ 0 - 2
src/components/left.vue

@@ -358,7 +358,6 @@ import {
358 358
 } from "vue3-seamless-scroll";
359 359
 import Scroll from "./ScrollView.vue";
360 360
 
361
-import vueScrolling from "vue-scrolling";
362 361
 // import { callUIInteraction } from "../webrtcVideo";
363 362
 import Tag from "./Tag.vue";
364 363
 
@@ -374,7 +373,6 @@ export default {
374 373
     Tag,
375 374
     Vue3SeamlessScroll,
376 375
     VerticalScroll,
377
-    vueScrolling,
378 376
     Scroll
379 377
   },
380 378
   setup(_, { emit }) {

+ 8 - 24
src/components/right.vue

@@ -205,10 +205,6 @@ import { getDevice, getVideoUrl, getvideo } from "../request/api";
205 205
 //找到你的组件地址引入进来
206 206
 import VideoJs from "./VideoJs.vue";
207 207
 import { CountTo } from "vue3-count-to";
208
-import { Virtual } from "swiper/modules";
209
-import { useSwiper } from "swiper/vue";
210
-import { Swiper, SwiperSlide } from "swiper/vue";
211
-import "swiper/css";
212 208
 
213 209
 export default {
214 210
   name: "Histogram",
@@ -217,13 +213,9 @@ export default {
217 213
     ElCarousel,
218 214
     ElCarouselItem,
219 215
     CountTo,
220
-    Swiper,
221
-    SwiperSlide,
222 216
     VideoJs,
223 217
   },
224 218
   setup() {
225
-    const swiper = useSwiper();
226
-    console.log("swiper", swiper);
227 219
     onMounted(() => {});
228 220
 
229 221
     const data = reactive({
@@ -302,15 +294,15 @@ export default {
302 294
       videoDialog.value = true;
303 295
       dialogTitle.value = item.title;
304 296
 
305
-      // getVideoUrl({ rtsp: item.src }).then((res) => {
306
-      //   console.log("视频处理", res);
307
-      //   console.log("视频处理2", res.data.httpFlv);
297
+      getVideoUrl({ rtsp: item.src }).then((res) => {
298
+        console.log("视频处理", res);
299
+        console.log("视频处理2", res.data.httpFlv);
308 300
 
309
-      //   videoData.src = res.data.httpFlv;
310
-      // });
301
+        videoData.src = res.data.httpFlv;
302
+      });
311 303
       // videoData.src = src;
312
-      videoData.src =
313
-        "https://weizhi.huanghuai.edu.cn/jk/hls/c7a1e790-b3bc-4092-a975-40d0e35d54c2.m3u8";
304
+      // videoData.src =
305
+      //   "https://weizhi.huanghuai.edu.cn/jk/hls/c7a1e790-b3bc-4092-a975-40d0e35d54c2.m3u8";
314 306
     };
315 307
     // 播放视频
316 308
     const onPlay = function () {
@@ -403,12 +395,7 @@ export default {
403 395
       console.log("darta", data);
404 396
       isShowDeviceDetails.value = true;
405 397
     };
406
-    const swiperOptions = ref({
407
-      autoplay: true,
408
-      renderExternal: (data) => {
409
-        console.log("data", data);
410
-      },
411
-    });
398
+   
412 399
     let swiperRef = ref(null);
413 400
     const d1img = ref("./img/d1_1.png");
414 401
     const d12img = ref("./img/d1_2.png");
@@ -444,11 +431,8 @@ export default {
444 431
       deviceDetailsList,
445 432
       lookDetails,
446 433
       isShowDeviceDetails,
447
-      Virtual,
448 434
       swiperLeft,
449 435
       swiperRight,
450
-      swiper,
451
-      swiperOptions,
452 436
       swiperRef,
453 437
     };
454 438
   },

+ 0 - 2
src/main.js

@@ -11,7 +11,6 @@ import 'vue3-video-play/dist/style.css' // 引入css
11 11
 import videojs from "video.js";
12 12
 import "video.js/dist/video-js.css";
13 13
 
14
-import vueScrolling from "vue-scrolling";
15 14
 // Vue.prototype.$video = videojs;
16 15
 
17 16
 
@@ -20,7 +19,6 @@ const app = createApp(App)
20 19
 console.log("全局的app", app)
21 20
 app.use(router)
22 21
 app.use(vue3videoPlay)
23
-app.use(vueScrolling)
24 22
 // app.config.globalProperties.$message = ElMessage;
25 23
 // app.use(ElMessage)
26 24
 app.mount("#app")

+ 3 - 45
yarn.lock

@@ -17,7 +17,7 @@
17 17
   resolved "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz"
18 18
   integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==
19 19
 
20
-"@babel/parser@^7.15.8", "@babel/parser@^7.16.4", "@babel/parser@^7.23.5":
20
+"@babel/parser@^7.15.8", "@babel/parser@^7.16.4":
21 21
   version "7.26.9"
22 22
   resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.26.9.tgz"
23 23
   integrity sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==
@@ -230,17 +230,6 @@
230 230
     "@vue/compiler-core" "3.2.37"
231 231
     "@vue/shared" "3.2.37"
232 232
 
233
-"@vue/compiler-sfc@2.7.16":
234
-  version "2.7.16"
235
-  resolved "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz"
236
-  integrity sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==
237
-  dependencies:
238
-    "@babel/parser" "^7.23.5"
239
-    postcss "^8.4.14"
240
-    source-map "^0.6.1"
241
-  optionalDependencies:
242
-    prettier "^1.18.2 || ^2.0.0"
243
-
244 233
 "@vue/compiler-sfc@3.2.37":
245 234
   version "3.2.37"
246 235
   resolved "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz"
@@ -473,7 +462,7 @@ core-js@^2.4.0:
473 462
   resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz"
474 463
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
475 464
 
476
-core-js@^3.8.1, core-js@^3.8.3:
465
+core-js@^3.8.1:
477 466
   version "3.33.0"
478 467
   resolved "https://registry.npmjs.org/core-js/-/core-js-3.33.0.tgz"
479 468
   integrity sha512-HoZr92+ZjFEKar5HS6MC776gYslNOKHt75mEBKWKnPeFDpZ6nH5OeF3S6HFT1mUAUZKrzkez05VboaX8myjSuw==
@@ -483,11 +472,6 @@ csstype@^2.6.8:
483 472
   resolved "https://registry.npmmirror.com/csstype/-/csstype-2.6.20.tgz"
484 473
   integrity sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==
485 474
 
486
-csstype@^3.1.0:
487
-  version "3.1.3"
488
-  resolved "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz"
489
-  integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
490
-
491 475
 dayjs@^1.11.13:
492 476
   version "1.11.13"
493 477
   resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz"
@@ -998,7 +982,7 @@ postcss-pxtorem@^6.0.0:
998 982
   resolved "https://registry.npmmirror.com/postcss-pxtorem/-/postcss-pxtorem-6.0.0.tgz"
999 983
   integrity sha512-ZRXrD7MLLjLk2RNGV6UA4f5Y7gy+a/j1EqjAfp9NdcNYVjUMvg5HTYduTjSkKBkRkfqbg/iKrjMO70V4g1LZeg==
1000 984
 
1001
-postcss@^8.0.0, postcss@^8.1.10, postcss@^8.4.13, postcss@^8.4.14:
985
+postcss@^8.0.0, postcss@^8.1.10, postcss@^8.4.13:
1002 986
   version "8.4.14"
1003 987
   resolved "https://registry.npmmirror.com/postcss/-/postcss-8.4.14.tgz"
1004 988
   integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
@@ -1007,11 +991,6 @@ postcss@^8.0.0, postcss@^8.1.10, postcss@^8.4.13, postcss@^8.4.14:
1007 991
     picocolors "^1.0.0"
1008 992
     source-map-js "^1.0.2"
1009 993
 
1010
-"prettier@^1.18.2 || ^2.0.0":
1011
-  version "2.8.8"
1012
-  resolved "https://registry.npmmirror.com/prettier/-/prettier-2.8.8.tgz"
1013
-  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
1014
-
1015 994
 process@^0.11.10:
1016 995
   version "0.11.10"
1017 996
   resolved "https://registry.npmjs.org/process/-/process-0.11.10.tgz"
@@ -1156,11 +1135,6 @@ supports-preserve-symlinks-flag@^1.0.0:
1156 1135
   resolved "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
1157 1136
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
1158 1137
 
1159
-swiper@^11.2.5:
1160
-  version "11.2.5"
1161
-  resolved "https://registry.npmmirror.com/swiper/-/swiper-11.2.5.tgz"
1162
-  integrity sha512-nG0kbIyBfeE2BPFt9nPUX03qUBF75o6+enzjIT/DfCmbh8ORlwhc4eZz1+4H/yseAgb3H+OoEYzmb64i0tYNnQ==
1163
-
1164 1138
 terser@^5.29.1:
1165 1139
   version "5.29.1"
1166 1140
   resolved "https://registry.npmmirror.com/terser/-/terser-5.29.1.tgz"
@@ -1399,22 +1373,6 @@ vue-router@^4.2.5:
1399 1373
   dependencies:
1400 1374
     "@vue/devtools-api" "^6.5.0"
1401 1375
 
1402
-vue-scrolling@^1.0.1:
1403
-  version "1.0.1"
1404
-  resolved "https://registry.npmmirror.com/vue-scrolling/-/vue-scrolling-1.0.1.tgz"
1405
-  integrity sha512-E9USTNpvNm033pE3kSvs9RUlPlyVXcutziNn1nyDjLDWrLG32jCjEdGhqy6/nOeGfls5Lg8wafPLgDJ/Ul8oow==
1406
-  dependencies:
1407
-    core-js "^3.8.3"
1408
-    vue "^2.6.14"
1409
-
1410
-vue@^2.6.14:
1411
-  version "2.7.16"
1412
-  resolved "https://registry.npmmirror.com/vue/-/vue-2.7.16.tgz"
1413
-  integrity sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==
1414
-  dependencies:
1415
-    "@vue/compiler-sfc" "2.7.16"
1416
-    csstype "^3.1.0"
1417
-
1418 1376
 "vue@^3.0.0-0 || ^2.6.0", vue@^3.2.0, vue@^3.2.2, vue@^3.2.25, "vue@>= 3 < 4", "vue@2 || 3", vue@3.2.37:
1419 1377
   version "3.2.37"
1420 1378
   resolved "https://registry.npmmirror.com/vue/-/vue-3.2.37.tgz"