修改

src/views/user/kyts/components/SearchBox.vue

@@ -10,7 +10,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="搜索条件">
-        <el-input v-model="data.user" placeholder="请输入" />
+        <el-input v-model="data.keyword" placeholder="请输入" />
       </el-form-item>
       <el-form-item label="查询时间">
         <el-date-picker
@@ -40,7 +40,8 @@ export default {
         return {
           name: '',
           dep_id: '',
-          time: []
+          time: [],
+          keyword: ''
         }
       }
     }

src/views/user/kyts/index.vue

@@ -29,7 +29,8 @@ export default {
       searchData: {
         name: '',
         dep_id: '',
-        time: []
+        time: [],
+        keyword: ''
       },
       tableData: [],
       paginationData: {
@@ -44,13 +45,14 @@ export default {
   },
   methods: {
     getList() {
-      const { name, dep_id, time } = this.searchData
+      const { name, dep_id, time, keyword } = this.searchData
       const { page, limit } = this.paginationData
       const params = {
         name,
         dep_id,
         page,
-        limit
+        limit,
+        keyword
       }
       if (time && time.length) {
         params.start_time = time[0]
@@ -59,10 +61,8 @@ export default {
       this.loading = true
       userSearchLog(params).then(res => {
         const { p } = res
-        if (p.list.length) {
-          this.paginationData.total = p.count
-          this.tableData = p.list
-        }
+        this.paginationData.total = p.count
+        this.tableData = p.list
       }).catch(error => {
         console.log(error)
       }).finally(() => {
@@ -79,10 +79,11 @@ export default {
       this.getList()
     },
     handleDownLoad() {
-      const { name, dep_id, time } = this.searchData
+      const { name, dep_id, time, keyword } = this.searchData
       const params = {
         name,
-        dep_id
+        dep_id,
+        keyword
       }
       if (time && time.length) {
         params.start_time = time[0]
@@ -91,7 +92,7 @@ export default {
       userSearchLogExport(params).then(res => {
         const content = res.data // 后台返回二进制数据
         const blob = new Blob([content])
-        const fileName = `${name}.csv`
+        const fileName = `科研探索日志.csv`
         if ('download' in document.createElement('a')) { // 非IE下载
           const elink = document.createElement('a')
           elink.download = fileName

src/views/user/list/index.vue

@@ -50,7 +50,7 @@
       <el-table-column prop="group_name" label="部门" />
       <el-table-column prop="realname" label="姓名" />
       <el-table-column prop="phone" label="手机号" />
-      <!--      <el-table-column prop="name" 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="描述" />
@@ -204,7 +204,8 @@ export default {
         phone: null,
         realname: null,
         desc: null,
-        dep_id: ''
+        dep_id: '',
+        dep_name: ''
       },
       delForm: {
         id: null,
@@ -235,7 +236,7 @@ export default {
         if (Object.keys(p.list).length) {
           for (const key in p.list) {
             this.deportments.push({
-              id: key,
+              id: parseInt(key),
               name: p.list[key]
             })
           }
@@ -288,6 +289,7 @@ export default {
       })
     },
     editAlert(data) {
+      console.log(data, 8888)
       this.alertForm.id = data.id
       // this.alertForm.account = data.account
       this.alertForm.name = data.name