[变更] 修改为左右布局，修改菜单顺序，添加标协会员相关菜单

src/views/dashboard/Analysis.vue

@@ -1,49 +1,80 @@
 <template>
-  <div class="index-home">
-    <img class="index-bgimg" src="../../assets/indexImgs/index-bg.png"/>
+  <div class="main-box">
+    <a-card :bordered="false">
+      <a-table
+        ref="table"
+        size="middle"
+        rowKey="id"
+        :columns="columns"
+        :scroll="{x: 1000}"
+        :dataSource="dataMessageList"
+        :pagination="ipagination"
+        :loading="loading"
+        @change="handleTableChange"
+        class="j-table-force-nowrap">
 
-    <div class="content">
-      <div class="router-list">
-        <div @click="toRouterPath(item)" v-for="(item,index) of IndexRouter" :key="index" class="router-list-item">
-          <div class="center">
-            <img :src="item.meta.icon"/>
-            <p class="router-list-title">{{ item.meta.title }}</p>
-          </div>
-        </div>
-      </div>
-      <div class="message-list">
-        <div class="message-list-content">
-          <div class="message-list-title" style="margin-bottom: 10px;">
-            <img src="../../assets/indexImgs/file.png"/>
-            <span class="my-notice">我的消息</span>
-            <span class="query-list" @click="toUserAnnouncementList">查看更多></span>
-          </div>
-          <div>
-            <div class="message-list-item" v-for="item of dataMessageList" :key="item.id">
-              <div class="message-list-item-name">
-                <div class="message-list-item-name-title">【{{ item.titile_dictText }}】</div>
-                <a-tooltip>
-                  <template slot="title">
-                    <span v-html="item.msgContent" class="ellipsis-span"></span>
-                  </template>
-                  <span v-html="myEllipsis(item.msgContent,35)" class="ellipsis-span"></span>
-                </a-tooltip>
-              </div>
-              <!--              <span v-html="item.msgContent"></span>-->
-              <span class="message-list-item-time">{{ item.sendTime }}</span>
-              <span class="operate">
-                 <a @click="showAnnouncement(item)" style="margin-right: 8px">查看</a>
-                 <a @click="haveRead(item)" v-if="item.readFlag === '0' ">已读</a>
-                <a class="readed" v-if="item.readFlag === '1' ">已读</a>
-              </span>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <show-announcement ref="ShowAnnouncement"></show-announcement>
-    <dynamic-notice ref="showDynamNotice" :path="openPath" :formData="formData"/>
+        <template slot="text" slot-scope="text">
+          <a-tooltip>
+            <template slot="title">
+              <span v-html="text" class="ellipsis-span"></span>
+            </template>
+            <span v-html="myEllipsis(text,35)" class="ellipsis-span"></span>
+          </a-tooltip>
+        </template>
+
+        <span slot="action" class="action-span-cell" slot-scope="text, record">
+          <a @click="showAnnouncement(record)" style="margin-right: 8px">查看</a>
+          <a @click="haveRead(record)" v-if="record.readFlag === '0' ">已读</a>
+          <a class="readed" v-if="record.readFlag === '1' ">已读</a>
+        </span>
+      </a-table>
+    </a-card>
   </div>
+  <!--  <div class="index-home">-->
+  <!--    <img class="index-bgimg" src="../../assets/indexImgs/index-bg.png"/>-->
+
+  <!--    <div class="content">-->
+  <!--      <div class="router-list">-->
+  <!--        <div @click="toRouterPath(item)" v-for="(item,index) of IndexRouter" :key="index" class="router-list-item">-->
+  <!--          <div class="center">-->
+  <!--            <img :src="item.meta.icon"/>-->
+  <!--            <p class="router-list-title">{{ item.meta.title }}</p>-->
+  <!--          </div>-->
+  <!--        </div>-->
+  <!--      </div>-->
+  <!--      <div class="message-list">-->
+  <!--        <div class="message-list-content">-->
+  <!--          <div class="message-list-title" style="margin-bottom: 10px;">-->
+  <!--            <img src="../../assets/indexImgs/file.png"/>-->
+  <!--            <span class="my-notice">我的消息</span>-->
+  <!--            <span class="query-list" @click="toUserAnnouncementList">查看更多></span>-->
+  <!--          </div>-->
+  <!--          <div>-->
+  <!--            <div class="message-list-item" v-for="item of dataMessageList" :key="item.id">-->
+  <!--              <div class="message-list-item-name">-->
+  <!--                <div class="message-list-item-name-title">【{{ item.titile_dictText }}】</div>-->
+  <!--                  <a-tooltip>-->
+  <!--                    <template slot="title">-->
+  <!--                      <span v-html="item.msgContent" class="ellipsis-span"></span>-->
+  <!--                    </template>-->
+  <!--                    <span v-html="myEllipsis(item.msgContent,35)" class="ellipsis-span"></span>-->
+  <!--                  </a-tooltip>-->
+  <!--              </div>-->
+  <!--              &lt;!&ndash;              <span v-html="item.msgContent"></span>&ndash;&gt;-->
+  <!--              <span class="message-list-item-time">{{ item.sendTime }}</span>-->
+  <!--              <span class="operate">-->
+  <!--                   <a @click="showAnnouncement(item)" style="margin-right: 8px">查看</a>-->
+  <!--                   <a @click="haveRead(item)" v-if="item.readFlag === '0' ">已读</a>-->
+  <!--                  <a class="readed" v-if="item.readFlag === '1' ">已读</a>-->
+  <!--              </span>-->
+  <!--            </div>-->
+  <!--          </div>-->
+  <!--        </div>-->
+  <!--      </div>-->
+  <!--    </div>-->
+  <!--    <show-announcement ref="ShowAnnouncement"></show-announcement>-->
+  <!--    <dynamic-notice ref="showDynamNotice" :path="openPath" :formData="formData"/>-->
+  <!--  </div>-->
 </template>
 
 <script>
@@ -52,6 +83,7 @@ import { getAction, putAction } from '@api/manage'
 import { Bus } from '@comp/tools/Bus'
 import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
 import DynamicNotice from '../../components/tools/DynamicNotice'
+import { JeroListMixin } from '@/mixins/JeroListMixin'
 
 
 export default {
@@ -60,9 +92,36 @@ export default {
     DynamicNotice,
     ShowAnnouncement
   },
+  mixins: [JeroListMixin],
   data() {
     return {
       IndexRouter,
+      columns: [
+        {
+          title: '提醒类型',
+          align: 'center',
+          width: 180,
+          dataIndex: 'titile_dictText',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '内容',
+          align: 'center',
+          dataIndex: 'msgContent',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '提醒时间',
+          align: 'center',
+          width: 180,
+          dataIndex: 'createTime',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '操作',
+          dataIndex: 'action',
+          align: 'center',
+          width: 160,
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
       url: {
         list: '/sys/sysAnnouncementSend/getCompanyMyAnnouncementSend',
         editCementSend: 'sys/sysAnnouncementSend/editCompanyByAnntIdAndUserId'
@@ -70,14 +129,15 @@ export default {
       // 消息数据
       dataMessageList: [],
       openPath: '',
-      formData: ''
+      formData: '',
+      disableMixinCreated: true
     }
   },
   created() {
-    this.loadData()
-    Bus.$on('header-notice-change', () => {
-      this.loadData()
-    })
+    // this.loadData()
+    // Bus.$on('header-notice-change', () => {
+    //   this.loadData()
+    // })
   },
   methods: {
     /*
@@ -175,6 +235,8 @@ export default {
 </script>
 
 <style scoped lang="less">
+@import '~@assets/less/common.less';
+
 .index-home {
   position: relative;
   width: 100%;
@@ -283,7 +345,7 @@ export default {
 
     .ellipsis-span {
       /deep/ p {
-        margin-bottom: 0!important;
+        margin-bottom: 0 !important;
       }
     }
 

src/views/standardsAssociation/BasicInfo.vue

@@ -0,0 +1,13 @@
+<template>
+  <div>基本信息</div>
+</template>
+
+<script>
+export default {
+  name: 'BasicInfo'
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/standardsAssociation/CertificateManagement.vue

@@ -0,0 +1,13 @@
+<template>
+  <div>证书管理</div>
+</template>
+
+<script>
+export default {
+  name: 'CertificateManagement'
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/standardsAssociation/Council.vue

@@ -0,0 +1,13 @@
+<template>
+  <div>理事会</div>
+</template>
+
+<script>
+export default {
+  name: 'Council'
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/standardsAssociation/InfoCommunicationMeeting.vue

@@ -0,0 +1,13 @@
+<template>
+  <div>信息交流会</div>
+</template>
+
+<script>
+export default {
+  name: 'InfoCommunicationMeeting'
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/standardsAssociation/MemberManagement.vue

@@ -0,0 +1,13 @@
+<template>
+  <div>会员管理</div>
+</template>
+
+<script>
+export default {
+  name: 'MemberManagement'
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/standardsAssociation/PaymentInfo/CertificateInfo.vue

@@ -0,0 +1,13 @@
+<template>
+  <div>缴费信息-证书信息</div>
+</template>
+
+<script>
+export default {
+  name: 'CertificateInfo'
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/standardsAssociation/PaymentInfo/InvoiceInfo.vue

@@ -0,0 +1,13 @@
+<template>
+  <div>缴费信息-发票信息</div>
+</template>
+
+<script>
+export default {
+  name: 'InvoiceInfo'
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/standardsAssociation/PaymentInfo/MemberInfo.vue

@@ -0,0 +1,13 @@
+<template>
+  <div>缴费信息-会员信息</div>
+</template>
+
+<script>
+export default {
+  name: 'MemberInfo'
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/standardsAssociation/StandardPublicizingImplementation.vue

@@ -0,0 +1,13 @@
+<template>
+  <div>标准宣贯</div>
+</template>
+
+<script>
+export default {
+  name: 'StandardPublicizingImplementation'
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/standardsAssociation/TrainingMeeting.vue

@@ -0,0 +1,13 @@
+<template>
+  <div>培训会</div>
+</template>
+
+<script>
+export default {
+  name: 'TrainingMeeting'
+}
+</script>
+
+<style scoped>
+
+</style>