|
@@ -83,27 +83,11 @@
|
|
|
<a href="javascript:void(0);" @click="openEnterAnn">更多</a>
|
|
|
</template>
|
|
|
|
|
|
- <ul class="clearfix">
|
|
|
- <li v-for="item in annList" :key="item.id">
|
|
|
- <!-- 显示已发布的公告 需轮播 -->
|
|
|
- <div>
|
|
|
- <a href="javascript:void(0);" class="clearfix">
|
|
|
- <span class="department fl" v-if="item.type == '项目'" style="color:#006d77;">
|
|
|
- [ {{ item.type }} ]
|
|
|
- </span>
|
|
|
- <span class="department fl" v-if="item.type == '人事'" style="color:#98c1d9;">
|
|
|
- [ {{ item.type }} ]
|
|
|
- </span>
|
|
|
- <span class="department fl" v-if="item.type == '财务'" style="color:orange;">
|
|
|
- [ {{ item.type }} ]
|
|
|
- </span>
|
|
|
- <span class="title fl" @click="showAnnModal(item)">{{ item.title }}</span>
|
|
|
- <span class="createTime fr">{{ item.createTime }}</span>
|
|
|
- <span class="createBy fr">{{ item.createBy }}</span>
|
|
|
- </a>
|
|
|
- </div>
|
|
|
- </li>
|
|
|
- </ul>
|
|
|
+ <!-- DataV -->
|
|
|
+ <div class="dataV">
|
|
|
+ <dv-scroll-board :config="config" style="width:100%;height:300px;" @click="getMethod" />
|
|
|
+ </div>
|
|
|
+ <!-- DataV -->
|
|
|
</a-card>
|
|
|
</a-col>
|
|
|
<!-- 我的计划 -->
|
|
@@ -243,29 +227,13 @@
|
|
|
</component>
|
|
|
</a-modal>
|
|
|
|
|
|
- <!-- 公告详情 弹框 -->
|
|
|
- <a-modal v-model="annVisible" title="企业公告详情" @ok="handleOk" width="40%">
|
|
|
- <p>
|
|
|
- 标题: <span class="annDet">{{ annDetail.title }}</span>
|
|
|
- </p>
|
|
|
- <p>
|
|
|
- 发布部门: <span class="annDet">{{ annDetail.type }}</span>
|
|
|
- </p>
|
|
|
- <p>
|
|
|
- 创建人: <span class="annDet"> {{ annDetail.createBy }}</span>
|
|
|
- </p>
|
|
|
- <p>
|
|
|
- 创建日期: <span class="annDet">{{ annDetail.createTime }}</span>
|
|
|
- </p>
|
|
|
- <p>详情:</p>
|
|
|
-
|
|
|
- <!-- 文本框 -->
|
|
|
- <span v-html="myValue" class="valueBox"></span>
|
|
|
- </a-modal>
|
|
|
+ <!-- 公告详情 弹框 组件 -->
|
|
|
+ <detAnn-modal ref="DetAnnModal" @ok="modalFormOk" :fatherGetList="getAnnList"></detAnn-modal>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
+import DetAnnModal from '@views/oa/enter-ann/add/detAnnModal.vue'
|
|
|
import { mapGetters } from 'vuex'
|
|
|
import { getAction } from '@/api/manage'
|
|
|
import FullCalendar from '@fullcalendar/vue'
|
|
@@ -278,18 +246,22 @@ import { scheduleGetListByTime, scheduleQueryById } from '@api/oa/cd-schedule'
|
|
|
import { enterpriseEList } from '@api/oa/cd-enterprise-announcement'
|
|
|
import '@fullcalendar/daygrid/main.css'
|
|
|
import JEditor from '../../components/jeecg/JEditor.vue'
|
|
|
+import '@/assets/less/dataVTable.less' // 修改首页 DataV 轮播图样式
|
|
|
export default {
|
|
|
name: 'Home',
|
|
|
components: {
|
|
|
- FullCalendar,
|
|
|
- JEditor
|
|
|
+ FullCalendar, //日历
|
|
|
+ JEditor, //富文本
|
|
|
+ DetAnnModal //公告详情弹框
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- annVisible: false, //公告详情关闭
|
|
|
- annDetail: [], //公告详情
|
|
|
- myValue: '', //富文本内容
|
|
|
- // smallText: '', // 富文本内容
|
|
|
+ config: {
|
|
|
+ waitTime: 2000, //轮播时间间隔
|
|
|
+ columnWidth: [2],
|
|
|
+ data: [] //全局变量轮播图数据
|
|
|
+ },
|
|
|
+
|
|
|
//日历组件 参数
|
|
|
calendarOptions: {
|
|
|
// 日程数组
|
|
@@ -361,7 +333,6 @@ export default {
|
|
|
activeKeyAll: [],
|
|
|
msg1Count: '0',
|
|
|
msg2Count: '0',
|
|
|
- annList: [], //企业公告列表
|
|
|
url: {
|
|
|
listCementByUser: '/sys/annountCement/listByUser'
|
|
|
},
|
|
@@ -376,6 +347,7 @@ export default {
|
|
|
//
|
|
|
data: [], // 表单数据
|
|
|
total: 0, // 表单数据总数
|
|
|
+
|
|
|
ipagination: {
|
|
|
current: 1,
|
|
|
pageSize: 3,
|
|
@@ -420,20 +392,22 @@ export default {
|
|
|
},
|
|
|
mounted() {
|
|
|
this.loadData()
|
|
|
+ this.getAnnList()
|
|
|
},
|
|
|
methods: {
|
|
|
+ //点击轮播图
|
|
|
+ getMethod(value) {
|
|
|
+ console.log(value)
|
|
|
+ },
|
|
|
+
|
|
|
//公告详情
|
|
|
showAnnModal(item) {
|
|
|
- this.annVisible = true
|
|
|
- this.annDetail = item //传值给回显数组
|
|
|
+ this.$refs.DetAnnModal.annVisible = true
|
|
|
+ this.$refs.DetAnnModal.annDetail = item //传值给回显数组
|
|
|
console.log('点击公告的详情', this.annDetail)
|
|
|
- this.myValue = this.annDetail.content
|
|
|
- },
|
|
|
- //公告详情 弹框按钮
|
|
|
- handleOk(e) {
|
|
|
- console.log(e)
|
|
|
- this.annVisible = false
|
|
|
+ this.$refs.DetAnnModal.myValue = this.$refs.DetAnnModal.annDetail.content
|
|
|
},
|
|
|
+
|
|
|
//查询日程数据
|
|
|
getScheduleData() {
|
|
|
this.$nextTick(() => {
|
|
@@ -472,9 +446,9 @@ export default {
|
|
|
this.loading = false
|
|
|
if (res.success) {
|
|
|
this.todoList = res.result || []
|
|
|
- console.log('首页 我的待办数字:', this.todoList.length)
|
|
|
+ // console.log('首页 我的待办数字:', this.todoList.length)
|
|
|
this.total = this.data.leading
|
|
|
- console.log('系统消息:', this.data)
|
|
|
+ // console.log('系统消息:', this.data)
|
|
|
}
|
|
|
})
|
|
|
},
|
|
@@ -494,12 +468,21 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
|
|
|
- // 公告数据
|
|
|
- getAnnList() {
|
|
|
- enterpriseEList({isRelease:'1',pageSize:1000}).then(res => {
|
|
|
+ // 公告数据 (查询条件:已发布、数据条数)
|
|
|
+ async getAnnList() {
|
|
|
+ await enterpriseEList({ isRelease: '1', pageSize: 1000 }).then(res => {
|
|
|
if (res.success) {
|
|
|
- this.annList = res.result.records || []
|
|
|
- console.log('首页公告----->', this.annList)
|
|
|
+ this.annList = res.result.records
|
|
|
+ console.log('轮播公告-->', this.annList)
|
|
|
+ let scrollData = [] //轮播表数据
|
|
|
+ // 拿到返回的数据进行遍历并渲染
|
|
|
+ this.annList.map(item => {
|
|
|
+ // console.log('mpa方法的item', item)
|
|
|
+ let list = [item.type, item.title, item.createBy, item.createTime]
|
|
|
+ scrollData.push(list)
|
|
|
+ // console.log('>>>', scrollData)
|
|
|
+ })
|
|
|
+ this.config = { data: scrollData } //双向绑定(轮播表数据绑定到配置的data数据中)
|
|
|
}
|
|
|
})
|
|
|
},
|
|
@@ -606,23 +589,12 @@ export default {
|
|
|
prev() {
|
|
|
this.calendarApi.prev()
|
|
|
console.log(this.calendarApi.prev)
|
|
|
- }
|
|
|
+ },
|
|
|
+ modalFormOk() {}
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
<style lang="less" scoped>
|
|
|
-//富文本内容
|
|
|
-.valueBox {
|
|
|
- font-weight: 700;
|
|
|
- display: block;
|
|
|
- border: 1px solid #ccc;
|
|
|
- padding: 10px;
|
|
|
-}
|
|
|
-// 整个详情弹框内容
|
|
|
-.annDet {
|
|
|
- // color: #ccc;
|
|
|
- font-weight: 700;
|
|
|
-}
|
|
|
ul li {
|
|
|
list-style: none;
|
|
|
}
|