Commit 58a0cdb9 authored by danfuman's avatar danfuman

修改

parent 7cb9ba54
...@@ -330,7 +330,7 @@ li { ...@@ -330,7 +330,7 @@ li {
padding-right: 12px; padding-right: 12px;
padding-left: 12px; padding-left: 12px;
line-height: 21px; line-height: 21px;
font-size: 12px; font-size: 14px;
font-weight: 400; font-weight: 400;
} }
thead { thead {
......
...@@ -224,7 +224,7 @@ export default { ...@@ -224,7 +224,7 @@ export default {
} }
.el-table { .el-table {
.cell { .cell {
font-size: 12px; font-size: 14px;
} }
.el-table__header-wrapper { .el-table__header-wrapper {
min-height: 40px; min-height: 40px;
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</div> </div>
</div> </div>
<div class="content"> <div class="content">
<div class="table-search"> <div class="table-search" v-if="tableDataTotal > 0 && !isSkeleton">
<div class="total">{{tableDataTotal}}</div> <div class="total">{{tableDataTotal}}</div>
<div class="right"> <div class="right">
<span class="add" @click="addEnterprise">添加企业</span> <span class="add" @click="addEnterprise">添加企业</span>
...@@ -68,8 +68,12 @@ ...@@ -68,8 +68,12 @@
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton> <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<div class="empty" v-if="tableDataTotal === 0 && !isSkeleton"> <div class="empty" v-if="tableDataTotal === 0 && !isSkeleton">
<img class="img" src="@/assets/images/project/empty.png"> <img class="img" src="@/assets/images/project/empty.png">
<div class="p1">抱歉,没找到相关数据</div> <div class="p1">您还未添加监控企业</div>
<div class="p2">建议调整关键词或筛选条件,重新搜索</div> <!--<div class="p2">建议调整关键词或筛选条件,重新搜索</div>-->
<div class="empty-btn">
<span class="add" @click="addEnterprise">添加企业</span>
<span class="add1" @click="handleBatch">批量监控</span>
</div>
</div> </div>
</div> </div>
<div class="pagination-box" v-if="tableDataTotal>queryParams.pageSize"> <div class="pagination-box" v-if="tableDataTotal>queryParams.pageSize">
...@@ -218,7 +222,6 @@ ...@@ -218,7 +222,6 @@
methods: { methods: {
async querySubmit() { async querySubmit() {
companyPage(this.queryParams).then(res => { companyPage(this.queryParams).then(res => {
console.log(res)
this.isSkeleton = false; this.isSkeleton = false;
this.tableData=res.rows this.tableData=res.rows
this.tableDataTotal=res.total this.tableDataTotal=res.total
...@@ -501,7 +504,6 @@ ...@@ -501,7 +504,6 @@
margin: 0 auto; margin: 0 auto;
height: 550px; height: 550px;
text-align: center; text-align: center;
border-top: 1px solid #EFEFEF;
.img{ .img{
width: 108px; width: 108px;
height: 108px; height: 108px;
...@@ -517,6 +519,29 @@ ...@@ -517,6 +519,29 @@
font-size: 14px; font-size: 14px;
margin-top: 8px; margin-top: 8px;
} }
.empty-btn{
margin-top: 24px;
span{
width: 88px;
height: 32px;
border-radius: 4px 4px 4px 4px;
line-height: 32px;
text-align: center;
display: inline-block;
font-size: 14px;
cursor: pointer;
}
.add{
color: #0081FF;
border: 1px solid #0081FF;
margin-right: 16px;
}
.add1{
color: #FFFFFF;
background: #0081FF;
border: 1px solid #0081FF;
}
}
} }
} }
::v-deep .dialogAdd{ ::v-deep .dialogAdd{
......
<template> <template>
<!--监控维度设置--> <!--监控维度设置-->
<div class="app-container MonitorSettings"> <div class="app-container MonitorSettings">
<div class="content"> <div class="content" style="height: 100%;">
<div class="m-title">监控维度设置</div> <div class="m-title">监控维度设置</div>
<div class="m-main"> <div class="m-main">
<div class="main-item"> <div class="main-item">
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
rulesDetail({}).then(res => { rulesDetail({}).then(res => {
console.log(res) console.log(res)
if(res.data){ if(res.data){
let dimension=res.data.dimension.split(',');
this.queryParams={ this.queryParams={
pushFrequency:res.data.pushFrequency.toString(), pushFrequency:res.data.pushFrequency.toString(),
receiveMode:res.data.receiveMode.toString(), receiveMode:res.data.receiveMode.toString(),
...@@ -135,14 +135,18 @@ ...@@ -135,14 +135,18 @@
} }
this.startTime =res.data.timePeriodStart this.startTime =res.data.timePeriodStart
this.endTime = res.data.timePeriodEnd this.endTime = res.data.timePeriodEnd
if(res.data.dimension){
let dimension=res.data.dimension.split(',');
for(let item in dimension){ for(let item in dimension){
if (this.arr.indexOf(dimension[item]) == -1) { if (this.arr.indexOf(dimension[item]) == -1) {
console.log(dimension[item])
this.gsfx.push(dimension[item]) this.gsfx.push(dimension[item])
} else { } else {
this.sffx.push(dimension[item]) this.sffx.push(dimension[item])
} }
} }
} }
}
}) })
}) })
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</div> </div>
<div class="content"> <div class="content">
<div class="total">{{tableDataTotal}}</div> <div class="total" v-if="tableDataTotal > 0 && !isSkeleton">{{tableDataTotal}}</div>
<div class="table-item"> <div class="table-item">
<div v-if="tableDataTotal > 0 && !isSkeleton"> <div v-if="tableDataTotal > 0 && !isSkeleton">
<el-table <el-table
...@@ -106,8 +106,8 @@ ...@@ -106,8 +106,8 @@
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton> <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<div class="empty" v-if="tableDataTotal === 0 && !isSkeleton"> <div class="empty" v-if="tableDataTotal === 0 && !isSkeleton">
<img class="img" src="@/assets/images/project/empty.png"> <img class="img" src="@/assets/images/project/empty.png">
<div class="p1">抱歉,没找到相关数据</div> <div class="p1">暂未发现企业风险动态信息</div>
<div class="p2">建议调整关键词或筛选条件,重新搜索</div> <!--<div class="p2">建议调整关键词或筛选条件,重新搜索</div>-->
</div> </div>
</div> </div>
<div class="pagination-box" v-if="tableDataTotal>queryParams.pageSize"> <div class="pagination-box" v-if="tableDataTotal>queryParams.pageSize">
...@@ -374,7 +374,6 @@ ...@@ -374,7 +374,6 @@
el.Array.push({key:i,value:j}) el.Array.push({key:i,value:j})
} }
}) })
console.log(this.tableData)
}) })
}, },
getDetail(name,id) { getDetail(name,id) {
...@@ -802,7 +801,6 @@ ...@@ -802,7 +801,6 @@
margin: 0 auto; margin: 0 auto;
height: 550px; height: 550px;
text-align: center; text-align: center;
border-top: 1px solid #EFEFEF;
.img{ .img{
width: 108px; width: 108px;
height: 108px; height: 108px;
......
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton> <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<div class="empty" v-if="tableDataTotal === 0 && !isSkeleton"> <div class="empty" v-if="tableDataTotal === 0 && !isSkeleton">
<img class="img" src="@/assets/images/project/empty.png"> <img class="img" src="@/assets/images/project/empty.png">
<div class="p1">抱歉,没找到相关数据</div> <div class="p1">当前暂无监控报告</div>
<div class="p2">建议调整关键词或筛选条件,重新搜索</div> <!--<div class="p2">建议调整关键词或筛选条件,重新搜索</div>-->
</div> </div>
<div class="pagination-box" v-if="tableDataTotal>queryParams.pageSize" style="background: #ffffff;margin-top: 16px;padding-right: 16px;"> <div class="pagination-box" v-if="tableDataTotal>queryParams.pageSize" style="background: #ffffff;margin-top: 16px;padding-right: 16px;">
<el-pagination background :current-page="queryParams.pageNum" :page-size="queryParams.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" /> <el-pagination background :current-page="queryParams.pageNum" :page-size="queryParams.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
...@@ -251,7 +251,6 @@ ...@@ -251,7 +251,6 @@
margin: 0 auto; margin: 0 auto;
height: 550px; height: 550px;
text-align: center; text-align: center;
border-top: 1px solid #EFEFEF;
background: #ffffff; background: #ffffff;
.img{ .img{
width: 108px; width: 108px;
......
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