hrms-bangkok/web-faq
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

แก้ error

Browse source
This commit is contained in:
Tanyalak 2023-12-15 10:56:57 +07:00
parent 66671faf81
commit e305d7e907
2 changed files with 9 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/modules/00_contact/views/Main.vue
View file

@ -1,31 +1,16 @@
<script setup lang="ts">
</script>
<template>
<<<<<<< HEAD
<div class="col-12 row justify-center text-h6 text-dark q-pt-md">ติดต่อเรา</div>
<div class="col-12"><q-separator color="grey-4" /></div>
=======
<div class="col-xs-10 col-md-8 row q-col-gutter-md">
<div class="col-12 row justify-center text-h6 text-dark">ระบบทรัพยากรบุคคล</div>
<div class="col-12">
<q-separator color="grey-4" /></div>
<div class="col-12">
<div class="col-12 row q-col-gutter-lg">
</div>
</div>
</div>
<div class="q-px-md q-py-sm text-subtitle1 text-dark bg-grey-4 text-weight-medium">
ระบบหลัก
</div>
>>>>>>> aom_dev
<q-card class="row col-12 q-mt-md">
<div class="col-12 q-px-md q-py-sm text-subtitle1 text-dark bg-grey-4 text-weight-medium">
ระบบหลัก
</div>
<div class="col-12 row q-pa-md">
</div>
</q-card>
</template>
<style>

16
src/views/MainLayout.vue
View file

@ -79,15 +79,9 @@ const onScroll = (info: any) => { scrollInfo.value = info}
<img src="@/assets/logo.png" style="height: 35px; max-width: 35px" />
</div>
<q-space></q-space>
<<<<<<< HEAD
<div class="row q-col-gutter-x-sm">
<div><q-btn flat color="white" label="หน้าแรก" @click="goHome"/></div>
<div><q-btn color="primary" label="ติดต่อเรา" @click="click()"/></div>
=======
<div>
<q-btn class="text-weight-medium" flat color="white" label="หน้าแรก" @click="goHome"/>
<q-btn color="secondary" text-color="white" label="ติดต่อเรา" @click="click()"/>
>>>>>>> aom_dev
<div><q-btn class="text-weight-medium" flat color="white" label="หน้าแรก" @click="goHome"/></div>
<div><q-btn color="secondary" text-color="white" label="ติดต่อเรา" @click="click()"/></div>
</div>
</q-toolbar>
</q-header>
@ -106,15 +100,9 @@ const onScroll = (info: any) => { scrollInfo.value = info}
</template>
</q-input>
</div>
<<<<<<< HEAD
<div class="col-xs-10 col-md-8 row q-col-gutter-md" style=" margin-top: 80px;" v-if="currentRoute == 'home'">
<div class="col-12 row justify-center text-h6 text-dark">ระบบทรัพยากรบุคคล</div>
<div class="col-12"><q-separator color="grey-4" /></div>
=======
<div class="col-xs-10 col-md-8 row q-col-gutter-md" style=" margin-top: 80px;" v-if="currentRouteName == ''">
<div class="col-12 row justify-center text-h6 text-dark">ระบบทรัพยากรบุคคล</div>
<div class="col-12"><q-separator color="grey-4" /></div>
>>>>>>> aom_dev
<div class="col-12">
<div class="col-12 row q-col-gutter-lg">