diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java index c0bf0ba..0ca7f03 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java @@ -119,7 +119,7 @@ public class CompanyStore extends BaseEntity private BigDecimal daishouRatio; /** 标签 1.可租车 2.可换电 3.二手车,多个用,号隔开,例如1,2,3 */ - @Excel(name = "标签 1.可租车 2.可换电 3.二手车,多个用,号隔开,例如1,2,3") + @Excel(name = "标签") private String label; /** 运营公司id */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java index 4632296..bc46374 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java @@ -56,6 +56,11 @@ public class CompanyStoreServiceImpl implements ICompanyStoreService { companyStore.setCreateTime(DateUtils.getNowDate()); companyStore.setUpdateTime(DateUtils.getNowDate()); + if(companyStore.getAuditStatus().equals("1")){ + companyStore.setStatus("0"); + }else{ + companyStore.setStatus("0"); + } return companyStoreMapper.insertCompanyStore(companyStore); } @@ -69,6 +74,11 @@ public class CompanyStoreServiceImpl implements ICompanyStoreService public int updateCompanyStore(CompanyStore companyStore) { companyStore.setUpdateTime(DateUtils.getNowDate()); + if(companyStore.getAuditStatus().equals("1")){ + companyStore.setStatus("0"); + }else{ + companyStore.setStatus("0"); + } return companyStoreMapper.updateCompanyStore(companyStore); } diff --git a/ruoyi-admin/src/main/resources/templates/operation/car/distribute.html b/ruoyi-admin/src/main/resources/templates/operation/car/distribute.html index 7fdaa77..9900313 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/car/distribute.html +++ b/ruoyi-admin/src/main/resources/templates/operation/car/distribute.html @@ -34,7 +34,7 @@
- + diff --git a/ruoyi-admin/src/main/resources/templates/operation/car/edit.html b/ruoyi-admin/src/main/resources/templates/operation/car/edit.html index 195149a..36fec06 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/car/edit.html +++ b/ruoyi-admin/src/main/resources/templates/operation/car/edit.html @@ -78,7 +78,7 @@
- + diff --git a/ruoyi-admin/src/main/resources/templates/operation/store/add.html b/ruoyi-admin/src/main/resources/templates/operation/store/add.html index 62c7e2d..c05b3c4 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/store/add.html +++ b/ruoyi-admin/src/main/resources/templates/operation/store/add.html @@ -4,6 +4,7 @@ +
@@ -66,19 +67,27 @@
- + + +
+
+
+ +
+
+

提示:可以拖动地图中的标记来精确定位

- +
- +
@@ -317,6 +326,34 @@ $("#areatreeName").val(body.find('#treeName').val()); $.modal.close(index); } + + + + // 初始化地图 + let map, marker; + + function initMap() { + // var position = document.getElementById("position"); + + var center = new TMap.LatLng(28.228302,112.938901);//设置中心点坐标 + //初始化地图 + var map = new TMap.Map("mapContainer", { + center: center + }); + + //绑定点击事件 + map.on("click",function(evt){ + var lat = evt.latLng.getLat().toFixed(6); + var lng = evt.latLng.getLng().toFixed(6); + // position.innerHTML = lat + "," + lng; + + $("#latitude").val(lat); + $("#longitude").val(lng); + }) + } + + // 初始化地图 + window.onload = initMap; \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/operation/store/edit.html b/ruoyi-admin/src/main/resources/templates/operation/store/edit.html index 2d9717e..c19cd4b 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/store/edit.html +++ b/ruoyi-admin/src/main/resources/templates/operation/store/edit.html @@ -4,6 +4,7 @@ +
@@ -70,16 +71,23 @@
+
+ +
+
+

提示:可以拖动地图中的标记来精确定位

+
+
- +
- +
@@ -341,5 +349,32 @@ $("#areatreeName").val(body.find('#treeName').val()); $.modal.close(index); } + + + // 初始化地图 + let map, marker; + + function initMap() { + // var position = document.getElementById("position"); + + var center = new TMap.LatLng(28.228302,112.938901);//设置中心点坐标 + //初始化地图 + var map = new TMap.Map("mapContainer", { + center: center + }); + + //绑定点击事件 + map.on("click",function(evt){ + var lat = evt.latLng.getLat().toFixed(6); + var lng = evt.latLng.getLng().toFixed(6); + // position.innerHTML = lat + "," + lng; + + $("#latitude").val(lat); + $("#longitude").val(lng); + }) + } + + // 初始化地图 + window.onload = initMap;