页面修改

src/components/systemLogs.vue

 <style>
-    .sysLog_Content{
-        border-left:2px solid #D2D2D2;
-        margin:40px 0 0 40px;
+  .sysLog_Content {
+    border-left: 2px solid #D2D2D2;
+    margin: 40px 0 0 40px;
   }
-    .sysLog_List{
+
+  .sysLog_List {
     position: relative;
-        margin:0 0 20px 16px;
+    margin: 0 0 20px 16px;
   }
-    .sysCircle{
+
+  .sysCircle {
     display: inline-block;
-        width:13px;
-        height:13px;
+    width: 13px;
+    height: 13px;
     background-color: #36AF84;
-        border:2px solid #58D2A7;
-        border-radius:50%;
-        margin-right:10px;
+    border: 2px solid #58D2A7;
+    border-radius: 50%;
+    margin-right: 10px;
     position: relative;
-        top:-4px;
+    top: -4px;
   }
-    .sysFirDate{
-        color:#38425D;
+
+  .sysFirDate {
+    color: #38425D;
     font-weight: bold;
-        font-size:12px;
+    font-size: 12px;
     position: relative;
-        top:-4px;
+    top: -4px;
   }
-    .sysContent_main{
-        width:894px;
+
+  .sysContent_main {
+    width: 894px;
     min-height: 101px;
     background-color: #fff;
-        border:1px solid #E5E5E5;
-        border-radius:8px;
-        margin-top:10px;
-        color:#333333;
-        font-size:14px;
-        padding:20px;
+    border: 1px solid #E5E5E5;
+    border-radius: 8px;
+    margin-top: 10px;
+    color: #333333;
+    font-size: 14px;
+    padding: 20px;
   }
-    .sysPosi_div{
-        margin:-4px 0 0 -24px;
+
+  .sysPosi_div {
+    margin: -4px 0 0 -24px;
   }
-    .sysCircle_other{
-        width:13px;
-        height:13px;
+
+  .sysCircle_other {
+    width: 13px;
+    height: 13px;
     display: inline-block;
     border-radius: 50%;
     background-color: #B1B1B1;
-        border:2px solid #EFEFEF;
-        margin-right:10px;
-<<<<<<< HEAD
-=======
+    border: 2px solid #EFEFEF;
+    margin-right: 10px;
     position: relative;
-        top:-3px;
->>>>>>> 8e6bb64928beef82a7e4f060b1248eaebd93e197
+    top: -3px;
   }
-    .sysFirDate_other{
-        color:#38425D;
-        font-size:12px;
-<<<<<<< HEAD
-=======
+
+  .sysFirDate_other {
+    color: #38425D;
+    font-size: 12px;
     position: relative;
-        top:-4px;
->>>>>>> 8e6bb64928beef82a7e4f060b1248eaebd93e197
+    top: -4px;
   }
+
 </style>
 
 <template>
@@ -70,16 +72,11 @@
       <div class="sysPosi_div">
         <span class="sysCircle" v-if="index==0"></span>
         <span class="sysCircle_other" v-else></span>
-<<<<<<< HEAD
-                <span style="font-size:14px;margin-right:20px;">{{item.UpdateTitle}}</span>
-=======
         <span style="font-size:14px;margin-right:20px;position:relative;top:-4px;">{{item.UpdateTitle}}</span>
->>>>>>> 8e6bb64928beef82a7e4f060b1248eaebd93e197
         <span class="sysFirDate" v-if="index==0">{{item.UpdateTimeStr}}</span>
         <span class="sysFirDate_other" v-else>{{item.UpdateTimeStr}}</span>
       </div>
       <div class="sysContent_main" v-html="item.UpdateContent">
-
       </div>
     </div>
   </div>
@@ -88,24 +85,18 @@
   export default {
     data() {
       return {
-          msg:{
-            pageIndex:1,
-            pageSize:15
+        msg: {
+          pageIndex: 1,
+          pageSize: 15
         },
-          dataList:[],
+        dataList: [],
       };
     },
     methods: {
       getList() {
-            this.apipost("sysrecord_get_GetPageList",this.msg,res => {
+        this.apipost("sysrecord_get_GetPageList", this.msg, res => {
             if (res.data.resultCode == 1) {
               this.dataList = res.data.data.pageData;
-<<<<<<< HEAD
-                    console.log(this.dataList,'datalist');
-=======
->>>>>>> 8e6bb64928beef82a7e4f060b1248eaebd93e197
-                } else {
-                    this.Error(res.data.message);
             }
           },
           err => {}
@@ -117,5 +108,3 @@
     }
   };
 </script>
\ No newline at end of file
-
-