[fix]: 部分代码格式化；修复控制台出现的warning；替换::v-deep为:deep()

src/App.vue

@@ -5,6 +5,7 @@
       <div class="container" :class="menuShow ? '' : 'full_screen'" v-if="pageShow">
         <!-- <bg-nav :highlightParentRule="highlightParentRule" :title="nowParent.menuName" width="208px" :list="nowParent.children" v-show="navShow" class="con-nav" /> -->
         <bg-nav
+          v-if="nowParent.children"
           :highlightParentRule="highlightParentRule"
           width="208px"
           :list="nowParent.children"

src/i18n/i18n.js

-import {createI18n} from 'vue-i18n'
+import {createI18n} from 'vue-i18n/index'
 import lang from './index'
 
 const i18n = createI18n({

src/main.js

@@ -27,7 +27,7 @@ import i18n from "./i18n/i18n.js";
 import axios from "./request/http.js";
 
 const createVue = createApp(App);
-createVue.use(ElementPlus, { locale });
+// createVue.use(ElementPlus, { locale });
 
 function getMsgAppid() {
   axios.get(`/apaas/system/v5/message/account`).then((res) => {
@@ -96,12 +96,11 @@ Promise.all([getUser(), getMenu("dadb2d3f-e263-48d1-9389-42acb9ea49f8")])
       // }
     }
     generateRoutes();
-
-    createVue.use(ElementPlus).use(store).use(router).use(i18n).use(bgui);
-    createVue.mount("#app");
   })
-  .catch(() => {
-    createVue.use(ElementPlus).use(store).use(router).use(i18n).use(bgui);
+  .catch((e) => {
+    console.error(e)
+  }).finally(() => {
+    createVue.use(ElementPlus, { locale }).use(store).use(router).use(i18n).use(bgui);
     createVue.mount("#app");
   });
 

src/page/login/index.vue

 <template>
-    <div class="login-container">
-      <div class="bg-warning">系统有效期剩余345 天，请管理员及时更换license！</div>
-      <div class="bg-main">
-        <!-- <div class="bg-logo">
+  <div class="login-container">
+    <div class="bg-warning">系统有效期剩余345 天，请管理员及时更换license！</div>
+    <div class="bg-main">
+      <!-- <div class="bg-logo">
           <img class="logo" src="../../assets/imgs/login_img_logo.png" />
         </div> -->
-  
-        <div class="bg-content">
-          <bg-tabs
-            class="login-tab"
-            v-model="loginTab"
-            style="min-height: 450px;width: 480px"
-            v-if="pageType === 'login'"
-          >
-            <bg-tab label="账号密码登录" name="account">
-              <LoginByAccount  @register="switchPageType('account')" @password="password"/>
-            </bg-tab>
-            <bg-tab label="验证码登录" name="register">
-              <LoginByCode  @register="switchPageType('register')" @password="password"/>
-            </bg-tab>
-          </bg-tabs>
-        </div>
+
+      <div class="bg-content">
+        <bg-tabs
+          class="login-tab"
+          v-model="loginTab"
+          style="min-height: 450px; width: 480px"
+          v-if="pageType === 'login'">
+          <bg-tab label="账号密码登录" name="account">
+            <LoginByAccount @register="switchPageType('account')" @password="password" />
+          </bg-tab>
+          <bg-tab label="验证码登录" name="register">
+            <LoginByCode @register="switchPageType('register')" @password="password" />
+          </bg-tab>
+        </bg-tabs>
       </div>
-      <!-- v-if="pageType !== 'register'" -->
-      <div class="bg-msg">
-        <p>
-          Copyright © 比格大数据, All Rights Reserved.
-        </p>
-        <p>
-          ICP备案序号：晋ICP备12000773号 | 晋公网安备 14010602060307号
-        </p>
-        <p>
-          法律声明 | 隐私政策
-        </p>
-      </div> 
-    
-      
     </div>
-  </template>
-  
-  <script setup>
-  import LoginByAccount from "@/components/login-by-account.vue";
-  import LoginByCode from "@/components/login-by-code.vue";
-  // import RegisterPersonalUser from "@/components/register-personal-user.vue";
-  // import RegisterFrimUser from "@/components/register-firm-user.vue";
-  // import RegisterOrgUser from "@/components/register-org-user.vue";
-  // import RegisterSuccess from "@/components/register-success.vue";
-  import { ref, computed, onMounted } from "vue";
-  import { useRouter } from "vue-router";
-  const router = useRouter();
-  
-  const pageType = ref('login')
-  const loginTab = ref('account')
-  const registerTab = ref('registerTab')
+    <!-- v-if="pageType !== 'register'" -->
+    <div class="bg-msg">
+      <p>Copyright © 比格大数据, All Rights Reserved.</p>
+      <p>ICP备案序号：晋ICP备12000773号 | 晋公网安备 14010602060307号</p>
+      <p>法律声明 | 隐私政策</p>
+    </div>
+  </div>
+</template>
 
-  const switchPageType = (type) => {
-    // pageType.value = type
-    router.push('/registe')
+<script setup>
+import LoginByAccount from "@/components/login-by-account.vue";
+import LoginByCode from "@/components/login-by-code.vue";
+// import RegisterPersonalUser from "@/components/register-personal-user.vue";
+// import RegisterFrimUser from "@/components/register-firm-user.vue";
+// import RegisterOrgUser from "@/components/register-org-user.vue";
+// import RegisterSuccess from "@/components/register-success.vue";
+import { ref, computed, onMounted } from "vue";
+import { useRouter } from "vue-router";
+const router = useRouter();
 
-  }
-  const password = () => {
-    router.push('/password')
-  }
-  
-  </script>
-  
-  <style lang="scss" scoped>
-  .login-container {
-    width: 100vw;
-    height: calc(100vh - 56px);
-    background-image: url("@/assets/imgs/bg_zhuce.png");
-    background-size: 100% 100%;
-    background-position: center center;
-    position: relative;
-  
-    .bg-main {
-      position: absolute;
-      top: 50%;
-      right: 0;
-      margin-right: 16vw;
-      margin-bottom: 80px;
-      transform: translateY(calc(-50%));
-      width: 500px;
-      max-height: calc(100vh - 100px);
-      overflow: hidden auto;
-  
-      &::-webkit-scrollbar {
-        width: 16px;
-        height: 1px;
-      }
-  
-      /* &::-webkit-scrollbar-track {
+const pageType = ref("login");
+const loginTab = ref("account");
+const registerTab = ref("registerTab");
+
+const switchPageType = (type) => {
+  // pageType.value = type
+  router.push("/registe");
+};
+const password = () => {
+  router.push("/password");
+};
+</script>
+
+<style lang="scss" scoped>
+.login-container {
+  width: 100vw;
+  height: calc(100vh - 56px);
+  background-image: url("@/assets/imgs/bg_zhuce.png");
+  background-size: 100% 100%;
+  background-position: center center;
+  position: relative;
+
+  .bg-main {
+    position: absolute;
+    top: 50%;
+    right: 0;
+    margin-right: 16vw;
+    margin-bottom: 80px;
+    transform: translateY(calc(-50%));
+    width: 500px;
+    max-height: calc(100vh - 100px);
+    overflow: hidden auto;
+
+    &::-webkit-scrollbar {
+      width: 16px;
+      height: 1px;
+    }
+
+    /* &::-webkit-scrollbar-track {
         border-radius: 8px;
         box-shadow: 8px 0 0 #f4f4f4 inset;
         border: 4px solid rgba(0, 0, 0, 0);
       } */
-  
-      &::-webkit-scrollbar-thumb {
-        border-radius: 8px;
-        box-shadow: 8px 0 0 #a5adb7 inset;
-        border: 4px solid rgba(0, 0, 0, 0);
-      }
-  
-      > .bg-logo {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        .logo{
-          width: 450px;
-        }
-  
-        > span {
-          font-size: 36px;
-          color: #ffffff;
-          margin-left: 25px;
-        }
+
+    &::-webkit-scrollbar-thumb {
+      border-radius: 8px;
+      box-shadow: 8px 0 0 #a5adb7 inset;
+      border: 4px solid rgba(0, 0, 0, 0);
+    }
+
+    > .bg-logo {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .logo {
+        width: 450px;
       }
-  
-      > .bg-content {
-  
+
+      > span {
+        font-size: 36px;
+        color: #ffffff;
+        margin-left: 25px;
       }
     }
-    > .bg-warning {
-        text-align: center;
-        background-color: #fdf4e2;
-        color: #e56600;
-        font-size: 14px;
-        height: 32px;
-        line-height: 32px;
+
+    > .bg-content {
     }
-  
-    > .bg-msg {
-      position: absolute;
-      bottom: 10px;
-      left: 0;
-      width: 100%;
-      font-size: 14px;
-      line-height: 20px;
-      color: #616f94;
-      text-align: center;
-      > p {
-        padding: 8px 0;
-      }
-     
+  }
+  > .bg-warning {
+    text-align: center;
+    background-color: #fdf4e2;
+    color: #e56600;
+    font-size: 14px;
+    height: 32px;
+    line-height: 32px;
+  }
+
+  > .bg-msg {
+    position: absolute;
+    bottom: 10px;
+    left: 0;
+    width: 100%;
+    font-size: 14px;
+    line-height: 20px;
+    color: #616f94;
+    text-align: center;
+    > p {
+      padding: 8px 0;
     }
   }
-  </style>
-  
+}
+</style>
\ No newline at end of file

src/page/main/config/accessRule/index.vue

@@ -445,10 +445,10 @@ onBeforeMount(() => {
           border-radius: 3px;
           border: solid 1px #b0bee8;
         }
-        ::v-deep td {
+        :deep() td {
           padding: 9px 0 !important;
         }
-        ::v-deep .el-switch {
+        :deep() .el-switch {
           height: 20px;
           width: 44px;
           .el-switch__core {
@@ -460,7 +460,7 @@ onBeforeMount(() => {
     }
   }
 
-  ::v-deep .dialog_box_detail {
+  :deep() .dialog_box_detail {
     .el-dialog__body {
       padding: 0 0 18px 0;
       height: 580px;

src/page/main/config/loginPage/index.vue

@@ -97,7 +97,7 @@ const rules = reactive({});
       padding-left: 24px;
       .el-form {
         width: 60%;
-        ::v-deep .el-form-item {
+        :deep() .el-form-item {
           &:nth-of-type(1) {
             .el-upload--picture-card {
               width: 120px;
@@ -112,7 +112,7 @@ const rules = reactive({});
           }
         }
       }
-      ::v-deep .gap-title {
+      :deep() .gap-title {
         font-size: 16px;
         color: #202531;
       }

src/page/main/config/preference/index.vue

@@ -254,7 +254,7 @@ const save = () => {};
     .authorizeForm,
     .secureForm,
     .registerForm {
-      ::v-deep .el-form-item {
+      :deep() .el-form-item {
         margin-bottom: 24px;
         width: 750px;
         font-size: 14px;

src/page/main/develop/systemApproval/approval/index.vue

@@ -248,11 +248,11 @@ const save = () => {
     }
     .approveForm {
       padding: 24px 24px 0 24px;
-      ::v-deep .el-form-item {
+      :deep() .el-form-item {
         margin-bottom: 24px;
       }
-      ::v-deep .el-form-item__label,
-      ::v-deep .el-radio__label {
+      :deep() .el-form-item__label,
+      :deep() .el-radio__label {
         color: var(--el-text-color-primary);
       }
     }

src/page/main/log/userAccount/index.vue

@@ -482,10 +482,10 @@ onBeforeMount(() => {
           border-radius: 3px;
           border: solid 1px #b0bee8;
         }
-        ::v-deep td {
+        :deep() td {
           padding: 9px 0 !important;
         }
-        ::v-deep .el-switch {
+        :deep() .el-switch {
           height: 20px;
           width: 44px;
           .el-switch__core {
@@ -497,7 +497,7 @@ onBeforeMount(() => {
     }
   }
 
-  ::v-deep .dialog_box_detail {
+  :deep() .dialog_box_detail {
     .el-dialog__body {
       padding: 0 0 18px 0;
       height: 580px;

src/page/main/log/userBehavior/index.vue

@@ -482,10 +482,10 @@ onBeforeMount(() => {
           border-radius: 3px;
           border: solid 1px #b0bee8;
         }
-        ::v-deep td {
+        :deep() td {
           padding: 9px 0 !important;
         }
-        ::v-deep .el-switch {
+        :deep() .el-switch {
           height: 20px;
           width: 44px;
           .el-switch__core {
@@ -497,7 +497,7 @@ onBeforeMount(() => {
     }
   }
 
-  ::v-deep .dialog_box_detail {
+  :deep() .dialog_box_detail {
     .el-dialog__body {
       padding: 0 0 18px 0;
       height: 580px;

src/router/index.js

@@ -69,7 +69,7 @@ router.beforeEach((to, from, next) => {
 
   // 检查to.path是否存在于免登陆白名单
   if (inWhiteList(to.path)) {
-    next();
+    return next();
   } else {
     // 判断是否已经登录，未登录则重定向到首页或其他页面（通过query传参记录原来的路径）
     // 根据配置判断是否跳转第三方登录，跳转第三方登录则不跳login