解决分页选择页数和条数后，跳转到其他页面，再回来时，分页选择的页数条数丢失的问题，完善邮箱登录，日志完善，操作日志中增加详细报错堆栈信息

src/api/system/login.js

@@ -53,6 +53,14 @@ export function register(data) {
   })
 }
 
+export function getMailCode(data) {
+  return request({
+    url: '/getMailCode',
+    method: 'post',
+    data: data
+  })
+}
+
 /**
  * 三方授权回调
  * @param {*} data

src/components/Pagination/index.vue

@@ -23,60 +23,68 @@ export default {
   props: {
     total: {
       required: true,
-      type: Number,
+      type: Number
     },
     page: {
       type: Number,
-      default: 1,
+      default: 1
     },
     limit: {
       type: Number,
-      default: 20,
+      default: 20
     },
     pageSizes: {
       type: Array,
       default() {
         return [10, 20, 30, 50, 100]
-      },
+      }
     },
     // 移动端页码按钮的数量端默认值5
     pagerCount: {
       type: Number,
-      default: document.body.clientWidth < 992 ? 5 : 7,
+      default: document.body.clientWidth < 992 ? 5 : 7
     },
     layout: {
       type: String,
-      default: 'total, sizes, prev, pager, next, jumper',
+      default: 'total, sizes, prev, pager, next, jumper'
     },
     background: {
       type: Boolean,
-      default: true,
+      default: true
     },
     autoScroll: {
       type: Boolean,
-      default: true,
+      default: true
     },
     hidden: {
       type: Boolean,
-      default: false,
+      default: false
-    },
+    }
   },
   setup(props, { ctx, emit }) {
+    const router = useRouter()
+    const route = useRoute()
     const currentPage = computed({
       get() {
-        return props.page
+        if (route.query.page) {
+          emit('update:page', parseInt(route.query.page))
+        }
+        return route.query.page ? parseInt(route.query.page) : props.page
       },
       set(val) {
         emit('update:page', val)
-      },
+      }
     })
     const pageSize = computed({
       get() {
-        return props.limit
+        if (route.query.limit) {
+          emit('update:limit', parseInt(route.query.limit))
+        }
+        return route.query.limit ? parseInt(route.query.limit) : props.limit
       },
       set(val) {
         emit('update:limit', val)
-      },
+      }
     })
 
     function handleSizeChange(val) {
@@ -84,21 +92,35 @@ export default {
       if (props.autoScroll) {
         // scrollTo(0, 800);
       }
+      router.replace({
+        path: router.currentRoute.value.path,
+        query: {
+          page: currentPage.value,
+          limit: val
+        }
+      })
     }
     function handleCurrentChange(val) {
       emit('pagination', { page: val, limit: pageSize.value })
       if (props.autoScroll) {
         // scrollTo(0, 800);
       }
+      router.replace({
+        path: router.currentRoute.value.path,
+        query: {
+          page: val,
+          limit: pageSize.value
+        }
+      })
     }
 
     return {
       currentPage,
       pageSize,
       handleSizeChange,
-      handleCurrentChange,
+      handleCurrentChange
     }
-  },
+  }
 }
 </script>
 <style scoped>

src/views/loginByEmail.vue

@@ -66,7 +66,7 @@
 </template>
 
 <script setup name="loginByEmail" lang="ts">
-// import { getMailCode, getEmailVerifyImg, getRsaKey } from '@/api/system/login'
+import { getMailCode } from '@/api/system/login'
 import defaultSettings from '@/settings'
 import starBackground from '@/views/components/starBackground.vue'
 import LangSelect from '@/components/LangSelect/index.vue'
@@ -115,8 +115,6 @@ const loginRules = {
 const loginRef = ref()
 const loading = ref<boolean>(false)
 const dragVerify = ref(false)
-// const verifyImg = ref('https://picsum.photos/979/547' + '/?image=' + Math.round(Math.random() * 20))
-// const /v.jpg
 const isPassing = ref(false)
 const loginForm = ref<loginForm>({
   email: '',
@@ -141,14 +139,6 @@ const verifyImg: verifyImg = reactive({
 })
 // 先存到数组中，然后刷新取下一个
 function getVerifyImg() {
-  // getEmailVerifyImg().then((res) => {
-  //   verifyImg.array = res.data
-  //   if (verifyImg.array.length === 0) {
-  //     verifyImg.array.push('/v.jpg')
-  //   }
-  //   verifyImg.src = verifyImg.array[0]
-  //   // resolve(verifyImg)
-  // })
   verifyImg.array = [
     '/verifyimg/10-979x547.jpg',
     '/verifyimg/11-979x547.jpg',
@@ -186,8 +176,6 @@ function refreshImg() {
     verifyImg.src = verifyImg.array[verifyImg.flag]
     verifyImg.flag++
   }
-  // verifyImg.value = 'https://picsum.photos/979/547' + '/?image=' + Math.round(Math.random() * 20)
-  // verifyImgArray.value.shift();
 }
 const redirect = ref()
 redirect.value = route.query.redirect
@@ -212,7 +200,6 @@ interface LoginUser {
   loginDate: string
   deptId: number
 }
-// const currentLoginUser = ref<LoginUser>()
 let currentLoginCo: any[] = reactive([])
 /**
  * @description: 登录
@@ -239,7 +226,6 @@ function handleLogin() {
                     id: element.dictValue,
                     name: element.dictLabel
                   })
-                  // currentLoginUser.value = res.data.user
                 })
               roleSelectDialog.roles = roles
             })
@@ -276,27 +262,11 @@ function roleSelectDialogClose(): void {
   globalProperties.$modal.msg(t('roleSelectDialog.close'))
 }
 /**
- * @description: 企业类型选择弹窗回调
+ * @description:
- * @param {roles} role 企业类型信息
+ * @param {roles} role
  */
 function roleSelectDialogCallback(role: roles): void {
   loading.value = false
-  const { coSysType, coId } = currentLoginCo.find((item) => item.coSysType === role.id)
-  userStore
-    .loginByCoSysType({ coId: coId, cosysType: coSysType }) // , user: currentLoginUser.value
-    .then(() => {
-      router.push({ path: redirect.value || '/' })
-    })
-    .catch((error) => {
-      console.error(error)
-      globalProperties.$modal.msgError(error.msg)
-      loading.value = false
-      // 重新获取验证码
-      // if (captchaOnOff.value) {
-      //   getCode()
-      //   loginForm.value.code = ''
-      // }
-    })
 }
 /**
  * @description: 获取滑动验证

src/views/monitor/operlog/index.vue

@@ -145,6 +145,11 @@
           <el-col :lg="24">
             <el-form-item label="异常信息：" v-if="form.status === 1">{{ form.errorMsg }}</el-form-item>
           </el-col>
+          <el-col :lg="24">
+            <el-form-item label="异常堆栈信息：" v-if="form.status === 1">
+              <el-input type="textarea" disabled rows="5" v-model="form.stackTrace" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <template #footer>