Pārlūkot izejas kodu

1、调整首页显示,应用中心点击跳转新标签页
2、图标展示等

fuwb 1 mēnesi atpakaļ
vecāks
revīzija
0ba8c6e60b

BIN
client/src/assets/imgs/menu/gtkj.png


BIN
client/src/assets/imgs/menu/sykj.png


+ 1 - 1
client/src/layout/components/UserInfo/src/UserInfo.vue

@@ -37,7 +37,7 @@ const loginOut = () => {
     .then(async () => {
       await userStore.loginOut()
       tagsViewStore.delAllViews()
-      replace('/loginAdmin?redirect=/system/user')
+      replace('/login?redirect=/system/user')
     })
     .catch(() => {})
 }

+ 40 - 40
client/src/router/modules/remaining.ts

@@ -84,47 +84,47 @@ const remainingRouter: AppRouteRecordRaw[] = [
           noCache: false,
           affix: true
         }
-      },
-      {
-        path: 'mainOfficeCenter',
-        name: 'MainOfficeCenter',
-        component: () => import('@/views/oaSystem/mainOfficeCenter/index.vue'),
-        meta: {
-          title: '办件中心'
-        }
-      },
-      {
-        path: 'processContainer',
-        component: () => import('@/views/oaSystem/processContainer/index.vue'),
-        name: 'ProcessContainer',
-        meta: {
-          title: ''
-        }
-      },
-      {
-        path: 'supplier',
-        component: () => import('@/views/oaSystem/searchCenter/supplier/index.vue'),
-        name: 'supplier',
-        meta: {
-          title: '供应商管理'
-        }
-      },
-      {
-        path: 'ReportPrint',
-        component: () => import('@/views/oaSystem/officeCenter/index.vue'),
-        name: 'ReportPrint',
-        meta: {
-          title: '报表打印'
-        }
-      },
-      {
-        path: 'processLog',
-        component: () => import('@/views/oaSystem/officeCenter/index.vue'),
-        name: 'ProcessLog',
-        meta: {
-          title: '流程日志'
-        }
       }
+      // {
+      //   path: 'mainOfficeCenter',
+      //   name: 'MainOfficeCenter',
+      //   component: () => import('@/views/oaSystem/mainOfficeCenter/index.vue'),
+      //   meta: {
+      //     title: '办件中心'
+      //   }
+      // },
+      // {
+      //   path: 'processContainer',
+      //   component: () => import('@/views/oaSystem/processContainer/index.vue'),
+      //   name: 'ProcessContainer',
+      //   meta: {
+      //     title: ''
+      //   }
+      // },
+      // {
+      //   path: 'supplier',
+      //   component: () => import('@/views/oaSystem/searchCenter/supplier/index.vue'),
+      //   name: 'supplier',
+      //   meta: {
+      //     title: '供应商管理'
+      //   }
+      // },
+      // {
+      //   path: 'ReportPrint',
+      //   component: () => import('@/views/oaSystem/officeCenter/index.vue'),
+      //   name: 'ReportPrint',
+      //   meta: {
+      //     title: '报表打印'
+      //   }
+      // },
+      // {
+      //   path: 'processLog',
+      //   component: () => import('@/views/oaSystem/officeCenter/index.vue'),
+      //   name: 'ProcessLog',
+      //   meta: {
+      //     title: '流程日志'
+      //   }
+      // }
     ]
   },
   {

+ 3 - 0
client/src/views/oaSystem/home/FiveItem.vue

@@ -81,6 +81,9 @@ const items = ref<TitleType[]>([
   },
   {
     title: '咨询答复'
+  },
+  {
+    title: '通讯信息'
   }
 ])
 

+ 4 - 4
client/src/views/oaSystem/home/OneItem.vue

@@ -8,12 +8,12 @@
         </div>
       </template>
       <div class="content">
-        <ul class="tabs">
-          <li class="active">待办公文<span class="corner">9</span></li>
-          <!-- <li>代理审批<span class="corner">4</span></li>
+        <!-- <ul class="tabs"> -->
+        <!-- <li class="active">待办公文<span class="corner">9</span></li> -->
+        <!-- <li>代理审批<span class="corner">4</span></li>
           <li>督查督办<span class="corner">0</span></li>
           <li>待办会议<span class="corner">4</span></li> -->
-        </ul>
+        <!-- </ul> -->
         <div class="tab_content">
           <div v-for="(item, index) in 6" :key="index">
             <div>

+ 9 - 9
client/src/views/oaSystem/home/ThreeItem.vue

@@ -38,18 +38,18 @@ type TitleType = {
   corner?: number
 }
 const items = ref<TitleType[]>([
-  {
-    title: '最新资讯'
-  },
   {
     title: '通知公告'
-  },
-  {
-    title: '学习论坛'
-  },
-  {
-    title: '综合资料'
   }
+  // {
+  //   title: '最新资讯'
+  // },
+  // {
+  //   title: '学习论坛'
+  // },
+  // {
+  //   title: '综合资料'
+  // }
 ])
 </script>
 

+ 16 - 16
client/src/views/oaSystem/home/TitleCard.vue

@@ -64,22 +64,22 @@ const handleTabClick = (item: TitleType, index: number) => {
         &:first-child {
           padding-left: 0px;
         }
-        &:last-child {
-          position: relative;
-          &::before {
-            content: '';
-            position: absolute;
-            display: block;
-            left: 0px;
-            top: 0px;
-            bottom: 0px;
-            margin: auto;
-            margin: auto;
-            height: 16px;
-            width: 1px;
-            background: #b5b8be;
-          }
-        }
+        // &:last-child {
+        //   position: relative;
+        //   &::before {
+        //     content: '';
+        //     position: absolute;
+        //     display: block;
+        //     left: 0px;
+        //     top: 0px;
+        //     bottom: 0px;
+        //     margin: auto;
+        //     margin: auto;
+        //     height: 16px;
+        //     width: 1px;
+        //     background: #b5b8be;
+        //   }
+        // }
         &.active {
           color: #23272b;
           font-weight: bold;

+ 7 - 2
client/src/views/oaSystem/home/TwoItem.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="TwoItemBox">
     <div class="weatherBox">
-      <img :src="getAssetsFile(iconPath)" alt="" />
+      <!-- <img :src="getAssetsFile(iconPath)" alt="" /> -->
       <div class="info">
         <p>系统管理员<span class="sub">您好!欢迎进入系统</span></p>
         <p class="desc">{{ currentDate }}</p>
@@ -11,7 +11,7 @@
       <title-card :items="items">
         <div class="content">
           <ul>
-            <li v-for="(item, index) in applications" :key="index">
+            <li v-for="(item, index) in applications" :key="index" @click="openOtherWeb(item)">
               <div class="logo">
                 <img :src="getAssetsFile(item['icon'])" />
               </div>
@@ -117,6 +117,11 @@ const getCurrentDate = () => {
   currentDate.value = '登录于:' + `${year}-${month}-${day}`
 }
 
+// 应用中心打开其他的Web应用
+const openOtherWeb = (item) => {
+  window.open(item.path, '_blank')
+}
+
 onMounted(() => {
   getCurrentDate()
   getLocationByIp()

+ 10 - 2
client/src/views/oaSystem/oaLayout/index.vue

@@ -17,7 +17,7 @@
           </div>
           <template #dropdown>
             <el-dropdown-menu style="width: 100px">
-              <el-dropdown-item>退 出</el-dropdown-item>
+              <el-dropdown-item @click="logout"> 退 出 系 统 </el-dropdown-item>
             </el-dropdown-menu>
           </template>
         </el-dropdown>
@@ -56,11 +56,13 @@ import { useTagsViewStore } from '@/store/modules/tagsView'
 import TagList from './tagList.vue'
 import Menus from './menus.vue'
 import subscribe from '@/utils/Subscribe'
+import { useUserStore } from '@/store/modules/user'
 
 defineOptions({ name: 'Layout' })
 
 const tagsViewStore = useTagsViewStore()
-
+const userStore = useUserStore()
+const { replace } = useRouter()
 const route = useRoute()
 const isFrameView = ref<boolean>(false)
 const iframeViews = ref<any[]>([])
@@ -78,6 +80,12 @@ const filterIframe = (arr): any[] => {
     }
   })
 }
+const logout = async () => {
+  await userStore.loginOut()
+  tagsViewStore.delAllViews()
+  replace('/login?redirect=/home')
+}
+
 subscribe.on('iframe:reload', (view) => {
   setTimeout(() => {
     const iframe = document.getElementById(view.name)