chuangte/bick_back
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.调整

Browse Source
This commit is contained in:
邱贞招 2024-07-18 12:01:43 +08:00
parent c4872b2050
commit 972f27e9d3
9 changed files with 350 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/Map/TrajectoryMap.vue
View File

@ -67,7 +67,13 @@ export default {
}, },
methods: { methods: {
destroyMap() { destroyMap() {
this.map?.destroy(); if (this.map) {
console.log("轨迹=====地图实例存在，销毁地图...");
this.map.destroy();
console.log("轨迹=====地图已销毁");
} else {
console.log("轨迹=====地图实例不存在，无需销毁");
}
}, },
initAMap() { initAMap() {
AMapLoader.load({ AMapLoader.load({
@ -86,12 +92,14 @@ export default {
this.trajectory(); //轨迹 this.trajectory(); //轨迹
}).catch((e) => { }).catch((e) => {
console.log("地图加载失败！！！");
console.log(e); console.log(e);
}); });
}, },
// 显示轨迹 // 显示轨迹
trajectory() { trajectory() {
this.line = JSON.parse(this.tripRouteStr) this.line = JSON.parse(this.tripRouteStr)
console.log("this.line================"+this.line)
let line = this.line; let line = this.line;
this.marker = new AMap.Marker({ this.marker = new AMap.Marker({
map: this.map, map: this.map,

202
src/components/Map/location/LocationMap.vue
View File

@ -2,20 +2,6 @@
<div class="place-search-map" :style="{width: width, height: height}" v-loading="loading"> <div class="place-search-map" :style="{width: width, height: height}" v-loading="loading">
<div id="container"></div> <div id="container"></div>
<el-row class="search-row" :gutter="8" type="flex"> <el-row class="search-row" :gutter="8" type="flex">
<!-- <el-col :span="6">-->
<!-- <area-text-select-->
<!-- :level="1"-->
<!-- :province.sync="area.province"-->
<!-- :city.sync="area.city"-->
<!-- @change="onChangeArea"/>-->
<!-- </el-col>-->
<!-- <el-col :span="10">-->
<!-- <el-input v-model="keyword" placeholder="请输入地址关键词" />-->
<!-- </el-col>-->
<!-- <el-col>-->
<!-- <el-button type="primary" icon="el-icon-search" @click="doPlaceSearch(keyword)">搜索</el-button>-->
<!-- <el-button @click="doSearchNearByCenter(keyword)" >周边搜索</el-button>-->
<!-- </el-col>-->
</el-row> </el-row>
<div id="panel"></div> <div id="panel"></div>
</div> </div>
@ -78,21 +64,28 @@ export default {
this.initAMap(); this.initAMap();
}, },
beforeDestroy() { beforeDestroy() {
console.log("轨迹=====组件将被销毁");
this.destroyMap(); this.destroyMap();
}, },
methods: { methods: {
destroyMap() { destroyMap() {
this.map?.destroy(); if (this.map) {
}, console.log("位置=====地图实例存在，销毁地图...");
onChangeArea() { this.map.destroy();
this.loadPlaceSearch(this.area.province, this.area.city); console.log("位置=====地图已销毁");
if (this.keyword != null) {
this.doPlaceSearch(this.keyword);
} else { } else {
let city = this.area.city === '市辖区' ? this.area.province : this.area.city; console.log("位置=====地图实例不存在，无需销毁");
this.doPlaceSearch(city + '人民政府');
} }
}, },
// onChangeArea() {
// this.loadPlaceSearch(this.area.province, this.area.city);
// if (this.keyword != null) {
// this.doPlaceSearch(this.keyword);
// } else {
// let city = this.area.city === '市辖区' ? this.area.province : this.area.city;
// this.doPlaceSearch(city + '人民政府');
// }
// },
initAMap() { initAMap() {
AMapLoader.load({ AMapLoader.load({
key: globalConfig.aMap.key, // 申请好的Web端开发者Key，首次调用 load 时必填 key: globalConfig.aMap.key, // 申请好的Web端开发者Key，首次调用 load 时必填
@ -109,37 +102,38 @@ export default {
// this.map.on('click', this.onClickMap); // this.map.on('click', this.onClickMap);
// POI // POI
this.loadPlaceSearch(this.area.province, this.area.city); // this.loadPlaceSearch(this.area.province, this.area.city);
// 逆地理编码 // 逆地理编码
this.loadGeoCoder(); // this.loadGeoCoder();
// 加载初始地址 // 加载初始地址
this.initMarker(); this.initMarker();
}).catch((e) => { }).catch((e) => {
console.log("地图加载失败！！！");
console.log(e); console.log(e);
}); });
}, },
async initMarker() { initMarker() {
this.removeAllMarker(); this.removeAllMarker();
if (this.initLng != null && this.initLat != null) { if (this.initLng != null && this.initLat != null) {
this.getGeoAddress(this.initLng, this.initLat).then(res => { // this.getGeoAddress(this.initLng, this.initLat).then(res => {
// 标点 // 标点
this.removeAllMarker(); this.removeAllMarker();
console.log("添加标记点") console.log("添加标记点")
this.addMarker(this.initLng, this.initLat, this.deviceSn, this.status, this.onlineStatus); this.addMarker(this.initLng, this.initLat, this.deviceSn, this.status, this.onlineStatus);
this.$emit('map-geo', res, this.initLng, this.initLat); // this.$emit('map-geo', res, this.initLng, this.initLat);
// 地区 // 地区
let component = res.regeocode.addressComponent; // let component = res.regeocode.addressComponent;
this.area = { // this.area = {
province: component.province, // province: component.province,
city: component.city === '' ? '市辖区' : component.city, // city: component.city === '' ? '市辖区' : component.city,
} // }
}).finally(() => { // }).finally(() => {
this.loading = false; // this.loading = false;
}) // })
} }
}, },
addMarker: function(lng, lat, title, status, onlineStatus) { addMarker: function(lng, lat, title, status, onlineStatus) {
@ -212,75 +206,75 @@ export default {
this.markers = []; this.markers = [];
}, },
// 点击地图事件 // 点击地图事件
onClickMap(e) { // onClickMap(e) {
console.log('clickMap', e); // console.log('clickMap', e);
let lng = e.lnglat.lng; // let lng = e.lnglat.lng;
let lat = e.lnglat.lat; // let lat = e.lnglat.lat;
this.changeMarker(lng, lat); // this.changeMarker(lng, lat);
}, // },
// 逆地理编码，并标点 // // 逆地理编码，并标点
changeMarker(lng, lat) { // changeMarker(lng, lat) {
console.log('changeMarker', lng,lat); // console.log('changeMarker', lng,lat);
this.loading = true; // this.loading = true;
this.getGeoAddress(lng, lat).then(res => { // this.getGeoAddress(lng, lat).then(res => {
this.removeAllMarker(); // this.removeAllMarker();
this.addMarker(lng, lat, res.regeocode.formattedAddress); // this.addMarker(lng, lat, res.regeocode.formattedAddress);
this.$emit('map-geo', res, lng, lat); // this.$emit('map-geo', res, lng, lat);
}).finally(() => { // }).finally(() => {
this.loading = false; // this.loading = false;
}) // })
}, // },
// 获取逆地理编码 // // 获取逆地理编码
getGeoAddress(lng, lat) { // getGeoAddress(lng, lat) {
console.log('getGeoAddress', lng,lat); // console.log('getGeoAddress', lng,lat);
console.log('this.geocoder', this.geocoder); // console.log('this.geocoder', this.geocoder);
if(this.geocoder){ // if(this.geocoder){
return new Promise((resolve, reject) =>{ // return new Promise((resolve, reject) =>{
this.geocoder.getAddress([lng, lat], (status, result) => { // this.geocoder.getAddress([lng, lat], (status, result) => {
if (status === 'complete' && result.info === 'OK') { // if (status === 'complete' && result.info === 'OK') {
console.log('resolve', result); // console.log('resolve', result);
resolve(result); // resolve(result);
} else { // } else {
console.log('reject', status,result); // console.log('reject', status,result);
reject(status); // reject(status);
} // }
}) // })
}) // })
} // }
}, // },
// 加载逆地理编码 // // 加载逆地理编码
loadGeoCoder() { // loadGeoCoder() {
AMap.plugin('AMap.Geocoder', () => { // AMap.plugin('AMap.Geocoder', () => {
this.geocoder = new AMap.Geocoder({ // this.geocoder = new AMap.Geocoder({
city: '全国' // city 指定进行编码查询的城市，支持传入城市名、adcode 和 citycode // city: '全国' // city 指定进行编码查询的城市，支持传入城市名、adcode 和 citycode
}) // })
}) // })
}, // },
// 加载POI // // 加载POI
loadPlaceSearch(province, city) { // loadPlaceSearch(province, city) {
if (city == null) { // if (city == null) {
city = '北京市'; // city = '北京市';
} // }
if (city === '市辖区') { // if (city === '市辖区') {
city = province; // city = province;
} // }
AMap.plugin(["AMap.PlaceSearch"], () => { // AMap.plugin(["AMap.PlaceSearch"], () => {
//构造地点查询类 // //构造地点查询类
this.placeSearch = new AMap.PlaceSearch({ // this.placeSearch = new AMap.PlaceSearch({
pageSize: 5, // 单页显示结果条数 // pageSize: 5, // 单页显示结果条数
pageIndex: 1, // 页码 // pageIndex: 1, // 页码
city: city, // 兴趣点城市 // city: city, // 兴趣点城市
citylimit: true, //是否强制限制在设置的城市内搜索 // citylimit: true, //是否强制限制在设置的城市内搜索
map: this.map, // 展现结果的地图实例 // map: this.map, // 展现结果的地图实例
panel: "panel", // 结果列表将在此容器中进行展示。 // panel: "panel", // 结果列表将在此容器中进行展示。
autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围 // autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
}); // });
}); // });
// 事件绑定 // // 事件绑定
this.placeSearch.on('selectChanged', (data) => { // this.placeSearch.on('selectChanged', (data) => {
this.$emit('select-changed', data); // this.$emit('select-changed', data);
}) // })
}, // },
//关键字查询 //关键字查询
doPlaceSearch(keyword) { doPlaceSearch(keyword) {
if (keyword == null) { if (keyword == null) {

1
src/views/system/commandLog/index.vue
View File

@ -73,6 +73,7 @@
<dict-tag :options="dict.type.onenet_call_status" :value="scope.row.callStatus"/> <dict-tag :options="dict.type.onenet_call_status" :value="scope.row.callStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime"> <el-table-column label="创建时间" align="center" prop="createTime">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>

291
src/views/system/dept/index.vue
View File

@ -9,6 +9,22 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="运营区名称" prop="areaName">
<el-input
v-model="queryParams.areaName"
placeholder="请输入运营区名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="微信" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入微信"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="运营商状态" clearable> <el-select v-model="queryParams.status" placeholder="运营商状态" clearable>
<el-option <el-option
@ -55,22 +71,38 @@
row-key="deptId" row-key="deptId"
:default-expand-all="isExpandAll" :default-expand-all="isExpandAll"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
> :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column prop="deptName" label="运营商名称" width="260"></el-table-column> <el-table-column prop="deptName" label="运营商名称" width="260" sortable="custom" :sort-orders="['descending', 'ascending']"></el-table-column>
<el-table-column prop="orderNum" label="排序" width="200"></el-table-column> <el-table-column prop="areaName" label="名下运营区" align="center" ></el-table-column>
<el-table-column prop="phone" label="电话" align="center" ></el-table-column> <el-table-column prop="phone" label="电话" align="center" ></el-table-column>
<el-table-column label="余额" align="center"> <el-table-column prop="appName" label="小程序" align="center" ></el-table-column>
<el-table-column prop="userName" label="绑定微信" align="center" ></el-table-column>
<el-table-column prop="separateAccount" label="独立支付" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="balance-cell">{{ scope.row.balance }}元</span> <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.separateAccount"/>
</template>
</el-table-column>
<el-table-column prop="platformServiceFee" label="服务费(%)" align="center" >
<template slot-scope="scope">
<span>{{ scope.row.platformServiceFee && scope.row.platformServiceFee != '0'?scope.row.platformServiceFee+'%':'' }}</span>
</template>
</el-table-column>
<el-table-column prop="handlingCharge" label="手续费(‰)" align="center" >
<template slot-scope="scope">
<span>{{ scope.row.handlingCharge && scope.row.handlingCharge != '0'?scope.row.handlingCharge+'‰':'' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="handlingCharge" label="手续费(‰)" align="center" ></el-table-column>
<el-table-column prop="status" label="状态" width="100"> <el-table-column prop="status" label="状态" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/> <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="200"> <el-table-column label="余额" align="center" prop="balance" sortable="custom" :sort-orders="['descending', 'ascending']">
<template slot-scope="scope">
<span class="balance-cell">{{ scope.row.balance }}元</span>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="200" sortable="custom" :sort-orders="['descending', 'ascending']">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
@ -84,21 +116,6 @@
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:dept:edit']" v-hasPermi="['system:dept:edit']"
>修改</el-button> >修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-plus"
@click="handleAdd(scope.row)"
v-hasPermi="['system:dept:add']"
>新增</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-link"
v-if="scope.row.parentId != 0 && scope.row.appUserId == null"
@click="bandWxUser(scope.row)"
v-hasPermi="['system:dept:edit']"
>绑定微信用户</el-button>
<el-button <el-button
v-if="scope.row.parentId != 0" v-if="scope.row.parentId != 0"
size="mini" size="mini"
@ -114,13 +131,21 @@
<!-- 添加或修改运营商对话框 --> <!-- 添加或修改运营商对话框 -->
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <!-- <el-row>-->
<el-col :span="24"> <!-- <el-col :span="24">-->
<el-form-item label="上级组织" prop="parentId" > <!-- <el-form-item label="上级组织" prop="parentId" >-->
<treeselect v-model="form.parentId" :options="deptOptions" :disabled="true" :normalizer="normalizer" placeholder="选择上级运营商" /> <!-- <el-select style="width: 85%" v-model="form.parentId" placeholder="选择上级运营商">-->
</el-form-item> <!-- <el-option-->
</el-col> <!-- v-for="item in deptOptions"-->
</el-row> <!-- :key="item.deptId"-->
<!-- :label="item.deptName"-->
<!-- :value="item.deptId"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!--&lt;!&ndash; <treeselect v-model="form.parentId" :options="deptOptions" :disabled="true" placeholder="选择上级运营商" />&ndash;&gt;-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="运营商名称" label-width="90" prop="deptName"> <el-form-item label="运营商名称" label-width="90" prop="deptName">
@ -128,8 +153,24 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="显示排序" prop="orderNum"> <el-form-item label="绑定微信" prop="phonenumber">
<el-input-number v-model="form.orderNum" controls-position="right" :min="0" /> <el-select
ref="headerSearchSelect"
v-model="form.appUserId"
:remote-method="queryPhonenumber"
filterable
default-first-option
remote
:loading="loading2"
placeholder="输入手机号搜索"
class="header-search-select" >
<el-option
v-for="item in options"
:key="item.value"
:label="item.label+'---'+item.appName"
:value="item.value">
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -214,11 +255,6 @@
<el-switch v-model="form.isUsePlatformApp" class="drawer-switch" /> <el-switch v-model="form.isUsePlatformApp" class="drawer-switch" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="域名" prop="domain">
<el-input style="width: 93%" v-model="form.domain" placeholder="请输入域名" />
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12" v-show="form.isUsePlatformApp != true"> <el-col :span="12" v-show="form.isUsePlatformApp != true">
@ -234,48 +270,55 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12" v-show="form.isUsePlatformApp != true"> <el-col :span="12" v-show="form.isUsePlatformApp != true">
<el-form-item label="小程序名称" prop="appName"> <el-form-item label="小程序名称" prop="appName" label-width="90px">
<el-input style="width: 93%" v-model="form.appName" placeholder="请输入小程序名称" /> <el-input style="width: 93%" v-model="form.appName" placeholder="请输入小程序名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="12" v-show="form.isUsePlatformApp != true">
<h2 style="font-weight: 700;font-size: 18px">支付相关</h2> <el-form-item label="域名" prop="domain">
<el-row> <el-input style="width: 93%" v-model="form.domain" placeholder="请输入域名" />
<el-col :span="12">
<el-form-item label="商户号" prop="merchantId">
<el-input style="width: 93%" v-model="form.merchantId" placeholder="请输入商户号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="apiV3密钥" prop="apiV3Key">
<el-input v-model="form.apiV3Key" placeholder="请输入apiV3密钥" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="通知回调地址" label-width="100" prop="notifyUrl">
<el-input style="width: 66%" v-model="form.notifyUrl" placeholder="请输入通知回调地址" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="密钥所在位置" label-width="100" prop="privateKeyPath">
<el-input style="width: 70%" v-model="form.privateKeyPath" placeholder="请输入密钥所在位置" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="证书序列号" label-width="90" prop="merchantSerialNumber">
<el-input style="width: 70%" v-model="form.merchantSerialNumber" placeholder="请输入证书序列号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="退款回调地址" label-width="100" prop="refundNotifyUrl">
<el-input style="width: 70%" v-model="form.refundNotifyUrl" placeholder="请输入退款回调地址" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div v-if="form.separateAccount == 'Y'">
<h2 style="font-weight: 700;font-size: 18px">支付相关</h2>
<el-row>
<el-col :span="12">
<el-form-item label="商户号" prop="merchantId">
<el-input style="width: 93%" v-model="form.merchantId" placeholder="请输入商户号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="apiV3密钥" prop="apiV3Key">
<el-input v-model="form.apiV3Key" placeholder="请输入apiV3密钥" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="通知回调地址" label-width="100" prop="notifyUrl">
<el-input style="width: 66%" v-model="form.notifyUrl" placeholder="请输入通知回调地址" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="密钥所在位置" label-width="100" prop="privateKeyPath">
<el-input style="width: 70%" v-model="form.privateKeyPath" placeholder="请输入密钥所在位置" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="证书序列号" label-width="90" prop="merchantSerialNumber">
<el-input style="width: 70%" v-model="form.merchantSerialNumber" placeholder="请输入证书序列号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="退款回调地址" label-width="100" prop="refundNotifyUrl">
<el-input style="width: 70%" v-model="form.refundNotifyUrl" placeholder="请输入退款回调地址" />
</el-form-item>
</el-col>
</el-row>
</div>
</div> </div>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -285,33 +328,33 @@
</el-dialog> </el-dialog>
<!-- 添加或修改提现记录对话框 --> <!-- 添加或修改提现记录对话框 -->
<el-dialog :title="title2" :visible.sync="open2" width="500px" append-to-body> <!-- <el-dialog :title="title2" :visible.sync="open2" width="500px" append-to-body>-->
<el-form ref="form2" :model="form2" :rules="rules2" label-width="120px"> <!-- <el-form ref="form2" :model="form2" :rules="rules2" label-width="120px">-->
<el-form-item label="手机号码" prop="phonenumber"> <!-- <el-form-item label="手机号码" prop="phonenumber">-->
<el-select <!-- <el-select-->
ref="headerSearchSelect" <!-- ref="headerSearchSelect"-->
v-model="form2.phonenumber" <!-- v-model="form2.phonenumber"-->
:remote-method="queryPhonenumber" <!-- :remote-method="queryPhonenumber"-->
filterable <!-- filterable-->
default-first-option <!-- default-first-option-->
remote <!-- remote-->
:loading="loading2" <!-- :loading="loading2"-->
placeholder="输入手机号搜索" <!-- placeholder="输入手机号搜索"-->
class="header-search-select" > <!-- class="header-search-select" >-->
<el-option <!-- <el-option-->
v-for="item in options" <!-- v-for="item in options"-->
:key="item.value" <!-- :key="item.value"-->
:label="item.label+'---'+item.appName" <!-- :label="item.label+'-&#45;&#45;'+item.appName"-->
:value="item.value"> <!-- :value="item.value">-->
</el-option> <!-- </el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-form> <!-- </el-form>-->
<div slot="footer" class="dialog-footer"> <!-- <div slot="footer" class="dialog-footer">-->
<el-button type="primary" @click="submitForm2">确 定</el-button> <!-- <el-button type="primary" @click="submitForm2">确 定</el-button>-->
<el-button @click="cancel">取 消</el-button> <!-- <el-button @click="cancel">取 消</el-button>-->
</div> <!-- </div>-->
</el-dialog> <!-- </el-dialog>-->
</div> </div>
</template> </template>
@ -340,6 +383,8 @@ export default {
options: [], options: [],
// 运营区选项 // 运营区选项
areaOptions: [], areaOptions: [],
// 默认排序
defaultSort: {prop: 'createTime', order: 'descending'},
// 弹出层标题 // 弹出层标题
title: "", title: "",
title2: "", title2: "",
@ -356,10 +401,13 @@ export default {
queryParams: { queryParams: {
deptName: undefined, deptName: undefined,
status: undefined, status: undefined,
phonenumber: null phonenumber: null,
areaName: undefined
}, },
// 表单参数 // 表单参数
form: {}, form: {
isProfitSharing: 'N'
},
form2: {}, form2: {},
// 表单校验 // 表单校验
rules: { rules: {
@ -405,20 +453,11 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
submitForm2: function() { /** 排序触发事件 */
let form2 = this.form2 handleSortChange(column, prop, order) {
this.$refs['form2'].validate(valid => { this.queryParams.orderByColumn = column.prop;
if (valid) { this.queryParams.isAsc = column.order;
this.$modal.confirm('是否确认绑定？').then(function() { this.getList();
return bandAppUser({appUserId:form2.phonenumber,deptId:form2.deptId})
}).then(() => {
// 刷新页面
location.reload()
this.$modal.msgSuccess('操作成功')
}).catch(() => {
})
}
})
}, },
queryPhonenumber(query) { queryPhonenumber(query) {
console.log("query:",query) console.log("query:",query)
@ -435,12 +474,6 @@ export default {
this.options = [] this.options = []
} }
}, },
bandWxUser(row){
this.reset();
this.form2 = row;
this.open2 = true;
this.title2 = "绑定微信用户";
},
/** 查询运营商列表 */ /** 查询运营商列表 */
getList() { getList() {
this.loading = true; this.loading = true;
@ -476,7 +509,18 @@ export default {
leader: undefined, leader: undefined,
phone: undefined, phone: undefined,
email: undefined, email: undefined,
status: "0" status: "0",
isProfitSharing: false,
separateAccount: 'N',
platformServiceFee: '4',
handlingCharge: '5.4',
isUsePlatformApp: true,
merchantId: null,
apiV3Key: null,
notifyUrl: null,
privateKeyPath: null,
merchantSerialNumber: null,
refundNotifyUrl: null
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -496,7 +540,8 @@ export default {
this.open = true; this.open = true;
this.title = "添加运营商"; this.title = "添加运营商";
listDept().then(response => { listDept().then(response => {
this.deptOptions = this.handleTree(response.data, "deptId"); console.log("response=============",response)
this.deptOptions = response.data;
listArea().then(response => { listArea().then(response => {
this.areaOptions = response.rows; this.areaOptions = response.rows;
this.form.parentId = 100; this.form.parentId = 100;

19
src/views/system/device/index.vue
View File

@ -410,10 +410,10 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="纬度：">{{ form.latitude }}</el-form-item> <el-form-item label="纬度：">{{ form.latitude }}</el-form-item>
</el-col> </el-col>
<el-col :span="8" v-if="form.gps === '1'"> <el-col :span="8" >
<el-form-item label="最后更新时间：" label-width="120">{{ form.lastTime }}</el-form-item> <el-form-item label="最后更新时间：" label-width="120">{{ form.lastTime }}</el-form-item>
</el-col> </el-col>
<el-col :span="4" v-else> <el-col :span="4" v-if="form.gps === '0'">
<span style="color: red;font-weight: 700"> <span style="color: red;font-weight: 700">
当前无gps信号 当前无gps信号
</span> </span>
@ -454,7 +454,7 @@
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="open2 = false">关 闭</el-button> <el-button @click="cancel2">关 闭</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@ -604,6 +604,15 @@ export default {
if (newVal) { if (newVal) {
this.fetchData(newVal); this.fetchData(newVal);
} }
},
open2(val) {
if (!val) {
console.log("========关闭地图=============")
this.showPlaceSearchMap = false; // 关闭地图
} else {
console.log("========打开地图=============")
this.showPlaceSearchMap = true; // 打开地图
}
} }
}, },
beforeDestroy() { beforeDestroy() {
@ -732,6 +741,10 @@ export default {
this.open = false; this.open = false;
this.reset(); this.reset();
}, },
// 取消按钮
cancel2() {
this.open2 = false;
},
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {

68
src/views/system/fee/index.vue
View File

@ -87,16 +87,16 @@
<el-form-item label="套餐名称" prop="name"> <el-form-item label="套餐名称" prop="name">
<el-input v-model="form.name" placeholder="请输入套餐名称" /> <el-input v-model="form.name" placeholder="请输入套餐名称" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="运营区" prop="areaId" v-if="userName == 'admin'">--> <el-form-item label="运营区" prop="areaId" v-if="userName == 'admin'">
<!-- <el-select v-model="form.areaId" placeholder="请选择运营区">--> <el-select v-model="form.areaId" placeholder="请选择运营区">
<!-- <el-option--> <el-option
<!-- v-for="item in areaOptions"--> v-for="item in areaOptions"
<!-- :key="item.areaId"--> :key="item.areaId"
<!-- :label="item.areaName"--> :label="item.areaName"
<!-- :value="item.areaId"--> :value="item.areaId"
<!-- ></el-option>--> ></el-option>
<!-- </el-select>--> </el-select>
<!-- </el-form-item>--> </el-form-item>
<el-form-item label="说明" prop="instructions" :show-overflow-tooltip="true"> <el-form-item label="说明" prop="instructions" :show-overflow-tooltip="true">
<editor v-model="form.instructions" :min-height="192"/> <editor v-model="form.instructions" :min-height="192"/>
<!-- <el-input v-model="form.explain" type="textarea" placeholder="请输入内容" /> --> <!-- <el-input v-model="form.explain" type="textarea" placeholder="请输入内容" /> -->
@ -113,19 +113,19 @@
</el-col> </el-col>
小时 后自动退押金 小时 后自动退押金
</el-form-item> </el-form-item>
<el-form-item label="订单超过" prop="unit"> <!-- <el-form-item label="订单超过" prop="unit">-->
<el-col :span="4"> <!-- <el-col :span="4">-->
<el-input v-model="form.orderExceedMinutes" placeholder="请输入" /> <!-- <el-input v-model="form.orderExceedMinutes" placeholder="请输入" />-->
</el-col> <!-- </el-col>-->
<el-col :span="1.2"> <!-- <el-col :span="1.2">-->
分钟,每 <!-- 分钟,每-->
</el-col> <!-- </el-col>-->
<el-col :span="4"> <!-- <el-col :span="4">-->
<el-input v-model="form.orderExceedWarn" placeholder="请输入" /> <!-- <el-input v-model="form.orderExceedWarn" placeholder="请输入" />-->
</el-col> <!-- </el-col>-->
分钟语音提醒一次归还设备 <!-- 分钟语音提醒一次归还设备-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="免费骑行" prop="freeRideTime"> <el-form-item label="免费骑行" prop="freeRideTime">
<el-col :span="4"> <el-col :span="4">
<el-input v-model="form.freeRideTime" placeholder="请输入" /> <el-input v-model="form.freeRideTime" placeholder="请输入" />
@ -161,7 +161,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item prop="startingTime"> <el-form-item prop="startingTime">
<el-input v-model="form.startingTime" placeholder="请输入起步时间" /> <el-input v-model="startingTime" placeholder="请输入起步时间" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="2" style="line-height: 32px;"> <el-col :span="2" style="line-height: 32px;">
@ -179,7 +179,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item prop="timeoutTime"> <el-form-item prop="timeoutTime">
<el-input v-model="form.timeoutTime" placeholder="请输入超出时间" /> <el-input v-model="timeoutTime" placeholder="请输入超出时间" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" style="line-height: 32px;"> <el-col :span="4" style="line-height: 32px;">
@ -423,14 +423,14 @@ export default {
sectionCharges: [ sectionCharges: [
{ required: true, message: '请输入区间收费', trigger: 'blur' }, { required: true, message: '请输入区间收费', trigger: 'blur' },
], ],
startingTime: [ // startingTime: [
{ required: true, message: '请输入起步时间', trigger: 'blur' }, // { required: true, message: '请输入起步时间', trigger: 'blur' },
{ pattern: /^\d+$/, message: '起步时间必须为正整数', trigger: 'blur' } // { pattern: /^\d+$/, message: '起步时间必须为正整数', trigger: 'blur' }
], // ],
timeoutTime: [ // timeoutTime: [
{ required: true, message: '请输入超时时间', trigger: 'blur' }, // { required: true, message: '请输入超时时间', trigger: 'blur' },
{ pattern: /^\d+$/, message: '超时时间必须为正整数', trigger: 'blur' } // { pattern: /^\d+$/, message: '超时时间必须为正整数', trigger: 'blur' }
], // ],
}, },
}; };
}, },
@ -536,7 +536,9 @@ export default {
}else if(this.form.rentalUnit=='day'){ }else if(this.form.rentalUnit=='day'){
this.timeUnit='天' this.timeUnit='天'
} }
this.returnVerify = this.form.area.returnVerify; if(this.form.area){
this.returnVerify = this.form.area.returnVerify;
}
// console.log("-------returnVerify------",this.returnVerify) // console.log("-------returnVerify------",this.returnVerify)
// delete this.form.ridingRuleJson; // delete this.form.ridingRuleJson;
let json = JSON.parse(response.data.ridingRuleJson) let json = JSON.parse(response.data.ridingRuleJson)

13
src/views/system/order/index.vue
View File

@ -457,6 +457,17 @@ export default {
this.getList(); this.getList();
this.getAreaList(); this.getAreaList();
}, },
watch: {
open(val) {
if (!val) {
console.log("========关闭轨迹地图=============")
this.showPlaceSearchMap = false; // 关闭地图
} else {
console.log("========打开轨迹地图=============")
this.showPlaceSearchMap = true; // 打开地图
}
}
},
methods: { methods: {
toLog(row){ toLog(row){
this.$router.push(`/system/commandLog/orderNo/index/${row.orderNo}`); this.$router.push(`/system/commandLog/orderNo/index/${row.orderNo}`);
@ -705,7 +716,7 @@ export default {
this.reset(); this.reset();
const orderId = row.orderId || this.ids const orderId = row.orderId || this.ids
getOrder(orderId).then(response => { getOrder(orderId).then(response => {
console.log("=====getOrder======="+JSON.stringify(response)) // console.log("=====getOrder======="+JSON.stringify(response))
this.form = response.data; this.form = response.data;
if (response.data.etRefund) { if (response.data.etRefund) {
this.form.etRefund = response.data.etRefund; this.form.etRefund = response.data.etRefund;

9
src/views/system/partner/index.vue
View File

@ -93,6 +93,11 @@
<el-table-column label="手机号码" align="center" prop="phonenumber" /> <el-table-column label="手机号码" align="center" prop="phonenumber" />
<el-table-column label="运营区域" align="center" prop="areaName" /> <el-table-column label="运营区域" align="center" prop="areaName" />
<el-table-column label="分账比例(%)" align="center" prop="dividendProportion" /> <el-table-column label="分账比例(%)" align="center" prop="dividendProportion" />
<el-table-column label="余额" align="center">
<template slot-scope="scope">
<span class="balance-cell">{{ scope.row.balance }}元</span>
</template>
</el-table-column>
<el-table-column label="车辆数" align="center" prop="deviceNum" /> <el-table-column label="车辆数" align="center" prop="deviceNum" />
<el-table-column label="状态" align="center" > <el-table-column label="状态" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
@ -597,4 +602,8 @@ export default {
font-size: 12px; font-size: 12px;
line-height: 18px; line-height: 18px;
} }
.balance-cell {
font-weight: bold;
color: red;
}
</style> </style>

4
src/views/system/user/index.vue
View File

@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-row :gutter="20"> <el-row :gutter="20">
<!--运营商数据--> <!--运营商数据-->
<el-col :span="4" :xs="24" v-if="userName == 'admin'"> <el-col :span="3" :xs="24" v-if="userName == 'admin'">
<div class="head-container"> <div class="head-container">
<el-input <el-input
v-model="deptName" v-model="deptName"
@ -334,7 +334,7 @@ export default {
components: { Treeselect }, components: { Treeselect },
computed: { computed: {
colSpan() { colSpan() {
return this.userName === 'admin' ? 20 : 24; return this.userName === 'admin' ? 21 : 24;
} }
}, },
data() { data() {