提交

src/api/bus/driverInfo.js

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

src/api/bus/vehicleInfo.js

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

src/routers/modules/bus.js

@@ -23,7 +23,30 @@ var routers = [
                         title: '乘客管理'
                 }
         },
-        
+        {
+                path: '/bus/driverInfo/list',
+                name: 'BusDriverInfoList',
+                // 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/driverInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '司机管理'
+                }
+        },
+        {
+                path: '/bus/vehicleInfo/list',
+                name: 'BusVehicleInfoList',
+                // 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/vehicleInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '车辆管理'
+                }
+        },
 ]
 
 export default routers;

src/views/bus/driverInfo-detail.vue

@@ -0,0 +1,275 @@
+
+<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"
+    width="40%"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'130px'"
+      >
+          <el-form-item label="所属公司" prop="companyId">
+            <el-select-tree
+              :props="props"
+              :options="companyResult"
+              v-model="formModel.companyId"
+              size="mediumn"
+              width="400px"
+            ></el-select-tree>
+          </el-form-item>
+
+          <el-form-item label="司机姓名" prop="name">
+              <el-input
+                v-model="formModel.name"
+                placeholder="请输入单位名称"
+                style="width: 400px"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input
+                v-model="formModel.idCard"
+                placeholder="请输入身份证号"
+                style="width: 400px"
+              ></el-input>
+            </el-form-item>
+           <el-form-item label="电话号码" prop="phone">
+              <el-input
+                v-model="formModel.phone"
+                placeholder="请输入电话号码"
+                style="width: 400px"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-model="formModel.remark"
+                placeholder="请输入备注"
+                style="width: 400px"
+              ></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>
+    </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 driverInfoApi from "@/api/bus/driverInfo";
+import SelectTree from "@/components/SelectTree";
+import companyInfoApi from "@/api/bus/companyInfo";
+
+import { getToken } from "@/utils/auth"; // get token from cookie
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {
+        enableChangeParent: false
+      },
+      ruleValidate: {
+        companyId: [
+          { required: true, message: "所属单位不能为空", trigger: "blur" },
+        ],
+        name: [
+          { required: true, message: "司机姓名不能为空", trigger: "blur" },
+        ],
+        idCard: [
+          { required: true, message: "身份证号不能为空", trigger: "blur" },
+        ],
+        phone: [
+          { required: true, message: "电话号码不能为空", trigger: "blur" },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      //上传地址
+      uploadUrl: Constant.serverUrl + "/uploadPicture",
+      uploadData: {
+        subFolder: "driverInfo",
+      },
+      fileUrl: "",
+      headers: {
+        Authorization: getToken(),
+      },
+      companyResult: [],
+      typeData: [],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      sceneData: [],
+      regionData: [],
+    };
+  },
+  created() {
+    var self = this;
+
+    companyInfoApi.treeList().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (self.formModel.parentId == null) {
+              self.formModel.parentId = "";
+            }
+
+            if (self.formModel.relationCompanyId == null) {
+              self.formModel.relationCompanyId = "";
+            }
+
+            if (id == null || id.length == 0) {
+              return driverInfoApi.add(self.formModel);
+            } else {
+              return driverInfoApi.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_400,w_400";
+    },
+    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;
+    },
+  },
+  components: {
+    "el-select-tree": SelectTree,
+  },
+  mounted: function () {
+    var self = this;
+    (function () {
+      if (self.businessKey.length == 0) {
+        return driverInfoApi.create();
+      } else {
+        return driverInfoApi.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_400,w_400";
+          }
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>

src/views/bus/driverInfo-list.vue

@@ -0,0 +1,497 @@
+<template>
+  <div style="padding-left: 5px">
+    <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="/driverInfo">司机管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <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"
+          v-model="queryModel.companyId"
+          height="200"
+        ></el-select-tree
+        >
+      </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="idCard">
+        <el-input type="text" size="mini" v-model="queryModel.idCard"></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-remove"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-upload2"
+        @click="batchImportVisible = true"
+        >导入</el-button
+      >
+    </el-row>
+    <el-table
+      ref="formTable"
+      :data="tableData"
+      v-loading="loading"
+      stripe
+      :height="tableHeight"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="公司名称"
+        width="200"
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="司机姓名"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="idCard"
+        label="身份证号码"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="phone"
+        label="手机号码"
+        width="120"
+      ></el-table-column>
+      <el-table-column prop="faceImage" label="照片" width="150">
+            <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="remark"
+        label="备注"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="创建时间"
+        width="150"
+      ></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>
+    <driverInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></driverInfo-detail>
+    <el-select-tree
+      size="mini"
+      :props="props"
+      :options="companyResult"
+      v-model="queryModel.companyId"
+      height="200"
+    ></el-select-tree>
+    <el-dialog
+      title="导入"
+      :visible.sync="batchImportVisible"
+      :modal-append-to-body="false"
+      style="text-align: left"
+      :close-on-click-modal="false"
+    >
+      <el-form label-width="150px">
+        <el-form-item label="模板下载">
+          <el-link
+            href="http://rccs.oss-cn-hangzhou.aliyuncs.com/smart-bus/excel/driver.xls"
+            type="primary"
+            target="_blank"
+            >点击下载模板</el-link
+          >
+        </el-form-item>
+        <el-form-item label="上传文件">
+          <el-upload
+            class="upload-demo"
+            accept=".xls"
+            :action="uploadUrlXls"
+            :data="uploadXlsData"
+            :headers="headers"
+            :on-preview="handleBatchImportPreview"
+            name="uploadFile"
+            :multiple="true"
+            :limit="1"
+            :on-remove="handleBatchImportRemove"
+            :before-remove="beforeBatchImportRemove"
+            :before-upload="beforeUpload"
+            :on-exceed="handleBatchImportExceed"
+            :on-success="handleBatchImportSuccess"
+            :file-list="batchImportFileList"
+          >
+            <el-button size="small" type="primary" :loading="xlsLoading"
+              >点击上传</el-button
+            >
+            <div slot="tip" class="el-upload__tip">
+              只能上传xls文件，且不超过500kb
+            </div>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="batchImportVisible = false"
+          >关 闭</el-button
+        >
+      </div>
+    </el-dialog>
+    <!--批量导入E-->
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import driverInfoDetail from "./driverInfo-detail";
+import driverInfoApi from "@/api/bus/driverInfo";
+import SelectTree from "@/components/SelectTree";
+import companyInfoApi from "@/api/bus/companyInfo";
+
+import { getToken } from "@/utils/auth"; // get token from cookie
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: "BusDriverInfoList",
+  data() {
+    var self = this;
+    return {
+      activeName: "list",
+      queryModel: {
+        name: "",
+        companyId: "",
+        idCard: "",
+        phone: "",
+      },
+      loading: false,
+      tableData: [],
+      treeData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      tableHeight: 300,
+      showDeviceModal: false,
+      companyId: "",
+      qrCode: "",
+      companyResult: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      batchImportVisible: false,
+      batchImportFileList: [],
+      uploadUrlXls: Constant.serverUrl + "/bus/driverInfo/importXls",
+      uploadXlsData: {
+        subFolder: "driver",
+      },
+      headers: {
+        Authorization: getToken(),
+      },
+      xlsLoading: false,
+      sceneData: [],
+      typeData:[]
+    };
+  },
+  created() {
+    var self = this;
+
+    companyInfoApi.treeList().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+
+    this.changePage(1);
+  },
+  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("companyId", self.queryModel.companyId);
+      formData.append("name", self.queryModel.name);
+      formData.append("idCard", self.queryModel.idCard);
+      formData.append("phone", self.queryModel.phone);
+
+
+
+      driverInfoApi
+        .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;
+          //45为分页栏的高度
+          //页面高度-列表上面的高度-分页栏高度
+          self.tableHeight =
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 100;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
+
+      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(() => {
+          driverInfoApi.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(() => {
+        driverInfoApi.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.showDeviceModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+
+    beforeUpload(file, fileList) {
+      //导入前判断
+    },
+    //批量导入-上传成功
+    handleBatchImportSuccess(response, file, fileList) {
+      var self = this;
+      self.xlsLoading = false;
+      if (response.result) {
+        self.$message.success(response.message);
+        this.batchImportFileList = [];
+        this.changePage(1);
+        this.uploadCompanyId = "";
+        this.uploadXlsData.companyId = "";
+        this.batchImportVisible = false;
+      } else {
+        //this.$message.error(response.message);
+        this.batchImportFileList = [];
+        this.changePage(1);
+        this.uploadCompanyId = "";
+        this.uploadXlsData.companyId = "";
+
+        if (response.data != null) {
+          //下载有错误信息提示的报表
+          //window.open(response.data);
+          self.$message({
+            showClose: true,
+            dangerouslyUseHTMLString: true,
+            message:
+              response.message +
+              `,<a href="${response.data}" target="_blank">点击下载未导入的数据报表</a>&nbsp;`,
+            duration: 30000,
+          });
+        }
+      }
+    },
+    //批量导入-预览
+    handleBatchImportPreview(file) {
+      console.log(file.url);
+    },
+    //批量导入-移除
+    handleBatchImportRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    //批量导入-移除前操作
+    beforeBatchImportRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    //批量导入-文件超出个数限制时的钩子
+    handleBatchImportExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+
+  },
+  mounted: function () {},
+  components: {
+    "driverInfo-detail": driverInfoDetail,
+    "el-select-tree": SelectTree,
+  },
+};
+</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/bus/vehicleInfo-detail.vue

@@ -0,0 +1,276 @@
+
+<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"
+    width="40%"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'130px'"
+      >
+          <el-form-item label="所属公司" prop="companyId">
+            <el-select-tree
+              :props="props"
+              :options="companyResult"
+              v-model="formModel.companyId"
+              size="mediumn"
+              width="400px"
+            ></el-select-tree>
+          </el-form-item>
+
+          <el-form-item label="车牌号" prop="licensePlateNumber">
+              <el-input
+                v-model="formModel.licensePlateNumber"
+                placeholder="请输入车牌号"
+                style="width: 400px"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="gps设备编号" prop="gpsDeviceNo">
+              <el-input
+                v-model="formModel.gpsDeviceNo"
+                placeholder="请输入gps设备编号"
+                style="width: 400px"
+              ></el-input>
+            </el-form-item>
+           <el-form-item label="设备编号" prop="deviceNo">
+              <el-input
+                v-model="formModel.deviceNo"
+                placeholder="请输入设备编号"
+                style="width: 400px"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="荷载人数" prop="loadNumber">
+              <el-input
+                v-model="formModel.loadNumber"
+                type="number"
+                placeholder="请输入荷载人数"
+                style="width: 400px"
+              ></el-input>
+            </el-form-item>
+
+            <el-form-item label="车辆照片" prop="picture">
+              <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>
+    </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 vehicleInfoApi from "@/api/bus/vehicleInfo";
+import SelectTree from "@/components/SelectTree";
+import companyInfoApi from "@/api/bus/companyInfo";
+
+import { getToken } from "@/utils/auth"; // get token from cookie
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {
+        enableChangeParent: false
+      },
+      ruleValidate: {
+        companyId: [
+          { required: true, message: "所属单位不能为空", trigger: "blur" },
+        ],
+        licensePlateNumber: [
+          { required: true, message: "车牌号不能为空", trigger: "blur" },
+        ],
+        gpsDeviceNo: [
+          { required: true, message: "gps设备号不能为空", trigger: "blur" },
+        ],
+        deviceNo: [
+          { required: true, message: "设备编号不能为空", trigger: "blur" },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      //上传地址
+      uploadUrl: Constant.serverUrl + "/uploadPicture",
+      uploadData: {
+        subFolder: "vehicleInfo",
+      },
+      fileUrl: "",
+      headers: {
+        Authorization: getToken(),
+      },
+      companyResult: [],
+      typeData: [],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      sceneData: [],
+      regionData: [],
+    };
+  },
+  created() {
+    var self = this;
+
+    companyInfoApi.treeList().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (self.formModel.parentId == null) {
+              self.formModel.parentId = "";
+            }
+
+            if (self.formModel.relationCompanyId == null) {
+              self.formModel.relationCompanyId = "";
+            }
+
+            if (id == null || id.length == 0) {
+              return vehicleInfoApi.add(self.formModel);
+            } else {
+              return vehicleInfoApi.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.picture = res.data;
+      self.fileUrl =
+        res.data + "?x-oss-process=image/resize,m_lfit,h_400,w_400";
+    },
+    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;
+    },
+  },
+  components: {
+    "el-select-tree": SelectTree,
+  },
+  mounted: function () {
+    var self = this;
+    (function () {
+      if (self.businessKey.length == 0) {
+        return vehicleInfoApi.create();
+      } else {
+        return vehicleInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+          let picture = self.formModel.picture;
+          if (picture != null) {
+            self.fileUrl =
+              picture + "?x-oss-process=image/resize,m_lfit,h_400,w_400";
+          }
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>

src/views/bus/vehicleInfo-list.vue

@@ -0,0 +1,521 @@
+<template>
+  <div style="padding-left: 5px">
+    <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="/driverInfo">司机管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <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"
+          v-model="queryModel.companyId"
+          height="200"
+        ></el-select-tree
+        >
+      </el-form-item>
+      <el-form-item label="车牌号" prop="licensePlateNumber">
+        <el-input type="text" size="mini" v-model="queryModel.licensePlateNumber"></el-input>
+      </el-form-item>
+      <el-form-item label="gps设备编号" prop="gpsDeviceNo">
+        <el-input type="text" size="mini" v-model="queryModel.gpsDeviceNo"></el-input>
+      </el-form-item>
+      <el-form-item label="设备编号" prop="deviceNo">
+        <el-input type="text" size="mini" v-model="queryModel.deviceNo"></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-remove"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-upload2"
+        @click="batchImportVisible = true"
+        >导入</el-button
+      >
+    </el-row>
+    <el-table
+      ref="formTable"
+      :data="tableData"
+      v-loading="loading"
+      stripe
+      :height="tableHeight"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column
+        prop="licensePlateNumber"
+        label="车牌号"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="gpsDeviceNo"
+        label="gps设备编号"
+        width="130"
+      ></el-table-column>
+      <el-table-column
+        prop="deviceNo"
+        label="门禁设备编号"
+        width="200"
+      ></el-table-column>
+      <el-table-column prop="picture" label="照片" width="150">
+            <template slot-scope="{row}">
+                <a v-if="row.picture" :href="row.picture" target="_blank">
+                    <el-image
+                    :size="50"
+                    :src="row.picture+'?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="loadNumber"
+        label="荷载人数"
+        width="100"
+      ></el-table-column>
+    <el-table-column prop="status"  label="车辆状态"  width="100">
+          <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="companyName"
+        label="所属单位"
+        width="130"
+      ></el-table-column>
+      <el-table-column prop="running" label="是否运行" width="100">
+          <template slot-scope="{ row }">
+            <span v-if="row.running==0">停车</span>
+            <span v-else-if="row.running==1">行驶中</span>
+          </template>
+      </el-table-column>
+    <el-table-column  prop="online"  label="在线状态"   width="100">
+        <template slot-scope="{ row }">
+          <div
+            v-if="row.online"
+            style="border-radius: 30px;background-color:#67C23A;width:20px;height:20px;"
+          ></div>
+          <div
+            v-if="!row.online"
+            style="border-radius: 30px;background-color:#F56C6C;width:20px;height:20px;"
+          ></div>
+          </template>
+    </el-table-column>
+      <el-table-column
+        prop="latestAddress"
+        label="最后所在位置"
+        width="150"
+      ></el-table-column>
+      <el-table-column label="操作" fixed="right" width="220">
+        <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>
+    <vehicleInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></vehicleInfo-detail>
+    <el-select-tree
+      size="mini"
+      :props="props"
+      :options="companyResult"
+      v-model="queryModel.companyId"
+      height="200"
+    ></el-select-tree>
+    <el-dialog
+      title="导入"
+      :visible.sync="batchImportVisible"
+      :modal-append-to-body="false"
+      style="text-align: left"
+      :close-on-click-modal="false"
+    >
+      <el-form label-width="150px">
+        <el-form-item label="模板下载">
+          <el-link
+            href="http://rccs.oss-cn-hangzhou.aliyuncs.com/smart-bus/excel/vehicle.xls"
+            type="primary"
+            target="_blank"
+            >点击下载模板</el-link
+          >
+        </el-form-item>
+        <el-form-item label="上传文件">
+          <el-upload
+            class="upload-demo"
+            accept=".xls"
+            :action="uploadUrlXls"
+            :data="uploadXlsData"
+            :headers="headers"
+            :on-preview="handleBatchImportPreview"
+            name="uploadFile"
+            :multiple="true"
+            :limit="1"
+            :on-remove="handleBatchImportRemove"
+            :before-remove="beforeBatchImportRemove"
+            :before-upload="beforeUpload"
+            :on-exceed="handleBatchImportExceed"
+            :on-success="handleBatchImportSuccess"
+            :file-list="batchImportFileList"
+          >
+            <el-button size="small" type="primary" :loading="xlsLoading"
+              >点击上传</el-button
+            >
+            <div slot="tip" class="el-upload__tip">
+              只能上传xls文件，且不超过500kb
+            </div>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="batchImportVisible = false"
+          >关 闭</el-button
+        >
+      </div>
+    </el-dialog>
+    <!--批量导入E-->
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import vehicleInfoDetail from "./vehicleInfo-detail";
+import vehicleInfoApi from "@/api/bus/vehicleInfo";
+import SelectTree from "@/components/SelectTree";
+import companyInfoApi from "@/api/bus/companyInfo";
+
+import { getToken } from "@/utils/auth"; // get token from cookie
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: "BusDriverInfoList",
+  data() {
+    var self = this;
+    return {
+      activeName: "list",
+      queryModel: {
+        licensePlateNumber: "",
+        companyId: "",
+        gpsDeviceNo: "",
+        deviceNo: "",
+      },
+      loading: false,
+      tableData: [],
+      treeData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      tableHeight: 300,
+      showDeviceModal: false,
+      companyId: "",
+      qrCode: "",
+      companyResult: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      batchImportVisible: false,
+      batchImportFileList: [],
+      uploadUrlXls: Constant.serverUrl + "/bus/vehicleInfo/importXls",
+      uploadXlsData: {
+        subFolder: "driver",
+      },
+      headers: {
+        Authorization: getToken(),
+      },
+      xlsLoading: false,
+      sceneData: [],
+      typeData:[]
+    };
+  },
+  created() {
+    var self = this;
+
+    companyInfoApi.treeList().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+
+    this.changePage(1);
+  },
+  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("companyId", self.queryModel.companyId);
+      formData.append("licensePlateNumber", self.queryModel.licensePlateNumber);
+      formData.append("gpsDeviceNo", self.queryModel.gpsDeviceNo);
+      formData.append("deviceNo", self.queryModel.deviceNo);
+
+
+
+      vehicleInfoApi
+        .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;
+          //45为分页栏的高度
+          //页面高度-列表上面的高度-分页栏高度
+          self.tableHeight =
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 100;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
+
+      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(() => {
+          vehicleInfoApi.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(() => {
+        vehicleInfoApi.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.showDeviceModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+
+    beforeUpload(file, fileList) {
+      //导入前判断
+    },
+    //批量导入-上传成功
+    handleBatchImportSuccess(response, file, fileList) {
+      var self = this;
+      self.xlsLoading = false;
+      if (response.result) {
+        self.$message.success(response.message);
+        this.batchImportFileList = [];
+        this.changePage(1);
+        this.uploadCompanyId = "";
+        this.uploadXlsData.companyId = "";
+        this.batchImportVisible = false;
+      } else {
+        //this.$message.error(response.message);
+        this.batchImportFileList = [];
+        this.changePage(1);
+        this.uploadCompanyId = "";
+        this.uploadXlsData.companyId = "";
+
+        if (response.data != null) {
+          //下载有错误信息提示的报表
+          //window.open(response.data);
+          self.$message({
+            showClose: true,
+            dangerouslyUseHTMLString: true,
+            message:
+              response.message +
+              `,<a href="${response.data}" target="_blank">点击下载未导入的数据报表</a>&nbsp;`,
+            duration: 30000,
+          });
+        }
+      }
+    },
+    //批量导入-预览
+    handleBatchImportPreview(file) {
+      console.log(file.url);
+    },
+    //批量导入-移除
+    handleBatchImportRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    //批量导入-移除前操作
+    beforeBatchImportRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    //批量导入-文件超出个数限制时的钩子
+    handleBatchImportExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+
+  },
+  mounted: function () {},
+  components: {
+    "vehicleInfo-detail": vehicleInfoDetail,
+    "el-select-tree": SelectTree,
+  },
+};
+</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>