|
|
@@ -20,7 +20,7 @@
|
|
|
</div>
|
|
|
<div class="user-item">
|
|
|
<div class="user-key">联系方式</div>
|
|
|
- <div class="user-value">17777777777</div>
|
|
|
+ <div class="user-value">{{user.phone}}</div>
|
|
|
</div>
|
|
|
<div class="user-item">
|
|
|
<div class="user-key">空间定位</div>
|
|
|
@@ -149,17 +149,15 @@
|
|
|
<div class="log-box box-background">
|
|
|
<div class="user-title">
|
|
|
<div class="user-title-name">个人日志</div>
|
|
|
- <div class="user-title-right">
|
|
|
+ <div class="user-title-right" @click="$router.push('/work/operation/log/person')">
|
|
|
<span>更多</span>
|
|
|
<i class="iconfont huifont-xiala-right"></i>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="log-list">
|
|
|
- <div class="log-item">林志权在2024-11-04邀请您加入【魔方大厦】项目，请及时处理</div>
|
|
|
- <div class="log-item">Lisa在2024-11-04时申请使用【公章】印章，请及时处理。</div>
|
|
|
- <div class="log-item">林志权在2024-11-04邀请您加入【魔方大厦】项目，请及时处理</div>
|
|
|
- <div class="log-item">Lisa在2024-11-04时申请使用【公章】印章，请及时处理。</div>
|
|
|
- <div class="log-item">林志权在2024-11-04邀请您加入【魔方大厦】项目，请及时处理</div>
|
|
|
+ <div class="log-item" v-for="item in logList" :key="item.id" @click="detail(item)">
|
|
|
+ {{item.message}}
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -167,27 +165,44 @@
|
|
|
<div class="hui-flex hui-content">
|
|
|
<div class="user-title">
|
|
|
<div class="user-title-name">我的消息</div>
|
|
|
- <div class="user-title-right">
|
|
|
+ <div class="user-title-right" @click="$router.push('/message')">
|
|
|
<span>更多</span>
|
|
|
<i class="iconfont huifont-xiala-right"></i>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="hui-flex-box hui-table">
|
|
|
- <el-table :data="tableData" row-key="id" stripe height="100%" @row-click="clickRow">
|
|
|
+ <el-table :data="tableData" row-key="id" stripe height="100%">
|
|
|
<el-table-column label="序号" width="50">
|
|
|
<template slot-scope="scope">
|
|
|
{{scope.$index + 1}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="消息内容" prop="message"></el-table-column>
|
|
|
- <el-table-column label="消息类型" prop="messageType" width="80">
|
|
|
+ <el-table-column label="消息内容">
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{messageType(scope.row.messageType).name}}</span>
|
|
|
+ <div class="hui-ellipsis">
|
|
|
+ {{scope.row.message}}
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="时间" prop="sentTime" width="180"></el-table-column>
|
|
|
+ <el-table-column label="消息类型" prop="messageType" width="150">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div class="hui-table-tag">
|
|
|
+ <div class="hui-tag">
|
|
|
+ <div>{{messageType(scope.row.messageType).name}}</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column width="150" label="操作">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span class="table-operation" @click="detail(scope.row)">
|
|
|
+ 详情
|
|
|
+ </span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="时间" prop="date" width="180"></el-table-column>
|
|
|
<template slot="empty">
|
|
|
- <empty width="100" description="暂无消息"></empty>
|
|
|
+ <empty description="暂无数据"></empty>
|
|
|
</template>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
@@ -195,16 +210,25 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <el-drawer title="消息详情" :visible.sync="drawer" :size="400" :append-to-body="true">
|
|
|
+ <detail v-if="drawer" :type="item.messageType" :detail="item" @close="drawer = false">
|
|
|
+ </detail>
|
|
|
+ </el-drawer>
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
+ import {
|
|
|
+ getMessagePageListByQuery
|
|
|
+ } from '@/httpApi/message'
|
|
|
+ import detail from '@/components/message/detail'
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
- user: {
|
|
|
- name: '林'
|
|
|
- },
|
|
|
+ user: {},
|
|
|
+ logList: [],
|
|
|
tableData: [],
|
|
|
+ item: {},
|
|
|
+ drawer: false,
|
|
|
industryList: [{
|
|
|
value: 21,
|
|
|
name: "建筑业",
|
|
|
@@ -236,11 +260,54 @@
|
|
|
}]
|
|
|
}
|
|
|
},
|
|
|
+ created() {
|
|
|
+ this.user = this.$store.getters.user;
|
|
|
+ this.initMessage();
|
|
|
+ this.initLog();
|
|
|
+ },
|
|
|
mounted() {
|
|
|
this.chart1();
|
|
|
},
|
|
|
+ components: {
|
|
|
+ detail
|
|
|
+ },
|
|
|
methods: {
|
|
|
- clickRow() {},
|
|
|
+ initLog() {
|
|
|
+ let data = {
|
|
|
+ projectId: this.$store.getters.project.id,
|
|
|
+ organizationId: this.$store.getters.organization.id,
|
|
|
+ sender: this.$store.getters.user.userId
|
|
|
+ }
|
|
|
+ getMessagePageListByQuery(1, 5, data).then(res => {
|
|
|
+ if (res.state) {
|
|
|
+ this.logList = res.data.dataList.map(node => {
|
|
|
+ return Object.assign(node, JSON.parse(node.json));
|
|
|
+ });
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ initMessage() {
|
|
|
+ let data = {
|
|
|
+ projectId: this.$store.getters.project.id,
|
|
|
+ organizationId: this.$store.getters.organization.id,
|
|
|
+ userId: this.$store.getters.user.userId
|
|
|
+ }
|
|
|
+ getMessagePageListByQuery(1, 8, data).then(res => {
|
|
|
+ if (res.state) {
|
|
|
+ this.tableData = res.data.dataList.map(node => {
|
|
|
+ return Object.assign(node, JSON.parse(node.json));
|
|
|
+ });
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ detail(item) {
|
|
|
+ if (!item.viewed) this.$msg.viewed(item.id, this.initMessage);
|
|
|
+ this.item = item;
|
|
|
+ this.drawer = true;
|
|
|
+ },
|
|
|
+ messageType(type) {
|
|
|
+ return this.$msg.messageType.filter(item => item.id === type)[0];
|
|
|
+ },
|
|
|
chart1() {
|
|
|
let chart = echarts.init(this.$refs.chart1);
|
|
|
let title = '建筑业',
|
|
|
@@ -382,6 +449,12 @@
|
|
|
flex: 1;
|
|
|
width: 0;
|
|
|
}
|
|
|
+
|
|
|
+ .user-title-right {
|
|
|
+ cursor: pointer;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
.staging-left {
|
|
|
@@ -690,11 +763,6 @@
|
|
|
border-color: transparent;
|
|
|
}
|
|
|
|
|
|
- tr:hover>td.el-table__cell {
|
|
|
- background: $--box-background;
|
|
|
- color: $--color-primary;
|
|
|
- }
|
|
|
-
|
|
|
.el-table__row--striped {
|
|
|
|
|
|
th.el-table__cell.is-leaf,
|
|
|
@@ -703,11 +771,6 @@
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- tr.el-table__row--striped:hover>td.el-table__cell {
|
|
|
- background: #232A37;
|
|
|
- color: $--color-primary;
|
|
|
- }
|
|
|
-
|
|
|
.el-table__header th.el-table__cell {
|
|
|
border-color: transparent;
|
|
|
}
|
