Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

src/App.vue

@@ -19,7 +19,7 @@
   </div>
 </template>
 <script>
-import { computed, defineComponent, ref, watch } from "vue";
+import { computed, defineComponent, ref } from "vue";
 import { useRouter, useRoute } from "vue-router";
 import { useStore } from "vuex";
 import NavLeft from "@/components/NavLeft";
@@ -48,12 +48,12 @@ export default defineComponent({
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });
-    watch(
-      () => route.path,
-      () => {
-        route.path === "/login" && (isLogin.value = true);
-      }
-    );
+    // watch(
+    //     () => route.path,
+    //     () => {
+    //       route.path === "/login" && (isLogin.value = true);
+    //     }
+    // );
     const currentRouteName = computed(() => route.name);
 
     function init() {
@@ -78,8 +78,8 @@ export default defineComponent({
         return;
       }
       const memberInitInfo = await api1
-        .getMemberInfo({ keyWord: "", pageNo: 1, pageSize: 10 })
-        .then((res) => res.data.data.rows);
+          .getMemberInfo({ keyWord: "", pageNo: 1, pageSize: 10 })
+          .then((res) => res.data.data.rows);
       store.commit("SET_MEMBER_INFO", memberInitInfo);
       localStorage.setItem("memberInitInfo", JSON.stringify(memberInitInfo));
     }
@@ -104,13 +104,13 @@ export default defineComponent({
     }
 
     const getDictList = (param) =>
-      api1
-        .getDict({
-          pageNo: 1,
-          pageSize: 20,
-          setCode: param,
-        })
-        .then((res) => res.data.data.rows);
+        api1
+            .getDict({
+              pageNo: 1,
+              pageSize: 20,
+              setCode: param,
+            })
+            .then((res) => res.data.data.rows);
     //获取组织树
     const getOrgTree = () => {
       const orgtreeList = localStorage.getItem("orgtreeList");
@@ -119,16 +119,16 @@ export default defineComponent({
         return;
       }
       api
-        .getOrgInfo({
-          keyWord: "",
-          id: -1,
-          pageNo: 1,
-          pageSize: 20,
-        })
-        .then((res) => {
-          localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
-          store.commit("getOrgtreeList", res.data.data);
-        });
+          .getOrgInfo({
+            keyWord: "",
+            id: -1,
+            pageNo: 1,
+            pageSize: 20,
+          })
+          .then((res) => {
+            localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
+            store.commit("getOrgtreeList", res.data.data);
+          });
     };
     init();
     return {
@@ -167,7 +167,7 @@ export default defineComponent({
   // font-family: MicrosoftYaHei, Microsoft YaHei, Avenir, Helvetica, Arial,
   // sans-serif;
   font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
-    Microsoft YaHei, Arial, sans-serif;
+  Microsoft YaHei, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   color: #2c3e50;