From 338762282504e2438707df96a9f3321ad9c6acd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?=
 =?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com>
Date: Tue, 1 Apr 2025 09:44:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=84=E4=BB=B6=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=A0=B7=E5=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E8=B0=83=E6=95=B4=E5=9B=BE=E8=A1=A8=E5=92=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/Layout.vue                        |  4 ---
 src/views/Login/components/QrCodeForm.vue    | 37 +++++++-------------
 src/views/hollow.vue                         | 13 -------
 src/views/oparetion/emty.vue                 |  6 +++-
 src/views/screen/compenonts/leftwrapper.vue  | 23 ++++++++----
 src/views/screen/compenonts/rightwrapper.vue |  7 ++--
 6 files changed, 38 insertions(+), 52 deletions(-)
 delete mode 100644 src/views/hollow.vue

diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 038ac6b..db816d9 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -53,11 +53,7 @@ export default defineComponent({
             onClick={handleClickOutside}
           ></div>
         ) : undefined}
-
         {renderLayout()}
-	      <Setting></Setting>
-
-        <Backtop></Backtop>
       </section>
     )
   }
diff --git a/src/views/Login/components/QrCodeForm.vue b/src/views/Login/components/QrCodeForm.vue
index 4d04794..267817e 100644
--- a/src/views/Login/components/QrCodeForm.vue
+++ b/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 {
diff --git a/src/views/hollow.vue b/src/views/hollow.vue
deleted file mode 100644
index 3736e5b..0000000
--- a/src/views/hollow.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<script setup lang="ts">
-
-</script>
-
-<template>
-	<div>
-		<h1>等待页面</h1>
-	</div>
-</template>
-
-<style scoped lang="scss">
-
-</style>
\ No newline at end of file
diff --git a/src/views/oparetion/emty.vue b/src/views/oparetion/emty.vue
index 221223b..8236984 100644
--- a/src/views/oparetion/emty.vue
+++ b/src/views/oparetion/emty.vue
@@ -1,4 +1,8 @@
-<script setup lang="ts"></script>
+<script setup lang="ts">
+defineOptions({
+  name: 'empty'
+})
+</script>
 
 <template>
   <ContentWrap>
diff --git a/src/views/screen/compenonts/leftwrapper.vue b/src/views/screen/compenonts/leftwrapper.vue
index c5f39f8..b82f531 100644
--- a/src/views/screen/compenonts/leftwrapper.vue
+++ b/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
       }
diff --git a/src/views/screen/compenonts/rightwrapper.vue b/src/views/screen/compenonts/rightwrapper.vue
index 21ccf69..5a2fff4 100644
--- a/src/views/screen/compenonts/rightwrapper.vue
+++ b/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) {