Browse Source

优化组件布局,修复样式问题,调整图表和提示信息显示逻辑

master
parent
commit
3387622825
  1. 4
      src/layout/Layout.vue
  2. 37
      src/views/Login/components/QrCodeForm.vue
  3. 13
      src/views/hollow.vue
  4. 6
      src/views/oparetion/emty.vue
  5. 23
      src/views/screen/compenonts/leftwrapper.vue
  6. 7
      src/views/screen/compenonts/rightwrapper.vue

4
src/layout/Layout.vue

@ -53,11 +53,7 @@ export default defineComponent({
onClick={handleClickOutside}
></div>
) : undefined}
{renderLayout()}
<Setting></Setting>
<Backtop></Backtop>
</section>
)
}

37
src/views/Login/components/QrCodeForm.vue

@ -31,20 +31,14 @@
</el-row>
</template>
<script lang="ts" setup>
import logoImg from '@/assets/imgs/logo.png'
import * as LoginApi from '@/api/login'
import * as authUtil from '@/utils/auth'
import LoginFormTitle from './LoginFormTitle.vue'
import { LoginStateEnum, useLoginState } from './useLogin'
import router from '@/router'
defineOptions({ name: 'QrCodeForm' })
const imageUrl = ref('')
const uuuid = ref('')
const uuid = ref('')
const refreshQR = ref(false)
const { t } = useI18n()
const { handleBackLogin, getLoginState } = useLoginState()
const getShow = computed(() => true)
// ID
let intervalId = ref()
@ -59,10 +53,9 @@ const getimg = async () => {
array.forEach((value) => {
result += value.toString(16).padStart(8, '0')
})
uuuid.value = result
var mockBinaryData = await LoginApi.getCodeWebPic({
scene: uuuid.value,
uuid.value = result
const mockBinaryData = await LoginApi.getCodeWebPic({
scene: uuid.value,
path: 'sub/common/waiting',
checkPath: false
})
@ -90,9 +83,7 @@ const tenMinutes = 10 * 60 * 10000
const refaulst = () => {
refreshQR.value = false
//
if (intervalId) {
clearInterval(intervalId.value)
}
intervalId.value && clearInterval(intervalId.value)
// 5
intervalId.value = setInterval(async () => {
try {
@ -101,17 +92,14 @@ const refaulst = () => {
clearInterval(intervalId.value)
console.log('定时器已停止,已过去 10 分钟。')
refreshQR.value = true
return
}
const res = await LoginApi.qrLoginCode({ code: uuuid.value })
if (res) {
clearInterval(intervalId.value)
authUtil.setToken(res)
const res = await LoginApi.qrLoginCode({ code: uuid.value })
intervalId.value && clearInterval(intervalId.value)
authUtil.setToken(res)
await nextTick(() => {
router.push({ path: '/' })
}
})
} catch (error) {
console.error('获取扫码状态失败:', error)
}
@ -122,10 +110,9 @@ onMounted(() => {
getimg()
})
onBeforeUnmount(() => {
//
clearInterval(intervalId.value)
//
intervalId.value && clearInterval(intervalId.value)
})
</script>
<style lang="scss" scoped>
.expired-text {

13
src/views/hollow.vue

@ -1,13 +0,0 @@
<script setup lang="ts">
</script>
<template>
<div>
<h1>等待页面</h1>
</div>
</template>
<style scoped lang="scss">
</style>

6
src/views/oparetion/emty.vue

@ -1,4 +1,8 @@
<script setup lang="ts"></script>
<script setup lang="ts">
defineOptions({
name: 'empty'
})
</script>
<template>
<ContentWrap>

23
src/views/screen/compenonts/leftwrapper.vue

@ -6,7 +6,7 @@
<TitleBox isRight>
<Charts :options="row2Options" ref="row2Chart" />
</TitleBox>
<TitleBox title="执法频次" >
<TitleBox title="执法频次">
<Charts :options="row3Options" ref="row3Chart" />
</TitleBox>
</section>
@ -31,7 +31,7 @@ const row1Options = ref({
xAxis: {
type: 'value',
max: (v) => {
return Math.floor(v.max + (v.max % 10))
return Math.floor(v.max * 1.1 + 1)
},
axisTick: {
show: false
@ -77,7 +77,7 @@ const row1Options = ref({
}
},
splitLine: {
show: true,
show: false,
lineStyle: {
color: 'rgba(255,255,255,0.2)'
}
@ -85,11 +85,20 @@ const row1Options = ref({
},
tooltip: {
show: true,
trigger: 'item',
trigger: 'axis',
backgroundColor: 'rgba(29,183,57,0.91)',
borderColor: 'transparent',
formatter: (v) => {
return `${v.data[2].name} <br /> 任务数:${v.data[0]}<br>企业数:${v.data[1]}`
formatter: (v: any) => {
return v.map((i: any) => {
return `${i.data[2].name}: 任务数:${i.data[0]} 企业数:${i.data[1]}`
}).join('<br />')
},
axisPointer: {
type: 'shadow',
axis: 'x',
label: {
backgroundColor: 'rgba(29,183,57,0.91)'
}
},
textStyle: {
color: '#fff'
@ -199,7 +208,7 @@ const row3Options: any = ref({
show: false
},
axisLabel: {
show:false,
show: false,
color: '#fff',
fontSize: 12
}

7
src/views/screen/compenonts/rightwrapper.vue

@ -191,8 +191,9 @@ const row2Options: any = ref({
},
labelLine: {
show: true,
length: 2
length: 5
},
roseType: true,
data: []
},
{
@ -203,6 +204,9 @@ const row2Options: any = ref({
label: {
show: false
},
emphasis: {
disabled:true
},
labelLine: {
show: false
},
@ -457,7 +461,6 @@ let timer: any = null
//
const rightThird = async () => {
list.value = await ScreenApi.getRightThird(queryParams.value)
console.log(list.value)
timer = setInterval(() => {
unref(listRef).scrollTop += 1
if (unref(listRef).scrollTop >= unref(listRef).scrollHeight) {

Loading…
Cancel
Save