Merge remote-tracking branch 'origin/demo' into demo

xieb

2023-09-26 9a527a2a6bab2522166629ecf74703fcb80b94c2

Merge remote-tracking branch 'origin/demo' into demo

 src/components/GMap.vue

@@ -1008,11 +1008,6 @@
          store.state.deviceStatusEvent.deviceOnline = {} as DeviceStatus
        }
        if (Object.keys(data.deviceOffline).length !== 0) {
          // deviceTsaUpdateHook.removeMarker(data.deviceOffline.sn)
          if ((data.deviceOffline.sn === osdVisible.value.sn) || (osdVisible.value.is_dock && data.deviceOffline.sn === osdVisible.value.gateway_sn)) {
            osdVisible.value.visible = false
            store.commit('SET_OSD_VISIBLE_INFO', osdVisible)
          }
          store.state.deviceStatusEvent.deviceOffline = {}
        }
      },

 src/components/common/sidebar.vue

@@ -77,6 +77,8 @@
        await UnBind(v)
      })
      store.commit('SET_OSD_VISIBLE_INFO', { ...query, visible: false })
      store.commit('SET_SELECT_WAYLINE_INFO', {})
      store.commit('SET_SELECT_DOCK_INFO', {})
      root.$router.push('/' + ERouterName.PROJECT_LIST)
    }
    return {

 src/pages/page-web/projects/wayline.vue

@@ -193,7 +193,6 @@
function selectRoute (wayline: WaylineFile) {
  loading.value = true
  getWayLineFile(workspaceId.value, wayline.id).then(res => {
    console.log(res, 'res')
    store.commit('SET_SELECT_WAYLINE_INFO', wayline)
    initKmlFile(res.data)
  }).finally(() => {