修改日志页

public/config.js

@@ -1,4 +1,5 @@
 var PLATFROM_CONFIG = {};
+// PLATFROM_CONFIG.baseUrl = "http://106.14.243.117:9001/"
 PLATFROM_CONFIG.baseUrl = "https://authgateway.fsjtkj.cn/" // http请求地址
 PLATFROM_CONFIG.socketUrl = "ws://192.168.3.239:8998/websocket" // websocket请求地址
 PLATFROM_CONFIG.appSecret = "40t7vcbi5bc1twyihd2dum82yn1mt1kj" //appSecret

src/views/dashboard/components/journal.vue

@@ -10,8 +10,12 @@
   <div class="dashboard-journal">
     <div class="journal-title flex">
       <div class="title">个人日志</div>
-      <div class="search">
-        <Search :isTitle="false" :isSlot="false" />
+      <div class="search flex-wrap">
+        <div class="j-date">
+          <el-date-picker v-model="value1" size="small" value-format="yyyy-MM-dd HH:mm:ss" class="j-date-input" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+          </el-date-picker>
+        </div>
+        <Search @getSearchData="getSearchData" @clearSearchData="clearSearch" :isTitle="false" :isSlot="false" />
       </div>
     </div>
     <div class="journal-content">
@@ -55,10 +59,18 @@ export default {
   data () {
     return {
       tableData: [],
+      value1: "",
+      Msg: "",
+      BeginTime: "",
+      EndTime: ""
     }
   },
   created () {
-    this.getLogList({});
+    this.getLogList({
+      Msg: "",
+      BeginTime: "",
+      EndTime: ""
+    });
   },
   methods: {
     tableRowClassName ({ row, rowIndex }) {
@@ -80,6 +92,27 @@ export default {
       } catch (error) {
         console.log(error);
       }
+    },
+    getSearchData (val) {
+      const dates = this.value1;
+      if (dates && dates.length) {
+        this.BeginTime = dates[0];
+        this.EndTime = dates[1];
+      }
+      this.Msg = val;
+      this.getLogList({
+        Msg: this.Msg,
+        BeginTime: this.BeginTime,
+        EndTime: this.EndTime
+      });
+    },
+    clearSearch () {
+      this.value1 = "";
+      this.getLogList({
+        Msg: "",
+        BeginTime: "",
+        EndTime: ""
+      });
     }
   }
 }
@@ -100,6 +133,16 @@ export default {
       font-weight: bold;
       color: #303133;
     }
+    .j-date {
+      height: 48px;
+      line-height: 48px;
+      padding: 0 24px;
+      background: #ffffff;
+      -webkit-box-shadow: 0px 6px 7px 0px rgb(0 0 0 / 6%);
+      box-shadow: 0px 6px 7px 0px rgb(0 0 0 / 6%);
+      border-radius: 6px;
+      margin-right: 20px;
+    }
   }
   .journal-content {
     margin-top: 24px;