From 1d69006cde6fc5a4ca33b9a6e9ceb43d24a85bdd Mon Sep 17 00:00:00 2001 From: likehai Date: Tue, 11 Jun 2024 17:43:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../godTemplateInfo/templateInfoSet/index.vue | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/god-ui/src/views/godTemplateInfo/templateInfoSet/index.vue b/god-ui/src/views/godTemplateInfo/templateInfoSet/index.vue index 6eba3427..730e162b 100644 --- a/god-ui/src/views/godTemplateInfo/templateInfoSet/index.vue +++ b/god-ui/src/views/godTemplateInfo/templateInfoSet/index.vue @@ -227,7 +227,7 @@ - + { + if(item.reserveTwo){ + if(item.reserveTwo === '1'){ + item.reserveThree = (item.price * 0.68).toFixed(2) + } + if(item.reserveTwo === '2'){ + item.reserveThree = (item.price * 0.88).toFixed(2) + } + }else { + item.reserveThree = 0.00 + } + }) }) }, // 取消按钮 @@ -525,6 +536,11 @@ export default { this.form = response.data this.open = true this.title = 'Vlog价格配置' + if(this.form.reserveTwo){ + this.changeA(this.form.reserveTwo); + }else { + this.form.reserveThree = 0.00 + } }) }, /** 提交按钮 */ @@ -558,6 +574,14 @@ export default { }).catch(() => { }) }, + changeA(res){ + if(res === '1'){ + this.form.reserveThree = (this.form.price * 0.68).toFixed(2) + } + if(res === '2'){ + this.form.reserveThree = (this.form.price * 0.88).toFixed(2) + } + }, /** 导出按钮操作 */ handleExport() { this.download('godTemplateInfo/templateInfo/export', { From 8993c0608451b5877f5d8331f1c39e5ee6b3138a Mon Sep 17 00:00:00 2001 From: LiWeiJie <3491909454@qq.com> Date: Tue, 11 Jun 2024 17:44:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=99=AF=E5=8C=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?,=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/HfhEquipmentManage.java | 48 ++++++++++++++----- .../domain/HfhScenicSpotManage.java | 29 +++++------ .../hfhEquipment/HfhEquipmentManageMapper.xml | 18 ++++++- .../src/views/hfhEquipment/manage/index.vue | 33 +++++++++++++ .../src/views/hfhScenicSpot/manage/index.vue | 29 +++++++---- 5 files changed, 123 insertions(+), 34 deletions(-) diff --git a/God-Vue-master/god-system/src/main/java/com/god/hfhEquipment/domain/HfhEquipmentManage.java b/God-Vue-master/god-system/src/main/java/com/god/hfhEquipment/domain/HfhEquipmentManage.java index fd5f6a6f..ec59c8ac 100644 --- a/God-Vue-master/god-system/src/main/java/com/god/hfhEquipment/domain/HfhEquipmentManage.java +++ b/God-Vue-master/god-system/src/main/java/com/god/hfhEquipment/domain/HfhEquipmentManage.java @@ -1,5 +1,6 @@ package com.god.hfhEquipment.domain; +import java.time.LocalDateTime; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -32,6 +33,14 @@ public class HfhEquipmentManage extends BaseEntity @Excel(name = "设备状态") private String deviceStatus; + /** 横坐标 */ + @Excel(name = "横坐标") + private String abscissa; + + /*纵坐标*/ + @Excel(name = "纵坐标") + private String ordinate; + /** 位置 */ @Excel(name = "位置") private String location; @@ -41,14 +50,38 @@ public class HfhEquipmentManage extends BaseEntity private String image; /** 录入时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "录入时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date recordTime; +// @JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss") + @Excel(name = "录入时间") + private String recordTime; /** 备注 */ @Excel(name = "备注") private String remarks; + public String getAbscissa() { + return abscissa; + } + + public void setAbscissa(String abscissa) { + this.abscissa = abscissa; + } + + public String getOrdinate() { + return ordinate; + } + + public void setOrdinate(String ordinate) { + this.ordinate = ordinate; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + public void setId(String id) { this.id = id; @@ -103,15 +136,7 @@ public class HfhEquipmentManage extends BaseEntity { return image; } - public void setRecordTime(Date recordTime) - { - this.recordTime = recordTime; - } - public Date getRecordTime() - { - return recordTime; - } public void setRemarks(String remarks) { this.remarks = remarks; @@ -122,6 +147,7 @@ public class HfhEquipmentManage extends BaseEntity return remarks; } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/God-Vue-master/god-system/src/main/java/com/god/hfhScenicSpot/domain/HfhScenicSpotManage.java b/God-Vue-master/god-system/src/main/java/com/god/hfhScenicSpot/domain/HfhScenicSpotManage.java index b2a05644..3004be54 100644 --- a/God-Vue-master/god-system/src/main/java/com/god/hfhScenicSpot/domain/HfhScenicSpotManage.java +++ b/God-Vue-master/god-system/src/main/java/com/god/hfhScenicSpot/domain/HfhScenicSpotManage.java @@ -1,5 +1,6 @@ package com.god.hfhScenicSpot.domain; +import java.time.LocalDateTime; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -32,8 +33,8 @@ public class HfhScenicSpotManage extends BaseEntity @Excel(name = "捕捉视频对象类型") private String capturedVideoObjectType; - /** 捕捉图片 */ - @Excel(name = "捕捉图片") + /** 景区名称 */ + @Excel(name = "景区名称") private String capturePicture; /** 视频 */ @@ -41,14 +42,23 @@ public class HfhScenicSpotManage extends BaseEntity private String video; /** 时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date captureTime; +// @JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss") +// @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd HH-mm-ss") + @Excel(name = "时间") + private String captureTime; /** 备注 */ @Excel(name = "备注") private String remarks; + public String getCaptureTime() { + return captureTime; + } + + public void setCaptureTime(String captureTime) { + this.captureTime = captureTime; + } + public void setId(String id) { this.id = id; @@ -103,15 +113,6 @@ public class HfhScenicSpotManage extends BaseEntity { return video; } - public void setCaptureTime(Date captureTime) - { - this.captureTime = captureTime; - } - - public Date getCaptureTime() - { - return captureTime; - } public void setRemarks(String remarks) { this.remarks = remarks; diff --git a/God-Vue-master/god-system/src/main/resources/mapper/hfhEquipment/HfhEquipmentManageMapper.xml b/God-Vue-master/god-system/src/main/resources/mapper/hfhEquipment/HfhEquipmentManageMapper.xml index 42ef904b..3a7d5cbc 100644 --- a/God-Vue-master/god-system/src/main/resources/mapper/hfhEquipment/HfhEquipmentManageMapper.xml +++ b/God-Vue-master/god-system/src/main/resources/mapper/hfhEquipment/HfhEquipmentManageMapper.xml @@ -13,15 +13,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, device_name, device_ip, device_status, location, image, record_time, remarks from hfh_equipment_manage + select id, device_name, device_ip, device_status, location, image, record_time, remarks, abscissa, ordinate from hfh_equipment_manage