Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory

liuyg

2021-07-26 c916b63f60fa9e6de04d6400960db47bd7d6a9cd

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory

 src/views/home/index.scss

@@ -257,12 +257,12 @@
    top: 50px;
  }
  /deep/ .el-table--striped .el-table__body tr.el-table__row--striped td {
    background: #18458f;
    background: #031d4b !important;
  }
  /deep/ .el-table--enable-row-transition .el-table__body td,
  /deep/ .el-table th,
  .el-table tr {
    background: #3457b1;
    background: #03225b !important;
  }
  /deep/ .el-table .cell {
    color: #fff;
@@ -271,6 +271,9 @@
  /deep/ .el-table td,
  .el-table th.is-leaf {
    border-bottom-color: transparent;
  }
  /deep/ .el-table__header th{
    border-bottom: 1px solid #031a38 !important;
  }
  /deep/.el-table--enable-row-hover .el-table__body tr:hover > td {
    background-color: #b0caf3;
@@ -303,7 +306,7 @@
  /deep/ .el-table--border::after,
  /deep/ .el-table--group::after,
  /deep/ .el-table::before {
    background-color: transparent;
    background-color: transparent !important;
  }
  .card-text {
    height: 30px;

 src/views/map/peopleGps.vue

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-07-05 16:31:54
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-07-23 14:12:26
 * @Last Modified time: 2021-07-23 14:54:47
 * menu-name 押运人员定位
 */
<template>
@@ -14,66 +14,67 @@
            <Map ref="modalForm" />
          </div>
          <div>
            <div class="data-table map-people-table" v-show="!detailFlag">
              <el-table
                :data="tableData"
                        <div class="data-table map-people-table"
                             v-show="!detailFlag">
                            <el-table :data="tableData"
                style="width: 100%"
                v-loading="loading"
              >
                <el-table-column
                  align="center"
                                      v-loading="loading">

                                <el-table-column align="center"
                                                 prop="mapInd"
                                                 label="序号"
                                                 width="54">
                                </el-table-column>

                                <el-table-column align="center"
                  prop="realName"
                  label="姓名"
                                                 width="82">
                                </el-table-column>

                                <el-table-column align="center"
                                                 prop="deptName"
                                                 label="所属公司">
                                </el-table-column>

                                <el-table-column label="操作"
                  width="136"
                >
                </el-table-column>

                <el-table-column
                  align="center"
                  prop="roleName"
                  label="所属角色"
                >
                </el-table-column>

                <el-table-column label="操作" width="136" align="center">
                                                 align="center">
                  <template slot-scope="scope">
                    <el-button
                      @click="positionClick(scope.row)"
                                        <el-button @click="positionClick(scope.row)"
                      type="text"
                      size="small"
                      title="定位"
                    >
                                                   title="定位">
                      <i class="el-icon-location"></i>
                    </el-button>
                    <el-button
                      @click="detailsClick(scope.row)"
                                        <el-button @click="detailsClick(scope.row)"
                      type="text"
                      size="small"
                      title="轨迹"
                    >
                                                   title="轨迹">
                      <i class="el-icon-position"></i>
                    </el-button>
                  </template>
                </el-table-column>
              </el-table>
              <div ref="tablePagination">
                <el-pagination
                  @size-change="handleSizeChange"
                                <el-pagination @size-change="handleSizeChange"
                  @current-change="handleCurrentChange"
                  background
                  :page-sizes="[10, 30, 50, 100]"
                  layout="sizes, prev, pager, next"
                                               layout="prev, pager, next"
                  :current-page="page.currentPage"
                  :page-size="page.pageSize"
                  :pager-count="3"
                  :total="page.total"
                >
                                               :total="page.total">
                </el-pagination>
              </div>
            </div>
            <div class="track-box" v-show="detailFlag">
                        <div class="track-box"
                             v-show="detailFlag">
              <div>
                <el-button @click="goOut" type="text" size="small" title="轨迹">
                                <el-button @click="goOut"
                                           type="text"
                                           size="small"
                                           title="轨迹">
                  <i class="el-icon-back"></i>
                </el-button>

@@ -86,8 +87,8 @@
                </li>

                <li>
                  <div>所属角色：</div>
                  <div>{{ detailObj.role }}</div>
                                    <div>所属公司：</div>
                                    <div>{{ detailObj.deptName }}</div>
                </li>

                <li>
@@ -103,21 +104,20 @@
                <li>
                  <div>选择时间：</div>
                  <div class="datetime">
                    <el-date-picker
                      v-model="trackTime"
                                        <el-date-picker v-model="trackTime"
                      type="datetimerange"
                      range-separator="至"
                      start-placeholder="开始日期"
                      size="mini"
                      :editable="false"
                      end-placeholder="结束日期"
                    >
                                                        end-placeholder="结束日期">
                    </el-date-picker>
                  </div>
                </li>

                <li>
                  <el-button type="text" @click="lookTrack">
                                    <el-button type="text"
                                               @click="lookTrack">
                    查看轨迹
                  </el-button>
                </li>
@@ -161,6 +161,14 @@
        size: this.page.pageSize,
      }).then((res) => {
        var data = res.data.data;

                data.records.forEach((item, index) => {
                    if (data.current > 1) {
                        item.mapInd = (data.current - 1) * 10 + index + 1
                    } else {
                        item.mapInd = index + 1
                    }
                })
        this.tableData = data.records;
        this.page.total = data.total;
        this.loading = false;
@@ -200,7 +208,7 @@
      this.detailFlag = true;
      this.detailObj = {
        name: row.realName,
        role: row.roleName,
                deptName: row.deptName,
        phone: row.phone,
        address: row.address,
        id: row.id,