|
|
@@ -7,7 +7,7 @@
|
|
|
<p class="index_headetab">
|
|
|
<span :class="[num == index ? ' spanto' : '']" v-for="(item,index) in editableTabs" :key="index" @click="tabSbu(item.dictValue)">{{item.dictLabel}}</span>
|
|
|
</p>
|
|
|
- <div style="height: 80%;">
|
|
|
+ <div style="height: 87%;">
|
|
|
<ul class="index_headerUl">
|
|
|
<li v-for="(item,index) in configList" :key="index">
|
|
|
<img src="../assets/images/icon_list_sj.png" alt="">
|
|
|
@@ -21,11 +21,11 @@
|
|
|
@size-change="handleSizeChange"
|
|
|
@current-change="handleCurrentChange"
|
|
|
:current-page.sync="currentPage3"
|
|
|
- :page-size="pageSize"
|
|
|
+ :page-size="queryParams.pageSize"
|
|
|
layout="prev, pager, next, jumper"
|
|
|
:total="total">
|
|
|
</el-pagination>
|
|
|
- <span>共 {{total}} 条 每页显示 6 条 </span>
|
|
|
+ <span>共 {{total}} 条 每页显示 8 条 </span>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -110,8 +110,8 @@
|
|
|
</p>
|
|
|
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">
|
|
|
<el-tab-pane label="用户管理" name="first"> -->
|
|
|
- <div style="height: 67%;">
|
|
|
- <div style="height: 80%;">
|
|
|
+ <div style="height: 84%;">
|
|
|
+ <div style="height: 85%;">
|
|
|
<h3 style="text-align: center;">{{tieku}}</h3>
|
|
|
<p class="index_profilep" > {{comg}} </p>
|
|
|
</div>
|
|
|
@@ -177,7 +177,7 @@
|
|
|
<span>
|
|
|
{{item.remind_time}}
|
|
|
</span>
|
|
|
- <img src="../assets/images/deletety.png" alt="">
|
|
|
+ <img src="../assets/images/deletety.png" alt="" v-if="shower">
|
|
|
</div>
|
|
|
</li>
|
|
|
|
|
|
@@ -202,7 +202,7 @@
|
|
|
<div class="index_memoranduMailnav">
|
|
|
<div class="tab_tol">
|
|
|
<el-table stripe v-loading="loading" :data="postList.rows" @selection-change="handleSelectionChange">
|
|
|
- <el-table-column :label="item.columnComment" align="center" :prop="item.columnName" v-for="(item,index) in postList.tableHeadList" :key="index" width="75px" />
|
|
|
+ <el-table-column :label="item.columnComment" align="center" :prop="item.columnName" v-for="(item,index) in postList.tableHeadList" :key="index" />
|
|
|
</el-table>
|
|
|
</div>
|
|
|
<div class="index_haderPagin index_haderPaginfoiu">
|
|
|
@@ -283,7 +283,7 @@ export default {
|
|
|
table:'sys_notice',
|
|
|
orderBy:'create_time desc',
|
|
|
pageNo:1,
|
|
|
- pageSize:6,
|
|
|
+ pageSize:10,
|
|
|
fixedData:{
|
|
|
condition:{
|
|
|
notice_type:1
|
|
|
@@ -426,6 +426,7 @@ export default {
|
|
|
newPassword: undefined,
|
|
|
confirmPassword: undefined
|
|
|
},
|
|
|
+ shower:true, //判断删除图标是否显示
|
|
|
}
|
|
|
};
|
|
|
},
|
|
|
@@ -450,21 +451,23 @@ export default {
|
|
|
// let ary = []
|
|
|
var that = this
|
|
|
// console.log(that.calendarData,887)
|
|
|
- for (var i = 0 ; i < that.calendarData.length; i++) {
|
|
|
- // that.ary.push(that.calendarData[i].startDate)
|
|
|
- // that.ary.push(that.calendarData[i].begin_time.slice(0,10))
|
|
|
- // that.ary.push(that.calendarData[i].all_date.split(','))
|
|
|
- that.calendarData[i].love="yu"
|
|
|
- if(that.calendarData[i].all_date !== undefined){
|
|
|
- // that.rjtu.concat(that.calendarData[i].all_date.join(','))
|
|
|
- that.ary.push(that.calendarData[i].all_date.join(','))
|
|
|
- // that.calendarData[i].all_date.fi
|
|
|
- that.calendarData[i].all_date.filter(route => {
|
|
|
- // console.log(route,9875)
|
|
|
- that.ary.push(route)
|
|
|
- })
|
|
|
- // that.ary = that.calendarData[i].all_date
|
|
|
- // console.log(that.calendarData[i].all_date.join(','),754)
|
|
|
+ if(that.calendarData.length !==null){
|
|
|
+ for (var i = 0 ; i < that.calendarData.length; i++) {
|
|
|
+ // that.ary.push(that.calendarData[i].startDate)
|
|
|
+ // that.ary.push(that.calendarData[i].begin_time.slice(0,10))
|
|
|
+ // that.ary.push(that.calendarData[i].all_date.split(','))
|
|
|
+ that.calendarData[i].love="yu"
|
|
|
+ if(that.calendarData[i].remind_time !== undefined){
|
|
|
+ // that.rjtu.concat(that.calendarData[i].all_date.join(','))
|
|
|
+ that.ary.push(that.calendarData[i].remind_time)
|
|
|
+ // that.calendarData[i].all_date.fi
|
|
|
+ // that.calendarData[i].remind_time.filter(route => {
|
|
|
+ // // console.log(route,9875)
|
|
|
+ // that.ary.push(route)
|
|
|
+ // })
|
|
|
+ // that.ary = that.calendarData[i].all_date
|
|
|
+ // console.log(that.calendarData[i].all_date.join(','),754)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
console.log(that.ary)
|
|
|
@@ -477,6 +480,7 @@ export default {
|
|
|
content (date) {
|
|
|
console.log(date,37645)
|
|
|
let data = date
|
|
|
+ let datase = date
|
|
|
let content = ''
|
|
|
let conert = ''
|
|
|
let conertre = ''
|
|
|
@@ -486,17 +490,25 @@ export default {
|
|
|
this.truew = []
|
|
|
console.log(this.calendarData)
|
|
|
// console.log(data,37645)
|
|
|
+
|
|
|
for (var i = 0 ; i < this.calendarData.length; i++) {
|
|
|
+ if(data == this.calendarData[i].remind_time){
|
|
|
+
|
|
|
+ }
|
|
|
// if (date === this.calendarData[i].begin_time) {
|
|
|
// console.log(this.calendarData[i])
|
|
|
- if(this.calendarData[i].all_date !== undefined){
|
|
|
- console.log(this.calendarData[i].all_date.includes(data))
|
|
|
- if(this.calendarData[i].all_date.includes(data) == true){
|
|
|
- console.log(this.calendarData[i].all_date.includes(data))
|
|
|
- this.truew.push(this.calendarData[i].all_date.includes(data))
|
|
|
- console.log(this.truew)
|
|
|
- if(this.truew.length >1){
|
|
|
- content = content + ',' + this.calendarData[i].schedule_content
|
|
|
+ // if(this.calendarData[i].remind_time !== undefined){
|
|
|
+ // console.log(this.calendarData[i].all_date.includes(data))
|
|
|
+ // 多个时间
|
|
|
+ // if(this.calendarData[i].remind_time.includes(data) == true){
|
|
|
+ // console.log(this.calendarData[i].all_date.includes(data))
|
|
|
+ // 多个时间
|
|
|
+ // this.truew.push(this.calendarData[i].remind_time.includes(data))
|
|
|
+ // console.log(this.truew)
|
|
|
+ // 多个时间
|
|
|
+ // if(this.truew.length >1){
|
|
|
+ // 多个时间
|
|
|
+ // content = content + ',' + this.calendarData[i].schedule_content
|
|
|
// nujeug = content.split(',')
|
|
|
// for(var i = 0 ; i < nujeug.length; i++){
|
|
|
// if (setre.indexOf(nujeug[i]) === -1) {
|
|
|
@@ -506,13 +518,20 @@ export default {
|
|
|
// content = setre.join(',')
|
|
|
// setre = [...new set(nujeug)]
|
|
|
// conert = setre.join(',')
|
|
|
- }else{
|
|
|
- content = this.calendarData[i].schedule_content
|
|
|
- }
|
|
|
+ // }else{
|
|
|
+ // if(datase == date){
|
|
|
+ // content = this.calendarData[i].schedule_content + content + ','
|
|
|
+ // console.log(1234567543)
|
|
|
+ // }else{
|
|
|
+ // content = this.calendarData[i].schedule_content
|
|
|
+ // console.log(1239545)
|
|
|
+ // }
|
|
|
+ // content = this.calendarData[i].schedule_content
|
|
|
+ // }
|
|
|
|
|
|
// content = this.calendarData[i].schedule_content
|
|
|
// return content
|
|
|
- }
|
|
|
+ // }
|
|
|
console.log(content)
|
|
|
// if(this.calendarData[i].all_date.includes(data) == false){
|
|
|
// console.log(this.calendarData[i].all_date.includes(data))
|
|
|
@@ -521,36 +540,9 @@ export default {
|
|
|
|
|
|
// }
|
|
|
//
|
|
|
- }
|
|
|
+ // }
|
|
|
// return content
|
|
|
// }
|
|
|
-
|
|
|
- // if(this.calendarData[i].all_date !== undefined){
|
|
|
- // for(var j= 0 ; j<this.calendarData[i].all_date.length; j++){
|
|
|
- // // if(data == this.calendarData[i].all_date[j]){
|
|
|
- // // // console.log(124)
|
|
|
- // // // console.log(this.calendarData[i])
|
|
|
- // // // content = this.calendarData[i].schedule_content
|
|
|
- // // // console.log(content)
|
|
|
- // // }else if(data !== this.calendarData[i].all_date[j]){
|
|
|
- // // content = this.calendarData[i].schedule_content
|
|
|
- // // console.log(876543)
|
|
|
- // // console.log(content)
|
|
|
- // // }
|
|
|
- // }
|
|
|
- // // this.calendarData[i].all_date.filter(route => {
|
|
|
- // // if(data == route){
|
|
|
- // // console.log(124)
|
|
|
- // // console.log(route.schedule_content)
|
|
|
- // // content = route.schedule_content
|
|
|
- // // console.log(content)
|
|
|
- // // }else{
|
|
|
- // // console.log(876543)
|
|
|
- // // }
|
|
|
- // // })
|
|
|
- // }
|
|
|
-
|
|
|
- // console.log(route,9875)
|
|
|
// that.ary.push(route)
|
|
|
|
|
|
// if(this.calendarData[i].schedule_content !== undefined){
|
|
|
@@ -564,23 +556,6 @@ export default {
|
|
|
|
|
|
// }
|
|
|
}
|
|
|
- // this.calendarData.filter(route =>{
|
|
|
- // if(route.schedule_content !== undefined){
|
|
|
- // // if(date == route.all_date)
|
|
|
-
|
|
|
- // console.log(route.schedule_content,23456)
|
|
|
- // content = route.schedule_content
|
|
|
- // }
|
|
|
-
|
|
|
- // })
|
|
|
- // if(content.length >1){
|
|
|
- // for(var k = 0 ; k < content.length; k++){
|
|
|
- // console.log(content[i])
|
|
|
- // // if(conertre.indexOf(conert[i])==-1){
|
|
|
- // // conertre+=conert[i];
|
|
|
- // }
|
|
|
- // }
|
|
|
-
|
|
|
console.log(content)
|
|
|
// console.log(this.rjtu,12345)
|
|
|
// content = this.rjtu.join(',')
|
|
|
@@ -655,9 +630,11 @@ export default {
|
|
|
listIndex(this.queryParamstabmemorandum).then(response => {
|
|
|
if(response.data !== undefined){
|
|
|
if(response.data.rows !== null){
|
|
|
+ this.shower = true
|
|
|
this.getmemorandum = response.data.rows;
|
|
|
}else{
|
|
|
- this.getmemorandum.push({memorandum_title:'暂无数据'})
|
|
|
+ this.shower = false
|
|
|
+ this.getmemorandum.push({memorandum_title:'暂无数据',shower:false})
|
|
|
}
|
|
|
console.log(this.getmemorandum,98765)
|
|
|
}
|
|
|
@@ -999,14 +976,14 @@ export default {
|
|
|
.index_headetab{
|
|
|
display: flex;
|
|
|
border-bottom: 1px solid #E5E5E5;
|
|
|
- height: 53px;
|
|
|
+ height: 65px;
|
|
|
padding-top: 10px;
|
|
|
padding-bottom: 10px;
|
|
|
span{
|
|
|
width: 70px;
|
|
|
text-align: center;
|
|
|
- line-height: 43px;
|
|
|
- height: 43px;
|
|
|
+ line-height: 55px;
|
|
|
+ height: 55px;
|
|
|
font-size: 15px;
|
|
|
font-family: PingFang SC;
|
|
|
font-weight: bold;
|
|
|
@@ -1050,7 +1027,7 @@ export default {
|
|
|
// border: 1px solid #eee;
|
|
|
// width: 100%;
|
|
|
padding: 0 20px;
|
|
|
- height: 386px;
|
|
|
+ height: 570px;
|
|
|
background-color: #fff;
|
|
|
position: relative;
|
|
|
border-radius: 6px;
|
|
|
@@ -1059,7 +1036,7 @@ export default {
|
|
|
height: 6px;
|
|
|
position: absolute;
|
|
|
right: 20px;
|
|
|
- top:25px;
|
|
|
+ top:32px;
|
|
|
}
|
|
|
.index_headerUl{
|
|
|
width: 100%;
|
|
|
@@ -1189,9 +1166,9 @@ export default {
|
|
|
}
|
|
|
// 公司概况样式
|
|
|
.index_headeProfile{
|
|
|
- margin-top: 20px;
|
|
|
+ margin-top: 40px;
|
|
|
margin-bottom: 20px;
|
|
|
- height: 316px;
|
|
|
+ height: 590px;
|
|
|
.index_profilep{
|
|
|
|
|
|
font-size: 12px;
|
|
|
@@ -1206,7 +1183,7 @@ export default {
|
|
|
.index_headerImg{
|
|
|
width: 21px;
|
|
|
height: 21px;
|
|
|
- top:9px;
|
|
|
+ top:19px;
|
|
|
}
|
|
|
}
|
|
|
// 备忘录样式
|
yrik