autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-16 05:10:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

1111

Browse Source
This commit is contained in:
BOOL\25024
2023-07-18 14:51:10 +08:00
parent aababa3bba
commit 39ba226345
2 changed files with 57 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
jsowell-ui/src/views/order/order/index.vue
View File

@@ -108,8 +108,7 @@
size="mini" size="mini"
@click="handleQuery" @click="handleQuery"
>搜索 >搜索
</el-button </el-button>
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@@ -117,8 +116,7 @@
size="mini" size="mini"
@click="resetQuery" @click="resetQuery"
>重置 >重置
</el-button </el-button>
>
</el-col> </el-col>
<el-button <el-button
type="warning" type="warning"
@@ -128,9 +126,8 @@
@click="handleExport" @click="handleExport"
v-hasPermi="['order:order:export']" v-hasPermi="['order:order:export']"
>导出 >导出
</el-button </el-button>
> <!-- <div>
<!-- <div>
{{ dateDescription }}期间，总用电量{{ sumUsedElectricity }}度，总消费金额{{ {{ dateDescription }}期间，总用电量{{ sumUsedElectricity }}度，总消费金额{{
sumOrderAmount sumOrderAmount
}}元，总结算金额{{ sumSettleAmount }}元 }}元，总结算金额{{ sumSettleAmount }}元
@@ -141,8 +138,7 @@
v-model="checkAll" v-model="checkAll"
@change="handleCheckAllChange" @change="handleCheckAllChange"
>全选 >全选
</el-checkbox </el-checkbox>
>
<div style="margin: 15px 0"></div> <div style="margin: 15px 0"></div>
<el-checkbox-group <el-checkbox-group
style="display: grid" style="display: grid"
@@ -154,8 +150,7 @@
:label="city" :label="city"
:key="city.id" :key="city.id"
>{{ city }} >{{ city }}
</el-checkbox </el-checkbox>
>
</el-checkbox-group> </el-checkbox-group>
</el-popover> </el-popover>
</el-row> </el-row>
@@ -166,7 +161,7 @@
style="width: 100%; height: 100%" style="width: 100%; height: 100%"
/> />
<div style="padding: 14px"> <div style="padding: 14px">
<el-skeleton-item variant="h3" style="width: 50%"/> <el-skeleton-item variant="h3" style="width: 50%" />
<div <div
style=" style="
display: flex; display: flex;
@@ -180,7 +175,7 @@
variant="text" variant="text"
style="margin-right: 16px" style="margin-right: 16px"
/> />
<el-skeleton-item variant="text" style="width: 30%"/> <el-skeleton-item variant="text" style="width: 30%" />
</div> </div>
</div> </div>
</template> </template>
@@ -201,15 +196,13 @@
" "
class="link-type" class="link-type"
>订单编号：{{ item.orderCode }} >订单编号：{{ item.orderCode }}
</router-link </router-link>
>
<el-tag <el-tag
:type="color(item.orderStatus)" :type="color(item.orderStatus)"
style="margin-left: 10px" style="margin-left: 10px"
>{{ item.orderStatusDescribe }} >{{ item.orderStatusDescribe }}
</el-tag </el-tag>
>
</div> </div>
<div> <div>
开始时间：{{ item.chargeStartTime || "一" }} 开始时间：{{ item.chargeStartTime || "一" }}
@@ -221,32 +214,34 @@
:title="`${item.nickName || '---'}（${ :title="`${item.nickName || '---'}（${
item.mobileNumber || '---' item.mobileNumber || '---'
}）`" }）`"
:column="6" :column="7"
> >
<!-- @click.native="goMemberDetail(item)" --> <!-- @click.native="goMemberDetail(item)" -->
<el-descriptions-item label="站点名称" > <el-descriptions-item label="站点名称">
<div style="color:#337ab7" @click="goStationDetail(item)">{{item.stationName || "一"}}</div> <div
style="color: #337ab7"
@click="goStationDetail(item)"
>
{{ item.stationName || "一" }}
</div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="实时充电度数">{{ <el-descriptions-item label="实时充电度数"
item.realTimeChargingDegree || "一" >{{ item.realTimeChargingDegree || "一" }}
}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="实时消费金额">{{ <el-descriptions-item label="实时消费金额"
item.realTimeAmount || "一" >{{ item.realTimeAmount || "一" }}
}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="起始SOC">{{ <el-descriptions-item label="起始SOC"
item.startSoc|| '一' >{{ item.startSoc || "一" }}
}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="终止SOC">{{ <el-descriptions-item label="终止SOC"
item.endSoc || "一" >{{ item.endSoc || "一" }}
}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="结束充电时间">{{ <el-descriptions-item label="结束充电时间"
item.chargeEndTime || "一" >{{ item.chargeEndTime || "一" }}
}} </el-descriptions-item>
<el-descriptions-item label="启动方式"
>{{ startMode(item.startMode )}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<div <div
@@ -283,12 +278,12 @@ import {
totalData, totalData,
} from "@/api/order/order"; } from "@/api/order/order";
import Template from "@/views/billing/template"; import Template from "@/views/billing/template";
import {listStation} from "@/api/pile/station"; import { listStation } from "@/api/pile/station";
import {getDay} from "@/utils/common"; import { getDay } from "@/utils/common";
export default { export default {
name: "Order", name: "Order",
components: {Template}, components: { Template },
dicts: ["order_status", "start_mode", "pay_mode", "pay_status"], dicts: ["order_status", "start_mode", "pay_mode", "pay_status"],
data() { data() {
@@ -358,23 +353,23 @@ export default {
this.dataLoading(); this.dataLoading();
}, },
methods: { methods: {
goMemberDetail(item){ goMemberDetail(item) {
this.$router.push({ this.$router.push({
name: 'memberDetail', name: "memberDetail",
params: { params: {
memberId: item.memberId, memberId: item.memberId,
} },
}); });
}, },
goStationDetail(scope) { goStationDetail(scope) {
// console.log(scope,'跳转站点名称') // console.log(scope,'跳转站点名称')
// console.log("跳转到充电站详情", scope.row.stationName); // console.log("跳转到充电站详情", scope.row.stationName);
this.$router.push({ this.$router.push({
name: 'stationDetail', name: "stationDetail",
params: { params: {
id: scope.stationId, id: scope.stationId,
stationName: scope.stationName, stationName: scope.stationName,
} },
}); });
}, },
setLoading() { setLoading() {
@@ -409,6 +404,7 @@ export default {
let arr = this.dict.type.start_mode.find( let arr = this.dict.type.start_mode.find(
(item) => item.value == mode (item) => item.value == mode
); );
console.log(arr,'arr');
if (arr == null) { if (arr == null) {
return "一"; return "一";
} else { } else {
@@ -585,11 +581,10 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}) })
.catch(() => { .catch(() => {});
});
}, },
/** 订单详情序号 */ /** 订单详情序号 */
rowOrderDetailIndex({row, rowIndex}) { rowOrderDetailIndex({ row, rowIndex }) {
row.index = rowIndex + 1; row.index = rowIndex + 1;
}, },
/** 订单详情添加按钮操作 */ /** 订单详情添加按钮操作 */
@@ -679,8 +674,8 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep ::v-deep
.el-descriptions--medium:not(.is-bordered) .el-descriptions--medium:not(.is-bordered)
.el-descriptions-item__cell { .el-descriptions-item__cell {
padding-bottom: 4px; padding-bottom: 4px;
} }

2
jsowell-ui/vue.config.js
View File

@@ -37,7 +37,7 @@ module.exports = {
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://localhost:8080`, // target: `http://localhost:8080`,
// 更改代理为本地地址 // 更改代理为本地地址
target: `http://192.168.2.5:8080`, target: `http://192.168.2.6:8080`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "", ["^" + process.env.VUE_APP_BASE_API]: "",