yanliming 4 lat temu
rodzic
commit
31a28bf75d

+ 46 - 0
src/api/bus/shiftInfo.js

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

+ 46 - 0
src/api/bus/stationInfo.js

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

+ 50 - 0
src/api/bus/userInfo.js

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

+ 37 - 1
src/routers/modules/bus.js

@@ -58,7 +58,43 @@ var routers = [
                         roles: ["admin"],
                         title: '线路管理'
                 }
-        }
+        },
+        {
+                path: '/bus/userInfo/list',
+                name: 'BusUserInfoList',
+                // 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/bus/userInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '注册用户管理'
+                }
+        },
+        {
+                path: '/bus/shiftInfo/list',
+                name: 'BusShiftInfoList',
+                // 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/bus/shiftInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '班次管理'
+                }
+        },
+        {
+                path: '/bus/shiftInfo/list',
+                name: 'BusShiftInfoList',
+                // 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/bus/shiftInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '班次管理'
+                }
+        },
 ]
 
 export default routers;

+ 56 - 68
src/views/bus/passengerInfo-list.vue

@@ -26,7 +26,7 @@
           v-model="queryModel.vehiclePersonId"
         ></el-input>
       </el-form-item>
-      <el-form-item label="注册用户名称" prop="userId">
+      <el-form-item label="注册用户名称" prop="userName">
         <el-input
           type="text"
           size="mini"
@@ -34,14 +34,22 @@
         ></el-input>
       </el-form-item>
       <el-form-item
-        label="0-未购票、1-已购票,2-已过站,3-已补票"
+        label="购票状态"
         prop="payStatus"
       >
-        <el-input
-          type="text"
-          size="mini"
+        <el-select
           v-model="queryModel.payStatus"
-        ></el-input>
+          filterable
+          clearable
+          placeholder="请选择"
+          style="width: 110px"
+          size="mini"
+        >
+          <el-option key="0" label="未购票" value="0"></el-option>
+          <el-option key="1" label="已购票" value="1"></el-option>
+          <el-option key="2" label="已国战" value="2"></el-option>
+          <el-option key="3" label="已补票" value="3"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -62,25 +70,9 @@
       </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-row class="button-group">
+      
+    </el-row> -->
     <el-table
       :data="tableData"
       style="min-height: 400px"
@@ -89,11 +81,11 @@
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column
-        prop="id"
-        label="乘客表主键"
-        width="180"
+        type="index"
+        label="序号"
+        :index="indexMethod"
+        width="50"
       ></el-table-column>
       <el-table-column
         prop="vehicleShiftId"
@@ -106,15 +98,23 @@
         width="180"
       ></el-table-column>
       <el-table-column
-        prop="userId"
-        label="注册用户编号"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="imageUrl"
-        label="乘车人照片"
+        prop="userName"
+        label="注册用户"
         width="180"
       ></el-table-column>
+      <el-table-column prop="imageUrl" label="乘车人照片" width="180">
+        <template slot-scope="{ row }">
+          <a v-if="row.imageUrl" :href="row.imageUrl" target="_blank">
+            <el-image
+              :size="50"
+              :src="
+                row.imageUrl + '?x-oss-process=image/resize,m_fill,w_64,h_64'
+              "
+              :key="row.id"
+            ></el-image>
+          </a>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="upTime"
         label="上车时间"
@@ -135,41 +135,26 @@
         label="下车站点"
         width="180"
       ></el-table-column>
-      <el-table-column
-        prop="status"
-        label="0-未乘车、1-上车、2-下车"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="payStatus"
-        label="0-未购票、1-已购票,2-已过站,3-已补票"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="createBy"
-        label="创建人"
-        width="180"
-      ></el-table-column>
+      <el-table-column prop="status" label="乘车状态" width="180">
+        <template slot-scope="{ row }">
+          <span v-if="row.status == 0">未乘车</span>
+          <span v-else-if="row.status == 1">上车</span>
+          <span v-else-if="row.status == 2">下车</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="payStatus" label="购票状态" width="180">
+        <template slot-scope="{ row }">
+          <span v-if="row.payStatus == 0">未购票</span>
+          <span v-else-if="row.payStatus == 1">已购票</span>
+          <span v-else-if="row.payStatus == 2">已过站</span>
+          <span v-else-if="row.payStatus == 3">已补票</span>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="createTime"
         label="创建时间"
         width="180"
       ></el-table-column>
-      <el-table-column
-        prop="updateBy"
-        label="更新人"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="updateTime"
-        label="更新时间"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="delFlag"
-        label="是否删除"
-        width="180"
-      ></el-table-column>
     </el-table>
     <el-pagination
       :current-page.sync="pageIndex"
@@ -188,7 +173,7 @@ import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
 export default {
-  name:"BusPassengerInfoList",
+  name: "BusPassengerInfoList",
   data() {
     var self = this;
 
@@ -217,6 +202,9 @@ export default {
     };
   },
   methods: {
+    indexMethod(index) {
+      return (this.pageIndex - 1) * this.pageSize + (index + 1);
+    },
     changePage(pageIndex) {
       var self = this;
 
@@ -231,7 +219,7 @@ export default {
       formData.append("vehicleShiftId", self.queryModel.vehicleShiftId);
       formData.append("vehiclePersonId", self.queryModel.vehiclePersonId);
       formData.append("userId", self.queryModel.userId);
-      formData.append("userId", self.queryModel.userName);
+      formData.append("userName", self.queryModel.userName);
       formData.append("status", self.queryModel.status);
       formData.append("payStatus", self.queryModel.payStatus);
 

+ 323 - 0
src/views/bus/shiftInfo-list.vue

@@ -0,0 +1,323 @@
+<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="/shiftInfo">班次管理</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="vehicleNumber">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.vehicleNumber"
+        ></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="index"
+        label="序号"
+        :index="indexMethod"
+        width="50"
+      ></el-table-column>
+      <el-table-column
+        prop="vehicleNumber"
+        label="车牌号码"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="driverName"
+        label="司机"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="routeName"
+        label="路线名称"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="startStationName"
+        label="起始站"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="currentStationName"
+        label="当前站点"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="endStationName"
+        label="终点站"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="status" label="状态" width="180">
+        <template slot-scope="{ row }">
+          <span v-if="row.status == 1">进行中</span>
+          <span v-else-if="row.status == 2">结束</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="finishTime"
+        label="收班时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="创建时间"
+        width="180"
+      ></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 shiftInfoApi from "@/api/bus/shiftInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: "BusShiftInfoList",
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        vehicleNumber: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+    };
+  },
+  methods: {
+    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("vehicleNumber", self.queryModel.vehicleNumber);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      shiftInfoApi
+        .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(() => {
+          shiftInfoApi.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(() => {
+        shiftInfoApi.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>

+ 222 - 0
src/views/bus/userInfo-detail.vue

@@ -0,0 +1,222 @@
+
+<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="'135px'"
+      >
+        <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="phone">
+          <el-input
+            v-model="formModel.phone"
+            placeholder="请输入手机号码"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="密码" prop="password" v-if="formModel.id == null">
+          <el-input
+            type="password"
+            v-model="formModel.password"
+            placeholder="请输入密码"
+            style="width:300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="人脸图片" prop="faceImage">
+          <el-upload
+            class="avatar-uploader"
+            name="photoFile"
+            :action="uploadUrl"
+            :show-file-list="false"
+            :headers="headers"
+            :data="uploadData"
+            :on-success="handleAvatarSuccess"
+            :before-upload="beforeAvatarUpload"
+          >
+            <img v-if="fileUrl" :src="fileUrl" class="avatar" />
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item
+          label="是否接受乘车信息"
+          prop="acceptMessage"
+        >
+          <el-radio-group v-model="formModel.acceptMessage">
+            <el-radio :label="true">是</el-radio>
+            <el-radio :label="false">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="openId" prop="openId">
+          <el-input
+            v-model="formModel.openId"
+            placeholder="请输入openId"
+            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 userInfoApi from "@/api/bus/userInfo";
+
+import { getToken } from "@/utils/auth"; // get token from cookie
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        name: [
+          { required: true, message: "乘客姓名不能为空", trigger: "blur" },
+        ],
+        phone: [
+          { required: true, message: "手机号码不能为空", trigger: "blur" },
+        ],
+        password: [
+          { required: true, message: "密码不能为空", trigger: "blur" },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      //上传地址
+      uploadUrl: Constant.serverUrl + "/uploadPicture",
+      uploadData: {
+        subFolder: "userInfo",
+      },
+      fileUrl: "",
+      headers: {
+        Authorization: getToken(),
+      },
+    };
+  },
+  methods: {
+    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 userInfoApi.add(self.formModel);
+            } else {
+              return userInfoApi.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);
+            }
+          });
+        }
+      });
+    },
+    handleAvatarSuccess(res, file) {
+      var self = this;
+      self.formModel.faceImage = res.data;
+      self.fileUrl =
+        res.data + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === "image/jpeg";
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      if (!isJPG) {
+        this.$message.error("上传头像图片只能是 JPG 格式!");
+      }
+      if (!isLt2M) {
+        this.$message.error("上传头像图片大小不能超过 2MB!");
+      }
+      return isJPG && isLt2M;
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return userInfoApi.create();
+      } else {
+        return userInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+
+          let faceImage = self.formModel.faceImage;
+          if (faceImage != null) {
+            self.fileUrl =
+              faceImage + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
+          }
+          let acceptMessage = self.formModel.acceptMessage;
+          if(acceptMessage == null){
+            self.formModel.acceptMessage = false;
+          }
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

+ 376 - 0
src/views/bus/userInfo-list.vue

@@ -0,0 +1,376 @@
+<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="/userInfo">注册用户管理</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="姓名" prop="name">
+        <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+      </el-form-item>
+      <el-form-item label="手机号码" prop="phone">
+        <el-input type="text" size="mini" v-model="queryModel.phone"></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" label="用户编号" width="180"></el-table-column>
+      <el-table-column prop="name" label="姓名" width="180"></el-table-column>
+      <el-table-column
+        prop="phone"
+        label="手机号码"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="faceImage" label="人脸图片" width="180">
+        <template slot-scope="{ row }">
+          <a v-if="row.faceImage" :href="row.faceImage" target="_blank">
+            <el-image
+              :size="50"
+              :src="
+                row.faceImage + '?x-oss-process=image/resize,m_fill,w_64,h_64'
+              "
+              :key="row.id"
+            ></el-image>
+          </a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="acceptMessage"
+        label="是否接受乘车信息"
+        width="180"
+      >
+        <template slot-scope="{ row }">
+          <span v-if="row.acceptMessage">是</span>
+          <span v-else>否</span>
+        </template></el-table-column
+      >
+      <el-table-column
+        prop="openId"
+        label="openId"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="创建时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="remark"
+        label="备注"
+        width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="操作" width="180" fixed="right">
+        <template slot-scope="{ row }">
+          <el-link type="primary" :underline="false" @click="handleEdit(row)"
+            >编辑</el-link
+          >-
+          <el-link type="primary" :underline="false" @click="handleResetPass(row)"
+            >密码重置</el-link
+          >-
+          <el-link type="danger" :underline="false" @click="handleDelete(row)"
+            >删除</el-link
+          >
+        </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>
+    <userInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></userInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import UserInfoDetail from "./userInfo-detail";
+import userInfoApi from "@/api/bus/userInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: "BusUserInfoList",
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        name: "",
+        phone: "",
+      },
+      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("name", self.queryModel.name);
+      formData.append("phone", self.queryModel.phone);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      userInfoApi
+        .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(() => {
+          userInfoApi.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(() => {
+        userInfoApi.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);
+      }
+    },
+    handleResetPass(record){
+      var self = this;
+
+      self
+        .$confirm("是否重置密码?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+
+           var formData = new FormData();
+
+          formData.append("userId", record.id);
+          formData.append("newPwd", "123456");
+
+          userInfoApi.changePassword(formData).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: "密码已重置为123456!",
+              });
+            }
+          });
+        });
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "userInfo-detail": UserInfoDetail,
+  },
+};
+</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>