diff --git a/src/assets/login_img/bg.png b/src/assets/login_img/bg.png index 10e896c..4d945fe 100644 Binary files a/src/assets/login_img/bg.png and b/src/assets/login_img/bg.png differ diff --git a/src/assets/login_img/title.png b/src/assets/login_img/title.png new file mode 100644 index 0000000..53a361f Binary files /dev/null and b/src/assets/login_img/title.png differ diff --git a/src/components/headView.vue b/src/components/headView.vue index 8333d49..e29f15b 100644 --- a/src/components/headView.vue +++ b/src/components/headView.vue @@ -78,6 +78,11 @@ const updateClock = () => { seconds.toString().padStart(2, '0'); } +const logout = () => { + // router.replace('/login') + router.push('/login') +} + onMounted(() => { mitt.emit('map_info', info); @@ -120,7 +125,7 @@ onMounted(() => { 多云 </div> <img class="icon item" src="/src/assets/head_img/icon.png" alt="" /> - <div class="item"> + <div class="item" @click="logout"> <img src="/src/assets/head_img/close.png" alt="" /> </div> </div> diff --git a/src/view/index/components/centerItem1.vue b/src/view/index/components/centerItem1.vue index 325e035..d66015e 100644 --- a/src/view/index/components/centerItem1.vue +++ b/src/view/index/components/centerItem1.vue @@ -7,14 +7,21 @@ import { onMounted, ref } from "vue"; const appStore = useAppStore(); -const list = ref(null) +const list = ref([]) const initData = () => { townMapCoun({ areaCode: appStore.address.areaCode, streetCode: appStore.address.streetCode, }).then((res) => { - list.value = res.data.townList; + res.data.townList.forEach(item => { + list.value.push({ + ...item, + ...{ + value: [item.lng, item.lat] + } + }) + }); }) } @@ -29,7 +36,7 @@ onMounted(() => { <div class="ball"> <ball class="ball1"></ball> </div> - <centerMap class="c-map" :list="list"></centerMap> + <centerMap v-if="list.length > 0" class="c-map" :list="list"></centerMap> </div> </template> diff --git a/src/view/login/index.vue b/src/view/login/index.vue index cfac107..e83f8ec 100644 --- a/src/view/login/index.vue +++ b/src/view/login/index.vue @@ -98,6 +98,7 @@ const submit = () => { <button class="btn" @click="submit">登录</button> </div> </div> + <div class="title"><span>吟龙物流信息监控溯源可视化大屏</span></div> </div> </dv-full-screen-container> </template> @@ -115,6 +116,29 @@ const submit = () => { background-image: url(../../assets/login_img/bg.png); background-size: 100% 100%; overflow: hidden; + position: relative; + .title { + position: absolute; + top: 20%; + right: 10%; + width: 35%; + padding-bottom: 0.4rem; + height: 4rem; + line-height: 4rem; + font-size: 2.6rem; + font-family: "ifonts"; + background-image: url(../../assets/login_img/title.png); + background-size: 100% 100%; + + span { + background-image: -webkit-linear-gradient(top, #061028, #144e8b); + -webkit-background-clip: text; + /* -webkit-text-fill-color: transparent; */ + color: rgba(0, 0, 0, 0); + -webkit-text-stroke-color: #5fa2ec; + -webkit-text-stroke-width: 1px; + } + } } .form {