feat:合并

src/App.vue

@@ -30,7 +30,6 @@ import zhCN from "ant-design-vue/es/locale/zh_CN";
 import * as api from "./api/index1";
 import * as api1 from "@/api/index1";
 import * as api2 from "@/api/index";
-
 export default defineComponent({
   components: {
     NavLeft,
@@ -48,16 +47,13 @@ export default defineComponent({
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });
-
     watch(
       () => route.path,
       () => {
         route.path === "/login" && (isLogin.value = true);
       }
     );
-
     const currentRouteName = computed(() => route.name);
-
     function init() {
       console.log(store);
       getUserInfo();
@@ -72,34 +68,22 @@ export default defineComponent({
       getMemberInfo();
       getOrgTree();
     }
-
     async function getMemberInfo() {
       const list = localStorage.getItem("memberInitInfo");
       if (list) {
         store.commit("SET_MEMBER_INFO", JSON.parse(list));
         return;
       }
-<<<<<<< HEAD
       const memberInitInfo = await api1
         .getMemberInfo({ keyWord: "", pageNo: 1, pageSize: 10 })
-        .then((res) =>
-          res.data.data.rows.map((e) => ({
-            label: e.realName,
-            value: e.id,
-          }))
-        );
-=======
-      const memberInitInfo = await api1.getMemberInfo({keyWord: '', pageNo: 1, pageSize: 10}).then(res=>res.data.data.rows);
->>>>>>> 6d96a3e66a5b7f7051e7e4e195e9bd6a980d7c7e
+        .then((res) => res.data.data.rows);
       store.commit("SET_MEMBER_INFO", memberInitInfo);
       localStorage.setItem("memberInitInfo", JSON.stringify(memberInitInfo));
     }
-
     async function getUserInfo() {
       const userInfo = await api2.userInfo();
       store.commit("SET_USER", userInfo);
     }
-
     async function initDict(key) {
       let list = localStorage.getItem(key);
       if (list) {
@@ -110,7 +94,6 @@ export default defineComponent({
       localStorage.setItem(key, JSON.stringify(list));
       store.commit("SET_DICT", { key, data: list });
     }
-
     const getDictList = (param) =>
       api1
         .getDict({
@@ -119,7 +102,6 @@ export default defineComponent({
           setCode: param,
         })
         .then((res) => res.data.data.rows);
-
     //获取组织树
     const getOrgTree = () => {
       const orgtreeList = localStorage.getItem("orgtreeList");
@@ -147,9 +129,7 @@ export default defineComponent({
           console.log("组织树获取失败", err);
         });
     };
-
     init();
-
     return {
       isLogin,
       routes,
@@ -170,17 +150,14 @@ export default defineComponent({
   color: #2c3e50;
   height: 100%;
 }
-
 #container {
   margin: 0;
   display: flex;
   flex-direction: column;
-
   width: 100%;
   min-width: 1000px;
   min-height: 100%;
   background-color: rgba(245, 247, 250, 1);
-
   main {
     height: 0;
     flex: 1 1 auto;
@@ -196,7 +173,6 @@ export default defineComponent({
     background: #ffffff;
     box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
   }
-
   // @media screen and (max-width: 1366px) {
   //   .cmMain {
   //     width: 750px;
@@ -218,4 +194,4 @@ export default defineComponent({
   //   }
   // }
 }
-</style>
+</style>