zxr 2 éve
szülő
commit
e7885834ee

+ 10 - 0
src/api/access/accessControl.js

@@ -26,3 +26,13 @@ export function listIpaddressconfig(query) {
     params: query
   })
 }
+
+
+// 人员信息列表查询
+export function employee(query) {
+  return request({
+    url: '/grassrootsregistration/employee/list',
+    method: 'get',
+    params: query
+  })
+}

+ 2 - 2
src/views/access/Renaccess/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item prop="offduty">
+      <!-- <el-form-item prop="offduty">
         <el-select v-model="ipDi" placeholder="请选择考勤地址" clearable>
           <el-option v-for="item in ipList" :key="item.id" :label="item.ip" :value="item.ip"></el-option>
         </el-select>
@@ -15,7 +15,7 @@
       <el-form-item>
         <el-button size="btr" @click="handleQuery">搜索</el-button>
         <el-button size="btr" @click="resetQuery">重置</el-button>
-      </el-form-item>
+      </el-form-item>-->
       <!-- :highlightedDates="year" -->
       <vue-horizontal-calendar
         :minDate="starttimes"

+ 55 - 46
src/views/access/renInformation/index.vue

@@ -7,16 +7,19 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item prop="offduty">
+      <!-- <el-form-item prop="offduty">
         <el-select v-model="ipDi" placeholder="请选择考勤地址" clearable>
-          <el-option
-            v-for="item in ipList"
-            :key="item.id"
-            :label="item.ip"
-            :value="item.ip"
-          >
-          </el-option>
+          <el-option v-for="item in ipList" :key="item.id" :label="item.ip" :value="item.ip"></el-option>
         </el-select>
+      </el-form-item>-->
+      <el-form-item prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入姓名"
+          clearable
+          size="small"
+          @input="handleQuery"
+        />
       </el-form-item>
       <!-- <el-form-item prop="offduty">
         <el-select
@@ -32,13 +35,13 @@
           >
           </el-option>
         </el-select>
-      </el-form-item> -->
+      </el-form-item>-->
       <el-form-item>
-        <el-button size="btr" @click="handleQuery">搜索</el-button>
+        <!-- <el-button size="btr" @click="handleQuery">搜索</el-button> -->
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <el-row :gutter="10" class="mb8"> </el-row>
+    <el-row :gutter="10" class="mb8"></el-row>
 
     <el-table
       v-loading="loading"
@@ -48,19 +51,16 @@
       <!-- <el-table-column label="序号" align="center" prop="id" /> -->
       <el-table-column label="序号" type="index" width="50" align="center">
         <template scope="scope">
-          <span>{{
+          <span>
+            {{
             (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
-          }}</span>
+            }}
+          </span>
         </template>
       </el-table-column>
       <el-table-column label="编号" align="center" prop="pin" />
       <el-table-column label="姓名" align="center" prop="name" />
-      <el-table-column
-        label="单位"
-        align="center"
-        prop="deptname"
-        show-overflow-tooltip
-      />
+      <el-table-column label="单位" align="center" prop="deptname" show-overflow-tooltip />
       <el-table-column label="手机号码" align="center" prop="mobile" />
       <el-table-column label="办公电话" align="center" prop="telephone" />
       <el-table-column label="状态" align="center" prop="status">
@@ -71,27 +71,27 @@
       </el-table-column>
     </el-table>
 
-    <!-- <pagination
+    <pagination
       v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
-    /> -->
+    />
   </div>
 </template>
   <script>
 import axios from "axios";
 import { getDicts } from "@/api/system/dict/data";
 import { getDept } from "@/api/grassrootsregistration/bdglmeeting";
-import { listIpaddressconfig } from "@/api/access/accessControl";
+import { listIpaddressconfig, employee } from "@/api/access/accessControl";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "access",
   components: {
-    Treeselect,
+    Treeselect
   },
   data() {
     return {
@@ -99,7 +99,7 @@ export default {
       queryParams: {
         number: 0,
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 10
       },
       bdglevenList: [],
       // 显示搜索条件
@@ -122,15 +122,15 @@ export default {
           {
             type: "email",
             message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"],
-          },
-        ],
+            trigger: ["blur", "change"]
+          }
+        ]
       },
       // 树形结构列表
       deptOptions: [],
       // 考勤机ipList
       ipList: [],
-      ipDi: null,
+      ipDi: null
       // 192.168.5.188:85
     };
   },
@@ -138,10 +138,10 @@ export default {
     // 获取列表
     this.getTiem();
     // 字典在位情况
-    getDicts("sys_zai").then((res) => {
+    getDicts("sys_zai").then(res => {
       this.renList = res.data;
     });
-    listIpaddressconfig().then((res) => {
+    listIpaddressconfig().then(res => {
       this.ipList = res.rows;
     });
   },
@@ -158,7 +158,7 @@ export default {
     },
     // 获取部门列表
     getBuMeng() {
-      getDept().then((res) => {
+      getDept().then(res => {
         this.deptOptions = res.data;
       });
     },
@@ -173,24 +173,34 @@ export default {
     // 重置
     resetQuery() {
       // this.getTiem();
-      this.ipDi=null;
+      // this.ipDi = null;
+      this.resetForm("queryForm");
+      this.handleQuery();
     },
     getList(number) {
       this.loading = false;
-      axios
-        .post(
-          `http://${this.ipDi}/api/v2/employee/get/?key=2633p84hnnlavzcy9afjcbtj1jdnega0ftscjkka6h7a`,
-          {
-            number,
-          }
-        )
-        .then((res) => {
+      // axios
+      //   .post(
+      //     `http://${this.ipDi}/api/v2/employee/get/?key=2633p84hnnlavzcy9afjcbtj1jdnega0ftscjkka6h7a`,
+      //     {
+      //       number
+      //     }
+      //   )
+      //   .then(res => {
+      //     this.loading = false;
+      //     this.bdglevenList = res.data.data.items;
+      //     this.total = res.data.data.items.length;
+      //   });
+      employee(this.queryParams).then(res => {
+        console.log(res);
+        if (res.code == 200) {
           this.loading = false;
-          this.bdglevenList = res.data.data.items;
-          this.total = res.data.data.items.length;
-        });
-    },
-  },
+          this.bdglevenList = res.rows;
+          this.total = res.total;
+        }
+      });
+    }
+  }
 };
 </script>
 <style scoped>
@@ -348,4 +358,3 @@ export default {
 }
 </style>
 
-