bugfix

src/views/system/log/index.vue

@@ -17,6 +17,24 @@
           label-width="68px"
           style="text-align:right;"
         >
+          <el-form-item label="">
+            <el-date-picker
+              v-model="queryParams.start_time"
+              type="date"
+              :picker-options="pickerOptions1"
+              placeholder="开始日期"
+              value-format="yyyyMMdd"
+            />
+          </el-form-item>
+          <el-form-item label="">
+            <el-date-picker
+              v-model="queryParams.end_time"
+              type="date"
+              :picker-options="pickerOptions2"
+              placeholder="结束日期"
+              value-format="yyyyMMdd"
+            />
+          </el-form-item>
           <el-form-item label="" prop="name">
             <el-input
               v-model="queryParams.name"
@@ -37,8 +55,8 @@
     <el-table v-loading="listLoading" :data="pageList">
       <el-table-column type="index" label="#" width="80" />
       <el-table-column prop="admin_name" label="账号名" width="120" />
-      <el-table-column prop="title" label="标题" width="130" />
-      <el-table-column prop="path" label="url" width="178" />
+      <el-table-column prop="title" label="标题" width="200" />
+      <el-table-column prop="path" label="url" width="200" />
       <el-table-column prop="content" label="请求参数" width="210">
         <template slot-scope="scope">
           <el-popover trigger="click" placement="top" width="400">
@@ -50,8 +68,8 @@
         </template>
       </el-table-column>
       <el-table-column prop="method" label="请求方式" width="90" />
-      <el-table-column prop="ip" label="IP" width="100" />
-      <el-table-column prop="user_agent" label="Browser" width="210">
+      <el-table-column prop="ip" label="IP" width="150" />
+      <el-table-column prop="user_agent" label="Browser">
         <template slot-scope="scope">
           <el-popover trigger="click" placement="top" width="400">
             <div style="max-height: 400px;overflow-y: auto;">{{ scope.row.user_agent }}</div>
@@ -61,7 +79,7 @@
           </el-popover>
         </template>
       </el-table-column>
-      <el-table-column prop="created_at" label="创建时间" width="150" />
+      <el-table-column prop="created_at" label="记录时间" width="150" />
     </el-table>
     <pagination
       :auto-scroll="false"
@@ -97,7 +115,27 @@ export default {
       queryParams: {
         page: 1,
         limit: 10,
-        name: undefined
+        name: undefined,
+        start_time: '',
+        end_time: ''
+      },
+      pickerOptions1: {
+        disabledDate: (time) => {
+          if (this.queryParams.end_time) {
+            return time.getTime() > new Date(this.queryParams.end_time).getTime()
+          } else {
+            return time.getTime() > Date.now()
+          }
+        }
+      },
+      pickerOptions2: {
+        disabledDate: (time) => {
+          if (this.queryParams.start_time) {
+            return time.getTime() < new Date(this.queryParams.start_time).getTime()
+          } else {
+            return time.getTime() > Date.now()
+          }
+        }
       }
     }
   },

src/views/user/list/index.vue

@@ -52,7 +52,6 @@
       <el-table-column prop="phone" label="手机号" />
       <el-table-column prop="dep_name" label="科室" />
       <el-table-column prop="login_at" label="最后登陆" />
-      <el-table-column prop="login_ip" label="登陆IP" />
       <el-table-column prop="desc" label="描述" />
       <el-table-column label="操作">
         <template slot-scope="scope">

src/views/user/log/index.vue

@@ -17,6 +17,24 @@
           label-width="68px"
           style="text-align:right;"
         >
+          <el-form-item label="">
+            <el-date-picker
+              v-model="queryParams.start_time"
+              type="date"
+              :picker-options="pickerOptions1"
+              placeholder="开始日期"
+              value-format="yyyyMMdd"
+            />
+          </el-form-item>
+          <el-form-item label="">
+            <el-date-picker
+              v-model="queryParams.end_time"
+              type="date"
+              :picker-options="pickerOptions2"
+              placeholder="结束日期"
+              value-format="yyyyMMdd"
+            />
+          </el-form-item>
           <el-form-item label="" prop="name">
             <el-input
               v-model="queryParams.name"
@@ -38,7 +56,7 @@
       <el-table-column type="index" label="#" width="80" />
       <el-table-column prop="username" label="账号名" width="120" />
       <el-table-column prop="title" label="标题" width="150" />
-      <el-table-column prop="path" label="url" width="158" />
+      <el-table-column prop="path" label="url" width="200" />
       <el-table-column prop="content" label="请求参数" width="210">
         <template slot-scope="scope">
           <el-popover trigger="click" placement="top" width="400">
@@ -50,7 +68,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="method" label="请求方式" width="90" />
-      <el-table-column prop="ip" label="IP" width="100" />
+      <el-table-column prop="ip" label="IP" width="150" />
       <el-table-column prop="user_agent" label="Browser">
         <template slot-scope="scope">
           <el-popover trigger="click" placement="top" width="400">
@@ -89,7 +107,27 @@ export default {
       queryParams: {
         page: 1,
         limit: 10,
-        name: undefined
+        name: undefined,
+        start_time: '',
+        end_time: ''
+      },
+      pickerOptions1: {
+        disabledDate: (time) => {
+          if (this.queryParams.end_time) {
+            return time.getTime() > new Date(this.queryParams.end_time).getTime()
+          } else {
+            return time.getTime() > Date.now()
+          }
+        }
+      },
+      pickerOptions2: {
+        disabledDate: (time) => {
+          if (this.queryParams.start_time) {
+            return time.getTime() < new Date(this.queryParams.start_time).getTime()
+          } else {
+            return time.getTime() > Date.now()
+          }
+        }
       }
     }
   },