7182bd23 by 任超

feat:消息

1 parent 04bbc29e
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
163 .topButton { 163 .topButton {
164 @include flex; 164 @include flex;
165 width: 100%; 165 width: 100%;
166 height: 80px; 166 height: 85px;
167 background-color: #3498db; 167 background-color: #3498db;
168 color: #ffffff; 168 color: #ffffff;
169 justify-content: space-between; 169 justify-content: space-between;
...@@ -193,4 +193,10 @@ ...@@ -193,4 +193,10 @@
193 } 193 }
194 } 194 }
195 } 195 }
196 }
197
198 .NoticeBar {
199 position: absolute;
200 left: 0;
201 bottom: 0;
196 } 202 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
16 <span class="iconName">{{ item.name }}</span> 16 <span class="iconName">{{ item.name }}</span>
17 </li> 17 </li>
18 </ul> 18 </ul>
19 <NoticeBar class="NoticeBar" :noticeList="noticeList" />
19 </div> 20 </div>
20 <!-- 内容框架 --> 21 <!-- 内容框架 -->
21 <div class="containerFrame"> 22 <div class="containerFrame">
...@@ -81,6 +82,7 @@ import { ...@@ -81,6 +82,7 @@ import {
81 getStepFormInfo, 82 getStepFormInfo,
82 } from "@/api/fqsq.js"; 83 } from "@/api/fqsq.js";
83 import { mapGetters } from "vuex" 84 import { mapGetters } from "vuex"
85 import NoticeBar from '@/components/NoticeBar/index'
84 import { deleteFlow, unClaimTask } from "@/api/ywbl.js"; 86 import { deleteFlow, unClaimTask } from "@/api/ywbl.js";
85 import ProcessViewer from './components/processViewer.vue' 87 import ProcessViewer from './components/processViewer.vue'
86 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js"; 88 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js";
...@@ -90,10 +92,22 @@ import { queueDjywmc } from "@/views/ywbl/ywsq/slectBdcdata.js"; ...@@ -90,10 +92,22 @@ import { queueDjywmc } from "@/views/ywbl/ywsq/slectBdcdata.js";
90 export default { 92 export default {
91 components: { 93 components: {
92 fqsqDialog, 94 fqsqDialog,
95 NoticeBar,
93 ProcessViewer 96 ProcessViewer
94 }, 97 },
95 data () { 98 data () {
96 return { 99 return {
100 noticeList: [
101 {
102 title: '6666666666666666666'
103 },
104 {
105 title: '3333333333333333333'
106 },
107 {
108 title: '6666666666666666666'
109 }
110 ],
97 isDialog: false, 111 isDialog: false,
98 // 流程图 112 // 流程图
99 // 折叠 113 // 折叠
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
59 </div> 59 </div>
60 <div class="from-clues-content"> 60 <div class="from-clues-content">
61 <lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort" 61 <lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort"
62 :current-page.sync="pageData.currentPage" :heightNum="290" :total="tableData.total" 62 :current-page.sync="pageData.currentPage" :heightNum="295" :total="tableData.total"
63 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" 63 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
64 :data="tableData.data"> 64 :data="tableData.data">
65 </lb-table> 65 </lb-table>
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 <!-- 表格 --> 61 <!-- 表格 -->
62 <div class="from-clues-content"> 62 <div class="from-clues-content">
63 <lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort" 63 <lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort"
64 :current-page.sync="pageData.currentPage" :heightNum="290" :total="tableData.total" 64 :current-page.sync="pageData.currentPage" :heightNum="295" :total="tableData.total"
65 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" 65 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
66 :data="tableData.data"> 66 :data="tableData.data">
67 </lb-table> 67 </lb-table>
......