11
This commit is contained in:
parent
5a7f1e399e
commit
8be65ddfe3
|
|
@ -5,7 +5,7 @@ VUE_APP_TITLE = 共享电动车管理系统
|
|||
ENV = 'development'
|
||||
|
||||
# 共享电动车管理系统/开发环境
|
||||
VUE_APP_BASE_API = 'http://192.168.2.6:8080'
|
||||
VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
|
||||
|
||||
# 路由懒加载
|
||||
VUE_CLI_BABEL_TRANSPILE_MODULES = true
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ VUE_APP_TITLE = 共享电动车管理系统
|
|||
ENV = 'production'
|
||||
|
||||
# 共享电动车管理系统/生产环境
|
||||
VUE_APP_BASE_API = 'https://dianche.chuantewulian.cn/prod-api'
|
||||
VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
|
||||
|
||||
# 小程序外链跳转设备
|
||||
VUE_APP_WX_DEVICE_URL = 'weixin://dl/business/?appid=wx4d178f8c80348214&env_version=release'
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@ NODE_ENV = production
|
|||
|
||||
# 测试环境配置
|
||||
ENV = 'staging'
|
||||
VUE_APP_BASE_API = 'https://dianche.chuantewulian.cn/prod-api'
|
||||
VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
|
||||
# 共享电动车管理系统/测试环境
|
||||
VUE_APP_BASE_API = 'https://dianche.chuantewulian.cn/stage-api'
|
||||
# VUE_APP_BASE_API = 'https://dianche.chuantewulian.cn/stage-api'
|
||||
|
|
|
|||
|
|
@ -2,12 +2,7 @@
|
|||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="运营区" prop="areaName">
|
||||
<el-input
|
||||
v-model="queryParams.areaName"
|
||||
placeholder="请输入运营区"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
<el-input v-model="queryParams.areaName" placeholder="请输入运营区" clearable @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
|
|
@ -17,25 +12,12 @@
|
|||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['system:area:add']"
|
||||
>新增</el-button>
|
||||
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
||||
v-hasPermi="['system:area:add']">新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['system:area:edit']"
|
||||
>修改</el-button>
|
||||
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
|
||||
v-hasPermi="['system:area:edit']">修改</el-button>
|
||||
<!-- <el-button
|
||||
type="success"
|
||||
plain
|
||||
|
|
@ -47,25 +29,12 @@
|
|||
>电子围栏修改</el-button> -->
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['system:area:remove']"
|
||||
>删除</el-button>
|
||||
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
|
||||
v-hasPermi="['system:area:remove']">删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['system:area:export']"
|
||||
>导出</el-button>
|
||||
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
|
||||
v-hasPermi="['system:area:export']">导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
|
@ -100,12 +69,8 @@
|
|||
<el-table-column label="联系人电话" align="center" prop="phone" />
|
||||
<el-table-column label="状态" align="center" key="status">
|
||||
<template slot-scope="scope">
|
||||
<el-switch
|
||||
v-model="scope.row.status"
|
||||
active-value="0"
|
||||
inactive-value="1"
|
||||
@change="handleStatusChange(scope.row)"
|
||||
></el-switch>
|
||||
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
|
||||
@change="handleStatusChange(scope.row)"></el-switch>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
||||
|
|
@ -115,43 +80,24 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['system:area:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="openmaps(scope.row)"
|
||||
v-hasPermi="['system:area:edit']"
|
||||
>修改电子围栏</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['system:area:remove']"
|
||||
>删除</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['system:area:edit']">修改</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-edit" @click="openmaps(scope.row)"
|
||||
v-hasPermi="['system:area:edit']">修改电子围栏</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
||||
v-hasPermi="['system:area:remove']">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
|
||||
@pagination="getList" />
|
||||
<el-dialog title="电子围栏" :visible.sync="mapopen" width="1200px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
|
||||
<el-form-item label="电子围栏" prop="boundaryStr">
|
||||
<area-map :key="key" v-model="form.boundaryStr" :dataId="form.areaId" :pathList="form.boundaryStr" @center="center" @mapList="mapList" />
|
||||
<area-map :key="key" v-model="form.boundaryStr" :dataId="form.areaId" :pathList="form.boundaryStr"
|
||||
@center="center" @mapList="mapList" />
|
||||
</el-form-item>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
|
|
@ -172,7 +118,7 @@
|
|||
</div>
|
||||
</el-dialog>
|
||||
<!-- 添加或修改运营区对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="1200px" :before-close="handleClose">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
|
|
@ -182,15 +128,18 @@
|
|||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="运营区域">
|
||||
<el-select v-model="form.province" clearable size="small" placeholder="请选择省" class="filter-item" style="width: 90px" @change="provinceChange($event)">
|
||||
<el-select v-model="form.province" clearable size="small" placeholder="请选择省" class="filter-item"
|
||||
style="width: 90px" @change="provinceChange($event)">
|
||||
<el-option v-for="item in form.provinceList" :key="item.name" :label="item.name" :value="item.name" />
|
||||
</el-select>
|
||||
|
||||
<el-select v-model="form.city" clearable size="small" placeholder="请选择城市" class="filter-item" style="width: 100px" @change="cityChange($event)">
|
||||
<el-select v-model="form.city" clearable size="small" placeholder="请选择城市" class="filter-item"
|
||||
style="width: 100px" @change="cityChange($event)">
|
||||
<el-option v-for="item in form.cityList" :key="item.name" :label="item.name" :value="item.name" />
|
||||
</el-select>
|
||||
|
||||
<el-select v-model="form.county" clearable size="small" placeholder="请选择区县" class="filter-item" style="width: 100px" >
|
||||
<el-select v-model="form.county" clearable size="small" placeholder="请选择区县" class="filter-item"
|
||||
style="width: 100px">
|
||||
<el-option v-for="item in form.countyList" :key="item.name" :label="item.name" :value="item.name" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
|
@ -224,12 +173,8 @@
|
|||
<el-col :span="12">
|
||||
<el-form-item label="运营时间" prop="areaTime">
|
||||
<el-select v-model="form.areaTime" placeholder="请选择运营时间" style="width: 100%;">
|
||||
<el-option
|
||||
v-for="dict in dict.type.et_operating_area_time"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
<el-option v-for="dict in dict.type.et_operating_area_time" :key="dict.value" :label="dict.label"
|
||||
:value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -242,16 +187,9 @@
|
|||
<el-row v-if="form.areaTime == 2">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="自定义">
|
||||
<el-time-picker
|
||||
v-model="form.areaTimeStart"
|
||||
value-format="HH:mm:ss"
|
||||
placeholder="开始时间">
|
||||
<el-time-picker v-model="form.areaTimeStart" value-format="HH:mm:ss" placeholder="开始时间">
|
||||
</el-time-picker>
|
||||
<el-time-picker
|
||||
arrow-control
|
||||
v-model="form.areaTimeEnd"
|
||||
value-format="HH:mm:ss"
|
||||
placeholder="结束时间">
|
||||
<el-time-picker arrow-control v-model="form.areaTimeEnd" value-format="HH:mm:ss" placeholder="结束时间">
|
||||
</el-time-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -260,33 +198,24 @@
|
|||
<el-col :span="8">
|
||||
<el-form-item label="运营区域外断电" label-width="120">
|
||||
<el-radio-group v-model="form.areaOutOutage" style="width: 50%">
|
||||
<el-radio
|
||||
v-for="dict in dict.type.et_business_switch"
|
||||
:key="dict.value"
|
||||
:label="dict.value"
|
||||
>{{dict.label}}</el-radio>
|
||||
<el-radio v-for="dict in dict.type.et_business_switch" :key="dict.value"
|
||||
:label="dict.value">{{ dict.label }}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="停车点外还车调度" label-width="150">
|
||||
<el-radio-group v-model="form.parkingOutDispatch" style="width: 50%">
|
||||
<el-radio
|
||||
v-for="dict in dict.type.et_business_switch"
|
||||
:key="dict.value"
|
||||
:label="dict.value"
|
||||
>{{dict.label}}</el-radio>
|
||||
<el-radio v-for="dict in dict.type.et_business_switch" :key="dict.value"
|
||||
:label="dict.value">{{ dict.label }}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="电子围栏外还车调度" label-width="150">
|
||||
<el-radio-group v-model="form.areaOutDispatch" style="width: 50%">
|
||||
<el-radio
|
||||
v-for="dict in dict.type.et_business_switch"
|
||||
:key="dict.value"
|
||||
:label="dict.value"
|
||||
>{{dict.label}}</el-radio>
|
||||
<el-radio v-for="dict in dict.type.et_business_switch" :key="dict.value"
|
||||
:label="dict.value">{{ dict.label }}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -295,33 +224,24 @@
|
|||
<el-col :span="8">
|
||||
<el-form-item label="禁行区内断电" label-width="90">
|
||||
<el-radio-group v-model="form.noRidingOutage" style="width: 60%">
|
||||
<el-radio
|
||||
v-for="dict in dict.type.et_business_switch"
|
||||
:key="dict.value"
|
||||
:label="dict.value"
|
||||
>{{dict.label}}</el-radio>
|
||||
<el-radio v-for="dict in dict.type.et_business_switch" :key="dict.value"
|
||||
:label="dict.value">{{ dict.label }}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="实名认证">
|
||||
<el-radio-group v-model="form.authentication" style="width: 60%">
|
||||
<el-radio
|
||||
v-for="dict in dict.type.et_business_switch"
|
||||
:key="dict.value"
|
||||
:label="dict.value"
|
||||
>{{dict.label}}</el-radio>
|
||||
<el-radio v-for="dict in dict.type.et_business_switch" :key="dict.value"
|
||||
:label="dict.value">{{ dict.label }}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="短信通知服务" label-width="90">
|
||||
<el-radio-group v-model="form.msgSwitch" style="width: 60%">
|
||||
<el-radio
|
||||
v-for="dict in dict.type.et_business_switch"
|
||||
:key="dict.value"
|
||||
:label="dict.value"
|
||||
>{{dict.label}}</el-radio>
|
||||
<el-radio v-for="dict in dict.type.et_business_switch" :key="dict.value"
|
||||
:label="dict.value">{{ dict.label }}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -330,18 +250,15 @@
|
|||
<el-col :span="12">
|
||||
<el-form-item label="收费方式">
|
||||
<el-select v-model="form.ruleIds" multiple placeholder="请选择收费方式">
|
||||
<el-option
|
||||
v-for="item in ruleOptions"
|
||||
:key="item.ruleId"
|
||||
:label="item.name"
|
||||
:value="item.ruleId"
|
||||
></el-option>
|
||||
<el-option v-for="item in ruleOptions" :key="item.ruleId" :label="item.name"
|
||||
:value="item.ruleId"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="低于电量（%）不得骑行" label-width="150">
|
||||
<el-input-number style="width: 50%" v-model="form.undercharge" placeholder="低于电量（%）不得骑行"></el-input-number>
|
||||
<el-input-number style="width: 50%" v-model="form.undercharge"
|
||||
placeholder="低于电量（%）不得骑行"></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
|
|
@ -354,31 +271,36 @@
|
|||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="预约服务费" label-width="150">
|
||||
<el-input-number style="width: 50%" v-model="form.appointmentServiceFee" placeholder="预约时每十分钟的计费"></el-input-number>
|
||||
<el-input-number style="width: 50%" v-model="form.appointmentServiceFee"
|
||||
placeholder="预约时每十分钟的计费"></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="调度费" label-width="150">
|
||||
<el-input-number style="width: 50%" v-model="form.dispatchFee" placeholder="车辆超出运行区外的调度费用"></el-input-number>
|
||||
<el-input-number style="width: 50%" v-model="form.dispatchFee"
|
||||
placeholder="车辆超出运行区外的调度费用"></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="管理费" label-width="150">
|
||||
<el-input-number style="width: 50%" v-model="form.vehicleManagementFee" placeholder="车辆在运营区内但没在停车区产生的调度费用"></el-input-number>
|
||||
<el-input-number style="width: 50%" v-model="form.vehicleManagementFee"
|
||||
placeholder="车辆在运营区内但没在停车区产生的调度费用"></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="电量低于多少值自动生成换电订单" label-width="150" prop="autoReplacementOrder">
|
||||
<el-input-number style="width: 50%" v-model="form.autoReplacementOrder" placeholder="电量低于多少值自动生成换电订单"></el-input-number>
|
||||
<el-input-number style="width: 50%" v-model="form.autoReplacementOrder"
|
||||
placeholder="电量低于多少值自动生成换电订单"></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="最大预约时间" label-width="150">
|
||||
<el-input-number style="width: 50%" v-model="form.timeoutMinutes" placeholder="车辆可最长预约多少分钟"></el-input-number>
|
||||
<el-input-number style="width: 50%" v-model="form.timeoutMinutes"
|
||||
placeholder="车辆可最长预约多少分钟"></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
@ -402,7 +324,8 @@
|
|||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item label="电子围栏" prop="boundaryStr">
|
||||
<area-map :key="key" v-model="form.boundaryStr" :dataId="form.areaId" :pathList="form.boundaryStr" @center="center" @mapList="mapList" />
|
||||
<area-map :key="key" v-model="form.boundaryStr" :dataId="form.areaId" :pathList="form.boundaryStr"
|
||||
@center="center" @mapList="mapList" />
|
||||
</el-form-item>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
|
|
@ -522,10 +445,14 @@ export default {
|
|||
}
|
||||
// console.log("newProvince======"+JSON.stringify(newProvince))
|
||||
this.form.provinceList = newProvince
|
||||
this.loading=true
|
||||
// this.loading = true
|
||||
console.log(console.log(this.form.provinceList, ' this.form.provinceList'))
|
||||
})
|
||||
},
|
||||
handleClose(){
|
||||
this.open=false
|
||||
this.loading = false
|
||||
},
|
||||
handleStatusChange(row) {
|
||||
let text = row.status === "0" ? "启用" : "停用";
|
||||
this.$modal.confirm('确认要"' + text + row.areaName + '"运营区吗？').then(function () {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user