Quellcode durchsuchen

待开发路由隐藏

zuy vor 2 Jahren
Ursprung
Commit
82ae551e1c

+ 1 - 1
admin-web/src/layout/logo/index.vue

@@ -13,7 +13,7 @@ import { useRouter} from 'vue-router';
 import { computed } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
-import logoMini from '/public/logo.png';
+import logoMini from '/logo.png';
 
 // 定义变量内容
 const router = useRouter();

+ 4 - 2
admin-web/src/layout/navBars/breadcrumb/toolbar.vue

@@ -43,6 +43,7 @@
       </div>
     </template>
 
+<!--
 
     <div class="layout-navbars-breadcrumb-user-icon">
       <el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">
@@ -58,6 +59,7 @@
         </template>
       </el-popover>
     </div>
+-->
 
     <div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
       <el-icon class="el-icon--right"><ele-FullScreen /></el-icon>
@@ -87,9 +89,9 @@
           </el-dropdown-item>-->
           <!--					<el-dropdown-item command="/admin/home">{{ $t('message.user.dropdown1') }}</el-dropdown-item>-->
           <!--					<el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>-->
-          <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
+<!--          <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
           <el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>
-          <el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item>
+          <el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item>-->
           <el-dropdown-item divided command="logOut">
             <el-icon color="#409EFC">
               <ele-SwitchButton/>

+ 8 - 8
admin-web/src/router/route.ts

@@ -134,7 +134,7 @@ export const adminRoutes: Array<RouteRecordRaw> = [
                             icon: 'ele-OfficeBuilding',
                         },
                     },
-                    {
+                /*    {
                         path: '/station/endpoint',
                         name: 'adminStationEndpoint',
                         component: () => import('/@/views/admin/station/endpoint/index.vue'),
@@ -163,10 +163,10 @@ export const adminRoutes: Array<RouteRecordRaw> = [
 
                             icon: 'ele-Compass',
                         },
-                    },
+                    },*/
                 ]
             },
-            {
+         /*   {
                 path: '/marketing',
                 name: 'adminMarketing',
                 component: () => import('/@/views/admin/marketing/index.vue'),
@@ -179,7 +179,7 @@ export const adminRoutes: Array<RouteRecordRaw> = [
                     isIframe: false,
                     icon: 'ele-PieChart',
                 }
-            },
+            },*/
             {
                 path: '/ordering',
                 name: 'adminOrdering',
@@ -208,7 +208,7 @@ export const adminRoutes: Array<RouteRecordRaw> = [
                     icon: 'ele-User',
                 }
             },
-            {
+        /*    {
                 path: '/finance',
                 name: 'adminFinance',
                 component: () => import('/@/views/admin/finance/index.vue'),
@@ -221,7 +221,7 @@ export const adminRoutes: Array<RouteRecordRaw> = [
                     isIframe: false,
                     icon: 'ele-Wallet',
                 }
-            },
+            },*/
             {
                 path: '/org',
                 name: 'adminOrg',
@@ -269,7 +269,7 @@ export const adminRoutes: Array<RouteRecordRaw> = [
                     },
                 ]
             },
-            {
+   /*         {
                 path: '/optList',
                 name: 'adminOptList',
                 component: () => import('/@/views/admin/log/opt/index.vue'),
@@ -284,7 +284,7 @@ export const adminRoutes: Array<RouteRecordRaw> = [
                     icon: 'ele-Cpu',
 
                 }
-            },
+            },*/
 
         ],
     },

+ 4 - 4
admin-web/src/views/admin/role/index.vue

@@ -86,7 +86,7 @@
         </el-table-column>
       </el-table>
 
-<!--      <ext-page class="page-pager" v-model:value="state.pageQuery" @change="loadData(false)"/>-->
+      <ext-page class="page-pager" v-model:value="state.pageQuery" @change="loadData(false)"/>
     </el-card>
   </div>
 <!--  <RoleDialog ref="roleDialogRef" @refresh="loadData(true)"/>-->
@@ -173,9 +173,9 @@ const loadData = (refresh: boolean = false) => {
   }
   state.tableData.loading = true;
   $get(`/admin-user/listRole`, {...state.formQuery, ...state.pageQuery}).then((res: any) => {
-    // let {list, total} = res;
-    state.tableData.data = res;
-    // state.pageQuery.total = total;
+    let {list, total} = res;
+    state.tableData.data = list;
+    state.pageQuery.total = total;
     state.tableData.loading = false;
   }).catch(e => {
     console.error(e)

+ 1 - 1
admin-web/src/views/login/index.vue

@@ -47,7 +47,7 @@ import { defineAsyncComponent, onMounted, reactive, computed } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import { NextLoading } from '/@/utils/loading';
-import logoMini from '/public/logo.png';
+import logoMini from '/logo.png';
 import loginMain from '/@/assets/login-main.svg';
 import loginBg from '/@/assets/login-bg.svg';