From ad2ecbe20b8128ff91e1c8e160c0af869e5d3fa1 Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Wed, 31 Jan 2024 15:53:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E6=B7=BB=E5=8A=A0=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E7=AB=99=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/api/member/memberGroup.js      | 10 ++-
 .../src/views/member/memberGroup/detail.vue   | 65 ++++++++++++++++++-
 jsowell-ui/vue.config.js                      |  3 +-
 3 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/jsowell-ui/src/api/member/memberGroup.js b/jsowell-ui/src/api/member/memberGroup.js
index 3147fcaff..268308d98 100644
--- a/jsowell-ui/src/api/member/memberGroup.js
+++ b/jsowell-ui/src/api/member/memberGroup.js
@@ -60,4 +60,12 @@ export function queryMemberList(data) {
         data: data
     })
 }
-
+//  创建优惠计费模板
+export function preferentialTemplates(data) {
+    console.log("创建优惠计费模板", JSON.stringify(data));
+    return request({
+        method: "post",
+        url: "/billing/template/createPreferentialBillingTemplate",
+        data,
+    });
+}
diff --git a/jsowell-ui/src/views/member/memberGroup/detail.vue b/jsowell-ui/src/views/member/memberGroup/detail.vue
index 5cd2279d3..a70f30fb9 100644
--- a/jsowell-ui/src/views/member/memberGroup/detail.vue
+++ b/jsowell-ui/src/views/member/memberGroup/detail.vue
@@ -241,6 +241,14 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
+                <span>24小时尖峰平谷分布设置</span>
+                <div>
+                    <el-tag v-for="item in tagsTime" :key="item.label" :type="item.type"
+                        style="margin: 10px 10px 10px 0; width: 160px; height: 30px line-height:30px;text-align: center;"
+                        effect="dark">
+                        {{ item.label }}
+                    </el-tag>
+                </div>
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click="getCancel">取 消</el-button>
@@ -251,7 +259,7 @@
 </template>
 
 <script>
-import { addMember, queryMemberList } from "@/api/member/memberGroup";
+import { addMember, queryMemberList, preferentialTemplates } from "@/api/member/memberGroup";
 import { listOrder } from "@/api/order/order";
 import { getStationListByMerchantId } from "@/api/pile/station";
 import { queryStationBillingTemplateList, getTemplate } from "@/api/billing/template.js";
@@ -397,6 +405,8 @@ export default {
                 ],
             },
             sitesList: [],//站点列表
+            stationId: '',//站点id
+            tagsTime: []
         };
     },
 
@@ -405,7 +415,9 @@ export default {
         this.getMemberList();
         this.getOrderList();
     },
+    computed: {
 
+    },
     methods: {
         handleAddMember() {
             this.openAddMember = true
@@ -465,6 +477,7 @@ export default {
         getCancel() {
             this.getSite = false;
             this.selectSite = '';
+            this.tagsTime = [];
             this.exchangeRate = {
                 electricityPriceA: "",
                 servicePriceA: "",
@@ -489,7 +502,24 @@ export default {
         siteConfirmation() {
             this.$refs["exchangeRate"].validate(valid => {
                 if (valid) {
-                    console.log('验证成功');
+                    let newOffers = {
+                        stationId: this.stationId,
+                        electricityPriceA: this.exchangeRate.modifyServiceA,
+                        servicePriceA: this.exchangeRate.modifyElectricityA,
+                        electricityPriceB: this.exchangeRate.modifyServiceB,
+                        servicePriceB: this.exchangeRate.modifyElectricityB,
+                        electricityPriceC: this.exchangeRate.modifyServiceC,
+                        servicePriceC: this.exchangeRate.modifyElectricityC,
+                        electricityPriceD: this.exchangeRate.modifyServiceD,
+                        servicePriceD: this.exchangeRate.modifyElectricityD,
+                        timeArray: this.exchangeRate.timeArray
+                    }
+                    console.log('验证成功', newOffers);
+                    preferentialTemplates(newOffers).then((response) => {
+                        console.log("添加站点优惠模板", response);
+                        this.$modal.msgSuccess("添加成功");
+                        this.getCancel() //重置
+                    });
                 } else {
                     console.log('验证失败');
                 }
@@ -498,17 +528,48 @@ export default {
         // 查计费模板详情
         queryInfo(stationId) {
             console.log(stationId);
+            this.stationId = stationId
             queryStationBillingTemplateList(stationId).then((response) => {
                 console.log("通过站点id查询计费模板 result: ", response.rows, response.rows[0].templateId);
                 this.stationBillingTemplate = response.rows;
                 getTemplate(response.rows[0].templateId).then((response) => {
                     console.log("查询计费模板详情", response);
                     this.exchangeRate = response.data;
+                    this.dynamicTags();
                     // 重置验证
                     this.$refs["exchangeRate"].resetFields();
                 });
             });
         },
+        dynamicTags() {
+            let tags = [];
+            this.exchangeRate.timeArray.map((x) => {
+                // console.log(x.type);
+                let type;
+                let desc;
+                if (x.type === "1") {
+                    type = "danger";
+                    desc = "尖";
+                } else if (x.type === "2") {
+                    type = "warning";
+                    desc = "峰";
+                } else if (x.type === "3") {
+                    type = "success";
+                    desc = "平";
+                } else {
+                    type = "info";
+                    desc = "谷";
+                }
+                let label = desc + " - " + x.startTime + " - " + x.endTime;
+                let tag = {
+                    type: type,
+                    label: label,
+                };
+                tags.push(tag);
+            });
+            this.tagsTime = tags
+            console.log(this.tagsTime);
+        },
     },
 };
 </script>
diff --git a/jsowell-ui/vue.config.js b/jsowell-ui/vue.config.js
index 0dfb045b9..2ec66f69b 100644
--- a/jsowell-ui/vue.config.js
+++ b/jsowell-ui/vue.config.js
@@ -35,9 +35,10 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+        // target: `http://localhost:8080`,
         // 更改代理为本地地址
         // target: `http://192.168.2.6:8080`,
+        target: `https://api.jsowellcloud.com`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",