From 6f1f24b43e191c5ccc36d2335146f62cb06b0094 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 22 Nov 2022 22:03:02 +0800
Subject: [PATCH] refactor

---
 yudao-ui-admin-vue3/src/App.vue               | 23 ++++++++-----------
 yudao-ui-admin-vue3/src/views/Error/404.vue   |  1 -
 yudao-ui-admin-vue3/src/views/Error/500.vue   |  1 -
 .../views/Profile/components/BasicInfo.vue    |  5 ++--
 .../views/Profile/components/ProfileUser.vue  |  3 ++-
 .../src/views/Profile/components/ResetPwd.vue |  7 +++---
 .../views/Profile/components/UserAvatar.vue   |  1 +
 .../views/Profile/components/UserSocial.vue   |  6 +++--
 .../views/visualization/jmreport/index.vue    | 18 ++++++++-------
 9 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/App.vue b/yudao-ui-admin-vue3/src/App.vue
index 20b5730bf..1ce059439 100644
--- a/yudao-ui-admin-vue3/src/App.vue
+++ b/yudao-ui-admin-vue3/src/App.vue
@@ -1,19 +1,20 @@
+<template>
+  <ConfigGlobal :size="currentSize">
+    <RouterView :class="greyMode ? `${prefixCls}-grey-mode` : ''" />
+  </ConfigGlobal>
+</template>
 <script setup lang="ts">
 import { computed } from 'vue'
-import { useAppStore } from '@/store/modules/app'
-import { ConfigGlobal } from '@/components/ConfigGlobal'
-import { isDark } from '@/utils/is'
-import { useDesign } from '@/hooks/web/useDesign'
 import Cookies from 'js-cookie'
+import { isDark } from '@/utils/is'
+import { useAppStore } from '@/store/modules/app'
+import { useDesign } from '@/hooks/web/useDesign'
+import { ConfigGlobal } from '@/components/ConfigGlobal'
 
 const { getPrefixCls } = useDesign()
-
 const prefixCls = getPrefixCls('app')
-
 const appStore = useAppStore()
-
 const currentSize = computed(() => appStore.getCurrentSize)
-
 const greyMode = computed(() => appStore.getGreyMode)
 
 // 根据浏览器当前主题设置系统主题色
@@ -32,12 +33,6 @@ const setDefaultTheme = () => {
 setDefaultTheme()
 </script>
 
-<template>
-  <ConfigGlobal :size="currentSize">
-    <RouterView :class="greyMode ? `${prefixCls}-grey-mode` : ''" />
-  </ConfigGlobal>
-</template>
-
 <style lang="less">
 @prefix-cls: ~'@{namespace}-app';
 
diff --git a/yudao-ui-admin-vue3/src/views/Error/404.vue b/yudao-ui-admin-vue3/src/views/Error/404.vue
index cd10cb9bb..1e2c13c9c 100644
--- a/yudao-ui-admin-vue3/src/views/Error/404.vue
+++ b/yudao-ui-admin-vue3/src/views/Error/404.vue
@@ -1,7 +1,6 @@
 <template>
   <Error @error-click="errorClick" />
 </template>
-
 <script setup lang="ts">
 import { Error } from '@/components/Error'
 import { useRouter } from 'vue-router'
diff --git a/yudao-ui-admin-vue3/src/views/Error/500.vue b/yudao-ui-admin-vue3/src/views/Error/500.vue
index 79a64b8ee..9c703e71b 100644
--- a/yudao-ui-admin-vue3/src/views/Error/500.vue
+++ b/yudao-ui-admin-vue3/src/views/Error/500.vue
@@ -1,7 +1,6 @@
 <template>
   <Error type="500" @error-click="errorClick" />
 </template>
-
 <script setup lang="ts">
 import { Error } from '@/components/Error'
 import { useRouter } from 'vue-router'
diff --git a/yudao-ui-admin-vue3/src/views/Profile/components/BasicInfo.vue b/yudao-ui-admin-vue3/src/views/Profile/components/BasicInfo.vue
index f1811acdd..0d223e40d 100644
--- a/yudao-ui-admin-vue3/src/views/Profile/components/BasicInfo.vue
+++ b/yudao-ui-admin-vue3/src/views/Profile/components/BasicInfo.vue
@@ -15,13 +15,14 @@ import { reactive, onMounted, unref, ref } from 'vue'
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElRadioGroup, ElRadio } from 'element-plus'
 import { useI18n } from '@/hooks/web/useI18n'
+import { FormSchema } from '@/types/form'
+import { FormExpose } from '@/components/Form'
 import {
   getUserProfileApi,
   updateUserProfileApi,
   UserProfileUpdateReqVO
 } from '@/api/system/user/profile'
-import { FormSchema } from '@/types/form'
-import { FormExpose } from '@/components/Form'
+
 const { t } = useI18n()
 // 表单校验
 const rules = reactive<FormRules>({
diff --git a/yudao-ui-admin-vue3/src/views/Profile/components/ProfileUser.vue b/yudao-ui-admin-vue3/src/views/Profile/components/ProfileUser.vue
index f1bf319fc..cff385e1c 100644
--- a/yudao-ui-admin-vue3/src/views/Profile/components/ProfileUser.vue
+++ b/yudao-ui-admin-vue3/src/views/Profile/components/ProfileUser.vue
@@ -40,11 +40,12 @@
   </div>
 </template>
 <script setup lang="ts">
-import { getUserProfileApi, ProfileVO } from '@/api/system/user/profile'
 import { onMounted, ref } from 'vue'
 import dayjs from 'dayjs'
 import UserAvatar from './UserAvatar.vue'
 import { useI18n } from '@/hooks/web/useI18n'
+import { getUserProfileApi, ProfileVO } from '@/api/system/user/profile'
+
 const { t } = useI18n()
 const userInfo = ref<ProfileVO>()
 const getUserInfo = async () => {
diff --git a/yudao-ui-admin-vue3/src/views/Profile/components/ResetPwd.vue b/yudao-ui-admin-vue3/src/views/Profile/components/ResetPwd.vue
index b28d74eaf..74ea9970b 100644
--- a/yudao-ui-admin-vue3/src/views/Profile/components/ResetPwd.vue
+++ b/yudao-ui-admin-vue3/src/views/Profile/components/ResetPwd.vue
@@ -16,12 +16,13 @@
   </el-form>
 </template>
 <script setup lang="ts">
-import { InputPassword } from '@/components/InputPassword'
+import { ref, reactive } from 'vue'
 import { ElForm, ElFormItem, ElMessage } from 'element-plus'
 import type { FormRules, FormInstance } from 'element-plus'
-import { updateUserPwdApi } from '@/api/system/user/profile'
-import { ref, reactive } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
+import { InputPassword } from '@/components/InputPassword'
+import { updateUserPwdApi } from '@/api/system/user/profile'
+
 const { t } = useI18n()
 const formRef = ref<FormInstance>()
 const password = reactive({
diff --git a/yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue b/yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue
index 2aaa65d3c..412b869e7 100644
--- a/yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue
+++ b/yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue
@@ -94,6 +94,7 @@ import { VueCropper } from 'vue-cropper'
 import { ElRow, ElCol, ElUpload, ElMessage, ElDialog } from 'element-plus'
 import { propTypes } from '@/utils/propTypes'
 import { uploadAvatarApi } from '@/api/system/user/profile'
+
 const cropper = ref()
 const dialogVisible = ref(false)
 const cropperVisible = ref(false)
diff --git a/yudao-ui-admin-vue3/src/views/Profile/components/UserSocial.vue b/yudao-ui-admin-vue3/src/views/Profile/components/UserSocial.vue
index ada32d5ad..7c99c409a 100644
--- a/yudao-ui-admin-vue3/src/views/Profile/components/UserSocial.vue
+++ b/yudao-ui-admin-vue3/src/views/Profile/components/UserSocial.vue
@@ -24,13 +24,15 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
 import { ElTable, ElTableColumn } from 'element-plus'
+import { useMessage } from '@/hooks/web/useMessage'
 import { SystemUserSocialTypeEnum } from '@/utils/constants'
 import { getUserProfileApi, ProfileVO } from '@/api/system/user/profile'
 import { socialAuthRedirect, socialUnbind } from '@/api/system/user/socialUser'
-import { ElMessage } from 'element-plus'
 
+const message = useMessage()
 const socialUsers = ref<any[]>([])
 const userInfo = ref<ProfileVO>()
+
 const initSocial = async () => {
   const res = await getUserProfileApi()
   userInfo.value = res
@@ -59,7 +61,7 @@ const unbind = async (row) => {
   if (res) {
     row.openid = undefined
   }
-  ElMessage.success('解绑成功')
+  message.success('解绑成功')
 }
 
 onMounted(async () => {
diff --git a/yudao-ui-admin-vue3/src/views/visualization/jmreport/index.vue b/yudao-ui-admin-vue3/src/views/visualization/jmreport/index.vue
index 854a106af..73a58aa62 100644
--- a/yudao-ui-admin-vue3/src/views/visualization/jmreport/index.vue
+++ b/yudao-ui-admin-vue3/src/views/visualization/jmreport/index.vue
@@ -1,13 +1,15 @@
-<script setup lang="ts">
-import { IFrame } from '@/components/IFrame'
-import { getAccessToken } from '@/utils/auth'
-import { ref } from 'vue'
-const BASE_URL = import.meta.env.VITE_BASE_URL
-const src = ref(BASE_URL + '/jmreport/list?token=' + getAccessToken())
-</script>
-
 <template>
   <ContentWrap>
     <IFrame :src="src" />
   </ContentWrap>
 </template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { IFrame } from '@/components/IFrame'
+import { getAccessToken } from '@/utils/auth'
+
+const BASE_URL = import.meta.env.VITE_BASE_URL
+const src = ref(BASE_URL + '/jmreport/list?token=' + getAccessToken())
+</script>
+