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

Merge remote-tracking branch 'origin/tx'

Browse Source
This commit is contained in:
邱贞招 2024-07-22 10:29:50 +08:00
commit 3038670ad8
9 changed files with 157 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -5,8 +5,8 @@ VUE_APP_TITLE = 共享电动车管理系统
ENV = 'development'
# 共享电动车管理系统/开发环境
VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
# VUE_APP_BASE_API = 'http://192.168.2.189:8080'
# VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
VUE_APP_BASE_API = 'http://localhost:8080'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

8
src/api/system/articleClassify.js
View File

@ -17,6 +17,14 @@ export function listDeptExcludeChild(classifyId) {
})
}
// 查询分类列表（排除节点）
export function listDeptExcludeChilds(classifyIds) {
return request({
url: '/article/classify/list/excludes/' + classifyIds,
method: 'get'
})
}
// 查询分类详细
export function getDept(classifyId) {
return request({

133
src/views/system/area/index.vue
View File

@ -243,86 +243,84 @@
<el-row>
<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-group>
<el-switch v-model="form.areaOutOutage" class="drawer-switch" />
</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-group>
<el-switch v-model="form.parkingOutDispatch" class="drawer-switch" />
</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-group>
<el-switch v-model="form.areaOutDispatch" class="drawer-switch" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<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-group>
<el-switch v-model="form.noRidingOutage" class="drawer-switch" />
<!-- <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-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-group>
<el-switch v-model="form.authentication" class="drawer-switch" />
<!-- <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-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-group>
<el-switch v-model="form.msgSwitch" class="drawer-switch" />
<!-- <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-group>-->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="强制停车点还车" label-width="90">
<el-radio-group v-model="form.parkingReturn" 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-group>
<el-switch v-model="form.parkingReturn" class="drawer-switch" />
<!-- <el-radio-group v-model="form.parkingReturn" 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-group>-->
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="运营区外还车" label-width="120">
<el-radio-group v-model="form.areaOutReturn" 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-group>
<el-switch v-model="form.areaOutReturn" class="drawer-switch" />
<!-- <el-radio-group v-model="form.areaOutReturn" 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-group>-->
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否开启押金抵扣" label-width="120">
<el-radio-group v-model="form.isDepositDeduction" 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-group>
<el-switch v-model="form.isDepositDeduction" class="drawer-switch" />
<!-- <el-radio-group v-model="form.isDepositDeduction" 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-group>-->
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="还车是否拍照审核" label-width="120">
<el-radio-group v-model="form.returnVerify" 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-group>
<el-switch v-model="form.returnVerify" class="drawer-switch" />
<!-- <el-radio-group v-model="form.returnVerify" 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-group>-->
</el-form-item>
</el-col>
</el-row>
@ -378,7 +376,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="最大预约时间" label-width="150">
<el-form-item label="最大预约时间(分)" label-width="150">
<el-input-number style="width: 50%" v-model="form.timeoutMinutes"
placeholder="车辆可最长预约多少分钟"></el-input-number>
</el-form-item>
@ -638,10 +636,35 @@ export default {
longitude: null,
latitude: null,
// parkingPoint: null,
agreement: undefined,
agreement: '<p><strong style=\\"color: rgb(68, 68, 68);\\">亲爱的用户，为了确保您的骑行安全，</strong></p><p><strong style=\\"color: rgb(68, 68, 68);\\">请务必遵守以下骑行提示： </strong></p><p><span style=\\"color: rgb(136, 136, 136);\\">仅限16岁及以上用户使用。</span></p><p><span style=\\"color: rgb(136, 136, 136);\\">为确保安全，后座不允许载人。</span></p><p><span style=\\"color: rgb(136, 136, 136);\\">请务必佩戴安全头盔，保护自身安全。 </span></p><p><span style=\\"color: rgb(136, 136, 136);\\">注意道路状况，避开坑洼，小心骑行。</span></p><p><span style=\\"color: rgb(136, 136, 136);\\">请在规定的地点还车，避免随意停放。</span></p><p><span style=\\"color: rgb(136, 136, 136);\\">不逆行、不闯红灯，遵守所有交通法规。</span></p><p><span style=\\"color: rgb(136, 136, 136);\\">骑行时不要使用手机，保持注意力集中。</span></p><p><span style=\\"color: rgb(136, 136, 136);\\">避免急刹车和急转弯，保持适当的车速。</span></p><p><span style=\\"color: rgb(136, 136, 136);\\">夜间骑行时，确保车灯和反光标识正常。</span></p><p><br></p><p><strong style=\\"color: rgb(68, 68, 68);\\">紧急情况处理：</strong></p><p><span style=\\"color: rgb(136, 136, 136);\\">如有紧急情况，请及时拨打客服电话。</span></p><p><span style=\\"color: rgb(136, 136, 136);\\">感谢您的理解与配合，祝您骑行愉快。</span></p>',
createBy: null,
createTime: null,
status: '1',
deptId: null,
contact: null,
phone: null,
autoReplacementOrder: null,
remark: null,
province: null,
city: null,
county: null,
provinceList: [],
cityList: [],
countyList: [],
ruleIds: [],
areaOutOutage: true ,
parkingOutDispatch: true,
areaOutDispatch: true,
noRidingOutage: true,
authentication: true,
msgSwitch: false,
parkingReturn: true,
areaOutReturn: true,
isDepositDeduction: false,
returnVerify: false,
deposit: 200,
customService: false,
undercharge: 20
};
this.resetForm("form");
},
@ -681,6 +704,16 @@ export default {
this.form = response.data;
this.form.ruleIds = response.ruleIds
response.data.customService == "1" ? this.form.customService = true : this.form.customService = false
response.data.areaOutOutage == "1" ? this.form.areaOutOutage = true : this.form.areaOutOutage = false
response.data.parkingOutDispatch == "1" ? this.form.parkingOutDispatch = true : this.form.parkingOutDispatch = false
response.data.areaOutDispatch == "1" ? this.form.areaOutDispatch = true : this.form.areaOutDispatch = false
response.data.noRidingOutage == "1" ? this.form.noRidingOutage = true : this.form.noRidingOutage = false
response.data.authentication == "1" ? this.form.authentication = true : this.form.authentication = false
response.data.msgSwitch == "1" ? this.form.msgSwitch = true : this.form.msgSwitch = false
response.data.parkingReturn == "1" ? this.form.parkingReturn = true : this.form.parkingReturn = false
response.data.areaOutReturn == "1" ? this.form.areaOutReturn = true : this.form.areaOutReturn = false
response.data.isDepositDeduction == "1" ? this.form.isDepositDeduction = true : this.form.isDepositDeduction = false
response.data.returnVerify == "1" ? this.form.returnVerify = true : this.form.returnVerify = false
this.open = true;
this.title = "修改运营区";
this.key++;
@ -718,11 +751,17 @@ export default {
// 将 rest 对象中的属性赋值给 data
let data = { ...rest };
console.log("this.form=================",data)
if (data.customService) {
data.customService = "1";
}else{
data.customService = "0";
}
data.customService = data.customService ? "1" : "0";
data.areaOutOutage = data.areaOutOutage ? "1" : "0";
data.parkingOutDispatch = data.parkingOutDispatch ? "1" : "0";
data.areaOutDispatch = data.areaOutDispatch ? "1" : "0";
data.noRidingOutage = data.noRidingOutage ? "1" : "0";
data.authentication = data.authentication ? "1" : "0";
data.msgSwitch = data.msgSwitch ? "1" : "0";
data.parkingReturn = data.parkingReturn ? "1" : "0";
data.areaOutReturn = data.areaOutReturn ? "1" : "0";
data.isDepositDeduction = data.isDepositDeduction ? "1" : "0";
data.returnVerify = data.returnVerify ? "1" : "0";
// console.log(data, 'data without cityList, countyList, provinceList');
// console.log(this.form,'formformformformform');
if (this.form.areaId != null) {

27
src/views/system/articleClassify/index.vue
View File

@ -67,7 +67,7 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
<el-table-column prop="classifyName" label="分类名称" width="260"></el-table-column>
<el-table-column prop="deptName" label="运营商" width="260"></el-table-column>
<el-table-column prop="deptName" label="运营商" width="260" v-if="userName == 'admin'"></el-table-column>
<el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
<el-table-column prop="status" label="状态" width="100">
<template slot-scope="scope">
@ -82,6 +82,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
v-if="(scope.row.classifyName != '帮助中心' && scope.row.parentId != 111) || userName == 'admin'"
size="mini"
type="text"
icon="el-icon-edit"
@ -89,6 +90,7 @@
v-hasPermi="['system:articleClassify:edit']"
>修改</el-button>
<el-button
v-if="(scope.row.classifyName != '帮助中心' && scope.row.parentId != 111) || userName == 'admin'"
size="mini"
type="text"
icon="el-icon-plus"
@ -96,7 +98,7 @@
v-hasPermi="['system:articleClassify:add']"
>新增</el-button>
<el-button
v-if="scope.row.parentId != 0"
v-if="(scope.row.parentId != 0 && scope.row.classifyName != '帮助中心' && scope.row.parentId != 111) || userName == 'admin'"
size="mini"
type="text"
icon="el-icon-delete"
@ -186,7 +188,15 @@
</template>
<script>
import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/articleClassify";
import {
listDept,
getDept,
delDept,
addDept,
updateDept,
listDeptExcludeChild,
listDeptExcludeChilds
} from '@/api/system/articleClassify'
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@ -206,6 +216,7 @@ export default {
deptOptions: [],
// 弹出层标题
title: "",
userName: undefined,
title2: "",
// 是否显示弹出层
open: false,
@ -245,6 +256,7 @@ export default {
};
},
created() {
this.userName = this.$store.state.user.name;
this.getList();
},
methods: {
@ -309,8 +321,13 @@ export default {
}
this.open = true;
this.title = "添加分类";
listDept().then(response => {
listDeptExcludeChild(111).then(response => {
this.deptOptions = this.handleTree(response.data, "classifyId");
// // 移除 classifyId 等于 111 的对象
// this.deptOptions = this.deptOptions.filter(dept => dept.classifyId !== 111);
//
console.log("==============="+JSON.stringify(this.deptOptions))
});
},
/** 新增按钮操作 */
@ -334,7 +351,7 @@ export default {
this.form = response.data;
this.open = true;
this.title = "修改分类";
listDeptExcludeChild(row.classifyId).then(response => {
listDeptExcludeChilds(row.classifyId+",111").then(response => {
this.deptOptions = this.handleTree(response.data, "classifyId");
if (this.deptOptions.length == 0) {
const noResultsOptions = { classifyId: this.form.parentId, classifyName: this.form.parentName, children: [] };

2
src/views/system/audit/index.vue
View File

@ -528,7 +528,7 @@ export default {
console.log("---------"+JSON.stringify(this.form5))
authoritypass(this.form5.orderNo).then(response => {
this.$modal.msgSuccess("操作成功");
this.open3 = false;
this.open5 = false;
this.getList();
});
}

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

@ -160,8 +160,8 @@
元（含
</el-col>
<el-col :span="4">
<el-form-item prop="startingTime">
<el-input v-model="form.startingTime" placeholder="请输入起步时间" />
<el-form-item>
<el-input v-model="startingTime" placeholder="请输入起步时间" />
</el-form-item>
</el-col>
<el-col :span="2" style="line-height: 32px;">
@ -172,13 +172,13 @@
<el-form-item label="超出价">
<el-row :gutter="10">
<el-col :span="4">
<el-input v-model="form.timeoutPrice" placeholder="请输入超出价格" />
<el-input v-model="timeoutPrice" placeholder="请输入超出价格" />
</el-col>
<el-col :span="2" style="line-height: 32px;">
元/
</el-col>
<el-col :span="4">
<el-form-item prop="timeoutTime">
<el-form-item>
<el-input v-model="timeoutTime" placeholder="请输入超出时间" />
</el-form-item>
</el-col>
@ -369,6 +369,8 @@ export default {
chargingCycleValue: '',
cappedAmount: '',
rule: [{ start: '', end: '', eachUnit: '', fee: '' }],
timeoutTime: '',
startingTime: ''
// chargingCycle: 1, // 默认选择第一个选项
// chargingCycleValue: '', // 对应的值
},
@ -423,14 +425,17 @@ export default {
sectionCharges: [
{ required: true, message: '请输入区间收费', trigger: 'blur' },
],
startingTime: [
{ required: true, message: '请输入起步时间', trigger: 'blur' },
{ pattern: /^\d+$/, message: '起步时间必须为正整数', trigger: 'blur' }
],
timeoutTime: [
{ required: true, message: '请输入超时时间', trigger: 'blur' },
{ pattern: /^\d+$/, message: '超时时间必须为正整数', trigger: 'blur' }
],
areaId: [
{ required: true, message: '请选择运营区', trigger: 'change' },
]
// startingTime: [
// { required: true, message: '请输入起步时间', trigger: 'blur' },
// { pattern: /^\d+$/, message: '起步时间必须为正整数', trigger: 'blur' }
// ],
// timeoutTime: [
// { required: true, message: '请输入超时时间', trigger: 'blur' },
// { pattern: /^\d+$/, message: '超时时间必须为正整数', trigger: 'blur' }
// ],
},
};
},
@ -497,9 +502,9 @@ export default {
this.enablelnterval = false,
this.more = { start: '', end: '9999', eachUnit: '', fee: '' }
this.rule = [{ start: '', end: '', eachUnit: '', fee: '' }],
this.form.timeoutTime = '',
this.timeoutTime = '',
this.startingPrice = '',
this.form.startingTime = '',
this.startingTime = '',
this.timeoutPrice = '',
this.resetForm("form")
},
@ -543,9 +548,9 @@ export default {
// delete this.form.ridingRuleJson;
let json = JSON.parse(response.data.ridingRuleJson)
if (this.form.ridingRule == 1) {
this.form.timeoutTime = json.timeoutTime
this.timeoutTime = json.timeoutTime
this.startingPrice = json.startingPrice
this.form.startingTime = json.startingTime
this.startingTime = json.startingTime
this.timeoutPrice = json.timeoutPrice
} else {
this.rule = json.rule.slice(0, -1);
@ -567,6 +572,15 @@ export default {
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
// 如何不是整数，弹窗提示
if (!/^\d+$/.test(this.startingTime)) {
this.$modal.msgError('起步时间必须为正整数');
return;
}
if (!/^\d+$/.test(this.timeoutTime)) {
this.$modal.msgError('超时时间必须为正整数');
return;
}
// this.form.rule.push(this.more)
// console.log(this.form,'mmmmmmmmmmmmm');
let data = { ...this.form }; // 使用对象扩展运算符确保复制一个新对象，避免直接修改 this.form
@ -580,9 +594,9 @@ export default {
data.ridingRuleJson.enablelnterval = this.enablelnterval
} else {
data.ridingRuleJson.timeoutTime = this.form.timeoutTime
data.ridingRuleJson.timeoutTime = this.timeoutTime
data.ridingRuleJson.startingPrice = this.startingPrice
data.ridingRuleJson.startingTime = this.form.startingTime
data.ridingRuleJson.startingTime = this.startingTime
data.ridingRuleJson.timeoutPrice = this.timeoutPrice
}
@ -636,9 +650,9 @@ export default {
this.enablelnterval = false
this.rule = [{ start: '', end: '', eachUnit: '', fee: '' }]
this.form.timeoutTime = ''
this.timeoutTime = ''
this.startingPrice = ''
this.form.startingTime = ''
this.startingTime = ''
this.timeoutPrice = ''
}
},

2
src/views/system/onlineLog/index.vue
View File

@ -48,7 +48,7 @@
<el-table-column label="纬度" align="center" prop="latitude" />
<el-table-column label="记录时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
</el-table>

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

@ -141,6 +141,8 @@
<el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
<el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
<el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
<el-table-column label="角色" align="center" key="roleNames" prop="roleNames" v-if="columns[2].visible" :show-overflow-tooltip="true" />
<el-table-column label="运营区" align="center" key="areaName" prop="areaName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
<el-table-column label="运营商" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
<el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
<el-table-column label="关联APP用户" align="center" key="appUserName" prop="appUserName" v-if="columns[5].visible" width="120" />

12
src/views/system/withdrawAudit/index.vue
View File

@ -37,16 +37,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="业务类型" prop="busType">
<el-select style="width: 150px" v-model="queryParams.busType" placeholder="请选择业务类型" clearable>
<el-option
v-for="dict in dict.type.et_business_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="交易时间">
<el-date-picker
v-model="dateRange"
@ -271,7 +261,7 @@ export default {
orderNo: null,
outTradeNo: null,
type: null,
busType: null,
busType: '5',
amount: null,
handlingCharge: null,
operatorDividend: null,