站点金额

src/api/bus/priceInfo.js

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

src/routers/modules/bus.js

@@ -95,6 +95,18 @@ var routers = [
                         title: '班次管理'
                 }
         },
+        {
+                path: '/bus/routeInfo/priceList',
+                name: 'BusRouteInfoList',
+                // 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/routeInfo-price-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '班次管理'
+                }
+        },
 ]
 
 export default routers;

src/views/bus/passengerInfo-list.vue

@@ -82,79 +82,84 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column
-        type="index"
-        label="序号"
-        :index="indexMethod"
-        width="50"
-      ></el-table-column>
-      <el-table-column
-        prop="vehicleShiftId"
-        label="车辆班次编号"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="vehiclePersonId"
-        label="车辆人员编号"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        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="上车时间"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="downTime"
-        label="下车时间"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="upStationId"
-        label="上车站点"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="downStationId"
-        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>
+          type="index"
+          label="序号"
+          :index="indexMethod"
+          width="50"
+        ></el-table-column>
+        <el-table-column prop="status" label="乘车状态" width="100">
+          <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="100">
+          <template slot-scope="{ row }">
+            <span v-if="row.payStatus == 0" style="color:red">未购票</span>
+            <span v-else-if="row.payStatus == 1">已购票</span>
+            <span v-else-if="row.payStatus == 2" style="color:red">已过站</span>
+            <span v-else-if="row.payStatus == 3">已补票</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="vehiclePersonId"
+          label="车辆人员编号"
+          width="150"
+        ></el-table-column>
+        <el-table-column
+          prop="userName"
+          label="注册用户"
+          width="150"
+        ></el-table-column>
+        <el-table-column prop="imageUrl" label="乘车人照片" width="120">
+          <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_54,h_54'
+                "
+                :key="row.id"
+              ></el-image>
+            </a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="ticketUpStationName"
+          label="购票上车站点"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="upStationName"
+          label="上车站点"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="ticketDownStationName"
+          label="购票下车站点"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="downStationName"
+          label="下车站点"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="upTime"
+          label="上车时间"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="downTime"
+          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"

src/views/bus/routeInfo-list.vue

@@ -23,8 +23,7 @@
           :options="companyResult"
           v-model="queryModel.companyId"
           height="200"
-        ></el-select-tree
-        >
+        ></el-select-tree>
       </el-form-item>
       <el-form-item label="路线名称" prop="name">
         <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
@@ -85,7 +84,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-    <el-table-column
+      <el-table-column
         prop="companyName"
         label="所属单位"
         width="130"
@@ -105,11 +104,20 @@
         label="结束时间"
         width="200"
       ></el-table-column>
-      <el-table-column label="操作" >
+      <el-table-column label="操作">
         <template slot-scope="{ row }">
-            <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
-            <el-button size="mini" type="success" @click="handleEditPath(row)">路线绘制</el-button>
-            <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+          <el-button size="mini" type="warning" @click="handleEdit(row)"
+            >编辑</el-button
+          >
+          <el-button size="mini" type="success" @click="handleEditPath(row)"
+            >路线绘制</el-button
+          >
+          <el-button size="mini" type="success" @click="handleEditPrice(row)"
+            >费用查看</el-button
+          >
+          <el-button size="mini" type="danger" @click="handleDelete(row)"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -127,51 +135,54 @@
       :title="modalTitle"
       @close="onDetailModalClose"
     ></routeInfo-detail>
-      <el-dialog
-            width="80%"
-            :visible.sync="showMapDialog"
-            title="路线绘制"
-            :modal-append-to-body="true"
-            :append-to-body="true"
-            style="text-align:left;"
-            :close-on-click-modal="false"
-            v-loading="mapLoading"
+    <el-dialog
+      width="80%"
+      :visible.sync="showMapDialog"
+      title="路线绘制"
+      :modal-append-to-body="true"
+      :append-to-body="true"
+      style="text-align: left"
+      :close-on-click-modal="false"
+      v-loading="mapLoading"
     >
-        <el-amap
-                ref="roadlineMap"
-                vid="roadlineMap"
-                :plugin="plugin"
-                :center="centerPoint"
-                :zoom="15"
-                style="width:100%;height:400px;"
-        >
-            <!--站点-->
-            <el-amap-marker :zIndex="1"
-                            v-for="station in stationList"
-                            :key="station.id"
-                            :position="station.position"
-                            :title="station.title"></el-amap-marker>
-            <!--路线-->
-            <el-amap-polyline :path="mapPath"
-                              :zIndex="2"
-                              :isOutline="true"
-                              :outlineColor="'#ffeeff'"
-                              :borderWeight="3"
-                              :strokeColor="'#3366FF'"
-                              :strokeOpacity="1"
-                              :strokeWeight="6"
-                              :strokeStyle="'solid'"
-                              :strokeDasharray="[10, 5]"
-                              :lineJoin="'round'"
-                              :lineCap="'round'"
-                              :editable="true"
-            ></el-amap-polyline>
-        </el-amap>
-        <span slot="footer" class="dialog-footer">
+      <el-amap
+        ref="roadlineMap"
+        vid="roadlineMap"
+        :plugin="plugin"
+        :center="centerPoint"
+        :zoom="15"
+        style="width: 100%; height: 400px"
+      >
+        <!--站点-->
+        <el-amap-marker
+          :zIndex="1"
+          v-for="station in stationList"
+          :key="station.id"
+          :position="station.position"
+          :title="station.title"
+        ></el-amap-marker>
+        <!--路线-->
+        <el-amap-polyline
+          :path="mapPath"
+          :zIndex="2"
+          :isOutline="true"
+          :outlineColor="'#ffeeff'"
+          :borderWeight="3"
+          :strokeColor="'#3366FF'"
+          :strokeOpacity="1"
+          :strokeWeight="6"
+          :strokeStyle="'solid'"
+          :strokeDasharray="[10, 5]"
+          :lineJoin="'round'"
+          :lineCap="'round'"
+          :editable="true"
+        ></el-amap-polyline>
+      </el-amap>
+      <span slot="footer" class="dialog-footer">
         <el-button @click="handleConnectStation()">站点连线</el-button>
         <el-button @click="handleMapPathConfirm()">确定</el-button>
-        <el-button @click="showMapDialog=false;">关闭</el-button>
-    </span>
+        <el-button @click="showMapDialog = false">关闭</el-button>
+      </span>
     </el-dialog>
     <el-dialog
       title="导入"
@@ -273,6 +284,7 @@ export default {
       batchImportVisible: false,
       batchImportFileList: [],
       showMapDialog: false,
+      showPriceModal: false,
       uploadUrlXls: Constant.serverUrl + "/bus/routeInfo/importXls",
       uploadXlsData: {
         subFolder: "driver",
@@ -282,23 +294,28 @@ export default {
       },
       xlsLoading: false,
       sceneData: [],
-      typeData:[],
+      typeData: [],
       selectRoute: null,
       centerPoint: [112.276585, 30.306401],
       stationList: [
-          {id: 1, position: [112.276585, 30.306401], content: ''},
-          {id: 2, position: [112.275276, 30.306827], content: ''}
+        { id: 1, position: [112.276585, 30.306401], content: "" },
+        { id: 2, position: [112.275276, 30.306827], content: "" },
+      ],
+      mapPath: [
+        [112.276585, 30.306401],
+        [112.275276, 30.306827],
       ],
-      mapPath: [[112.276585, 30.306401], [112.275276, 30.306827]],
       mapLoading: false,
-      plugin: [{
-          pName: 'ToolBar',
+      plugin: [
+        {
+          pName: "ToolBar",
           events: {
-              init(instance) {
-                  console.log(instance);
-              }
-          }
-      }],
+            init(instance) {
+              console.log(instance);
+            },
+          },
+        },
+      ],
     };
   },
   created() {
@@ -315,23 +332,21 @@ export default {
   },
   methods: {
     changePage(pageIndex) {
-        var self = this;
-
-        self.loading = true;
+      var self = this;
 
-        self.pageIndex = pageIndex;
-        var formData = new FormData();
+      self.loading = true;
 
-        formData.append("pageIndex", self.pageIndex);
-        formData.append("pageSize", self.pageSize);
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
 
-        if(self.queryModel.companyId!=null){
-            formData.append("companyId", self.queryModel.companyId);
-        }
-        
-        formData.append("name", self.queryModel.name);
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
 
+      if (self.queryModel.companyId != null) {
+        formData.append("companyId", self.queryModel.companyId);
+      }
 
+      formData.append("name", self.queryModel.name);
 
       routeInfoApi
         .pageList(formData)
@@ -435,6 +450,7 @@ export default {
       //保存成功后回调
       this.showModal = false;
       this.showDeviceModal = false;
+      this.showPriceModal = false;
 
       if (refreshed) {
         this.changePage(this.pageIndex);
@@ -497,96 +513,113 @@ export default {
       );
     },
     handleMapPathConfirm() {
-        this.mapLoading = true;
+      this.mapLoading = true;
 
-        var pathList = this.mapPath.map((item) => {
-            return item.lng + "," + item.lat;
-        });
+      var pathList = this.mapPath.map((item) => {
+        return item.lng + "," + item.lat;
+      });
 
-        routeInfoApi.updateMapPath({
-            id: this.selectRoute.id,
-            pathList: pathList
-        }).then(response => {
-            this.mapLoading = false;
+      routeInfoApi
+        .updateMapPath({
+          id: this.selectRoute.id,
+          pathList: pathList,
+        })
+        .then((response) => {
+          this.mapLoading = false;
 
-            var jsonData = response.data;
+          var jsonData = response.data;
 
-            if (jsonData.result) {
-                this.showMapDialog = false;
-                this.$message.success("保存成功!");
-            } else {
-                this.$message.warning("系统错误!" + jsonData.message);
-            }
+          if (jsonData.result) {
+            this.showMapDialog = false;
+            this.$message.success("保存成功!");
+          } else {
+            this.$message.warning("系统错误!" + jsonData.message);
+          }
         });
     },
     handleConnectStation() {
-        this.$confirm("是否确认根据站点重新绘制路线?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-        })
-            .then(() => {
-                this.mapPath = [];
-                this.stationList.forEach((item) => {
-                    this.mapPath.push(item.position);
-                });
-            });
+      this.$confirm("是否确认根据站点重新绘制路线?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.mapPath = [];
+        this.stationList.forEach((item) => {
+          this.mapPath.push(item.position);
+        });
+      });
     },
     handleEditPath(row) {
-        //读取当前路线的站点
-        this.loading = true;
+      //读取当前路线的站点
+      this.loading = true;
 
-        routeInfoApi.edit(row.id).then(response => {
-            this.loading = false;
+      routeInfoApi.edit(row.id).then((response) => {
+        this.loading = false;
 
-            var jsonData = response.data;
-            var model = jsonData.data;
+        var jsonData = response.data;
+        var model = jsonData.data;
 
-            var _stationList = model.stationList;
+        var _stationList = model.stationList;
 
-            if (model.pathList != null) {
-                this.mapPath = model.pathList.map((item) => {
-                    return item.split(",");
-                });
-
-                this.centerPoint = this.mapPath[0];
-            } else {
-                this.mapPath = [];
-            }
+        if (model.pathList != null) {
+          this.mapPath = model.pathList.map((item) => {
+            return item.split(",");
+          });
 
-            if (_stationList.length <= 1) {
-                this.$message.warning("请先至少设置2个站点!");
-            } else {
-                this.selectRoute = row;
-                this.showMapDialog = true;
+          this.centerPoint = this.mapPath[0];
+        } else {
+          this.mapPath = [];
+        }
 
-                this.stationList = [];
+        if (_stationList.length <= 1) {
+          this.$message.warning("请先至少设置2个站点!");
+        } else {
+          this.selectRoute = row;
+          this.showMapDialog = true;
 
-                var initMapPath = this.mapPath.length == 0;
+          this.stationList = [];
 
-                _stationList.forEach((item) => {
-                    if (item.location != null && item.location.length > 0) {
-                        var station = {
-                            id: item.id,
-                            title: item.name,
-                            position: item.location.split(",")
-                        }
+          var initMapPath = this.mapPath.length == 0;
 
-                        this.stationList.push(station);
+          _stationList.forEach((item) => {
+            if (item.location != null && item.location.length > 0) {
+              var station = {
+                id: item.id,
+                title: item.name,
+                position: item.location.split(","),
+              };
 
-                        if (initMapPath) {
-                            this.mapPath.push(station.position);
-                        }
-                    }
-                });
+              this.stationList.push(station);
 
-                if(this.mapPath.length>0){
-                    this.centerPoint = this.mapPath[0];
-                }
+              if (initMapPath) {
+                this.mapPath.push(station.position);
+              }
             }
-        });
-    },
+          });
 
+          if (this.mapPath.length > 0) {
+            this.centerPoint = this.mapPath[0];
+          }
+        }
+      });
+    },
+    handleEditPrice(record) {
+
+            var path = "/bus/routeInfo/priceList";
+            
+
+            this.$store.dispatch('tagsView/delView', {
+                name: "BusRouteInfoList",
+                path: path
+            }).then(({ visitedViews }) => {
+                this.$router.push({ 
+                path: path,
+                query:{
+                    routeId: record.id
+                }
+                });
+            });
+        },
   },
   mounted: function () {},
   components: {

src/views/bus/routeInfo-price copy.vue

@@ -0,0 +1,283 @@
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+    append-to-body
+    :modal="true"
+    width="90%"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-divider></el-divider>
+      <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-upload2"
+        @click="batchImportVisible = true"
+        >导入</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="name"
+          label="站名"
+          width="200px"
+        ></el-table-column>
+        <template v-for="col in stationPriceColumns">
+          <el-table-column
+            :label="col.name"
+            :prop="col.id"
+            :key="col.id"
+            width="200px"
+          >
+            <template slot-scope="{ row }">
+              <div style="display: flex; flex-direction: column">
+                <template
+                  v-for="(item, index) in row.stationPriceMap[col.id]"
+                >
+                  <div v-html="showItem(item,col.id)" :key="index"></div>
+                </template>
+              </div>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
+      <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/routeInfo.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>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import shiftInfoApi from "@/api/bus/shiftInfo";
+
+import passengerInfoApi from "@/api/bus/passengerInfo";
+import priceInfoApi from "@/api/bus/priceInfo";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      queryModel: {
+        vehicleShiftId: "",
+        vehiclePersonId: "",
+        userId: "",
+        userName: "",
+        status: "",
+        payStatus: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 5,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [5, 15, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      showDialog: true,
+      stationPriceColumns: [],
+      batchImportVisible:false,
+    };
+  },
+  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("routeId", self.businessKey);
+
+      priceInfoApi
+        .searchRoutePrice(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data;
+          self.tableData = jsonData.stationInfoList;
+          self.stationPriceColumns = jsonData.stationPriceColumns;
+        })
+        .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(() => {
+          passengerInfoApi.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(() => {
+        passengerInfoApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    
+    showItem(item,id) {
+      return item;
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+};
+</script>

src/views/bus/routeInfo-price-list.vue

@@ -0,0 +1,316 @@
+<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="#">收费项目管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-upload2"
+        @click="batchImportVisible = true"
+        >导入</el-button
+      >
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        type="index"
+        label="序号"
+        :index="indexMethod"
+        width="50"
+      ></el-table-column>
+      <el-table-column prop="name" label="站名" width="200px"></el-table-column>
+      <template v-for="col in stationPriceColumns">
+        <el-table-column
+          :label="col.name"
+          :prop="col.id"
+          :key="col.id"
+          width="200px"
+        >
+          <template slot-scope="{ row }">
+            <div style="display: flex; flex-direction: column">
+              <template v-for="(item, index) in row.stationPriceMap[col.id]">
+                <div v-html="showItem(item, col.id)" :key="index"></div>
+              </template>
+            </div>
+          </template>
+        </el-table-column>
+      </template>
+    </el-table>
+    <!-- 批量导入s -->
+    <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/routeInfo.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 shiftInfoApi from "@/api/bus/shiftInfo";
+
+import passengerInfoApi from "@/api/bus/passengerInfo";
+import priceInfoApi from "@/api/bus/priceInfo";
+
+import { getToken } from "@/utils/auth"; // get token from cookie
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      queryModel: {
+        vehicleShiftId: "",
+        vehiclePersonId: "",
+        userId: "",
+        userName: "",
+        status: "",
+        payStatus: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 5,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [5, 15, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      showDialog: true,
+      stationPriceColumns: [],
+      batchImportVisible: false,
+      routeId:"",
+      uploadUrlXls: Constant.serverUrl + "/bus/priceInfo/importXls",
+      uploadXlsData: {
+        subFolder: "driver",
+        routeId:""
+      },
+      headers: {
+        Authorization: getToken(),
+      },
+      batchImportFileList:[],
+      xlsLoading:false
+    };
+  },
+  methods: {
+    indexMethod(index) {
+      return (this.pageIndex - 1) * this.pageSize + (index + 1);
+    },
+    changePage(routeId) {
+      var self = this;
+      self.loading = true;
+      var formData = new FormData();
+
+      formData.append("routeId", routeId);
+
+      priceInfoApi
+        .searchRoutePrice(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data;
+          self.tableData = jsonData.stationInfoList;
+          self.stationPriceColumns = jsonData.stationPriceColumns;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    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(() => {
+          passengerInfoApi.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.routeId);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex,this.routeId);
+      }
+    },
+
+    showItem(item, id) {
+      return item;
+    },
+    beforeUpload(file, fileList) {
+      //导入前判断
+      var self = this;
+      self.uploadXlsData.routeId = self.routeId;
+    },
+    //批量导入-上传成功
+    handleBatchImportSuccess(response, file, fileList) {
+      var self = this;
+      if (response.result) {
+        self.xlsLoading = false;
+        self.$message.success(response.message);
+        this.batchImportFileList = [];
+        this.changePage(this.routeId);
+        this.uploadCompanyId = "";
+        this.uploadXlsData.companyId = "";
+        this.batchImportVisible = false;
+      } else {
+        //this.$message.error(response.message);
+        this.batchImportFileList = [];
+        this.changePage(this.routeId);
+
+        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 () {
+    var routeId = this.$route.query.routeId;
+    this.routeId = routeId;
+    this.changePage(routeId);
+  },
+};
+</script>
+<style scoped>
+.el-divider {
+  margin: 5px 0;
+}
+
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+.order-list {
+  text-align: left;
+}
+.button-group {
+  padding: 10px;
+  text-align: left;
+}
+</style>

src/views/bus/shiftInfo-list.vue

@@ -78,6 +78,12 @@
         :index="indexMethod"
         width="50"
       ></el-table-column>
+      <el-table-column prop="status" label="状态" width="120">
+        <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="vehicleNumber"
         label="车牌号码"
@@ -93,6 +99,16 @@
         label="路线名称"
         width="180"
       ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="开班时间"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="finishTime"
+        label="收班时间"
+        width="150"
+      ></el-table-column>
       <el-table-column
         prop="startStationName"
         label="起始站"
@@ -108,22 +124,13 @@
         label="终点站"
         width="180"
       ></el-table-column>
-      <el-table-column prop="status" label="状态" width="180">
+      <el-table-column label="操作" width="150" fixed="right">
         <template slot-scope="{ row }">
-          <span v-if="row.status == 1">进行中</span>
-          <span v-else-if="row.status == 2">结束</span>
+          <el-link type="primary" :underline="false" @click="handleOpenPassenger(row)"
+            >查看乘客</el-link
+          >
         </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"
@@ -133,11 +140,19 @@
       @size-change="pageSizeChange"
       layout="total, sizes, prev, pager, next, jumper"
     ></el-pagination>
+    <shiftInfo-passenger
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></shiftInfo-passenger>
   </div>
 </template>
 <script>
 import Constant from "@/constant";
 import shiftInfoApi from "@/api/bus/shiftInfo";
+import ShiftInfoPassenger from "./shiftInfo-passenger";
+
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
@@ -225,13 +240,8 @@ export default {
     handleReset(name) {
       this.$refs[name].resetFields();
     },
-    handleAdd() {
-      this.modalTitle = "新增";
-      this.businessKey = "";
-      this.showModal = true;
-    },
-    handleEdit(record) {
-      this.modalTitle = "编辑";
+    handleOpenPassenger(record) {
+      this.modalTitle = "查看乘客";
       this.businessKey = record.id;
       this.showModal = true;
     },
@@ -299,6 +309,10 @@ export default {
   mounted: function () {
     this.changePage(1);
   },
+
+  components: {
+    "shiftInfo-passenger": ShiftInfoPassenger,
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/bus/shiftInfo-passenger.vue

@@ -0,0 +1,349 @@
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+    append-to-body
+    :modal="true"
+    width="90%"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="车辆人员编号" prop="vehiclePersonId">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.vehiclePersonId"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="注册用户名称" prop="userName">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.userName"
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+        label="购票状态"
+        prop="payStatus"
+      >
+        <el-select
+          v-model="queryModel.payStatus"
+          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
+          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-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="status" label="乘车状态" width="100">
+          <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="100">
+          <template slot-scope="{ row }">
+            <span v-if="row.payStatus == 0" style="color:red">未购票</span>
+            <span v-else-if="row.payStatus == 1">已购票</span>
+            <span v-else-if="row.payStatus == 2" style="color:red">已过站</span>
+            <span v-else-if="row.payStatus == 3">已补票</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="vehiclePersonId"
+          label="车辆人员编号"
+          width="150"
+        ></el-table-column>
+        <el-table-column
+          prop="userName"
+          label="注册用户"
+          width="150"
+        ></el-table-column>
+        <el-table-column prop="imageUrl" label="乘车人照片" width="120">
+          <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_54,h_54'
+                "
+                :key="row.id"
+              ></el-image>
+            </a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="ticketUpStationName"
+          label="购票上车站点"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="upStationName"
+          label="上车站点"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="ticketDownStationName"
+          label="购票下车站点"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="downStationName"
+          label="下车站点"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="upTime"
+          label="上车时间"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="downTime"
+          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>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import shiftInfoApi from "@/api/bus/shiftInfo";
+
+import passengerInfoApi from "@/api/bus/passengerInfo";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      queryModel: {
+        vehicleShiftId: "",
+        vehiclePersonId: "",
+        userId: "",
+        userName: "",
+        status: "",
+        payStatus: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 5,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [5, 15, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      showDialog: true,
+    };
+  },
+  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("vehicleShiftId", self.businessKey);
+      formData.append("vehiclePersonId", self.queryModel.vehiclePersonId);
+      formData.append("userId", self.queryModel.userId);
+      formData.append("userName", self.queryModel.userName);
+      formData.append("status", self.queryModel.status);
+      formData.append("payStatus", self.queryModel.payStatus);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      passengerInfoApi
+        .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(() => {
+          passengerInfoApi.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(() => {
+        passengerInfoApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+};
+</script>