Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Details.vue

@@ -821,6 +821,9 @@ export default {
       let that=this
       this.$router.beforeEach((to, from, next) => {
         console.log("to.query.blank && to.query.blank=='y'",to.query)
+        if(to.path=="/ModifyVisaProduct"){
+          this.reloadpage();
+        }
         if(that.openMode==1){
           let isThreeNav=false
           to.matched.forEach(x=>{

src/components/EditTemplate.vue

@@ -506,7 +506,7 @@
             <div class="TNcontent" v-else>
               <div class="EtNodata">暂无数据</div>
             </div>
-            <span class="defaultAccount" slot="reference">默认叙述</span>
+            <span class="defaultAccount" slot="reference" v-if="defaultA">默认叙述</span>
           </el-popover>
         </span>
       </div>
@@ -534,7 +534,7 @@
   Quill.register(Font, true);
   export default {
     name: 'edit',
-    props: ["editValue", "toolbarShow", "referenceList", "placeholder"],
+    props: ["editValue", "toolbarShow", "referenceList", "placeholder","defaultAccount"],
     data() {
       return {
         myToolbar: '',
@@ -542,6 +542,7 @@
         myImageUploader: '',
         quillValue: this.editValue,
         popvisible: false,
+        defaultA:true,
         //字体样式
         fonts: [
           "SimSun",
@@ -591,6 +592,12 @@
       }
     },
     created() {
+      if(this.defaultAccount==undefined){
+        this.defaultA=true;
+      }else{
+        
+        this.defaultA=this.defaultAccount;
+      }
       this.myToolbar = "toolbar_" + this.guid();
       this.editorOption.placeholder = this.placeholder;
       this.myQuillEditor = "editer_" + this.guid();

src/components/FinancialModule/invoicesManagerAdd.vue

@@ -161,10 +161,13 @@ export default {
         InvoiceApplyState: 1,
         CustomerId: 0,
         IsDefaultInfo: 1,
+<<<<<<< HEAD
+=======
         Address: '',
         CompanyPhone: '',
         OpeningBank: '',
         BankNo: '',
+>>>>>>> 8e6bb64928beef82a7e4f060b1248eaebd93e197
       },
       DepartName: "",
       emName: "",
@@ -192,10 +195,13 @@ export default {
     Addiis: function () {   // 新增接口
       if (this.msg.CompanyName === '') return this.$message.error('请填写公司名称！')
       if (this.msg.DutyParagraph === '') return this.$message.error('请填写税号！')
+<<<<<<< HEAD
+=======
       if (this.msg.Address === '') return this.$message.error('请填写地址！')
       if (this.msg.CompanyPhone === '') return this.$message.error('请填写电话！')
       if (this.msg.OpeningBank === '') return this.$message.error('请填写开户行！')
       if (this.msg.BankNo === '') return this.$message.error('请填写账号！')
+>>>>>>> 8e6bb64928beef82a7e4f060b1248eaebd93e197
       if (this.checked) {
         this.msg.IsDefaultInfo = 1
       } else {

src/components/Hotel/HotelProductManage2.vue

@@ -512,7 +512,7 @@
         editShow: false,
         msg: {
           Hotel: '0',
-          Supplier: '0',
+          Supplier: 30,
           Inventory: '0',
           B2BPrice: '0',
           B2CPrice: '0',
@@ -541,7 +541,7 @@
         },
         msg2: {
           Hotel: '0',
-          Supplier: '0',
+          Supplier: 30,
           Inventory: '0',
           B2BPrice: '0',
           B2CPrice: '0',
@@ -868,7 +868,7 @@
         }, res => {
           if (res.data.resultCode === 1) {
             let data = res.data.data;
-            this.msg.Supplier = data.Supplier === 0 ? '0' : data.Supplier
+            this.msg.Supplier = data.Supplier === 0 ? 30 : data.Supplier
             this.msg.Inventory = data.Inventory
             this.msg.B2BPrice = data.B2BPrice
             this.msg.B2CPrice = data.B2CPrice

src/components/Hotel/HotelQueryList.vue

@@ -145,12 +145,12 @@
         </el-row>
         <div class="Hq_addDetail">
           <el-row>
-            <el-col :span="9">
+            <el-col :span="12">
               <el-form-item label="说明">
-                <el-input type="textarea" v-model="postMsg.TipContent" maxlength="200"></el-input>
+                 <quill-editor class="w595" :options="editorOption"  v-model="postMsg.TipContent"></quill-editor>
               </el-form-item>
             </el-col>
-            <el-col :span="15">
+            <el-col :span="12">
               <input type="button" class="normalBtn" value="保存" @click="SaveHotelTip()" />
             </el-col>
           </el-row>
@@ -168,7 +168,7 @@
           <template v-if="queryMsg.total>0">
             <tr v-for="(item,index) in HotelTipList">
               <td>{{item.Id}}</td>
-              <td>{{item.TipContent}}</td>
+              <td><p style="text-align:left;padding-left:5px;" v-html="item.TipContent"></p></td>
               <td>{{item.CreateByName}}</td>
               <td>{{item.CreateTimeStr}}</td>
               <td>
@@ -192,8 +192,6 @@
     </div>
     <el-dialog custom-class="w800" title="信息" :visible.sync="showHQinfo" center>
       <el-form>
-        <div class="HQ_miaoshu">1.酒店库存系统已开放使用,欢迎前往参观选购!! </div>
-        <div class="HQ_miaoshu">2.库存酒店皆为时时更新,请上传人员细心上传!!</div>
         <table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList Hq_addTable" style="width:100%;">
           <tr>
             <th>编号</th>
@@ -204,7 +202,7 @@
           <template v-if="queryMsg.total>0">
             <tr v-for="(item,index) in HotelTipList">
               <td>{{item.Id}}</td>
-              <td>{{item.TipContent}}</td>
+              <td><p style="text-align:left;padding-left:5px;" v-html="item.TipContent"></p></td>
               <td>{{item.CreateByName}}</td>
               <td>{{item.CreateTimeStr}}</td>
             </tr>
@@ -282,7 +280,16 @@
             let startTime = new Date(this.queryMsg.QEndDate)
             return startTime.getTime() >= time.getTime()
           }
-        }
+        },
+        editorOption:{
+          placeholder: '请输入内容',
+          modules:{
+              toolbar:[
+                ['bold', 'italic', 'underline', 'strike'],        // toggled buttons
+                ['blockquote', 'code-block','align']
+              ]
+          }
+      },
       };
     },
     methods: {
@@ -518,6 +525,10 @@
     text-decoration: underline;
   }
 
+.HqCom_bottom .ql-container
+{
+   min-height: 100px;
+}
   .classHong {
     background-color: rgb(255, 55, 55);
   }

src/components/Hotel/HouseTypeList.vue

+<template>
+  <div>
+    <div class="query-box" style="border-bottom: none;">
+      <ul>
+       <li>
+          <span>
+            <em>酒店</em>
+            <el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable>
+              <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
+              <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li><span><em>日期</em>
+            <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
+            -
+            <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
+          </span>
+        </li>
+        <li>
+          <input type="button" class="normalBtn" value="查询" @click="getList()" />
+        </li>      
+        </ul>
+    </div>
+    <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
+      <table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList" v-if="isShow">
+        <tr>
+          <th width="300">酒店名称</th>
+          <th width="80"></th>
+          <th v-for="item in dataList[0].subList">
+            {{getDateList(item.DateStr)}}
+          </th>
+        </tr>
+        <tr>
+          <th></th>
+          <th></th>
+          <th v-for="item in dataList[0].subList">
+            {{getWeek(item.DateStr)}}
+          </th>
+        </tr>
+        <tr v-for="item in dataList">
+            <td>
+              <div style="min-width:300px; text-align:left;padding-left:5px;">{{item.HotelName}}</div>
+            </td>
+            <td>
+                <div class="Hotel_kong" style="min-width:60px;">空房</div>
+                <div class="Hotel_kong">超定</div>
+            </td>
+            <td v-for="subItem in item.subList">
+                <div class="Hotel_kong Com_hoteldiv" :class="{'noKucun':subItem.Status==0}">{{subItem.RemainingInventory}}</div>
+                <div class="Hotel_kong Com_hoteldiv">
+                  <span v-if="subItem.UseInventory-subItem.Inventory>0" style="color:red;">{{subItem.UseInventory-subItem.Inventory}}</span>
+                </div>
+            </td>
+        </tr>
+      </table>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+          msg:{
+              HotelId:0,
+              StartDate: new Date().Format("yyyy-MM-dd"),
+              EndDate: this.setEdate(),
+          },
+          HotelList: [],
+          dataList: [],
+          isShow:false,
+      };
+    },
+    methods: {
+      getList() {
+        if (this.msg.StartDate == null) {
+          this.msg.StartDate = new Date().Format("yyyy-MM-dd")
+        }
+        if (this.msg.EndDate == null) {
+          this.msg.EndDate = this.setEdate()
+        }
+        this.apipost("dict_post_HotelOffer_GetHotelStatics",this.msg,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.dataList = res.data.data;
+              this.isShow=true;
+              console.log(this.dataList,'dataList');
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          err => {}
+        );
+      },
+      //获取酒店列表
+      GetHotelList() {
+        this.apipost(
+          "hotel_post_GetHasStockHotelList", {
+            Country: 651,
+            IsMoreThanZero: 1
+          },
+          res => {
+            if (res.data.resultCode == 1) {
+              this.HotelList = res.data.data;
+            }
+          },
+          err => {}
+        );
+      },
+      setEdate(){
+          return this.addMoth(new Date().Format("yyyy-MM-dd"), 1)
+      },
+      addMoth(d, m) {
+        let ds = d.split('-'),
+          _d = ds[2] - 0;
+        let nextM = new Date(ds[0], ds[1] - 1 + m + 1, 0);
+        let max = nextM.getDate();
+        d = new Date(ds[0], ds[1] - 1 + m, _d > max ? max : _d);
+        return d.toLocaleDateString().match(/\d+/g).join('-')
+      },
+      //格式化返回显示日期
+      getDateList(dateStr){
+        var str = dateStr.split('-');
+        return str[1]+'/'+str[2];
+      },
+      //获取星期几
+      getWeek(dateStr){
+        var weekDay = ["天", "一", "二", "三", "四", "五", "六"];  
+        var myDate = new Date(Date.parse(dateStr));  
+        return weekDay[myDate.getDay()]
+      }
+    },
+    mounted() {
+      this.GetHotelList();
+      this.getList();
+    }
+  };
+</script>
+
+<style>
+  .HouseTypeList {
+    background: #ccc;
+    width:100%;
+  }
+  .Com_hoteldiv{
+    min-width: 40px;
+  }
+  .noKucun{
+    background-color: black;
+  }
+  .Hotel_kong{
+    width:100%;
+    height:35px;
+    line-height: 35px;
+    border-bottom:1px solid #d1d1d1;
+  }
+  .Hotel_kong:last-child{
+    border:0;
+  }
+  .HouseTypeList tr th {
+    background: #e6e6e6;
+    height: 35px;
+    font-size: 12px;
+    color: #333;
+  }
+
+  .HouseTypeList tr {
+    background: #fff;
+    text-align: center;
+    height: 35px;
+  }
+
+  .HouseTypeList tr td {
+    font-size: 12px;
+  }
+</style>

src/components/PrintPage.vue

@@ -2,25 +2,24 @@
     ._PrintPage{
         width: 100%;
         background-color: white;
-        /* position: absolute; */
+        position: absolute;
         padding-top: 20px;
     }
     ._PrintPage_box{
         width: 1000px;
-        /* margin-left: 160px; */
         margin: 0 auto;
         padding: 0 !important;
     }
     ._border_1{
         border: 1px solid #333333;
         margin-bottom:30px;
-        page-break-after: always;
+        /* page-break-after: always; */
     }
-    @media print {
+    /* @media print {
         ._PrintPage{
             margin-left:-145px;
         }
-    }
+    } */
 </style>
 <template v-loading="loading">
     <div class="_PrintPage">

src/components/SalesModule/VisaFinancialDocuments.vue

@@ -519,7 +519,6 @@ export default {
        })
     },
     addFinancialOrder () {  //  新增单据方法
-      
       let userInfo =[];
       this.checkList.forEach(check=>{
         this.checknameList.forEach(item=>{
@@ -528,6 +527,11 @@ export default {
           }
         })
       })
+      if(userInfo.length==0){
+        this.Error("至少选择一人！");
+        return;
+      }
+      
       sessionStorage.setItem("saveGuestInfo",JSON.stringify(userInfo))
       // this.$store.commit('saveGuestInfo',userInfo)
       // console.log("getGuestInfo",this.$store.getters.getGuestInfo)

src/components/SalesVisa/VisaProduct.vue

@@ -28,14 +28,14 @@
 .page_MyCustomer ._mc_edit {
   overflow: auto;
   display: none;
-  position: absolute;
+  position: fixed;
   z-index: 50;
   bottom: 0;
-  left: 0;
+  left: 50px;
   border-top: 3px solid #38425d;
   background-color: #f9f9f9;
   padding: 10px;
-  width: 100%;
+  width: calc(100% - 50px);
   min-width: 1146px;
 }
 .page_MyCustomer .edHeight {
@@ -291,7 +291,8 @@
         </li>
         <li>
           <button class="hollowFixedBtn" @click="getList()">查询</button>
-          <button class="normalBtn" @click="cancelEdit(),addShow=true" v-if="msg.isFinacial==1">添加</button>
+          <!-- <button class="normalBtn" @click="cancelEdit(),addShow=true" v-if="msg.isFinacial==1">添加</button> -->
+          <button class="normalBtn" @click="AddVisaProduct" v-if="msg.isFinacial==1">添加</button>
         </li>
       </ul>
     </div>
@@ -370,7 +371,7 @@
         </td>
         <td class="groupTourOrderIcon">
           <el-button-group>
-            <el-tooltip
+            <!-- <el-tooltip
               class="item"
               effect="dark"
               content="修改"
@@ -383,6 +384,20 @@
                 icon="iconfont icon-img_bianji_small"
                 @click="getDetail(item)"
               ></el-button>
+            </el-tooltip> -->
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="修改"
+              placement="top-start"
+              v-if="item.SendVisaStatus==1&&msg.isFinacial==1"
+            >
+              <el-button
+                type="primary"
+                style="background:#409EFF; border-color:#409EFF"
+                icon="iconfont icon-img_bianji_small"
+                @click="EditVisaProduct(item)"
+              ></el-button>
             </el-tooltip>
             <el-tooltip effect="dark" content="查看" placement="top-start" v-if="msg.isFinacial==1">
               <el-button
@@ -629,6 +644,27 @@ export default {
     };
   },
   methods: {
+    // 修改签证产品
+    EditVisaProduct(item){
+      this.$router.push({
+        name: "ModifyVisaProduct",
+        query: {
+          Id:item.Id,
+          blank: "y",
+          tab: "配置签证产品"
+        }
+      });
+    },
+    // 添加签证产品
+    AddVisaProduct(){
+      this.$router.push({
+        name: "ModifyVisaProduct",
+        query: {
+          blank: "y",
+          tab: "配置签证产品"
+        }
+      });
+    },
     saveitem(tcid) {
       this.uploadTCID = tcid;
     },
@@ -736,7 +772,6 @@ export default {
         err => {}
       );
     },
-
     goUrl(obj) {
       this.$router.push({
         name: "VisaProductOrder",

src/components/index.vue

@@ -117,7 +117,7 @@
 			    			<i class="iconfont icon-imessage_top" :class="[hasNewMsg>0&&!IM_bodyIsShow?'animation red':'',IM_bodyIsShow?'red':'']" @click="IM_bodyIsShow=!IM_bodyIsShow"></i>
 							<!--<i class="iconfont icon-imessage_top"  @click="togglebox($event)"></i>-->
 						</li>
-			    		<li><i class="iconfont icon-banbengengxin" @click="goUrlLog()"></i></li>
+			    		<li><i class="iconfont icon-help_top"></i></li>
 			    		<li>
                 <el-dropdown trigger="click">
                   <span class="el-dropdown-link">
@@ -574,18 +574,6 @@
 				<div style="width: 100%; height: 50px;"></div>
 			</div>
 			</div>
-      <div class="logsBack" v-if="logsShow">
-        <div class="updateLogs">
-            <img src="../assets/img/logsImg.png" alt="" class="logsImg" />
-            <div class="logsTitle">
-                {{versionList[0].UpdateTitle}}版本更新
-            </div>
-            <div class="inlogs_Content" v-html="versionList[0].UpdateContent">
-
-            </div>
-            <input type="button" value="我知道了" class="normalBtn" style="margin:10px 0 0 155px;" @click="logsShow=false"/>
-        </div>
-      </div>
       <div class="downmz" v-show="downmz">
         <div class="top_1"></div>
         <div style="text-align:center">
@@ -610,7 +598,7 @@
           </div>
         </div>
         <div style="text-align:center;margin-top:20px">
-          <span class="khd"><a href="https://reborndev.oss-cn-hangzhou.aliyuncs.com/IM/%E9%BA%A6%E5%AD%90%E5%8A%A9%E6%89%8B.exe">IM客户端下载</a></span>
+          <span class="khd"><a href="http://im.oytour.com/麦子助手.exe">IM客户端下载</a></span>
         </div>
         <div class="im_bottom"></div>
       </div>
@@ -620,7 +608,8 @@
 				</audio>
 			</div>
 			<div class="temDivs">
-    			<router-view></router-view>
+        <!-- :key="key" -->
+    			<router-view ></router-view>
 			</div>
 
 
@@ -808,7 +797,7 @@
     <div v-show="mazip==0" id="downzip">
       <div>
         <div>
-          <a href="https://reborndev.oss-cn-hangzhou.aliyuncs.com/IM/%E9%BA%A6%E5%AD%90%E5%8A%A9%E6%89%8B.exe">
+          <a href="http://im.oytour.com/麦子助手.exe">
             <img @click="CloseZip" src="../assets/img/mzzip.png" alt="">  
           </a>
             <img @click="CloseZip" class="close" src="../assets/img/close.png" alt="">
@@ -831,7 +820,6 @@ import emojiObj from "../configs/emoji";
 import loading from "./commonPage/loading";
 import VueDraggableResizable from "vue-draggable-resizable";
 import { setInterval, clearInterval } from 'timers';
-import { version } from 'punycode';
 export default {
   components: {
     ChatList,
@@ -936,9 +924,6 @@ export default {
       displayNone: true,
       dialogTitle: "",
       outerVisible: false,
-      logsShow:false,
-      newVersion:'',
-      versionList:[],
       msg: {
         ParentId: 0,
         MenuStatus: "",
@@ -1077,6 +1062,9 @@ export default {
     }
   },
   computed: {
+    key(){
+	        return this.$route.path + Math.random();
+	    },
     sysMsgUnread() {
       let temp = this.$store.state.sysMsgUnread;
       let sysMsgUnread = temp.addFriend || 0;
@@ -1314,8 +1302,6 @@ export default {
     this.allPartMsg.RB_Group_Id = this.deleteMsg.groupId = this.likeMsg.groupId = this.addDynamicMsg.rB_GroupId = this.dynamicMsg.groupId =
       UserInfo.RB_Group_id;
     this.addDynamicMsg.rB_BranchId = UserInfo.RB_Branch_id;
-    //获取版本
-    this.getVersion();
     this.getMenu();
     this.setCheckMenu();
 
@@ -1323,6 +1309,7 @@ export default {
     this.getMyDynamic();
     this.getAboutMeDynamic();
     this.getWebAllPart();
+
     document
       .getElementById("allDynamic")
       .addEventListener("scroll", function() {
@@ -3023,10 +3010,6 @@ export default {
       //   this.$router.push({ path: url });
       // }
     },
-    goUrlLog(){
-        console.log('AAAAAAAA');
-        this.$router.push({ path: 'systemLogs', query:{} });
-    },
     goUrlPayment() {
        let eid=this.getLocalStorage().EmployeeId;
         this.$router.push({ path: 'empBankAccount', query: { id: eid,type:10,blank:'y' } });
@@ -3257,34 +3240,6 @@ export default {
           this.$message.error(r.data.message);
         }
       },null)
-    },
-    //获取版本号
-    getVersion(){
-      let msg = {
-          pageIndex:1,
-          pageSize:5
-      }
-      this.apipost("sysrecord_get_GetPageList",msg,res => {
-          if (res.data.resultCode == 1) {
-              this.versionList = res.data.data.pageData;
-              if(this.versionList.length>0){
-                  let oldVersion = localStorage.version;
-                  this.newVersion = this.versionList[0].UpdateTitle;
-                  if(this.newVersion!=oldVersion){
-                    this.logsShow = true;
-                    localStorage.version = this.newVersion;
-                  }else{
-                    this.logsShow = false;
-                  }
-              }else{
-                this.logsShow = false;
-              }
-          } else {
-            this.Error(res.data.message);
-          }
-        },
-        err => {}
-      );
 
     }
   }
@@ -3477,50 +3432,6 @@ export default {
   box-shadow: 1px 1px 50px rgba(0, 0, 0, 0.3);
   background-clip: content-box;
 }
-.logsBack{
-  position: fixed;
-  z-index: 999;
-  background: rgba(0, 0, 0, 0.2);
-  width: 100%;
-  height: 100%;
-  left: 0;
-  top: 0;
-}
-.updateLogs{
-    position: absolute;
-    width:400px;
-    height:400px;
-    left:50%;
-    top:50%;
-    margin-left:-200px;
-    margin-top:-200px;
-    border-radius: 4px;
-    border:1px solid #DCDCDC;
-    z-index: 9999;
-    background-color: #fff;
-}
-.logsTitle{
-  width:100%;
-  padding:0 10px;
-  text-align: center;
-  color:#333333;
-  font-size:12px;
-  margin-top:10px;
-  font-weight: bold;
-}
-.inlogs_Content{
-  width:100%;
-  padding:0 15px;
-  height:260px;
-  overflow: auto;
-  margin-top:20px;
-  color:#666666;
-  font-size:12px;
-}
-.logsImg{
-  margin-top:-30px;
-  margin-left:155px;
-}
 .myDocumentsLink {
   margin: 25px 0;
 }

src/components/systemLogs.vue

 <style>
-    .sysLog_Content{
-        border-left:2px solid #D2D2D2;
-        margin:40px 0 0 40px;
-    }
-    .sysLog_List{
-        position: relative;
-        margin:0 0 20px 16px;
-    }
-    .sysCircle{
-        display: inline-block;
-        width:13px;
-        height:13px;
-        background-color: #36AF84;
-        border:2px solid #58D2A7;
-        border-radius:50%;
-        margin-right:10px;
-        position: relative;
-        top:-4px;
-    }
-    .sysFirDate{
-        color:#38425D;
-        font-weight: bold;
-        font-size:12px;
-        position: relative;
-        top:-4px;
-    }
-    .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;
-    }
-    .sysPosi_div{
-        margin:-4px 0 0 -24px;
-    }
-    .sysCircle_other{
-        width:13px;
-        height:13px;
-        display: inline-block;
-        border-radius: 50%;
-        background-color: #B1B1B1;
-        border:2px solid #EFEFEF;
-        margin-right:10px;
-        position: relative;
-        top:-3px;
-    }
-    .sysFirDate_other{
-        color:#38425D;
-        font-size:12px;
-        position: relative;
-        top:-4px;
-    }
+  .sysLog_Content {
+    border-left: 2px solid #D2D2D2;
+    margin: 40px 0 0 40px;
+  }
+
+  .sysLog_List {
+    position: relative;
+    margin: 0 0 20px 16px;
+  }
+
+  .sysCircle {
+    display: inline-block;
+    width: 13px;
+    height: 13px;
+    background-color: #36AF84;
+    border: 2px solid #58D2A7;
+    border-radius: 50%;
+    margin-right: 10px;
+    position: relative;
+    top: -4px;
+  }
+
+  .sysFirDate {
+    color: #38425D;
+    font-weight: bold;
+    font-size: 12px;
+    position: relative;
+    top: -4px;
+  }
+
+  .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;
+  }
+
+  .sysPosi_div {
+    margin: -4px 0 0 -24px;
+  }
+
+  .sysCircle_other {
+    width: 13px;
+    height: 13px;
+    display: inline-block;
+    border-radius: 50%;
+    background-color: #B1B1B1;
+    border: 2px solid #EFEFEF;
+    margin-right: 10px;
+    position: relative;
+    top: -3px;
+  }
+
+  .sysFirDate_other {
+    color: #38425D;
+    font-size: 12px;
+    position: relative;
+    top: -4px;
+  }
+
 </style>
 
 <template>
-    <div class="sysLog_Content">
-        <div class="sysLog_List" v-for="(item,index) in dataList">
-            <div class="sysPosi_div">
-                <span class="sysCircle" v-if="index==0"></span>
-                <span class="sysCircle_other" v-else></span>
-                <span style="font-size:14px;margin-right:20px;position:relative;top:-4px;">{{item.UpdateTitle}}</span>
-                <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 class="sysLog_Content">
+    <div class="sysLog_List" v-for="(item,index) in dataList">
+      <div class="sysPosi_div">
+        <span class="sysCircle" v-if="index==0"></span>
+        <span class="sysCircle_other" v-else></span>
+        <span style="font-size:14px;margin-right:20px;position:relative;top:-4px;">{{item.UpdateTitle}}</span>
+        <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>
 </template>
 <script>
   export default {
     data() {
       return {
-          msg:{
-            pageIndex:1,
-            pageSize:15
-          },
-          dataList:[],
+        msg: {
+          pageIndex: 1,
+          pageSize: 15
+        },
+        dataList: [],
       };
     },
     methods: {
-        getList() {
-            this.apipost("sysrecord_get_GetPageList",this.msg,res => {
-                if (res.data.resultCode == 1) {
-                    this.dataList = res.data.data.pageData;
-                } else {
-                    this.Error(res.data.message);
-                }
-                },
-                err => {}
-            );
-        },
+      getList() {
+        this.apipost("sysrecord_get_GetPageList", this.msg, res => {
+            if (res.data.resultCode == 1) {
+              this.dataList = res.data.data.pageData;
+            }
+          },
+          err => {}
+        );
+      },
     },
     mounted() {
       this.getList();
     }
   };
-</script>
-
+</script>
\ No newline at end of file
-