Skip to content

S
SuperMan
Commit d6c041be authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 7fcf7f1c
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 103 deletions
src/components/systemLogs.vue
View file @ d6c041be
<style> <style>
.sysLog_Content{ .sysLog_Content {
border-left:2px solid #D2D2D2; border-left: 2px solid #D2D2D2;
margin:40px 0 0 40px; margin: 40px 0 0 40px;
} }
.sysLog_List{
position: relative; .sysLog_List {
margin:0 0 20px 16px; position: relative;
} margin: 0 0 20px 16px;
.sysCircle{ }
display: inline-block;
width:13px; .sysCircle {
height:13px; display: inline-block;
background-color: #36AF84; width: 13px;
border:2px solid #58D2A7; height: 13px;
border-radius:50%; background-color: #36AF84;
margin-right:10px; border: 2px solid #58D2A7;
position: relative; border-radius: 50%;
top:-4px; margin-right: 10px;
} position: relative;
.sysFirDate{ top: -4px;
color:#38425D; }
font-weight: bold;
font-size:12px; .sysFirDate {
position: relative; color: #38425D;
top:-4px; font-weight: bold;
} font-size: 12px;
.sysContent_main{ position: relative;
width:894px; top: -4px;
min-height: 101px; }
background-color: #fff;
border:1px solid #E5E5E5; .sysContent_main {
border-radius:8px; width: 894px;
margin-top:10px; min-height: 101px;
color:#333333; background-color: #fff;
font-size:14px; border: 1px solid #E5E5E5;
padding:20px; border-radius: 8px;
} margin-top: 10px;
.sysPosi_div{ color: #333333;
margin:-4px 0 0 -24px; font-size: 14px;
} padding: 20px;
.sysCircle_other{ }
width:13px;
height:13px; .sysPosi_div {
display: inline-block; margin: -4px 0 0 -24px;
border-radius: 50%; }
background-color: #B1B1B1;
border:2px solid #EFEFEF; .sysCircle_other {
margin-right:10px; width: 13px;
<<<<<<< HEAD height: 13px;
======= display: inline-block;
position: relative; border-radius: 50%;
top:-3px; background-color: #B1B1B1;
>>>>>>> 8e6bb64928beef82a7e4f060b1248eaebd93e197 border: 2px solid #EFEFEF;
} margin-right: 10px;
.sysFirDate_other{ position: relative;
color:#38425D; top: -3px;
font-size:12px; }
<<<<<<< HEAD
======= .sysFirDate_other {
position: relative; color: #38425D;
top:-4px; font-size: 12px;
>>>>>>> 8e6bb64928beef82a7e4f060b1248eaebd93e197 position: relative;
} top: -4px;
}
</style> </style>
<template> <template>
<div class="sysLog_Content"> <div class="sysLog_Content">
<div class="sysLog_List" v-for="(item,index) in dataList"> <div class="sysLog_List" v-for="(item,index) in dataList">
<div class="sysPosi_div"> <div class="sysPosi_div">
<span class="sysCircle" v-if="index==0"></span> <span class="sysCircle" v-if="index==0"></span>
<span class="sysCircle_other" v-else></span> <span class="sysCircle_other" v-else></span>
<<<<<<< HEAD <span style="font-size:14px;margin-right:20px;position:relative;top:-4px;">{{item.UpdateTitle}}</span>
<span style="font-size:14px;margin-right:20px;">{{item.UpdateTitle}}</span> <span class="sysFirDate" v-if="index==0">{{item.UpdateTimeStr}}</span>
======= <span class="sysFirDate_other" v-else>{{item.UpdateTimeStr}}</span>
<span style="font-size:14px;margin-right:20px;position:relative;top:-4px;">{{item.UpdateTitle}}</span> </div>
>>>>>>> 8e6bb64928beef82a7e4f060b1248eaebd93e197 <div class="sysContent_main" v-html="item.UpdateContent">
<span class="sysFirDate" v-if="index==0">{{item.UpdateTimeStr}}</span> </div>
<span class="sysFirDate_other" v-else>{{item.UpdateTimeStr}}</span>
</div>
<div class="sysContent_main" v-html="item.UpdateContent">
</div>
</div>
</div> </div>
</div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
msg:{ msg: {
pageIndex:1, pageIndex: 1,
pageSize:15 pageSize: 15
}, },
dataList:[], dataList: [],
}; };
}, },
methods: { methods: {
getList() { getList() {
this.apipost("sysrecord_get_GetPageList",this.msg,res => { this.apipost("sysrecord_get_GetPageList", this.msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
<<<<<<< HEAD }
console.log(this.dataList,'datalist'); },
======= err => {}
>>>>>>> 8e6bb64928beef82a7e4f060b1248eaebd93e197 );
} else { },
this.Error(res.data.message);
}
},
err => {}
);
},
}, },
mounted() { mounted() {
this.getList(); this.getList();
} }
}; };
</script> </script>
\ No newline at end of file
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