Merge branch 'main' of http://175.6.124.250:3100/Libt/multiple-police-situations

index.html

@@ -13,6 +13,8 @@
   <div id="app"></div>
   <script
     src="https://webapi.amap.com/maps?v=1.4.15&key=8910226d8d36a41d856262b1a588850c&plugin=AMap.MarkerClusterer"></script>
+  <!-- <script src="./public/jquery-3.4.1.min.js"></script>
+    <script src="./public/h5player.min.js"></script> -->
   <script src="./jquery-3.4.1.min.js"></script>
   <script src="./h5player.min.js"></script>
   <script type="module" src="/src/main.ts">

src/router/index.ts

@@ -1,9 +1,9 @@
-import {createRouter, createWebHistory,createWebHashHistory} from "vue-router";
+import { createRouter, createWebHistory, createWebHashHistory } from "vue-router";
-import {staticRouter, errorRouter} from "@/router/modules/staticRouters";
+import { staticRouter, errorRouter } from "@/router/modules/staticRouters";
-import {LOGIN_ROUTER, ROUTER_WHITE_LIST} from "@/configs";
+import { LOGIN_ROUTER, ROUTER_WHITE_LIST } from "@/configs";
-import {useUserStore} from "@/stores/modules/userStore";
+import { useUserStore } from "@/stores/modules/userStore";
-import {message, Modal} from "ant-design-vue";
+import { message, Modal } from "ant-design-vue";
-import {start, close} from '@/utils/nporgress'
+import { start, close } from '@/utils/nporgress'
 
 /**
  * createWebHistory & createWebHashHistory
@@ -14,7 +14,7 @@ const router = createRouter({
     history: createWebHashHistory(),
     routes: [...staticRouter, ...errorRouter],
     strict: false,
-    scrollBehavior: () => ({left: 0, top: 0})
+    scrollBehavior: () => ({ left: 0, top: 0 })
 });
 
 /**

src/views/login.vue

@@ -59,7 +59,7 @@ const loginParams = ref<{
   passWord: string
   code: string
 }>({
-  userNameOrTelephone: import.meta.env.VITE_APP_ENV === 'development' ? 'admin' : '',
+  userNameOrTelephone: import.meta.env.VITE_APP_ENV === 'development' ? 'test001' : '',
   passWord: import.meta.env.VITE_APP_ENV === 'development' ? '123456' : '',
   code: import.meta.env.VITE_APP_ENV === 'development' ? '1234' : '',
 })

src/views/page/hkplay.vue

@@ -2,14 +2,14 @@
   <div id="player"></div>
 </template>
 <script lang="ts" setup>
-	import api from '@/axios'
+import api from '@/axios'
-	import { Ref, ref, watch, onMounted, onBeforeMount, onBeforeUnmount, reactive, getCurrentInstance } from 'vue'
+import { Ref, ref, watch, onMounted, onBeforeMount, onBeforeUnmount, reactive, getCurrentInstance } from 'vue'
-	import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
-	const router = useRouter()
+const router = useRouter()
-	const infoData = ref()
+const infoData = ref()
-	var curIndex = 0 // 当前窗口下标
+var curIndex = 0 // 当前窗口下标
-	let myPlugin : any
+let myPlugin: any
-	onMounted(() => {
+onMounted(() => {
   if (typeof window.JSPlugin === 'undefined') {
     return
   } else {
@@ -45,13 +45,11 @@
         },
         bSupporDoubleClickFull: true, //是否支持双击全屏，默认true
       })
-				myPlugin.JS_SetWindowControlCallback({
+      myPlugin
-					pluginErrorHandler: function (index : any, iErrorCode : any, oError : any) {
+        .JS_SetWindowControlCallback({
-
+          pluginErrorHandler: function (index: any, iErrorCode: any, oError: any) {},
-					},
-				})
-					.then((res : any) => {
         })
+        .then((res: any) => {})
 
       var controlIndex = 2
       function playVideo() {
@@ -65,9 +63,8 @@
             curIndex //当前窗口下标
           )
           .then(
-							() => {
+            () => {},
-							},
+            (e: any) => {
-							(e : any) => {
               // console.log('网络流中断')
               controlIndex--
               if (controlIndex <= 0) {
@@ -83,27 +80,27 @@
       alert('播放失败')
     }
   })
-	})
+})
 
-	// 停止播放断开 ws 连接
+// 停止播放断开 ws 连接
-	onBeforeUnmount(() => {
+onBeforeUnmount(() => {
   myPlugin.JS_Stop(curIndex).then(
     () => {
       console.info('JS_Stop success')
       // do you want...
     },
-			(err : any) => {
+    (err: any) => {
       console.info('JS_Stop failed:', err)
       // do you want...
     }
   )
-	})
+})
 </script>
 
 <style scoped lang="scss">
-	#player {
+#player {
   height: 100%;
   width: 100%;
   background: #000;
-	}
+}
 </style>

src/views/page/index.vue

@@ -1061,6 +1061,10 @@ const pointCode = ref()
       try {
         // router.push({ path: '/index/hkplay', query: { pointId: a.pointId } })
         let routeData = router.resolve({ path: '/index/hkplay', query: { pointId: a.pointId } })
+        // console.log('routeData.href_____________________', routeData.href)
+        // routeData.href = 'index.html' + routeData.href
+        console.log('routeData.href_____________________', routeData.href)
+
         // console.log('🚀 ~ routeData:', JSON.stringify(routeData))
         // window.location.href = routeData.href