打卡点管理

.env.development

@@ -7,4 +7,6 @@ VUE_APP_COMPANY_HEALTH_WECHAT_XY_URL=http://wisdomhousewechat.sudaonline.net/pre
 #大屏企业版
 VUE_APP_COMPANY_HEALTH_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall_pc.html
 #大屏校园版
-VUE_APP_COMPANY_HEALTH_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd_pc.html
+VUE_APP_COMPANY_HEALTH_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd_pc.html
+#打卡点二维码地址
+VUE_APP_PUNCHLOCATION_URL=http://yktwechat.xiaoxinda.com/#/health/codeScene

.env.production

@@ -8,4 +8,6 @@ VUE_APP_COMPANY_HEALTH_WECHAT_XY_URL=http://wisdomhousewechat.sudaonline.net/pre
 #大屏企业版
 VUE_APP_COMPANY_HEALTH_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall_pc.html
 #大屏校园版
-VUE_APP_COMPANY_HEALTH_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd_pc.html
+VUE_APP_COMPANY_HEALTH_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd_pc.html
+#打卡点二维码地址
+VUE_APP_PUNCHLOCATION_URL=http://yktwechat.xiaoxinda.com/#/health/codeScene

package.json

@@ -16,6 +16,7 @@
     "nprogress": "0.2.0",
     "qrcodejs2": "^0.0.2",
     "vue": "^2.6.10",
+    "vue-amap": "^0.5.10",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.0.3",
     "vuex": "^3.1.2"

src/api/base/punchLocation.js

@@ -0,0 +1,50 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/punchLocation/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/punchLocation/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/punchLocation/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/punchLocation/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/punchLocation/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/punchLocation/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/punchLocation/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function changeEnable(formData) {
+  return request.post(constant.serverUrl + "/base/punchLocation/changeEnable", formData);
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove,changeEnable
+}

src/api/base/punchRecord.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData) {
+  return request.post(constant.serverUrl + "/base/punchRecord/pageList", formData);
+}
+
+function create() {
+  return request.get(constant.serverUrl + "/base/punchRecord/create");
+}
+
+function edit(id) {
+  return request.get(constant.serverUrl + "/base/punchRecord/edit/" + id);
+}
+
+function add(formModel) {
+  return request.post(constant.serverUrl + "/base/punchRecord/add", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel) {
+  return request.post(constant.serverUrl + "/base/punchRecord/update", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id) {
+  return request.post(constant.serverUrl + "/base/punchRecord/delete/" + id);
+}
+
+function batchRemove(idList) {
+  return request.post(constant.serverUrl + "/base/punchRecord/batchDelete", idList, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  pageList, create, edit, add, update, remove, batchRemove
+}

src/main.js

@@ -7,9 +7,19 @@ import './plugins/element.js'
 import AxiosPlugin from './plugins/AxiosPlugin'
 import './assets/iconfont/iconfont.css'
 
+import AMap from "vue-amap"
+
 Vue.config.productionTip = false
 Vue.use(AxiosPlugin);
 //Vue.use(ConfirmPlugin);
+Vue.use(AMap);
+
+AMap.initAMapApiLoader({
+  key: "09abadb2e35fc61fd84042c518e9aebf", 
+  plugin: ["AMap.Scale", "AMap.OverView", "AMap.ToolBar", "AMap.MapType"],
+  uiVersion: "1.0.11", // ui库版本，不配置不加载,
+  v: "1.4.4"
+});
 
 Vue.prototype.$echarts = echarts
 

src/routers/modules/base.js

@@ -350,6 +350,32 @@ var routers = [
                         title: '节假日设置'
                 }
         },
+        {
+                //打卡点管理
+                path: '/base/punchLocation/list',
+                name: 'BasePunchLocationList',
+                // route level code-splitting
+                // this generates a separate chunk (about.[hash].js) for this route
+                // which is lazy-loaded when the route is visited.
+                component: () => import('@/views/base/punchLocation-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '打卡点管理'
+                }
+        },
+        {
+                //打卡点打卡记录
+                path: '/base/punchRecord/list',
+                name: 'BasePunchRecordList',
+                // route level code-splitting
+                // this generates a separate chunk (about.[hash].js) for this route
+                // which is lazy-loaded when the route is visited.
+                component: () => import('@/views/base/punchRecord-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '打卡点打卡记录'
+                }
+        }
 ]
 
 export default routers;

src/views/base/personInfo-list.vue

@@ -301,7 +301,8 @@
               <span v-if="!row.faceBound">
                 <el-link type="primary" :underline="false" @click="uploadData(row)">数据同步</el-link>-
               </span>
-              <el-link type="primary" :underline="false" @click="showBound(row)">已绑定设备</el-link>
+              <el-link type="primary" :underline="false" @click="showBound(row)">已绑定设备</el-link>-
+              <el-link type="primary" :underline="false" @click="showLifeRecord(row)">生活记录</el-link>
             </el-col>
           </el-row>
         </template>
@@ -338,6 +339,13 @@
       @close="onDetailModalClose"
     ></personDeviceRelation-BoundList>
     <!--批量导入S-->
+    <!--生活记录 start-->
+    <lifeRecord-list
+      v-if="showRecordModal"
+      :personId="businessKey"
+      @close="recordModalClose"
+    ></lifeRecord-list>
+    <!--生活记录 end-->
     <el-dialog
       title="批量导入人员"
       :visible.sync="batchImportVisible"
@@ -1170,7 +1178,14 @@ export default {
           });
         }
       });
-    }
+    },
+    showLifeRecord(record) {
+      this.showRecordModal = true;
+      this.businessKey = record.id;
+    },
+    recordModalClose(refreshed) {
+      this.showRecordModal = false;
+    },
   },
   async mounted() {
     var self = this;

src/views/base/punchLocation-amap.vue

@@ -0,0 +1,175 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align:left;"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" :label-width="'100px'">
+        <el-row>
+          <el-col :span="24" style="height:400px;">
+            <!-- <baidu-map
+              class="bm-view"
+              :center="mapCenter"
+              :zoom="mapZoom"
+              @dblclick="ondblclick"
+              @dblclick="ondblclick"
+              :showAddressBar="true"
+              :autoLocation="true"
+              :double-click-zoom="false"
+              :scroll-wheel-zoom="true"
+            >
+              <bm-marker :position="pointPosition" :dragging="true" animation="BMAP_ANIMATION_BOUNCE"></bm-marker>
+            </baidu-map> -->
+             <el-amap 
+                  ref="map" 
+                  vid="amapDemo" 
+                  :amap-manager="amapManager" 
+                  :center="pointPosition" 
+                  :zoom="zoom" 
+                  :events="events" 
+                  class="amap-demo">
+                    <el-amap-marker vid="amapDemo" :position="pointPosition"></el-amap-marker>
+                </el-amap>
+          </el-col>
+          <el-col :span="24">
+            <el-input v-model="formModel.longtitude" readonly style="width:20%"></el-input>
+            <el-input v-model="formModel.latitude" readonly style="width:20%"></el-input>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import punchLocationApi from "@/api/base/punchLocation";
+import AMap from "vue-amap";
+let amapManager = new AMap.AMapManager();
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      amapManager,
+      zoom: 12,
+      formModel: {},
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      canQuery: true,
+      mapZoom: 12,
+      pointPosition: [112.240222, 30.337053],
+      showPosition: false,
+      events: {
+        click: e => {
+          var pt = e.lnglat;//点击选择新地址为中心点
+          console.log(pt);
+          
+          this.pointPosition = [pt.lng, pt.lat];
+          this.formModel.longtitude = pt.lng;
+          this.formModel.latitude = pt.lat;
+        }
+      }
+    };
+  },
+  methods: {
+    mapLoad(longtitude, latitude) {
+      this.pointPosition = [longtitude,latitude];
+    },
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          (function() {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return punchLocationApi.add(self.formModel);
+            } else {
+              return punchLocationApi.update(self.formModel);
+            }
+          })().then(function(response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success"
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
+
+              //self.$emit("close", false);
+            }
+          });
+        }
+      });
+    }
+  },
+  mounted: function() {
+    var self = this;
+    (function() {
+      if (self.businessKey.length == 0) {
+        self.$message({
+          message: "查无学校编号",
+          type: "warning"
+        });
+        return null;
+      } else {
+        return punchLocationApi.edit(self.businessKey);
+      }
+    })()
+      .then(response => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+          
+          if(self.formModel.longtitude!=null && self.formModel.latitude!=null){
+            this.mapLoad(self.formModel.longtitude, self.formModel.latitude);
+          }
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch(error => {
+        self.$message.error(error + "");
+      });
+  }
+};
+</script>
+<style>
+.bm-view {
+  width: 100%;
+  height: 400px;
+}
+
+.amap-demo{
+  width: 100%;
+  height: 400px;
+}
+</style>

src/views/base/punchLocation-detail.vue

@@ -0,0 +1,186 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align:left;"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+        <el-form-item label="学校" prop="companyId">
+          <el-select-tree
+            size="mini"
+            :props="props"
+            :options="companyResult"
+            :value="formModel.companyId"
+            @getValue="getSelectedValue($event)"
+            height="200"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="打卡点名称" prop="name">
+          <el-input v-model="formModel.name" placeholder="请输入打卡点名称" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="备注描述" prop="remark">
+          <el-input v-model="formModel.remark" placeholder="请输入备注描述" style="width:300px"></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import punchLocationApi from "@/api/base/punchLocation";
+import companyInfoApi from "@/api/base/companyInfo";
+import SelectTree from "@/components/SelectTree";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        companyId: [{ required: true, message: "请选择学校", trigger: "blur" }],
+        name: [
+          { required: true, message: "打卡点名称不能为空", trigger: "blur" }
+        ]
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      companyResult: [],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children"
+      }
+    };
+  },
+  created() {
+    var self = this;
+    companyInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.companyResult = jsonData.data;
+        }
+      }
+    });
+  },
+  methods: {
+    getSelectedValue(value) {
+      this.formModel.companyId = value;
+    },
+    loadTree() {
+      var formData = new FormData();
+
+      companyInfoApi.loadChildren(formData).then(resp => {
+        var jsonData = resp.data;
+
+        if (jsonData.result) {
+          this.treeData = jsonData.data;
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
+    loadChildren(tree, treeNode, resolve) {
+      var formData = new FormData();
+      formData.append("parentId", tree.id);
+
+      companyInfoApi.loadChildren(formData).then(resp => {
+        var jsonData = resp.data;
+
+        if (jsonData.result) {
+          resolve(jsonData.data);
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          (function() {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return punchLocationApi.add(self.formModel);
+            } else {
+              return punchLocationApi.update(self.formModel);
+            }
+          })().then(function(response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success"
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
+
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    }
+  },
+  mounted: function() {
+    var self = this;
+
+    (function() {
+      if (self.businessKey.length == 0) {
+        return punchLocationApi.create();
+      } else {
+        return punchLocationApi.edit(self.businessKey);
+      }
+    })()
+      .then(response => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+
+          var isEnable = self.formModel.isEnable;
+          if (isEnable != "") {
+            self.formModel.isEnable = true;
+          }
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch(error => {
+        self.$message.error(error + "");
+      });
+  },
+  components: {
+    "el-select-tree": SelectTree
+  }
+};
+</script>

src/views/base/punchLocation-list.vue

@@ -0,0 +1,475 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">系统管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/punchLocation">打卡点管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+      <el-form-item label="学校" prop="companyId">
+        <el-select-tree
+          size="mini"
+          :props="props"
+          :options="companyResult"
+          :value="queryModel.companyId"
+          @getValue="getSelectedValue($event)"
+          height="200"
+        ></el-select-tree>&nbsp;
+        <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>
+      </el-form-item>
+      <el-form-item label="打卡点名称" prop="name">
+        <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+      </el-form-item>
+      <el-form-item label="是否启用" prop="isEnable">
+        <el-select
+          v-model="queryModel.isEnable"
+          size="mini"
+          filterable
+          placeholder="请选择"
+          style="width:120px"
+        >
+          <el-option value label="全部"></el-option>
+          <el-option value="1" label="启用"></el-option>
+          <el-option value="0" label="停用"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+        >查询</el-button>&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+        >重置</el-button>&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        :disabled="multipleSelection.length==0"
+        @click="handleBatchDelete"
+      >删除选中项</el-button>
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height:400px;"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column type="index" label="序号" :index="indexMethod" width="50"></el-table-column>
+      <el-table-column prop="isEnable" label="启用状态" width="100">
+        <template slot-scope="{row}">
+          <el-switch
+            v-model="row.isEnable"
+            @change="enabledTo(row,row.isEnable)"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column prop="companyName" label="学校" width="180"></el-table-column>
+      <el-table-column prop="name" sort-by="name_" label="打卡点名称" width="180"></el-table-column>
+      <el-table-column prop="longtitude" label="打卡点经度" width="100"></el-table-column>
+      <el-table-column prop="latitude" label="打卡点维度" width="100"></el-table-column>
+      <el-table-column prop="remark" sort-by="remark_" label="备注" width="180"></el-table-column>
+      <el-table-column label="操作" width="300px">
+        <template slot-scope="{row}">
+          <el-row>
+            <el-col :span="4">
+              <el-link type="primary" :underline="false" @click="handleEdit(row)">编辑</el-link>
+            </el-col>
+            <el-col :span="4">
+              <el-link type="danger" :underline="false" @click="handleDelete(row)">删除</el-link>
+            </el-col>
+            <el-col :span="4">
+              <el-link type="primary" :underline="false" @click="handlePoint(row)">定位</el-link>
+            </el-col>
+            <el-col :span="6">
+              <el-popover
+                placement="left"
+                width="300"
+                trigger="click"
+                @show="openQRCode(row)"
+                @hide="closeQRCode(row)"
+              >
+                <div :ref="'qrcode_' + row.id" style="width:300px;height:300px;"></div>
+                <el-link type="primary" :underline="false" slot="reference">二维码展示</el-link>
+              </el-popover>
+            </el-col>
+          </el-row>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <punchLocation-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      :companyResult="companyResult"
+      @close="onDetailModalClose"
+    ></punchLocation-detail>
+    <punchLocation-map
+      v-if="showMapModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></punchLocation-map>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import PunchLocationDetail from "./punchLocation-detail";
+import PunchLocationMap from "./punchLocation-amap";
+import companyInfoApi from "@/api/base/companyInfo";
+import punchLocationApi from "@/api/base/punchLocation";
+import QRCode from "qrcodejs2";
+import SelectTree from "@/components/SelectTree";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: "BasePunchLocationList",
+  components: {
+    "punchLocation-detail": PunchLocationDetail,
+    "el-select-tree": SelectTree,
+    "punchLocation-map": PunchLocationMap
+  },
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        companyId: "",
+        name: "",
+        longtitude: "",
+        latitude: "",
+        remark: "",
+        isEnable: ""
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      companyResult: [],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children"
+      },
+      showMapModal: false
+    };
+  },
+  created() {
+    var self = this;
+    companyInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.companyResult = jsonData.data;
+        }
+      }
+    });
+  },
+  methods: {
+    getSelectedValue(value) {
+      this.queryModel.companyId = value;
+    },
+    loadTree() {
+      var formData = new FormData();
+
+      companyInfoApi.loadChildren(formData).then(resp => {
+        var jsonData = resp.data;
+
+        if (jsonData.result) {
+          this.treeData = jsonData.data;
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
+    loadChildren(tree, treeNode, resolve) {
+      var formData = new FormData();
+      formData.append("parentId", tree.id);
+
+      companyInfoApi.loadChildren(formData).then(resp => {
+        var jsonData = resp.data;
+
+        if (jsonData.result) {
+          resolve(jsonData.data);
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
+    indexMethod(index) {
+      return (this.pageIndex - 1) * this.pageSize + (index + 1);
+    },
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+      formData.append("companyId", self.queryModel.companyId);
+      formData.append("name", self.queryModel.name);
+      formData.append("longtitude", self.queryModel.longtitude);
+      formData.append("latitude", self.queryModel.latitude);
+      formData.append("remark", self.queryModel.remark);
+      formData.append("isEnable", self.queryModel.isEnable);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      punchLocationApi
+        .pageList(formData)
+        .then(function(response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch(error => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+        .then(() => {
+          punchLocationApi.remove(record.id).then(function(response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map(record => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        punchLocationApi.batchRemove(idList).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+      this.showMapModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    openQRCode(record) {
+      //el.innerHTML = "";
+      var self = this;
+      self.$refs["qrcode_" + record.id].innerHTML = "";
+      var qrtext = process.env.VUE_APP_PUNCHLOCATION_URL + "?id=" + record.id;
+      var el = self.$refs["qrcode_" + record.id];
+
+      var qr = new QRCode(el, {
+        text: qrtext,
+        width: 300,
+        height: 300,
+        colorDark: "#333333", //二维码颜色
+        colorLight: "#ffffff", //二维码背景色
+        correctLevel: QRCode.CorrectLevel.L //容错率，L/M/H
+      });
+    },
+    closeQRCode(record) {
+      self.$refs["qrcode_" + record.id].innerHTML = "";
+    },
+    handlePoint(record) {
+      this.modalTitle = "定位";
+      this.businessKey = record.id;
+      this.showMapModal = true;
+    },
+    enabledTo(row, type, value) {
+      var self = this;
+      this.$confirm("是否执行操作？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          //self.loading = true;
+          if (!self.disabled) {
+            var formData = new FormData();
+            formData.append("id", row.id);
+
+            punchLocationApi.changeEnable(formData).then(function(response) {
+              var jsonData = response.data;
+
+              if (jsonData.result) {
+                console.log(jsonData.result);
+              } else {
+                self.changePage(self.pageIndex);
+                self.$message({
+                  type: "error",
+                  message: jsonData.message
+                });
+              }
+            });
+            self.disabled = true;
+
+            setTimeout(function() {
+              self.disabled = false;
+              //self.loading = false;
+            }, 1000); //一秒内不能重复点击
+          } else {
+            self.$message({
+              type: "success",
+              message: "操作过快!"
+            });
+          }
+        })
+        .catch(() => {
+          // self.loading = false;
+          if (row.faceEnabled) {
+            row.faceEnabled = false;
+          } else {
+            row.faceEnabled = true;
+          }
+        });
+    }
+  },
+  mounted: function() {
+    this.changePage(1);
+  }
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/punchRecord-list.vue

@@ -0,0 +1,365 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">系统管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/punchRecord">punchRecord管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+      <el-form-item label prop="id">
+        <el-input type="text" size="mini" v-model="queryModel.id"></el-input>
+      </el-form-item>
+      <el-form-item label="打卡人ID" prop="personId">
+        <el-input type="text" size="mini" v-model="queryModel.personId"></el-input>
+      </el-form-item>
+      <el-form-item label="打卡点ID" prop="punchId">
+        <el-input type="text" size="mini" v-model="queryModel.punchId"></el-input>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input type="text" size="mini" v-model="queryModel.remark"></el-input>
+      </el-form-item>
+      <el-form-item label="当前经度" prop="longtitude">
+        <el-input type="text" size="mini" v-model="queryModel.longtitude"></el-input>
+      </el-form-item>
+      <el-form-item label="当前维度" prop="latitude">
+        <el-input type="text" size="mini" v-model="queryModel.latitude"></el-input>
+      </el-form-item>
+      <el-form-item label="是否删除" prop="delFlag">
+        <el-input type="text" size="mini" v-model="queryModel.delFlag"></el-input>
+      </el-form-item>
+      <el-form-item label="创建人" prop="createBy">
+        <el-input type="text" size="mini" v-model="queryModel.createBy"></el-input>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-input type="text" size="mini" v-model="queryModel.createTime"></el-input>
+      </el-form-item>
+      <el-form-item label="更新人" prop="updateBy">
+        <el-input type="text" size="mini" v-model="queryModel.updateBy"></el-input>
+      </el-form-item>
+      <el-form-item label="更新时间" prop="updateTime">
+        <el-input type="text" size="mini" v-model="queryModel.updateTime"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+        >查询</el-button>&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+        >重置</el-button>&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        :disabled="multipleSelection.length==0"
+        @click="handleBatchDelete"
+      >删除选中项</el-button>
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height:400px;"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="id" sort-by="id_" label sortable="custom" width="180"></el-table-column>
+      <el-table-column
+        prop="personId"
+        sort-by="person_id"
+        label="打卡人ID"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="punchId"
+        sort-by="punch_id"
+        label="打卡点ID"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="remark" sort-by="remark_" label="备注" sortable="custom" width="180"></el-table-column>
+      <el-table-column
+        prop="longtitude"
+        sort-by="longtitude_"
+        label="当前经度"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="latitude"
+        sort-by="latitude_"
+        label="当前维度"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="delFlag" sort-by="del_flag" label="是否删除" sortable="custom" width="180"></el-table-column>
+      <el-table-column
+        prop="createBy"
+        sort-by="create_by"
+        label="创建人"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        sort-by="create_time"
+        label="创建时间"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="updateBy"
+        sort-by="update_by"
+        label="更新人"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="updateTime"
+        sort-by="update_time"
+        label="更新时间"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="{row}">
+          <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
+          <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import punchRecordApi from "@/api/base/punchRecord";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: "BasePunchRecordList",
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        personId: "",
+        punchId: "",
+        remark: "",
+        longtitude: "",
+        latitude: "",
+        delFlag: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: ""
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: ""
+    };
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("id", self.queryModel.id);
+      formData.append("personId", self.queryModel.personId);
+      formData.append("punchId", self.queryModel.punchId);
+      formData.append("remark", self.queryModel.remark);
+      formData.append("longtitude", self.queryModel.longtitude);
+      formData.append("latitude", self.queryModel.latitude);
+      formData.append("delFlag", self.queryModel.delFlag);
+      formData.append("createBy", self.queryModel.createBy);
+      formData.append("createTime", self.queryModel.createTime);
+      formData.append("updateBy", self.queryModel.updateBy);
+      formData.append("updateTime", self.queryModel.updateTime);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      punchRecordApi
+        .pageList(formData)
+        .then(function(response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch(error => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+        .then(() => {
+          punchRecordApi.remove(record.id).then(function(response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map(record => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        punchRecordApi.batchRemove(idList).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    }
+  },
+  mounted: function() {
+    this.changePage(1);
+  }
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

yarn.lock

@@ -1947,6 +1947,11 @@ camelcase-keys@^2.0.0:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
 
+camelcase@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+  integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
+
 camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
@@ -8319,6 +8324,13 @@ upper-case@^1.1.1:
   resolved "https://registry.npm.taobao.org/upper-case/download/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
   integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
 
+uppercamelcase@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/uppercamelcase/-/uppercamelcase-1.1.0.tgz#324d98a6b3afc7e8a8953e10641509b0e4e23f97"
+  integrity sha1-Mk2YprOvx+iolT4QZBUJsOTiP5c=
+  dependencies:
+    camelcase "^1.2.1"
+
 uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
@@ -8435,6 +8447,13 @@ vm-browserify@^1.0.1:
   resolved "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz?cache=0&sync_timestamp=1572870772154&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvm-browserify%2Fdownload%2Fvm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha1-eGQcSIuObKkadfUR56OzKobl3aA=
 
+vue-amap@^0.5.10:
+  version "0.5.10"
+  resolved "https://registry.yarnpkg.com/vue-amap/-/vue-amap-0.5.10.tgz#464516203af0c085d404bd8acabf2401e4a36ff6"
+  integrity sha512-9ViNCev1vx32+zZ5RvF/TmUZNbwL9QrdA2/OnD2GlXMfQBkJy7D08Vb7379t6guqnopDPtWJ8K6gg72h9+4GUg==
+  dependencies:
+    uppercamelcase "^1.1.0"
+
 vue-eslint-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-5.0.0.tgz?cache=0&sync_timestamp=1573306349811&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-eslint-parser%2Fdownload%2Fvue-eslint-parser-5.0.0.tgz#00f4e4da94ec974b821a26ff0ed0f7a78402b8a1"