dev #11

Merged
jiangx merged 2 commits from dev into test 7 months ago
  1. 3
      src/composables/useHandleScreen.ts
  2. 3
      src/composables/useInitConfigAndMallInfo.ts
  3. 12
      src/composables/useInitMap.ts
  4. 16
      src/views/Index/Index.vue

3
src/composables/useHandleScreen.ts

@ -1,6 +1,5 @@
import { ref, computed, watch, onUnmounted } from 'vue' import { ref, computed, watch, onUnmounted } from 'vue'
import { storeToRefs } from 'pinia' import { storeToRefs } from 'pinia'
import * as Sentry from '@sentry/vue'
import { useRootStore } from '@/stores/root' import { useRootStore } from '@/stores/root'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { getStatistics } from '@/http/api/statistics' import { getStatistics } from '@/http/api/statistics'
@ -98,7 +97,7 @@ export const useHandleScreen = (callback: () => void) => {
nativeMethods.value?.goScreenSave() nativeMethods.value?.goScreenSave()
} catch (error) { } catch (error) {
clearTimers() clearTimers()
Sentry.captureException('checkHandleScreen:' + error)
console.log('checkHandleScreen:' + error)
} }
}, DELAY_CHECK_TIME) }, DELAY_CHECK_TIME)
} }

3
src/composables/useInitConfigAndMallInfo.ts

@ -1,4 +1,3 @@
import * as Sentry from '@sentry/vue'
import { useRootStore } from '@/stores/root' import { useRootStore } from '@/stores/root'
import { import {
getConfig, getConfig,
@ -90,7 +89,7 @@ export const useInitBaseData = async () => {
store.SET_SPECIAL_INDUSTRY_CODE(industryCode) store.SET_SPECIAL_INDUSTRY_CODE(industryCode)
store.SET_MENU_LIST(_menuList.data) store.SET_MENU_LIST(_menuList.data)
} catch (error) { } catch (error) {
Sentry.captureException(error)
console.log(error)
alert('数据异常,软件启动失败') alert('数据异常,软件启动失败')
} }
} }

12
src/composables/useInitMap.ts

@ -2,14 +2,19 @@ import { storeToRefs } from 'pinia'
import { cloneDeep } from 'lodash-es' import { cloneDeep } from 'lodash-es'
import { useRootStore } from '@/stores/root' import { useRootStore } from '@/stores/root'
import { getMapData, getMapShowHouseNumber } from '@/http/api/base' import { getMapData, getMapShowHouseNumber } from '@/http/api/base'
import { useRoute } from 'vue-router'
export const useInitMap = async function () { export const useInitMap = async function () {
try { try {
const route = useRoute()
const store = useRootStore() const store = useRootStore()
const { device, shopList, customFacilityList } = storeToRefs(store) const { device, shopList, customFacilityList } = storeToRefs(store)
const { data } = await getMapData() const { data } = await getMapData()
const { data: houseNumberData } = await getMapShowHouseNumber() const { data: houseNumberData } = await getMapShowHouseNumber()
const isShowHouseNumber = houseNumberData.map(item => item.content)[0]?.show const isShowHouseNumber = houseNumberData.map(item => item.content)[0]?.show
let renderTimer: number
//初始化地图 //初始化地图
window.MainMap_QM.init( window.MainMap_QM.init(
() => { () => {
@ -18,7 +23,14 @@ export const useInitMap = async function () {
window.Map_QM.cancelRender() window.Map_QM.cancelRender()
window.Map_QM.addEventListener('shop', onClickShop, false) window.Map_QM.addEventListener('shop', onClickShop, false)
window.Map_QM.renderer.domElement.addEventListener('contextlost', onContextLost) window.Map_QM.renderer.domElement.addEventListener('contextlost', onContextLost)
if (!route.meta.showMap) {
renderTimer = setTimeout(() => {
window.Map_QM?.cancelRender()
clearTimeout(renderTimer)
}, 1000)
}
}, },
{ {
build: device.value.buildingOrder, build: device.value.buildingOrder,
floor: device.value.floorOrder, floor: device.value.floorOrder,

16
src/views/Index/Index.vue

@ -3,7 +3,7 @@
<div class="relative z-10 px-[102px]"> <div class="relative z-10 px-[102px]">
<div class="mb-1 flex"> <div class="mb-1 flex">
<div class="mr-1 w-100"> <div class="mr-1 w-100">
<div class="mb-1 flex h-24 items-center rounded-lg bg-gradient-to-r from-pink-100 to-pink-200 pl-8" @click="handleSearch">
<div class="mb-1 flex h-24 items-center rounded-lg bg-gradient-to-r from-pink-100 to-pink-200 pl-8" @pointerdown="handleSearch">
<i class="iconfont icon-jichu_gongneng_sousuo text-48 text-white"></i> <i class="iconfont icon-jichu_gongneng_sousuo text-48 text-white"></i>
<div class="mx-5 h-8 w-0.5 bg-white/40"></div> <div class="mx-5 h-8 w-0.5 bg-white/40"></div>
<div> <div>
@ -14,7 +14,7 @@
<div <div
class="linear relative h-[550px] bg-cover" class="linear relative h-[550px] bg-cover"
:style="{ backgroundImage: `url(${menuList[1].moduleActivateLogo})` }" :style="{ backgroundImage: `url(${menuList[1].moduleActivateLogo})` }"
@click="goPage(menuList[1])"
@pointerdown="goPage(menuList[1])"
> >
<p class="flex items-center justify-between px-8 pt-8"> <p class="flex items-center justify-between px-8 pt-8">
<span class="font-700 text-28 leading-9 text-black/80">{{ menuList[1].moduleName }}</span> <span class="font-700 text-28 leading-9 text-black/80">{{ menuList[1].moduleName }}</span>
@ -27,7 +27,7 @@
<div <div
:style="{ backgroundImage: `url(${menuList[2].moduleActivateLogo})` }" :style="{ backgroundImage: `url(${menuList[2].moduleActivateLogo})` }"
class="mb-1 h-[403px] w-[432px] overflow-hidden rounded-xl bg-cover bg-center bg-no-repeat pl-10 pt-8" class="mb-1 h-[403px] w-[432px] overflow-hidden rounded-xl bg-cover bg-center bg-no-repeat pl-10 pt-8"
@click="goPage(menuList[2])"
@pointerdown="goPage(menuList[2])"
> >
<div class="mb-0.5 font-700 text-28 leading-9 text-white">{{ menuList[2].moduleName }}</div> <div class="mb-0.5 font-700 text-28 leading-9 text-white">{{ menuList[2].moduleName }}</div>
<div class="font-700 text-28 uppercase leading-9 text-white/80">{{ menuList[2].moduleNameEn }}</div> <div class="font-700 text-28 uppercase leading-9 text-white/80">{{ menuList[2].moduleNameEn }}</div>
@ -35,7 +35,7 @@
<div <div
:style="{ backgroundImage: `url(${menuList[4].moduleActivateLogo})` }" :style="{ backgroundImage: `url(${menuList[4].moduleActivateLogo})` }"
class="h-[243px] w-[432px] bg-cover pl-10 pt-8" class="h-[243px] w-[432px] bg-cover pl-10 pt-8"
@click="goPage(menuList[4])"
@pointerdown="goPage(menuList[4])"
> >
<div class="mb-0.5 font-700 text-28 leading-9 text-white">{{ menuList[4].moduleName }}</div> <div class="mb-0.5 font-700 text-28 leading-9 text-white">{{ menuList[4].moduleName }}</div>
<div class="font-700 text-28 uppercase leading-9 text-white/80">{{ menuList[4].moduleNameEn }}</div> <div class="font-700 text-28 uppercase leading-9 text-white/80">{{ menuList[4].moduleNameEn }}</div>
@ -46,7 +46,7 @@
<div <div
:style="{ backgroundImage: `url(${menuList[3].moduleActivateLogo})` }" :style="{ backgroundImage: `url(${menuList[3].moduleActivateLogo})` }"
class="linear relative mr-1 h-[308px] w-60 bg-cover pl-10 pt-8" class="linear relative mr-1 h-[308px] w-60 bg-cover pl-10 pt-8"
@click="goPage(menuList[3])"
@pointerdown="goPage(menuList[3])"
> >
<div class="mb-0.5 font-700 text-28 leading-9 text-white">{{ menuList[3].moduleName }}</div> <div class="mb-0.5 font-700 text-28 leading-9 text-white">{{ menuList[3].moduleName }}</div>
<div class="mb-0.5 font-700 text-28 uppercase leading-9 text-white">{{ menuList[3].moduleNameEn }}</div> <div class="mb-0.5 font-700 text-28 uppercase leading-9 text-white">{{ menuList[3].moduleNameEn }}</div>
@ -54,7 +54,7 @@
<div <div
:style="{ backgroundImage: `url(${menuList[5].moduleActivateLogo})` }" :style="{ backgroundImage: `url(${menuList[5].moduleActivateLogo})` }"
class="linear relative mr-1 h-[308px] w-60 bg-cover pl-10 pt-8" class="linear relative mr-1 h-[308px] w-60 bg-cover pl-10 pt-8"
@click="goPage(menuList[5])"
@pointerdown="goPage(menuList[5])"
> >
<div class="mb-0.5 font-700 text-28 leading-9 text-white">{{ menuList[5].moduleName }}</div> <div class="mb-0.5 font-700 text-28 leading-9 text-white">{{ menuList[5].moduleName }}</div>
<div class="mb-0.5 font-700 text-28 uppercase leading-9 text-white">{{ menuList[5].moduleNameEn }}</div> <div class="mb-0.5 font-700 text-28 uppercase leading-9 text-white">{{ menuList[5].moduleNameEn }}</div>
@ -63,7 +63,7 @@
<div <div
:style="{ backgroundImage: `url(${menuList[6].moduleActivateLogo})` }" :style="{ backgroundImage: `url(${menuList[6].moduleActivateLogo})` }"
class="mb-1 h-[152px] w-[388px] bg-cover pl-10 pt-8" class="mb-1 h-[152px] w-[388px] bg-cover pl-10 pt-8"
@click="goPage(menuList[6])"
@pointerdown="goPage(menuList[6])"
> >
<div class="mb-0.5 font-700 text-28 leading-9 text-white">{{ menuList[6].moduleName }}</div> <div class="mb-0.5 font-700 text-28 leading-9 text-white">{{ menuList[6].moduleName }}</div>
<div class="mb-0.5 font-700 text-28 uppercase leading-9 text-white">{{ menuList[6].moduleNameEn }}</div> <div class="mb-0.5 font-700 text-28 uppercase leading-9 text-white">{{ menuList[6].moduleNameEn }}</div>
@ -71,7 +71,7 @@
<div <div
:style="{ backgroundImage: `url(${menuList[7].moduleActivateLogo})` }" :style="{ backgroundImage: `url(${menuList[7].moduleActivateLogo})` }"
class="h-[152px] w-[388px] bg-cover pl-10 pt-8" class="h-[152px] w-[388px] bg-cover pl-10 pt-8"
@click="goPage(menuList[7])"
@pointerdown="goPage(menuList[7])"
> >
<div class="mb-0.5 font-700 text-28 leading-9 text-white">{{ menuList[7].moduleName }}</div> <div class="mb-0.5 font-700 text-28 leading-9 text-white">{{ menuList[7].moduleName }}</div>
<div class="mb-0.5 font-700 text-28 uppercase leading-9 text-white">{{ menuList[7].moduleNameEn }}</div> <div class="mb-0.5 font-700 text-28 uppercase leading-9 text-white">{{ menuList[7].moduleNameEn }}</div>

Loading…
Cancel
Save