From 39ba22634589d671203b1f0450652e79a6fd97b8 Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Tue, 18 Jul 2023 14:51:10 +0800
Subject: [PATCH] 1111

---
 jsowell-ui/src/views/order/order/index.vue | 117 ++++++++++-----------
 jsowell-ui/vue.config.js                   |   2 +-
 2 files changed, 57 insertions(+), 62 deletions(-)

diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue
index 1207dccaf..d19cfe593 100644
--- a/jsowell-ui/src/views/order/order/index.vue
+++ b/jsowell-ui/src/views/order/order/index.vue
@@ -96,7 +96,7 @@
                     margin-bottom: 15px;
                 "
                 :icon="icon"
-            >{{ showOrHideText }}
+                >{{ showOrHideText }}
             </el-button>
         </el-form>
 
@@ -107,18 +107,16 @@
                     icon="el-icon-search"
                     size="mini"
                     @click="handleQuery"
-                >搜索
-                </el-button
-                >
+                    >搜索
+                </el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button
                     icon="el-icon-refresh"
                     size="mini"
                     @click="resetQuery"
-                >重置
-                </el-button
-                >
+                    >重置
+                </el-button>
             </el-col>
             <el-button
                 type="warning"
@@ -127,10 +125,9 @@
                 size="mini"
                 @click="handleExport"
                 v-hasPermi="['order:order:export']"
-            >导出
-            </el-button
-            >
-<!--            <div>
+                >导出
+            </el-button>
+            <!--            <div>
                 {{ dateDescription }}期间，总用电量{{ sumUsedElectricity }}度，总消费金额{{
                     sumOrderAmount
                 }}元，总结算金额{{ sumSettleAmount }}元
@@ -140,9 +137,8 @@
                     :indeterminate="isIndeterminate"
                     v-model="checkAll"
                     @change="handleCheckAllChange"
-                >全选
-                </el-checkbox
-                >
+                    >全选
+                </el-checkbox>
                 <div style="margin: 15px 0"></div>
                 <el-checkbox-group
                     style="display: grid"
@@ -153,9 +149,8 @@
                         v-for="city in cities"
                         :label="city"
                         :key="city.id"
-                    >{{ city }}
-                    </el-checkbox
-                    >
+                        >{{ city }}
+                    </el-checkbox>
                 </el-checkbox-group>
             </el-popover>
         </el-row>
@@ -166,7 +161,7 @@
                     style="width: 100%; height: 100%"
                 />
                 <div style="padding: 14px">
-                    <el-skeleton-item variant="h3" style="width: 50%"/>
+                    <el-skeleton-item variant="h3" style="width: 50%" />
                     <div
                         style="
                             display: flex;
@@ -180,7 +175,7 @@
                             variant="text"
                             style="margin-right: 16px"
                         />
-                        <el-skeleton-item variant="text" style="width: 30%"/>
+                        <el-skeleton-item variant="text" style="width: 30%" />
                     </div>
                 </div>
             </template>
@@ -200,16 +195,14 @@
                                         item.orderCode
                                     "
                                     class="link-type"
-                                >订单编号：{{ item.orderCode }}
-                                </router-link
-                                >
+                                    >订单编号：{{ item.orderCode }}
+                                </router-link>
 
                                 <el-tag
                                     :type="color(item.orderStatus)"
                                     style="margin-left: 10px"
-                                >{{ item.orderStatusDescribe }}
-                                </el-tag
-                                >
+                                    >{{ item.orderStatusDescribe }}
+                                </el-tag>
                             </div>
                             <div>
                                 开始时间：{{ item.chargeStartTime || "一" }}
@@ -217,36 +210,38 @@
                         </div>
                         <div style="padding: 10px">
                             <el-descriptions
-                            class="title"
+                                class="title"
                                 :title="`${item.nickName || '---'}（${
                                     item.mobileNumber || '---'
                                 }）`"
-                                :column="6"
-                                
+                                :column="7"
                             >
-                            <!-- @click.native="goMemberDetail(item)" -->
-                             <el-descriptions-item label="站点名称" >
-                                <div style="color:#337ab7" @click="goStationDetail(item)">{{item.stationName || "一"}}</div>
+                                <!-- @click.native="goMemberDetail(item)" -->
+                                <el-descriptions-item label="站点名称">
+                                    <div
+                                        style="color: #337ab7"
+                                        @click="goStationDetail(item)"
+                                    >
+                                        {{ item.stationName || "一" }}
+                                    </div>
                                 </el-descriptions-item>
-                                <el-descriptions-item label="实时充电度数">{{
-                                        item.realTimeChargingDegree || "一"
-                                    }}
+                                <el-descriptions-item label="实时充电度数"
+                                    >{{ item.realTimeChargingDegree || "一" }}
                                 </el-descriptions-item>
-                                <el-descriptions-item label="实时消费金额">{{
-                                        item.realTimeAmount || "一"
-                                    }}
+                                <el-descriptions-item label="实时消费金额"
+                                    >{{ item.realTimeAmount || "一" }}
                                 </el-descriptions-item>
-                                <el-descriptions-item label="起始SOC">{{
-                                        item.startSoc|| '一'
-                                    }}
+                                <el-descriptions-item label="起始SOC"
+                                    >{{ item.startSoc || "一" }}
                                 </el-descriptions-item>
-                                <el-descriptions-item label="终止SOC">{{
-                                        item.endSoc || "一"
-                                    }}
+                                <el-descriptions-item label="终止SOC"
+                                    >{{ item.endSoc || "一" }}
                                 </el-descriptions-item>
-                                <el-descriptions-item label="结束充电时间">{{
-                                        item.chargeEndTime || "一"
-                                    }}
+                                <el-descriptions-item label="结束充电时间"
+                                    >{{ item.chargeEndTime || "一" }}
+                                </el-descriptions-item> 
+                                <el-descriptions-item label="启动方式"
+                                    >{{ startMode(item.startMode )}}
                                 </el-descriptions-item>
                             </el-descriptions>
                             <div
@@ -283,12 +278,12 @@ import {
     totalData,
 } from "@/api/order/order";
 import Template from "@/views/billing/template";
-import {listStation} from "@/api/pile/station";
-import {getDay} from "@/utils/common";
+import { listStation } from "@/api/pile/station";
+import { getDay } from "@/utils/common";
 
 export default {
     name: "Order",
-    components: {Template},
+    components: { Template },
 
     dicts: ["order_status", "start_mode", "pay_mode", "pay_status"],
     data() {
@@ -358,23 +353,23 @@ export default {
         this.dataLoading();
     },
     methods: {
-        goMemberDetail(item){
-           this.$router.push({
-                name: 'memberDetail',
+        goMemberDetail(item) {
+            this.$router.push({
+                name: "memberDetail",
                 params: {
                     memberId: item.memberId,
-                }
+                },
             });
         },
-         goStationDetail(scope) {
+        goStationDetail(scope) {
             // console.log(scope,'跳转站点名称')
             // console.log("跳转到充电站详情", scope.row.stationName);
             this.$router.push({
-                name: 'stationDetail',
+                name: "stationDetail",
                 params: {
                     id: scope.stationId,
                     stationName: scope.stationName,
-                }
+                },
             });
         },
         setLoading() {
@@ -409,6 +404,7 @@ export default {
             let arr = this.dict.type.start_mode.find(
                 (item) => item.value == mode
             );
+            console.log(arr,'arr');
             if (arr == null) {
                 return "一";
             } else {
@@ -585,11 +581,10 @@ export default {
                     this.getList();
                     this.$modal.msgSuccess("删除成功");
                 })
-                .catch(() => {
-                });
+                .catch(() => {});
         },
         /** 订单详情序号 */
-        rowOrderDetailIndex({row, rowIndex}) {
+        rowOrderDetailIndex({ row, rowIndex }) {
             row.index = rowIndex + 1;
         },
         /** 订单详情添加按钮操作 */
@@ -679,8 +674,8 @@ export default {
 </script>
 <style lang="scss" scoped>
 ::v-deep
-.el-descriptions--medium:not(.is-bordered)
-.el-descriptions-item__cell {
+    .el-descriptions--medium:not(.is-bordered)
+    .el-descriptions-item__cell {
     padding-bottom: 4px;
 }
 
diff --git a/jsowell-ui/vue.config.js b/jsowell-ui/vue.config.js
index a1a9d23ef..0f6210d9d 100644
--- a/jsowell-ui/vue.config.js
+++ b/jsowell-ui/vue.config.js
@@ -37,7 +37,7 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://localhost:8080`,
         // 更改代理为本地地址
-        target: `http://192.168.2.5:8080`,
+        target: `http://192.168.2.6:8080`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",