From 52583620d14510159a874908d7b96f5091ea1edb Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 29 Sep 2021 21:24:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E8=81=94=E8=B0=83=20?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layouts/TabLayout.vue          | 26 ++++--
 src/views/dashboard/Analysis.vue              | 22 +++--
 src/views/dashboard/indexRouter.js            | 82 +++++++++++++++++++
 src/views/meetingActivity/MeetingActivity.vue | 20 ++---
 4 files changed, 126 insertions(+), 24 deletions(-)
 create mode 100644 src/views/dashboard/indexRouter.js

diff --git a/src/components/layouts/TabLayout.vue b/src/components/layouts/TabLayout.vue
index 882045c..bfbc005 100644
--- a/src/components/layouts/TabLayout.vue
+++ b/src/components/layouts/TabLayout.vue
@@ -5,7 +5,7 @@
     <!-- update-end- author:sunjianlei --- date:20191009 --- for: 提升右键菜单的层级 -->
     <a-tabs
       @contextmenu.native="e => onContextmenu(e)"
-      v-if="multipage"
+      v-if="multipage && isIndexBool"
       :active-key="activePage"
       class="tab-layout-tabs"
       style="height:52px"
@@ -18,14 +18,16 @@
         <span slot="tab" :pagekey="page.fullPath">{{ page.meta.title }}</span>
       </a-tab-pane>
     </a-tabs>
-    <div style="margin: 12px 12px 0; overflow: auto">
+    <div style=" overflow: auto">
       <!-- update-begin-author:taoyan date:20201221 for:此处删掉transition标签 不知道为什么加上后 页面路由切换的时候即1及菜单切到2及菜单的时候 两个菜单页面会同时出现300-500秒左右 -->
-      <keep-alive v-if="multipage">
-        <router-view v-if="reloadFlag"/>
-      </keep-alive>
-      <template v-else>
-        <router-view v-if="reloadFlag"/>
-      </template>
+      <div>
+        <keep-alive v-if="multipage">
+          <router-view v-if="reloadFlag"/>
+        </keep-alive>
+        <template v-else>
+          <router-view v-if="reloadFlag"/>
+        </template>
+      </div>
       <!-- update-end-author:taoyan date:20201221 for:此处删掉transition标签 不知道为什么加上后 页面路由切换的时候即1及菜单切到2及菜单的时候 两个菜单页面会同时出现300-500秒左右 -->
     </div>
   </global-layout>
@@ -51,6 +53,7 @@
       return {
         pageList: [],
         linkList: [],
+        isIndexBool:false,
         activePage: '',
         menuVisible: false,
         menuItemList: [
@@ -103,6 +106,13 @@
       '$route': function(newRoute) {
         //console.log("新的路由",newRoute)
         this.activePage = newRoute.fullPath
+        // 首页不显示面包屑
+        if(this.activePage === '/dashboard/analysis'){
+          this.isIndexBool = false
+        }else {
+          this.isIndexBool = true
+        }
+        console.log(this.activePage,'this.activePage')
         if (!this.multipage) {
           this.linkList = [newRoute.fullPath]
           this.pageList = [Object.assign({},newRoute)]
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 7fdd571..ddce3ca 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -1,23 +1,35 @@
 <template>
-  <div>
-    我是首页
+  <div class="index-home">
+    <img class="index-bgimg" src="../../assets/indexImgs/index-bg.png" />
   </div>
 </template>
 
 <script>
-
+import IndexRouter from '@views/dashboard/indexRouter'
 
 export default {
   name: 'Analysis',
   components: {},
   data() {
     return {
-      indexStyle: 1
+
     }
   },
   created() {
-
+    console.log(IndexRouter)
   },
   methods: {}
 }
 </script>
+
+<style scoped lang="less">
+.index-home {
+  width: 100%;
+  height: calc(100vh - 59px);
+}
+
+.index-bgimg {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/views/dashboard/indexRouter.js b/src/views/dashboard/indexRouter.js
new file mode 100644
index 0000000..77be33f
--- /dev/null
+++ b/src/views/dashboard/indexRouter.js
@@ -0,0 +1,82 @@
+
+const IndexRouter =  [
+  {
+    redirect: null,
+    path: '/workTeam/WorkTeam',
+    component: 'workTeam/WorkTeam',
+    route: '4',
+    meta: {
+      icon: require('../../assets/indexImgs/workgroup.png'),
+      componentName: 'WorkTeam',
+      title: '我的工作组' // 菜单名称
+    },
+    name: 'work-team',
+    id: '4'
+  },
+  {
+    redirect: null,
+    path: '/mineProject/MineProject',
+    component: 'mineProject/MineProject',
+    route: '2',
+    meta: {
+      icon: require('../../assets/indexImgs/project.png'),
+      componentName: 'MineProject',
+      title: '我的项目' // 菜单名称
+    },
+    name: 'mine-project',
+    id: '2'
+  },
+  {
+    redirect: null,
+    path: '/meetingActivity/MeetingActivity',
+    component: 'meetingActivity/MeetingActivity',
+    route: '6',
+    meta: {
+      icon: require('../../assets/indexImgs/meeting.png'),
+      componentName: 'MeetingActivity',
+      title: '我的会议' // 菜单名称
+    },
+    name: 'meeting-activity',
+    id: '6'
+  },
+  {
+    redirect: null,
+    path: '/dataMember/DataMember',
+    component: 'dataMember/DataMember',
+    route: '5',
+    meta: {
+      icon: require('../../assets/indexImgs/member.png'),
+      componentName: 'DataMember',
+      title: '我的会员' // 菜单名称
+    },
+    name: 'data-member',
+    id: '5'
+  },
+  {
+    redirect: null,
+    path: '/dataDownload/DataDownload',
+    component: 'dataDownload/DataDownload',
+    route: '7',
+    meta: {
+      icon: require('../../assets/indexImgs/file.png'),
+      componentName: 'DataDownload',
+      title: '资料下载' // 菜单名称
+    },
+    name: 'data-download',
+    id: '7'
+  },
+  {
+    redirect: null,
+    path: '/mineContract/MineContract',
+    component: 'mineContract/MineContract',
+    route: '8',
+    meta: {
+      icon: require('../../assets/indexImgs/contract-manmage.png'),
+      componentName: 'MineContract',
+      title: '我的合同' // 菜单名称
+    },
+    name: 'mine-contract',
+    id: '8'
+  },
+]
+export default  IndexRouter
\ No newline at end of file
diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue
index 1e3953c..c0820ae 100644
--- a/src/views/meetingActivity/MeetingActivity.vue
+++ b/src/views/meetingActivity/MeetingActivity.vue
@@ -90,9 +90,9 @@
               <!--  缴费方式为线上缴费的，只有在会议召开时间期间才显示”上传凭证“按钮  "-->
               <a-button v-show="item.payMode === 2"  type="primary" @click="uploadPaymentRecord(item)">上传凭证</a-button>
             </p>
-            <img class="meeting-img-status" src="../../assets/meetingImgs/no-start.png"/>
-            <!--          <img class="meeting-img-status" src="../../assets/meetingImgs/ing.png" />-->
-            <!--          <img class="meeting-img-status" src="../../assets/meetingImgs/end.png.png" />-->
+            <img v-if="item.meetingStatus === 2 " class="meeting-img-status" src="../../assets/meetingImgs/no-start.png"/>
+            <img v-if="item.meetingStatus === 3 " class="meeting-img-status" src="../../assets/meetingImgs/ing.png" />
+            <img v-if="item.meetingStatus === 4 " class="meeting-img-status" src="../../assets/meetingImgs/end.png" />
           </div>
           <i></i>
           <i></i>
@@ -148,18 +148,18 @@ export default {
   },
   data() {
     return {
-      // 会议分类 全部 1 未开始 2 可报名 3 已报名
+      // 会议分类 全部 0  可报名 1 已报名 2
       meetingStatusArr: [
         {
-          key: '1',
+          key: '0',
           value: '全部'
         },
         {
-          key: '2',
+          key: '1',
           value: '可报名'
         },
         {
-          key: '3',
+          key: '2',
           value: '已报名'
         }
       ],
@@ -191,8 +191,6 @@ export default {
     }
   },
   created() {
-    // 默认查询所有的会议
-    this.filter.meetingStatus = this.meetingKey
     // 会议类型
     if(this.$route.query.meetingType){
       this.meetingType = this.$route.query.meetingType
@@ -206,7 +204,7 @@ export default {
     * */
     filterMeeting(key) {
       this.meetingKey = key
-      // this.filter.meetingStatus = this.meetingKey
+      this.filter.meetingSignUpType = this.meetingKey
       this.initData(1)
     },
     /*
@@ -238,7 +236,7 @@ export default {
       if (arg === 1) {
         this.pageNo = 1
       }
-      var params = Object.assign({}, this.lastQueryParam)
+      var params = Object.assign({}, this.lastQueryParam, this.filter)
       params.pageNo = this.pageNo
       params.pageSize = this.pageSize
       this.loading = true