From adcb1b3169488a5f86384dfc0b6578670e6662d2 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 27 Sep 2023 16:40:49 +0800
Subject: [PATCH] up

---
 src/api/visit/study.js                       |  10 ++
 src/views/gate/components/list.vue           |   2 +-
 src/views/parameter/component/addVisitor.vue |   2 +-
 src/views/parameter/visitor.vue              |   2 +-
 src/views/resource/bd.vue                    |   2 +-
 src/views/resource/study.vue                 |   2 +-
 src/views/resource/visit.vue                 |   2 +-
 src/views/system/department.vue              |   7 +-
 src/views/system/dictionary.vue              |   4 +-
 src/views/system/menu.vue                    |   6 +-
 src/views/system/permission.vue              |   2 +-
 src/views/system/role.vue                    |   4 +-
 src/views/system/user.vue                    |  18 ++-
 src/views/visit/blacklist.vue                |   2 +-
 src/views/visit/check.vue                    |   2 +-
 src/views/visit/component/addCommon.vue      |  12 +-
 src/views/visit/component/showVisit.vue      |  10 +-
 src/views/visit/longterm.vue                 |   2 +-
 src/views/visit/record.vue                   |   2 +-
 src/views/visit/study.vue                    | 154 +++++++++++++++++++
 20 files changed, 210 insertions(+), 37 deletions(-)
 create mode 100644 src/api/visit/study.js
 create mode 100644 src/views/visit/study.vue

diff --git a/src/api/visit/study.js b/src/api/visit/study.js
new file mode 100644
index 0000000..bc49897
--- /dev/null
+++ b/src/api/visit/study.js
@@ -0,0 +1,10 @@
+import request from "@/utils/request";
+
+export function getList(params){
+  return request({
+    url:'/api/admin/study/study-log',
+    method:'get',
+    params
+  })
+}
+
diff --git a/src/views/gate/components/list.vue b/src/views/gate/components/list.vue
index 39bb2b9..eac7003 100644
--- a/src/views/gate/components/list.vue
+++ b/src/views/gate/components/list.vue
@@ -4,7 +4,7 @@
       <xy-table :table-item="table" :list="data" :total="total" :height="tableHeights"
         :auths='[]'
         :is-page='false'
-        @pageSizeChange="e => {select.rows = e;select.page = 1;getList()}"
+        @pageSizeChange="e => {select.page_size = e;select.page = 1;getList()}"
         @pageIndexChange="e => {select.page = e;getList()}">
         <template v-slot:btns>
           <div></div>
diff --git a/src/views/parameter/component/addVisitor.vue b/src/views/parameter/component/addVisitor.vue
index ce3db84..b380788 100644
--- a/src/views/parameter/component/addVisitor.vue
+++ b/src/views/parameter/component/addVisitor.vue
@@ -196,7 +196,7 @@
     methods: {
 
       async getUser(){
-        const res = await listCommonuser({page:1,page_size:999})
+        const res = await listCommonuser({page:1,page_size:999,show_all:1})
         this.checkAdmin = res.data
       },
       async getDetail() {
diff --git a/src/views/parameter/visitor.vue b/src/views/parameter/visitor.vue
index a383722..1a04d74 100644
--- a/src/views/parameter/visitor.vue
+++ b/src/views/parameter/visitor.vue
@@ -19,7 +19,7 @@
       :list="data"
       :total="total"
       :auths="['edit','delete']"
-      @pageSizeChange="e => {select.rows = e;select.page = 1;getList()}"
+      @pageSizeChange="e => {select.page_size = e;select.page = 1;getList()}"
       @pageIndexChange="e => {select.page = e;getList()}"
       @delete="deleteRow"
       @editor="editorRow">
diff --git a/src/views/resource/bd.vue b/src/views/resource/bd.vue
index f8a115d..3ea1fe5 100644
--- a/src/views/resource/bd.vue
+++ b/src/views/resource/bd.vue
@@ -16,7 +16,7 @@
       :list="data"
       :total="total"
       :auths="['edit','delete']"
-      @pageSizeChange="e => {select.rows = e;select.page = 1;getList()}"
+      @pageSizeChange="e => {select.page_size = e;select.page = 1;getList()}"
       @pageIndexChange="e => {select.page = e;getList()}"
       @delete="deleteStudy"
       @editor="editorStudy">
diff --git a/src/views/resource/study.vue b/src/views/resource/study.vue
index ce50976..b27a7ed 100644
--- a/src/views/resource/study.vue
+++ b/src/views/resource/study.vue
@@ -20,7 +20,7 @@
     </div>
 
     <xy-table :table-item="table" :list="data" :total="total" :auths="['edit','delete']"
-      @pageSizeChange="e => {select.rows = e;select.page = 1;getList()}"
+      @pageSizeChange="e => {select.page_size = e;select.page = 1;getList()}"
       @pageIndexChange="e => {select.page = e;getList()}" @delete="deleteRow" @editor="editorRow">
     </xy-table>
     <addStudy ref="addStudy" @refresh="getList"></addStudy>
diff --git a/src/views/resource/visit.vue b/src/views/resource/visit.vue
index e729301..35c15e8 100644
--- a/src/views/resource/visit.vue
+++ b/src/views/resource/visit.vue
@@ -22,7 +22,7 @@
       :list="data"
       :total="total"
       :auths="['edit','delete']"
-      @pageSizeChange="e => {select.rows = e;select.page = 1;getList()}"
+      @pageSizeChange="e => {select.page_size = e;select.page = 1;getList()}"
       @pageIndexChange="e => {select.page = e;getList()}"
       @delete="deleteRow"
       @editor="editorRow">
diff --git a/src/views/system/department.vue b/src/views/system/department.vue
index 8f8865d..dd2c836 100644
--- a/src/views/system/department.vue
+++ b/src/views/system/department.vue
@@ -1,13 +1,14 @@
 <template>
   <div class="container">
     <!-- 查询配置 -->
-    <div >
+    <div  style="padding: 0px 20px">
       <div ref="lxHeader">
         <LxHeader icon="md-apps" text="部门管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
           <div slot="content"></div>
           <slot>
-            <div>
-              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
+            <div>
+
+              <!-- <Button type="primary" @click="load" style="margin-left: 10px">查询</Button> -->
               <Button type="primary" @click="edit()" style="margin-left: 10px">新增部门</Button>
             </div>
           </slot>
diff --git a/src/views/system/dictionary.vue b/src/views/system/dictionary.vue
index 92f45f3..72cace3 100644
--- a/src/views/system/dictionary.vue
+++ b/src/views/system/dictionary.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="container">
     <!-- 查询配置 -->
-    <div>
+    <div  style="padding: 0px 20px">
       <div ref="lxHeader">
         <LxHeader icon="md-apps" text="字典数据" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
           <div slot="content"></div>
           <slot>
             <div>
-              <Button type="primary" @click="load">查询</Button>
+              <!-- <Button type="primary" @click="load">查询</Button> -->
               <Button type="primary" @click="edit()" style="margin-left: 10px">新增字典</Button>
             </div>
           </slot>
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index a9b68f1..3c3608e 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="container">
     <!-- 查询配置 -->
-    <div>
+    <div  style="padding: 0px 20px">
       <div ref="lxHeader">
         <LxHeader icon="md-apps" text="菜单管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
           <div slot="content"></div>
           <slot>
             <div>
-              <Input style="width: 200px; margin-right: 10px" v-model.number="searchFields.Name" placeholder="关键字搜索" />
-              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
+              <!-- <Input style="width: 200px; margin-right: 10px" v-model.number="searchFields.Name" placeholder="关键字搜索" />
+              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button> -->
               <Button type="primary" @click="edit()" style="margin-left: 10px">新增菜单</Button>
             </div>
           </slot>
diff --git a/src/views/system/permission.vue b/src/views/system/permission.vue
index fe4e3dc..ba50c38 100644
--- a/src/views/system/permission.vue
+++ b/src/views/system/permission.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <!-- 查询配置 -->
-    <div>
+    <div  style="padding: 0px 20px">
       <div ref="lxHeader">
         <LxHeader icon="md-apps" style="margin-bottom: 10px; border: 0px; margin-top: 15px" text="权限管理">
           <div slot="content"></div>
diff --git a/src/views/system/role.vue b/src/views/system/role.vue
index 60b2696..510b765 100644
--- a/src/views/system/role.vue
+++ b/src/views/system/role.vue
@@ -7,8 +7,8 @@
           <div slot="content"></div>
           <slot>
             <div>
-              <Input style="width: 200px; margin-right: 10px" v-model.number="searchFields.Name" placeholder="关键字搜索" />
-              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
+              <!-- <Input style="width: 200px; margin-right: 10px" v-model.number="searchFields.Name" placeholder="关键字搜索" />
+              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button> -->
               <Button type="primary" @click="edit()" style="margin-left: 10px">新增角色</Button>
             </div>
           </slot>
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 40e4d52..be06343 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="container">
     <!-- 查询配置 -->
-    <div>
+    <div  style="padding: 0px 20px">
       <div ref="lxHeader">
         <LxHeader icon="md-apps" text="用户管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
           <div slot="content"></div>
           <slot>
-            <div>
-              <Input style="width: 200px; margin-right: 10px" v-model.number="searchFields.Name" placeholder="关键字搜索" />
+            <div class="searchs">
+              <el-input style="width: 200px;margin-right: 10px" v-model="searchFields.keyword" placeholder="关键字搜索" />
               <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
               <Button type="primary" @click="edit()" style="margin-left: 10px">新增用户</Button>
             </div>
@@ -180,7 +180,7 @@
         tableHeight: 0,
         //查询条件字段
         searchFields: {
-          KeyWord: ""
+          keyword: ""
         },
         tableData: []
       }
@@ -213,7 +213,8 @@
         var that = this;
         listuser({
           page:1,
-          page_size:999
+          page_size:999,
+          keyword:this.searchFields.keyword
         }).then(response => {
           var data = response.data;
           var _rolelist = [];
@@ -231,7 +232,7 @@
                 mod.checked = false;
               }
             }
-            
+
             m.departmentName = m.department?m.department.name:''
             console.log("m",m)
             console.log(_u_rolelist)
@@ -339,5 +340,8 @@
   };
 </script>
 
-<style>
+<style scoped>
+  /deep/ .searchs .el-input__inner{
+    height:32px;
+  }
 </style>
diff --git a/src/views/visit/blacklist.vue b/src/views/visit/blacklist.vue
index 8e843ea..3c033ae 100644
--- a/src/views/visit/blacklist.vue
+++ b/src/views/visit/blacklist.vue
@@ -21,7 +21,7 @@
 
     <xy-table :table-item="table" :list="data" :total="total"
       :auths="['edit','delete']"
-      @pageSizeChange="e => {select.rows = e;select.page = 1;getList()}"
+      @pageSizeChange="e => {select.page_size = e;select.page = 1;getList()}"
       @pageIndexChange="e => {select.page = e;getList()}" @delete="deleteRow" @editor="editorRow">
     </xy-table>
     <addBlack ref="addBlack" @refresh="getList"></addBlack>
diff --git a/src/views/visit/check.vue b/src/views/visit/check.vue
index d0e4bdb..92fe7c6 100644
--- a/src/views/visit/check.vue
+++ b/src/views/visit/check.vue
@@ -49,7 +49,7 @@
     </div>
 
     <xy-table :table-item="table" :list="data" :total="total"
-      @pageSizeChange="e => {select.rows = e;select.page = 1;getList()}"
+      @pageSizeChange="e => {select.page_size = e;select.page = 1;getList()}"
       @pageIndexChange="e => {select.page = e;getList()}">
       <template v-slot:btns>
         <el-table-column fixed="right" label="操作" width="180" header-align="center">
diff --git a/src/views/visit/component/addCommon.vue b/src/views/visit/component/addCommon.vue
index 03feb31..17d2711 100644
--- a/src/views/visit/component/addCommon.vue
+++ b/src/views/visit/component/addCommon.vue
@@ -284,14 +284,14 @@
           </div>
         </div>
       </template>
-      <template v-slot:visitorinfos1 v-if="visitType==1||visitType==2">
+      <template v-slot:visitorinfos1 v-if="visitAreaText=='生产区'">
         <div class="xy-table-item">
           <div class="xy-table-item-content" style="width:400px">
             陪同人信息：
           </div>
         </div>
       </template>
-      <template v-slot:accompany_id v-if="visitType==1||visitType==2">
+      <template v-slot:accompany_id v-if="visitAreaText=='生产区'">
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>人员：
@@ -619,7 +619,7 @@
         this.visitTimeList = res.data
         const resarea = await getAreaList()
         this.visitAreaList = resarea.data
-        const resuser = await listCommonuser({page:1,page_size:999})
+        const resuser = await listCommonuser({page:1,page_size:999,show_all:1})
         this.adminList = resuser.data
 
         const reason = await getparameter({
@@ -665,6 +665,9 @@
             if(e.id==item){
               this.form.accept_admin_id = e.id
               this.form.accpet_department_id = e.department_id
+              if(this.visitAreaText=='非生产区'){
+                this.form.accompany_id = e.id
+              }
             }
           })
 
@@ -677,6 +680,9 @@
               this.form.accept_admin_id = e.id
               this.form.accept_goods_admin_id = e.id
               this.form.accpet_department_id = e.department_id
+              if(this.visitAreaText=='非生产区'){
+                this.form.accompany_id = e.id
+              }
             }
           })
 
diff --git a/src/views/visit/component/showVisit.vue b/src/views/visit/component/showVisit.vue
index 8936536..b375203 100644
--- a/src/views/visit/component/showVisit.vue
+++ b/src/views/visit/component/showVisit.vue
@@ -209,7 +209,7 @@
           </div>
         </div>
       </template>
-      <template v-slot:cda v-if="form.type==1&&form.visit_area.name=='生产区'">
+      <template v-slot:cda v-if="form.type==1 && form.visit_area && form.visit_area.name=='生产区'">
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             CDA编号：
@@ -276,14 +276,14 @@
           </div>
         </div>
       </template>
-      <template v-slot:visitorinfos1>
+      <template v-slot:visitorinfos1 v-if="form.visit_area && form.visit_area.name=='生产区'">
         <div class="xy-table-item">
           <div class="xy-table-item-content" style="width:400px">
             陪同人信息：
           </div>
         </div>
       </template>
-      <template v-slot:accompany_id>
+      <template v-slot:accompany_id  v-if="form.visit_area && form.visit_area.name=='生产区'">
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;"></span>人员：
@@ -527,9 +527,7 @@
             this.getDetail()
           }
 
-          if (this.formDataType == 'coderecord') {
-            console.log("123")
-            console.log(this.form)
+          if (this.formDataType == 'coderecord') {
             this.codeForm.code = this.form.code
             this.codeForm.admin_id = parseInt(this.gateAdminId)
             this.codeForm.type = this.form.audit_status == 1 ? 1 : (this.form.audit_status == 3 && this.form.accept_admin_sign ? 2 : 0)
diff --git a/src/views/visit/longterm.vue b/src/views/visit/longterm.vue
index ce6c70c..bff7728 100644
--- a/src/views/visit/longterm.vue
+++ b/src/views/visit/longterm.vue
@@ -29,7 +29,7 @@
 
     <xy-table :table-item="table" :list="data" :total="total"
       :auths="['edit','delete']"
-      @pageSizeChange="e => {select.rows = e;select.page = 1;getList()}"
+      @pageSizeChange="e => {select.page_size = e;select.page = 1;getList()}"
       @pageIndexChange="e => {select.page = e;getList()}" @delete="deleteStudy" @editor="editorStudy">
 
     </xy-table>
diff --git a/src/views/visit/record.vue b/src/views/visit/record.vue
index ebdf048..bdbb8f0 100644
--- a/src/views/visit/record.vue
+++ b/src/views/visit/record.vue
@@ -45,7 +45,7 @@
 
     <xy-table :table-item="table" :list="data" :total="total"
       :auths="['edit','delete']"
-      @pageSizeChange="e => {select.rows = e;select.page = 1;getList()}"
+      @pageSizeChange="e => {select.page_size = e;select.page = 1;getList()}"
       @pageIndexChange="e => {select.page = e;getList()}" @delete="deleteStudy" @editor="editorStudy">
     </xy-table>
     <addCommon ref="addCommon" @refresh="getList"></addCommon>
diff --git a/src/views/visit/study.vue b/src/views/visit/study.vue
new file mode 100644
index 0000000..49c4eeb
--- /dev/null
+++ b/src/views/visit/study.vue
@@ -0,0 +1,154 @@
+<template>
+  <div style="padding: 0 20px">
+    <div ref="lxHeader">
+      <lx-header icon="md-apps" text="学习记录" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+        <slot>
+          <div style="display: flex;align-items: center;" class="selector">
+            <div style="margin-right: 10px;">关键词</div>
+
+            <el-input size="mini" placeholder="请输入关键词" v-model="select.keyword"
+              style="width: 160px;margin-right: 10px;"></el-input>
+            <el-button @click="getList" slot="reference" size="medium" type="primary" style="margin-left: 10px">查询
+            </el-button>
+          </div>
+        </slot>
+      </lx-header>
+    </div>
+
+    <xy-table :table-item="table" :list="data" :total="total"
+      :auths="[]"
+      @pageSizeChange="e => {select.page_size = e;select.page = 1;getList()}"
+      @pageIndexChange="e => {select.page = e;getList()}">
+      <template v-slot:btns>
+        <div></div>
+      </template>
+    </xy-table>
+  </div>
+</template>
+
+<script>
+  import {
+    getList
+  } from '@/api/visit/study.js'
+  export default {
+    data() {
+      return {
+        select: {
+          page: 1,
+          page_size: 10,
+          keyword: "",
+        },
+        total: 0,
+        data: [],
+        table: [{
+            label: '序号',
+            type: "index",
+            fixed: "left",
+            width: 80
+          },
+          {
+            label: '用户id',
+            sortable: false,
+            prop: 'user_id',
+            width: 120
+          },
+          {
+            label: '姓名',
+            sortable: false,
+            prop: 'name',
+            width: 120
+          },
+          {
+            label: '身份证',
+            sortable: false,
+            prop: 'idcard',
+            // width: 120
+          },
+          {
+            label: '联系方式',
+            sortable: false,
+            prop: 'mobile',
+            width: 120
+          },
+          {
+            label: '学习类型',
+            sortable: false,
+            prop: 'type',
+            width: 120,
+            formatter:(cell, data, value)=>{
+              if(value==1){
+                return '普通访客'
+              }else if(value==2){
+                return '施工访客'
+              }else if(value==3){
+                return '物流车辆'
+              }else{
+                return '未知'
+              }
+            }
+          },
+          {
+            label: '学习时间',
+            sortable: false,
+            prop: 'updated_at',
+            width: 180
+          },
+          {
+            label: '有效期',
+            sortable: false,
+            prop: 'expire_day',
+            width: 180
+          },
+        ]
+      }
+    },
+    computed: {},
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      async getList() {
+        let res = await getList(this.select)
+        console.log(res)
+        this.data = res.data
+        this.total = res.total
+      }
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  //::v-deep .el-button + .el-button{
+  //  margin-left: 0 !important;
+  //}
+  ::v-deep .el-button {
+    padding: 5px 8px !important;
+  }
+
+  .selector {
+    ::v-deep .el-input--suffix .el-input__inner {
+      height: 28px;
+    }
+
+    ::v-deep .el-select .el-input .el-select__caret {
+      line-height: 28px;
+    }
+
+    ::v-deep .el-range-editor.el-input__inner {
+      height: 28px;
+      width: 250px
+    }
+
+    ::v-deep .el-date-editor .el-range__icon {
+      line-height: 21px;
+    }
+
+    ::v-deep .el-date-editor .el-range-separator {
+      line-height: 21px;
+    }
+
+    ::v-deep .el-date-editor .el-range__close-icon {
+      line-height: 21px;
+    }
+  }
+</style>