Merge branch 'develop' of gitadmin/tuoheng_lc_web into release

src/views/dashboard/components/OneMap.vue

@@ -633,7 +633,7 @@ export default {
     const liveShow = (rowInfo) => {
       router.push({
         path: '/taskManage/all',
-        query: { rowInfo: JSON.stringify(rowInfo), type: 1 }
+        query: { rowInfo: JSON.stringify(rowInfo), toIndexRoute: true }
       })
     }
     onMounted(() => {

src/views/task-manage/all-task/components/LiveDrawer.vue

@@ -54,7 +54,7 @@ import VectorContext from 'ol/render/VectorContext'
 import * as control from 'ol/control'
 import { styleList } from '../tools/style.js'
 import { getTrackList, getLineList } from '@/api/task/index.js'
-
+import { useRouter } from 'vue-router'
 // 视频组件
 import VideoPlayer from '@/components/VideoPlayer/index.vue'
 export default defineComponent({
@@ -77,6 +77,7 @@ export default defineComponent({
   },
   setup(props, { emit }) {
     const originRef = ref()
+    const router = useRouter()
     const data = reactive({
       mapData: null,
       view: null,
@@ -147,7 +148,13 @@ export default defineComponent({
 
     function handleDrawerColse() {
       emit('update:visible', false)
-      // 如果是从首页进来的,关闭之后会跳转到首页,首页传进来的会传递一个参数为type==1
+      // 如果是从首页进来的,关闭之后会跳转到首页,首页传进来的会传递一个参数为type==true
+      if (props.data.toIndexRoute) {
+        router.push({
+          path: '/dashboard'
+
+        })
+      }
     }
 
     /* 获取轨迹数据 */

src/views/task-manage/all-task/index.vue

@@ -79,7 +79,7 @@ export default {
   setup() {
     const route = useRoute()
     const rowInfo = route.query.rowInfo
-    const type = route.query.type
+    const toIndexRoute = route.query.toIndexRoute
     getAirOptions()
     const searchRef = ref()
     const data = reactive({
@@ -123,6 +123,8 @@ export default {
     onMounted(() => {
       if (rowInfo) {
         data.rowData = JSON.parse(rowInfo)
+        // 有toIndexTRoute的话就关闭直播页面跳回首页
+        data.rowData.toIndexRoute = toIndexRoute
         data.liveDrawer = true
       }
     })