Commit c45c9eb9 by 李耀琨

解决冲突

parents 43be3567 eab0d7ca
......@@ -6,13 +6,13 @@ VUE_APP_FILE_API = 'http://192.168.0.56:9888'
VUE_APP_LOGIN_API = 'http://171.106.48.55:36003/cas/login?service=http://192.168.0.56:9888/oauth/login?systemTag=oa-interInformation2'
VUE_APP_LOGIN_API = 'http://171.106.48.55:36003/cas/login?service=http://192.168.0.56:9888/oauth/login?systemTag=oa-interInformation'
#获取菜单标识
VUE_APP_SYSTEAMTAG = ''
#退出登录标识
VUE_APP_LOGINOUT_TAG='oa-interInformation2'
VUE_APP_LOGINOUT_TAG='oa-interInformation'
# 是否启用 babel-plugin-dynamic-import-node插件
VUE_CLI_BABEL_TRANSPILE_MODULES = true
......@@ -6,4 +6,25 @@ export const createMessage = (data) => {
method: 'POST',
data
})
}
//详情页--评论排行
export const commentRaking = (data) => {
return request({
url: 'websiteCluster/web/commentRaking',
method: 'POST',
data
})
}
//详情页--本月阅读排行
export const monthClickRanking = (data) => {
return request({
url: 'websiteCluster/web/monthClickRanking',
method: 'POST',
data
})
}
\ No newline at end of file

386 Bytes | W: | H:

254 Bytes | W: | H:

src/assets/home/btns/menhu.png
src/assets/home/btns/17.png
src/assets/home/btns/menhu.png
src/assets/home/btns/17.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -34,17 +34,18 @@
<el-row
class="mt-15"
:gutter="20"
style="border-top: 1px solid #ccc; padding: 35px 0"
style="border-top: 1px solid #eee; padding: 35px 0"
>
<el-col>
<el-row :gutter="40">
<el-col v-for="item in attachList" :key="item.id" class="mb-10" :span="12" >
<el-col v-for="item in attachList" :key="item.id" class="mb-10" :span="24" >
<div @click="downLoadFile(item)" class="k-flex k-align-center">
<img
class="mr-5 gong-icon"
style=""
src="../../assets/home/gonggao.png"
src="../../assets/home/file.png"
/>
<div>下载附件:</div>
<div class="file-name">
{{item.attachName}}
</div>
......@@ -88,8 +89,13 @@
<div class="ml-5">{{item.userId}}</div>
<div class="mr-15">{{item.reTime}}</div>
</div>
<div style="margin-top:10px;font-size:9px;background:#eee;border-radius:5px;padding:15px;">
{{item.content}}
<div class="mt-10" style="font-size:9px;">{{item.content}}</div>
<div v-if="item.subComments.length>0" style="margin-top:10px;font-size:9px;background:#eee;border-radius:5px;padding:15px;">
<!-- {{item.content}} -->
<div class="mb-5" v-for="tab in item.subComments" :key="tab.id">
<span>{{tab.nickName}}</span>
<span>{{ tab.content }}</span>
</div>
</div>
<div @click="returnEvent(item,index)" v-if=" user.id && !item.returnFlag" class="mt-10" style="font-size:10px;margin-left:10px;color:blue;">回复</div>
<!-- 回复开始 -->
......@@ -101,7 +107,7 @@
v-model="reCommentContent"
placeholder="请输入回复内容"
></el-input>
<el-button class="ml-10 " type="primary" size="mini" @click="commentEvent(1,item.content,item.newsId)">发送</el-button>
<el-button class="ml-10 " type="primary" size="mini" @click="commentEvent(1,item.content,item.id)">发送</el-button>
</div>
<!-- 回复结束 -->
</div>
......@@ -121,7 +127,7 @@
placeholder="发表评论"
></el-input>
<div v-if="user.id" style="text-align:center;">
<el-button class="mt-15" s type="danger" size="mini" @click="commentEvent(0,'',article.newsId)">发表</el-button>
<el-button class="mt-15" s type="danger" size="mini" @click="commentEvent(0,'','')">发表</el-button>
</div>
<div
v-if="!user.id"
......@@ -192,6 +198,21 @@
</div>
<div
v-for="(item, index) in commentRankData"
:key="index"
class="k-flex k-space-between top-list"
>
<div class="article-name">
<span class="num" style="">{{ index + 1 }}</span>
<span class="right-line">
{{ item.boardName }}
<span class="line-div"></span>
</span>
<span>{{ item.subject }}</span>
</div>
<!--<div>{{item.date}}</div>-->
</div>
<!-- <div
v-for="(item, index) in topList"
:key="index"
class="k-flex k-space-between top-list"
......@@ -204,8 +225,8 @@
</span>
<span>{{ item.name }}</span>
</div>
<!--<div>{{item.date}}</div>-->
</div>
<div>{{item.date}}</div>
</div> -->
</div>
</el-col>
</el-row>
......@@ -292,7 +313,7 @@
import {newsDetail} from "@/api/homePage.js"
import { messageDetail } from "@/api/manage/manage";
import { removeToken } from "@/utils/auth";
import { createMessage } from "@/api/detail";
import { createMessage,commentRaking,monthClickRanking } from "@/api/detail";
// import { getUserInfo } from "@/utils/auth";
import { mapGetters, mapMutations } from "vuex";
......@@ -301,6 +322,7 @@ export default {
data() {
return {
commentRankData:[],//本月评论
reCommentContent:'',//回复内容
messageDetailData:[],//评论详情
returnFlag:false,//回复判断
......@@ -370,6 +392,35 @@ export default {
...mapGetters(['user']),
},
methods: {
//本月阅读排行
monthClickRanking(){
let params={};
var myDate = new Date();
var curMonth=myDate.getMonth(); //获取当前月份(0-11,0代表1月);
params.fyId=32;//传法院id,固定写死32,是固定的高院内网所以传 32
params.byMonth=curMonth;//按月
console.log('当前月份==',curMonth);//当前月份
monthClickRanking(JSON.stringify(params)).then(res=>{
if(res.success){
this.commentRankData=res.data;
}
})
},
//本月评论排行
commentRaking(){
let params={};
var myDate = new Date();
var curMonth=myDate.getMonth(); //获取当前月份(0-11,0代表1月);
params.fyId=32;//传法院id,固定写死32,是固定的高院内网所以传 32
params.byMonth=curMonth;//按月
console.log('当前月份==',curMonth);//当前月份
commentRaking(JSON.stringify(params)).then(res=>{
if(res.success){
this.commentRankData=res.data;
}
})
},
returnEvent(item,index){
// if(!user.id){
// this.$message({
......@@ -407,6 +458,8 @@ export default {
// this.msg = this.$router.history.current.query.name;
this.newsDetailFun(this.$router.history.current.query.newsId);
this.messageDetail(this.$router.history.current.query.newsId);//获取评论详情
// this.commentRaking();//获取本月评论排行
this.monthClickRanking();//获取本月阅读排行
},
newsDetailFun(val){
newsDetail({newsId:val}).then(res=>{
......@@ -432,10 +485,17 @@ export default {
switchBtn(i) {
console.log("111===", i);
this.activeItem = i;
if(this.activeItem==0){
this.monthClickRanking();//本月阅读排行
}else{
this.commentRaking();//获取评论排行
}
},
//发表评论
commentEvent(type,content,newsId){
commentEvent(type,content,commentId){
var oldContent=content;
// console.log('',newsId);
// console.log('',newsId)
var params={};
// type=1是回复,type=0是发表评论
......@@ -451,7 +511,7 @@ export default {
}
params.content=this.commentContent;
params.newsId=newsId;
params.newsId=this.$router.history.current.query.newsId;
}
if(type==1){
......@@ -463,8 +523,11 @@ export default {
return;
}
params.content=oldContent+'回复:'+this.reCommentContent+'。';
params.newsId=newsId;
// params.content=oldContent+'回复:'+this.reCommentContent+'。';
params.content='回复:'+this.reCommentContent+'。';
params.newsId=this.$router.history.current.query.newsId;
params.parentId=commentId;
}
createMessage(JSON.stringify(params)).then(res=>{
this.messageDetail(this.$router.history.current.query.newsId);
......
......@@ -4,19 +4,38 @@
<!-- 顶部标题工具栏 -->
<el-row >
<el-col class="" :span="18" :offset="3">
<div style="float:right;margin-top:15px;color:#D33237;font-size:10px;padding-right:25px;">
<div v-if="!userInfo.id" @click="loginEvent" class="k-flex k-align-center">
<div>
<el-image style="width:15px;height:16px;display:block;margin-right:5px;" :src="require('../assets/home/denglu.png')"></el-image>
</div>
<div>登录</div>
</div>
<div v-if="userInfo.id" class="k-flex k-align-center">
<el-image style="width:15px;height:16px;display:block;margin-right:5px;" :src="require('../assets/home/denglu.png')"></el-image>
<div class="center-txt mr-10" v-if="userInfo.id">
法院:{{ userInfo.courtCode }}&ensp;部门:{{ userInfo.dept?userInfo.dept.name:'' }}&ensp;姓名:{{ userInfo.nickName }}
</div>
<div @click="loginOut" class="k-flex k-align-center">
<el-image style="width:15px;height:16px;display:block;margin-right:5px;" :src="require('../assets/home/tuichu.png')"></el-image>
<div>退出</div>
</div>
</div>
</div>
<el-row :gutter="4" class="top-content">
<el-col :span="9" class="top-title">
<!-- <el-image style="width:100%;display:block;" :src="require('../assets/home/top.png')"></el-image> -->
<!-- <el-col :span="9" class="top-title">
<img :src="require('../assets/iconImg/01-首页/logo.png')" alt="" />
<div class="title-txt">广西法院内部信息网</div>
<!--&ensp;|&ensp;-->
<!--<div class="title-txt">会议管理模块</div>-->
</el-col>
<el-col :span="10">
<div class="center-txt" v-if="userInfo.id">
法院:{{ userInfo.courtCode }}&ensp;部门:{{ userInfo.dept?userInfo.dept.name:'' }}&ensp;姓名:{{ userInfo.nickName }}
</div>
</el-col>
<el-col :span="5" class="top-btn">
<el-col :span="5" class="top-btn"> -->
<!-- <div class="top-btn-item">
<img
:src="require('../assets/iconImg/01-首页/使用手册.png')"
......@@ -31,11 +50,11 @@
/>
<div class="top-btn-item-text">系统设置</div>
</div> -->
<div @click="loginOut" class="top-btn-item" v-if="userInfo.id">
<!-- <div @click="loginOut" class="top-btn-item" v-if="userInfo.id">
<img :src="require('../assets/iconImg/01-首页/退出.png')" alt="" />
<div class="top-btn-item-text">退出</div>
</div>
</el-col>
</el-col> -->
</el-row>
</el-col>
</el-row>
......@@ -103,6 +122,12 @@ export default {
location.href = res.data;
});
},
//登录
loginEvent(){
removeToken();
console.log('loginURL222222222222==',process.env.VUE_APP_LOGIN_API);
location.href = process.env.VUE_APP_LOGIN_API
},
},
};
</script>
......@@ -125,13 +150,18 @@ export default {
}
}
.top-content {
position:relative;
width: 100%;
height: 12vh;
display: flex;
justify-content: center;
align-items: center;
padding: 10px 15px;
padding: 15px 15px;
// background-image: url("../assets/iconImg/01-首页/头部背景图.png");
background-image: url("../assets/home/top.png");
background-repeat: no-repeat;
background-position: center center;
background-size: cover;
}
.top-title {
display: flex;
......
......@@ -8,7 +8,6 @@
<el-row :gutter="20" class="mt-15 first-zone-style">
<el-col :span="10" style="padding-left:0;padding-right:0;">
<div >
<el-carousel style="border-radius:8px;" height="500px" indicator-position="outside" :interval="4000">
<el-carousel-item style="border-radius:8px;" v-for="(item,index) in headlineRotation" :key="index">
<div v-if="item.attInfoList.length>0" class="carousel-div" style="border-radius:8px;" @click="setParams(item)">
<el-image :src="item.attInfoList[0].downloadPath" fit="contain" style="width:100%;height:100%;"></el-image>
......@@ -97,7 +96,7 @@
<!--第二栏按钮列表开始-->
<el-row class="mt-15 out-zone-style" :gutter="10" >
<el-col class="mb-10" :span="3" v-for="(item,index) in btnsList" :key="index">
<el-button>
<el-button style="width:120px;">
<el-image class="mr-5 gong-icon" :src="item.icon"></el-image>
{{item.name}}
</el-button>
......@@ -342,7 +341,7 @@
<el-col :span="13">
<div class="k-flex-between-center">
<div class="k-flex k-align-center">
<img class="mr-5 gong-icon" style="" src="../../assets/home/gonggao.png"/>
<img class="mr-5 gong-icon" style="" src="../../assets/home/third.png"/>
<div>法院业务</div>
</div>
<div style="font-size:12px;color: #999999;">
......@@ -476,7 +475,7 @@
<div class="zone-style">
<div class="k-flex-between-center">
<div class="k-flex k-align-center">
<img class="mr-5 gong-icon" style="" src="../../assets/home/gonggao.png"/>
<img class="mr-5 gong-icon" style="" src="../../assets/home/fourth.png"/>
<div>干警作品</div>
</div>
<div style="font-size:12px;color: #999999;">
......@@ -551,7 +550,7 @@
<el-row :gutter="20">
<el-col :span="4" >
<div class="k-flex k-center mt-10 info-tap">
<el-image style="width:35px;" :src="require('../../assets/home.png')"></el-image>
<el-image style="width:35px;" :src="require('../../assets/home/bottom.png')"></el-image>
<div class="ml-10" style="font-weight:bold;font-size:15px;">
<div>
全国高院
......@@ -786,95 +785,95 @@ export default {
],
btnsList:[
{
icon:require("../../assets/home/btns/menhu.png"),
icon:require("../../assets/home/btns/1-1.png"),
name:'综合门户',
},
{
icon:require("../../assets/home/btns/gongwenshouwen.png"),
icon:require("../../assets/home/btns/1.png"),
name:'公文汇总',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/2.png"),
name:'法律总库',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/3.png"),
name:'法律法规',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/4.png"),
name:'数据集中',
},
// {
// icon:require("../../assets/home/btns/5.png"),
// name:'公文汇总',
// },
{
icon:require("../../assets/home/head/1.png"),
name:'公文汇总',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/5.png"),
name:'即时通讯',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/6.png"),
name:'办公系统',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/7.png"),
name:'公文处理',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/8.png"),
name:'内部邮件',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/9.png"),
name:'院务公告',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/10.png"),
name:'手机短信',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/11.png"),
name:'工作流程',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/12.png"),
name:'文章简章',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/13.png"),
name:'人员查询',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/14.png"),
name:'科技法庭',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/15.png"),
name:'通讯录',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/16.png"),
name:'文书上网',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/17.png"),
name:'图书馆',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/18.png"),
name:'执行文书',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/19.png"),
name:'人民法院内网',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/20.png"),
name:'智能报表',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/21.png"),
name:'移动微学苑',
},
],
......
<template>
<div>
<el-row >
<el-col class="my-menu" :span="18" :offset="3">
<div class="nav k-flex-between-center">
<div class="nav-a">
<ul class="nav-a-ul">
<li class="nav-a-li" :class="classA == index ? 'active' : '' " @click="selected(index)" v-for="(item,index) in configNav" :key="index">
<router-link :to='item.path' class="nav-a-text" @click="showToggle(index)">{{item.name}}</router-link>
<div v-if="item.subItems" class="submenu-container" >
<ul class="menu_ul" :class="{'active' :index===isShow}">
<li class="menu_li" v-for = "(nav,index) in item.subItems" :class="classB == nav ? 'active' : '' " @click="menuselected(nav)" :key="index">
<router-link class="menu_ul_text" :to="nav.link" :class="{'active':nav.link == linkClick}" @click = "treeNavSwitch(nav)">{{nav.text}}</router-link>
</li>
</ul>
</div>
</li>
</ul>
</div>
<div class="k-flex seach-input k-align-center" style="width:180px;">
<el-input
placeholder="请输入内容"
clearable>
<i @click="searchEvent" slot="suffix" class="el-input__icon el-icon-search"></i>
</el-input>
</div>
</div>
</el-col>
</el-row>
</div>
</template>
<script>
export default {
data(){
return{
classA: 0,
classB: 0,
isShow: 0,
linkClick: "",
configNav: [
{
name: "首页",
path:'homePage',
},
{
name: "法院新闻",
path:'',
subItems:[
{ link:'/education',text: '教学管理系统'},
{ link:'/yingxiaozhaosheng',text: '营销招生系统' },
{ link:'',text: '视频直播系统' },
{ link:'',text: '个性化定制服务' }
]
},
{
name: "工作信息",
path:'/show',
},
{
name: "法院业务",
path:'/aboutour',
},
{
name: "干警作品",
path:'/aboutour',
},
{
name: "娱乐",
path:'/aboutour',
},
{
name: "全区法院",
path:'/aboutour',
},
{
name: "信息发布系统",
path:'/aboutour',
},
]
}
},
methods:{
selected(){},
menuselected(){},
}
}
</script>
<style lang="scss" scoped>
// 路由导航
// .el-menu--horizontal>.el-menu-item{
// background-color: rgb(58, 94, 131);
// color:#fff;
// }
// .el-menu--horizontal>.el-menu-item{
// border-bottom:none;
// background:rgb(58, 94, 131);
// }
// .el-menu--horizontal>.el-menu-item{
// background:rgb(22, 22, 22)!important;
// height:40px;
// line-height:40px;
// margin-right:10px;
// border-radius:5px 5px 0 0;
// font-size:12px;
// font-weight:bold;
// }
// .el-menu--horizontal>.el-menu-item.is-active{
// background-color: rgb(58, 94, 131)!important;
// }
// .el-menu.el-menu--horizontal{
// border-bottom:none;
// }
// .icon-size{
// font-size:15px;margin-right:5px;
// }
ul,li{
padding:0;
margin:0;
}
.nav {
width: 100%;
// min-width: 1300px;
height: auto;
margin: 0px auto;
// position: absolute;
// position: relative;
border-bottom: none;
line-height: 65px;
// padding:5px 0;
background: #D33237;
box-sizing:border-box;
// box-sizing:border-box;
border-radius:7px;
padding:0 15px;
}
.nav-a {
cursor: pointer;
// float: left;
// margin-left: 50px;
letter-spacing: 4px;
position: relative;
text-align:center;
}
.nav-a-ul {
list-style: none;
line-height:50px;
}
.nav-a-li {
position: relative;
display: inline-block;
// margin-left: 30px;
// height: 60px;
margin:0 20px;
}
.nav-a-text {
font-size: 14px;
color: #fff;
// line-height: 58px;
font-weight:bold;
text-decoration: none;
}
.menu_ul{
list-style: none;
background: #fff;
border-radius: 3px;
z-index: 999;
// position: absolute;
// display:flex;
// flex-wrap: wrap;
// white-space:nowrap;
// display: none;
// margin-top:10px;
}
.submenu-container {
// width: 130px;
// top: 58px;
// left: 67px;
// left:0;
// display: none;
margin-top:10px;
width: 100%;
position:absolute;
width:300px;
border:1px solid #ccc;
border-radius:5px;
padding:15px;
z-index:19;
background: #fff;
box-shadow: -5px 0px 20px 5px rgba(0,0,0,0.05);
}
.menu_li {
float:left;
height: 30px;
line-height: 30px;
padding:0 10px;
margin-bottom:10px;
border-right:1px solid #eee;
// padding-left: 12px;
}
.menu_ul_text {
font-size: 14px;
color: #666;
letter-spacing: 0;
line-height: 30px;
height:30px;
text-decoration: none;
padding-left: 6px;
}
.nav-a-li:hover{
position: absolute;
// display:inline-block;
// border-bottom: 2px solid #fff !important;
border-bottom: 2px solid red !important;
box-sizing:border-box;
}
.nav-a-li.active {
// border-bottom: 2px solid #fff;
}
.nav-a-li:active {
border-bottom: 2px solid #fff;
}
// .nav-a-li:hover .menu_ul {
// display: block;
// }
.nav-a-li:hover .submenu-container {
display: block;
}
.menu_ul_text:hover {
color: #2589ff;
}
.menu_li.active .menu_ul_text{
color: #2589ff;
}
.search-container{
// position:relative;
width: 100%;
height: 500px;
background-image: url(../../assets/pic.jpg);
background-repeat: no-repeat;
background-size: 100% 100%;
}
.index-div{
position:absolute;
width: 100%;
border-radius: 5px;
top:30%;
}
.indexConFind{
// position:absolute;
width: 60%;
height: 180px;
background-color: rgba(5, 23, 17, 0.21);
margin: 0 auto;
// top:20%;
border-radius: 5px;
}
.seach-input{
width:60%;
}
</style>
......@@ -60,6 +60,7 @@
ref="multipleTable"
:data="manageList"
style="width: 100%"
height="550"
@selection-change="handleSelectionChange1">
<el-table-column
......@@ -355,6 +356,7 @@
tooltip-effect="dark"
style="width: 100%"
border
height="550"
@selection-change="handleSelectionChange2">
<el-table-column
type="selection"
......@@ -448,8 +450,9 @@
<span slot="label"><i class="el-icon-date"></i>收报信息</span>
<el-table
border
height="550"
ref="multipleTable"
:data="manageTableData"
:data="reportList"
tooltip-effect="dark"
style="width: 100%"
@selection-change="handleSelectionChange3">
......@@ -498,7 +501,7 @@
>
<template slot-scope="scope">
<el-button
@click="leaveDia(scope.row.id)"
@click="leaveDia(scope.row.newsId)"
type="text"
size="small">
留言
......@@ -823,10 +826,13 @@
:before-close="handleComment">
<div>
<el-table
:data="messageDetailData"
:data="messageDetailDataList"
border
:header-cell-style="{'text-align':'center','color':'#606266'}"
style="width: 100%">
style="width: 100%"
row-key="id"
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column
prop="content"
label="评论内容"
......@@ -962,9 +968,13 @@
<el-checkbox :label="'15'" >组织生活会</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="内容">
<!-- <div style="text-align:center;margin:15px auto;">文章内容</div> -->
<div class="mb-15" style="width:100%;">
<vue-ueditor-wrap v-model="newsFormEdit.content" :config="myConfig" vue-ueditor-wrap></vue-ueditor-wrap>
<!-- <vue-ueditor-wrap ref="introduction" v-model="newsFormEdit.content" :config="myConfig" vue-ueditor-wrap></vue-ueditor-wrap> -->
<div v-html="newsFormEdit.content"></div>
</div>
</el-form-item>
<el-form-item align="center">
<!-- //创建未提交审核保存为5,提交审核为4,审核不通过为3,通过已发布为1 -->
<el-button type="primary" @click="updateNews('1')">通过</el-button>
......@@ -1030,30 +1040,14 @@
width="40%"
:before-close="handleCloseLeave">
<div>
<!-- <el-table
:data="messageDetailData"
border
style="width: 100%">
<el-table-column
prop="date"
label="日期"
width="180">
</el-table-column>
<el-table-column
prop="name"
label="姓名"
width="180">
</el-table-column>
<el-table-column
prop="address"
label="地址">
</el-table-column>
</el-table> -->
<el-table
:data="messageDetailData"
:data="messageDetailDataList"
border
:header-cell-style="{'text-align':'center','color':'#606266'}"
style="width: 100%">
style="width: 100%"
row-key="id"
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column
prop="content"
label="评论内容"
......@@ -1145,6 +1139,7 @@ export default {
},
data() {
return {
messageDetailDataList:[],
delFileList:[],//删除附件
userInfo:{},//用户信息
// selectData:'',//所属部门
......@@ -1894,7 +1889,19 @@ export default {
// params.newsId='f4bf8ffc4ec54e98a180f36b95668ec6';
messageDetail(JSON.stringify(params)).then(res=>{
if(res.success){
this.messageDetailData=res.data;
this.messageDetailDataList=res.data;
//改变回复的属性名
this.messageDetailDataList.forEach(item=>{
if(item.subComments){
item.children=item.subComments;
delete item.subComments;
// item = JSON.parse(JSON.stringify(item).replace(/subComments/g, 'children'))
}
})
console.log('this.messageDetailDataList==',this.messageDetailDataList)
// this.messageDetailDataList = JSON.parse(JSON.stringify(this.messageDetailData).replace(/subComments/g, 'children'))
//navigationName 修改前的属性名 name要修改的属性名
}
})
this.commentDialog=true;
......@@ -2015,6 +2022,7 @@ export default {
}
})
this.auditVisible=true;
// this.$refs.introduction.setDisabled();
},
// 审核列表--关闭审核弹窗
handleCloseAudit(){
......@@ -2076,11 +2084,19 @@ export default {
// 收报信息--留言
leaveDia(newsId){
let params={};
params.newsId=newsId;
// params.newsId='f4bf8ffc4ec54e98a180f36b95668ec6';
// params.newsId=newsId;
params.newsId='f4bf8ffc4ec54e98a180f36b95668ec6';
messageDetail(JSON.stringify(params)).then(res=>{
if(res.success){
this.messageDetailData=res.data;
this.messageDetailDataList=res.data;
this.messageDetailDataList.forEach(item=>{
//改变回复的属性名
if(item.subComments){
item.children=item.subComments;
delete item.subComments;
}
})
console.log('this.messageDetailDataList==',this.messageDetailDataList)
}
})
this.leaveVisible=true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment