Compare commits

..

No commits in common. "7edfd5275ff406c5d3f980cebe8b058766480599" and "e4986834f21de6b4d4e40111f44ea0a737c6672f" have entirely different histories.

6 changed files with 4474 additions and 4503 deletions

File diff suppressed because one or more lines are too long

View File

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

View File

@ -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 * createWebHistory & createWebHashHistory
@ -14,7 +14,7 @@ const router = createRouter({
history: createWebHashHistory(), history: createWebHashHistory(),
routes: [...staticRouter, ...errorRouter], routes: [...staticRouter, ...errorRouter],
strict: false, strict: false,
scrollBehavior: () => ({ left: 0, top: 0 }) scrollBehavior: () => ({left: 0, top: 0})
}); });
/** /**

View File

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

View File

@ -2,14 +2,14 @@
<div id="player"></div> <div id="player"></div>
</template> </template>
<script lang="ts" setup> <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') { if (typeof window.JSPlugin === 'undefined') {
return return
} else { } else {
@ -45,11 +45,13 @@ onMounted(() => {
}, },
bSupporDoubleClickFull: true, //true bSupporDoubleClickFull: true, //true
}) })
myPlugin myPlugin.JS_SetWindowControlCallback({
.JS_SetWindowControlCallback({ pluginErrorHandler: function (index : any, iErrorCode : any, oError : any) {
pluginErrorHandler: function (index: any, iErrorCode: any, oError: any) {},
},
})
.then((res : any) => {
}) })
.then((res: any) => {})
var controlIndex = 2 var controlIndex = 2
function playVideo() { function playVideo() {
@ -63,8 +65,9 @@ onMounted(() => {
curIndex // curIndex //
) )
.then( .then(
() => {}, () => {
(e: any) => { },
(e : any) => {
// console.log('') // console.log('')
controlIndex-- controlIndex--
if (controlIndex <= 0) { if (controlIndex <= 0) {
@ -80,27 +83,27 @@ onMounted(() => {
alert('播放失败') alert('播放失败')
} }
}) })
}) })
// ws // ws
onBeforeUnmount(() => { onBeforeUnmount(() => {
myPlugin.JS_Stop(curIndex).then( myPlugin.JS_Stop(curIndex).then(
() => { () => {
console.info('JS_Stop success') console.info('JS_Stop success')
// do you want... // do you want...
}, },
(err: any) => { (err : any) => {
console.info('JS_Stop failed:', err) console.info('JS_Stop failed:', err)
// do you want... // do you want...
} }
) )
}) })
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
#player { #player {
height: 100%; height: 100%;
width: 100%; width: 100%;
background: #000; background: #000;
} }
</style> </style>

View File

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