Skip to content

cfld-liyeyun-admin
cfld-liyeyun-admin
Commit a9282811 authored by zhouxudong's avatar zhouxudong
Browse files
Options

更新代码添加 园区开发区 处理图片 vr等

parent 74ac5807
Show whitespace changes
Inline Side-by-side
Showing with 152 additions and 54 deletions
ruoyi-system/src/main/java/com/ruoyi/system/controller/StarObjectExtensionInfoController.java
View file @ a9282811
...@@ -78,8 +78,12 @@ public class StarObjectExtensionInfoController extends BaseController ...@@ -78,8 +78,12 @@ public class StarObjectExtensionInfoController extends BaseController
* 新增星级扩展信息 * 新增星级扩展信息
*/ */
@GetMapping("/add") @GetMapping("/add")
public String add() public String add(HttpServletRequest request, ModelMap mmap)
{ {
String objectId = request.getParameter("objectId");
mmap.put("objectId", objectId);
String objectType = request.getParameter("objectType");
mmap.put("objectType", objectType);
return prefix + "/add"; return prefix + "/add";
} }
......
ruoyi-system/src/main/java/com/ruoyi/system/controller/SysCarouselInfoController.java
View file @ a9282811
...@@ -123,8 +123,12 @@ public class SysCarouselInfoController extends BaseController ...@@ -123,8 +123,12 @@ public class SysCarouselInfoController extends BaseController
* 新增轮播图信息 * 新增轮播图信息
*/ */
@GetMapping("/add") @GetMapping("/add")
public String add() public String add(HttpServletRequest request, ModelMap mmap)
{ {
String associationId = request.getParameter("associationId");
mmap.put("associationId", associationId);
String type = request.getParameter("type");
mmap.put("type", type);
return prefix + "/add"; return prefix + "/add";
} }
......
ruoyi-system/src/main/java/com/ruoyi/system/controller/SysCarouselVRInfoController.java
View file @ a9282811
...@@ -112,8 +112,14 @@ public class SysCarouselVRInfoController extends BaseController ...@@ -112,8 +112,14 @@ public class SysCarouselVRInfoController extends BaseController
* 新增轮播图信息 * 新增轮播图信息
*/ */
@GetMapping("/add") @GetMapping("/add")
public String add() public String add(HttpServletRequest request, ModelMap mmap)
{ {
String associationId = request.getParameter("associationId");
mmap.put("associationId", associationId);
String type = request.getParameter("type");
mmap.put("type", type);
String urlType = request.getParameter("urlType");
mmap.put("urlType", urlType);
return prefix + "/add"; return prefix + "/add";
} }
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCarouselInfo.java
View file @ a9282811
...@@ -40,7 +40,7 @@ public class SysCarouselInfo extends BaseEntity { ...@@ -40,7 +40,7 @@ public class SysCarouselInfo extends BaseEntity {
/** /**
* 类型（0 -都市圈、1-开发区、2-园区、3-首页） * 类型（0 -都市圈、1-开发区、2-园区、3-首页）
*/ */
@Excel(name = "类型", readConverterExp = "0=,-=都市圈、1-开发区、2-园区、3-首页") @Excel(name = "类型", readConverterExp = "0-都市圈、1-开发区、2-园区、3-土地、4-载体")
private Integer type; private Integer type;
/** /**
......
ruoyi-system/src/main/java/com/ruoyi/system/service/BaseService.java
View file @ a9282811
...@@ -16,5 +16,11 @@ public interface BaseService { ...@@ -16,5 +16,11 @@ public interface BaseService {
* @return: java.lang.Boolean * @return: java.lang.Boolean
**/ **/
Boolean updateImgUrl(Long associationId, String imgUrl); Boolean updateImgUrl(Long associationId, String imgUrl);
/**
* @description: 通过主键查名称
* @date: 2023/12/19 14:36
* @param: [associationId]
* @return: java.lang.String
**/
String getNameById(Long associationId);
} }
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CarrierInfoServiceImpl.java
View file @ a9282811
...@@ -118,4 +118,10 @@ public class CarrierInfoServiceImpl implements ICarrierInfoService, BaseService, ...@@ -118,4 +118,10 @@ public class CarrierInfoServiceImpl implements ICarrierInfoService, BaseService,
carrierInfo.setImgUrl(imgUrl); carrierInfo.setImgUrl(imgUrl);
return this.carrierInfoMapper.updateCarrierInfo(carrierInfo)==1; return this.carrierInfoMapper.updateCarrierInfo(carrierInfo)==1;
} }
@Override
public String getNameById(Long associationId) {
CarrierInfo carrierInfo = this.carrierInfoMapper.selectCarrierInfoById(associationId);
return carrierInfo.getBuildingNumber();
}
} }
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DevelopmentIndustrialLandInfoServiceImpl.java
View file @ a9282811
...@@ -118,4 +118,10 @@ public class DevelopmentIndustrialLandInfoServiceImpl implements IDevelopmentInd ...@@ -118,4 +118,10 @@ public class DevelopmentIndustrialLandInfoServiceImpl implements IDevelopmentInd
return this.developmentIndustrialLandInfoMapper.updateDevelopmentIndustrialLandInfo(developmentIndustrialLandInfo)==1; return this.developmentIndustrialLandInfoMapper.updateDevelopmentIndustrialLandInfo(developmentIndustrialLandInfo)==1;
} }
@Override
public String getNameById(Long associationId) {
DevelopmentIndustrialLandInfo developmentIndustrialLandInfo = this.developmentIndustrialLandInfoMapper.selectDevelopmentIndustrialLandInfoById(associationId);
return developmentIndustrialLandInfo.getName();
}
} }
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DevelopmentInfoServiceImpl.java
View file @ a9282811
...@@ -270,6 +270,13 @@ public class DevelopmentInfoServiceImpl implements IDevelopmentInfoService, Base ...@@ -270,6 +270,13 @@ public class DevelopmentInfoServiceImpl implements IDevelopmentInfoService, Base
developmentInfo.setImgUrl(imgUrl); developmentInfo.setImgUrl(imgUrl);
return this.developmentInfoMapper.updateDevelopmentInfo(developmentInfo)==1; return this.developmentInfoMapper.updateDevelopmentInfo(developmentInfo)==1;
} }
@Override
public String getNameById(Long associationId) {
DevelopmentInfo developmentInfo = this.developmentInfoMapper.selectDevelopmentInfoById(associationId);
return developmentInfo.getName();
}
/** /**
* @description: 设置经纬度 * @description: 设置经纬度
* @date: 2023/12/18 15:19 * @date: 2023/12/18 15:19
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ParkInfoServiceImpl.java
View file @ a9282811
...@@ -280,6 +280,12 @@ public class ParkInfoServiceImpl implements IParkInfoService, BaseService, Initi ...@@ -280,6 +280,12 @@ public class ParkInfoServiceImpl implements IParkInfoService, BaseService, Initi
return this.parkInfoMapper.updateParkInfo(parkInfo)==1; return this.parkInfoMapper.updateParkInfo(parkInfo)==1;
} }
@Override
public String getNameById(Long associationId) {
ParkInfo parkInfo = this.parkInfoMapper.selectParkInfoById(associationId);
return parkInfo.getName();
}
public Boolean updateImgUrl(Long associationId, BigDecimal longitude, BigDecimal latitude) { public Boolean updateImgUrl(Long associationId, BigDecimal longitude, BigDecimal latitude) {
ParkInfo parkInfo = this.parkInfoMapper.selectParkInfoById(associationId); ParkInfo parkInfo = this.parkInfoMapper.selectParkInfoById(associationId);
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StarObjectExtensionInfoServiceImpl.java
View file @ a9282811
...@@ -2,6 +2,8 @@ package com.ruoyi.system.service.impl; ...@@ -2,6 +2,8 @@ package com.ruoyi.system.service.impl;
import java.util.List; import java.util.List;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.factory.BusinessServiceFactory;
import com.ruoyi.system.service.BaseService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.StarObjectExtensionInfoMapper; import com.ruoyi.system.mapper.StarObjectExtensionInfoMapper;
...@@ -54,6 +56,9 @@ public class StarObjectExtensionInfoServiceImpl implements IStarObjectExtensionI ...@@ -54,6 +56,9 @@ public class StarObjectExtensionInfoServiceImpl implements IStarObjectExtensionI
@Override @Override
public int insertStarObjectExtensionInfo(StarObjectExtensionInfo starObjectExtensionInfo) public int insertStarObjectExtensionInfo(StarObjectExtensionInfo starObjectExtensionInfo)
{ {
BaseService businessByCode = BusinessServiceFactory.getBusinessByCode(Integer.valueOf(starObjectExtensionInfo.getObjectType()));
String name=businessByCode.getNameById(starObjectExtensionInfo.getObjectId());
starObjectExtensionInfo.setObjectName(name);
starObjectExtensionInfo.setCreateTime(DateUtils.getNowDate()); starObjectExtensionInfo.setCreateTime(DateUtils.getNowDate());
return starObjectExtensionInfoMapper.insertStarObjectExtensionInfo(starObjectExtensionInfo); return starObjectExtensionInfoMapper.insertStarObjectExtensionInfo(starObjectExtensionInfo);
} }
...@@ -68,6 +73,9 @@ public class StarObjectExtensionInfoServiceImpl implements IStarObjectExtensionI ...@@ -68,6 +73,9 @@ public class StarObjectExtensionInfoServiceImpl implements IStarObjectExtensionI
public int updateStarObjectExtensionInfo(StarObjectExtensionInfo starObjectExtensionInfo) public int updateStarObjectExtensionInfo(StarObjectExtensionInfo starObjectExtensionInfo)
{ {
starObjectExtensionInfo.setUpdateTime(DateUtils.getNowDate()); starObjectExtensionInfo.setUpdateTime(DateUtils.getNowDate());
BaseService businessByCode = BusinessServiceFactory.getBusinessByCode(Integer.valueOf(starObjectExtensionInfo.getObjectType()));
String name=businessByCode.getNameById(starObjectExtensionInfo.getObjectId());
starObjectExtensionInfo.setObjectName(name);
return starObjectExtensionInfoMapper.updateStarObjectExtensionInfo(starObjectExtensionInfo); return starObjectExtensionInfoMapper.updateStarObjectExtensionInfo(starObjectExtensionInfo);
} }
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysCarouselInfoServiceImpl.java
View file @ a9282811
...@@ -63,6 +63,11 @@ public class SysCarouselInfoServiceImpl implements ISysCarouselInfoService { ...@@ -63,6 +63,11 @@ public class SysCarouselInfoServiceImpl implements ISysCarouselInfoService {
public int insertSysCarouselInfo(SysCarouselInfo sysCarouselInfo) { public int insertSysCarouselInfo(SysCarouselInfo sysCarouselInfo) {
sysCarouselInfo.setCreateTime(DateUtils.getNowDate()); sysCarouselInfo.setCreateTime(DateUtils.getNowDate());
setLinkType(sysCarouselInfo); setLinkType(sysCarouselInfo);
Long associationId = sysCarouselInfo.getAssociationId();
Integer type = sysCarouselInfo.getType();
BaseService businessByCode = BusinessServiceFactory.getBusinessByCode(type);
String name=businessByCode.getNameById(associationId);
sysCarouselInfo.setAssociationName(name);
for (String s : sysCarouselInfo.getImgUrl().split(",")) { for (String s : sysCarouselInfo.getImgUrl().split(",")) {
sysCarouselInfo.setImgUrl(s); sysCarouselInfo.setImgUrl(s);
sysCarouselInfoMapper.insertSysCarouselInfo(sysCarouselInfo); sysCarouselInfoMapper.insertSysCarouselInfo(sysCarouselInfo);
...@@ -112,6 +117,10 @@ public class SysCarouselInfoServiceImpl implements ISysCarouselInfoService { ...@@ -112,6 +117,10 @@ public class SysCarouselInfoServiceImpl implements ISysCarouselInfoService {
public int updateSysCarouselInfo(SysCarouselInfo sysCarouselInfo) { public int updateSysCarouselInfo(SysCarouselInfo sysCarouselInfo) {
sysCarouselInfo.setUpdateTime(DateUtils.getNowDate()); sysCarouselInfo.setUpdateTime(DateUtils.getNowDate());
setLinkType(sysCarouselInfo); setLinkType(sysCarouselInfo);
Integer type = sysCarouselInfo.getType();
BaseService businessByCode = BusinessServiceFactory.getBusinessByCode(type);
String name=businessByCode.getNameById(sysCarouselInfo.getAssociationId());
sysCarouselInfo.setAssociationName(name);
return sysCarouselInfoMapper.updateSysCarouselInfo(sysCarouselInfo); return sysCarouselInfoMapper.updateSysCarouselInfo(sysCarouselInfo);
} }
......
ruoyi-system/src/main/resources/templates/carousel/VRinfo/add.html
View file @ a9282811
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-info-add"> <form class="form-horizontal m" id="form-info-add">
<input type="hidden" name ='urlType' id="urlType" value="3"> <input type="hidden" name ='urlType' id="urlType" th:value="${urlType}">
<input type="hidden" name ='type' id="type" th:value="${type}">
<input type="hidden" name ='associationId' id="associationId" th:value="${associationId}">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">VR地址链接：</label> <label class="col-sm-3 control-label">VR地址链接：</label>
<div class="col-sm-8"> <div class="col-sm-8">
...@@ -40,21 +42,21 @@ ...@@ -40,21 +42,21 @@
<!-- </select>--> <!-- </select>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<div class="form-group"> <!-- <div class="form-group">
<label class="col-sm-3 control-label">业务类型：</label> <label class="col-sm-3 control-label">业务类型：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select id="type" name="type" class="form-control m-b" th:with="type=${@dict.getType('lyy_business_type')}"> <select id="type" name="type" class="form-control m-b" th:with="type=${@dict.getType('lyy_business_type')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</div> </div>
</div> </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">排序：</label> <label class="col-sm-3 control-label">排序：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="orderNumber" class="form-control" type="text"> <input name="orderNumber" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <!--<div class="form-group">
<label class="col-sm-3 control-label">关联id：</label> <label class="col-sm-3 control-label">关联id：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input id="associationId" name="associationId" class="form-control" type="text" readonly="readonly"> <input id="associationId" name="associationId" class="form-control" type="text" readonly="readonly">
...@@ -67,9 +69,9 @@ ...@@ -67,9 +69,9 @@
<input class="form-control" type="text" id="associationName" name="associationName" onclick="selectType()" > <input class="form-control" type="text" id="associationName" name="associationName" onclick="selectType()" >
<span class="input-group-addon"><i class="fa fa-search"></i></span> <span class="input-group-addon"><i class="fa fa-search"></i></span>
</div> </div>
<!-- <input name="associationName" class="form-control" type="text">--> &lt;!&ndash; <input name="associationName" class="form-control" type="text">&ndash;&gt;
</div>
</div> </div>
</div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">VR封面：</label> <label class="col-sm-3 control-label">VR封面：</label>
<div class="col-sm-8"> <div class="col-sm-8">
......
ruoyi-system/src/main/resources/templates/carousel/VRinfo/edit.html
View file @ a9282811
...@@ -41,14 +41,16 @@ ...@@ -41,14 +41,16 @@
<!-- </select>--> <!-- </select>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<div class="form-group"> <input id="type" name="type" th:field="*{type}" class="form-control" type="hidden" readonly="readonly"/>
<input id="urlType" name="urlType" th:field="*{urlType}" class="form-control" type="hidden" readonly="readonly"/>
<!--<div class="form-group">
<label class="col-sm-3 control-label">业务类型：</label> <label class="col-sm-3 control-label">业务类型：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select id="type" name="type" class="form-control m-b" th:with="type=${@dict.getType('lyy_business_type')}"> <select id="type" name="type" class="form-control m-b" th:with="type=${@dict.getType('lyy_business_type')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{type}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{type}"></option>
</select> </select>
</div> </div>
</div> </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">排序：</label> <label class="col-sm-3 control-label">排序：</label>
<div class="col-sm-8"> <div class="col-sm-8">
...@@ -65,7 +67,7 @@ ...@@ -65,7 +67,7 @@
<label class="col-sm-3 control-label">名称：</label> <label class="col-sm-3 control-label">名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group"> <div class="input-group">
<input class="form-control" type="text" id="associationName" name="associationName" onclick="selectType()" th:field="*{associationName}"> <input class="form-control" type="text" id="associationName" name="associationName" readonly="readonly" th:field="*{associationName}">
<span class="input-group-addon"><i class="fa fa-search"></i></span> <span class="input-group-addon"><i class="fa fa-search"></i></span>
</div> </div>
<!-- <input name="associationName" th:field="*{associationName}" class="form-control" type="text">--> <!-- <input name="associationName" th:field="*{associationName}" class="form-control" type="text">-->
......
ruoyi-system/src/main/resources/templates/carousel/VRinfo/infoDetail.html
View file @ a9282811
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
$(function () { $(function () {
var options = { var options = {
url: prefix + "/list?associationId="+associationId+"&urlType="+urlType+"&type="+type, url: prefix + "/list?associationId="+associationId+"&urlType="+urlType+"&type="+type,
createUrl: prefix + "/add", createUrl: prefix + "/add?associationId="+associationId+"&urlType="+urlType+"&type="+type,
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
......
ruoyi-system/src/main/resources/templates/carousel/info/add.html
View file @ a9282811
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <!--<div class="form-group">
<label class="col-sm-3 control-label">业务类型：</label> <label class="col-sm-3 control-label">业务类型：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select id="type" name="type" class="form-control m-b" th:with="type=${@dict.getType('lyy_business_type')}"> <select id="type" name="type" class="form-control m-b" th:with="type=${@dict.getType('lyy_business_type')}">
...@@ -55,29 +55,33 @@ ...@@ -55,29 +55,33 @@
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</div> </div>
</div> </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">排序：</label> <label class="col-sm-3 control-label">排序：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="orderNumber" class="form-control" type="text"> <input name="orderNumber" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group">
<input id="type" name="type" th:value="${type}" class="form-control" type="hidden" readonly="readonly"/>
<input id="associationId" name="associationId" th:value="${associationId}" class="form-control" type="hidden" readonly="readonly"/>
<!--<div class="form-group">
<label class="col-sm-3 control-label">关联id：</label> <label class="col-sm-3 control-label">关联id：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input id="associationId" name="associationId" class="form-control" type="text" readonly="readonly"> <input id="associationId" name="associationId" th:value="${associationId}" class="form-control" type="hidden" readonly="readonly">
</div>
</div> </div>
<div class="form-group"> </div>-->
<!-- <div class="form-group">
<label class="col-sm-3 control-label">名称：</label> <label class="col-sm-3 control-label">名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group"> <div class="input-group">
<input class="form-control" type="text" id="associationName" name="associationName" onclick="selectType()" > <input class="form-control" type="text" id="associationName" name="associationName" onclick="selectType()" >
<span class="input-group-addon"><i class="fa fa-search"></i></span> <span class="input-group-addon"><i class="fa fa-search"></i></span>
</div> </div>
<!-- <input name="associationName" class="form-control" type="text">--> &lt;!&ndash; <input name="associationName" class="form-control" type="text">&ndash;&gt;
</div>
</div> </div>
</div>-->
<!-- <div class="form-group"> --> <!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">转跳链接：</label>--> <!-- <label class="col-sm-3 control-label">转跳链接：</label>-->
<!-- <div class="col-sm-8">--> <!-- <div class="col-sm-8">-->
...@@ -120,7 +124,7 @@ ...@@ -120,7 +124,7 @@
} }
} }
// 根据当前激活的选项卡获取（方式一） // 根据当前激活的选项卡获取（方式一）
function selectType(){ /*function selectType(){
if($("#type").val() == null || $("#type").val() == undefined){ if($("#type").val() == null || $("#type").val() == undefined){
return; return;
} }
...@@ -135,7 +139,7 @@ ...@@ -135,7 +139,7 @@
$.modal.openOptions(options); $.modal.openOptions(options);
} }
} }*/
function doSubmit2(index, layero){ function doSubmit2(index, layero){
var rows = layero.find("iframe")[0].contentWindow.getSelections(); var rows = layero.find("iframe")[0].contentWindow.getSelections();
......
ruoyi-system/src/main/resources/templates/carousel/info/edit.html
View file @ a9282811
...@@ -9,14 +9,14 @@ ...@@ -9,14 +9,14 @@
<form class="form-horizontal m" id="form-info-edit" th:object="${sysCarouselInfo}"> <form class="form-horizontal m" id="form-info-edit" th:object="${sysCarouselInfo}">
<input name="id" th:field="*{id}" type="hidden"> <input name="id" th:field="*{id}" type="hidden">
<div class="form-group"> <!--<div class="form-group">
<label class="col-sm-3 control-label">资源类型：</label> <label class="col-sm-3 control-label">资源类型：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select id="urlType" name="urlType" class="form-control m-b" th:with="type=${@dict.getType('sys_carousel_urltype')}"> <select id="urlType" name="urlType" class="form-control m-b" th:with="type=${@dict.getType('sys_carousel_urltype')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{urlType}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{urlType}"></option>
</select> </select>
</div> </div>
</div> </div>-->
<div id="upload" class="form-group"> <div id="upload" class="form-group">
<label class="col-sm-3 control-label">地址链接：</label> <label class="col-sm-3 control-label">地址链接：</label>
<div class="col-sm-8"> <div class="col-sm-8">
...@@ -41,8 +41,9 @@ ...@@ -41,8 +41,9 @@
</select> </select>
</div> </div>
</div> </div>
<input id="type" name="type" th:field="*{type}" class="form-control" type="hidden" readonly="readonly"/>
<div class="form-group"> <input id="urlType" name="urlType" th:field="*{urlType}" class="form-control" type="hidden" readonly="readonly"/>
<!--<div class="form-group">
<label class="col-sm-3 control-label">业务类型：</label> <label class="col-sm-3 control-label">业务类型：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select id="type" name="type" class="form-control m-b" th:with="type=${@dict.getType('lyy_business_type')}"> <select id="type" name="type" class="form-control m-b" th:with="type=${@dict.getType('lyy_business_type')}">
...@@ -50,7 +51,7 @@ ...@@ -50,7 +51,7 @@
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{type}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{type}"></option>
</select> </select>
</div> </div>
</div> </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">排序：</label> <label class="col-sm-3 control-label">排序：</label>
<div class="col-sm-8"> <div class="col-sm-8">
...@@ -67,8 +68,8 @@ ...@@ -67,8 +68,8 @@
<label class="col-sm-3 control-label">名称：</label> <label class="col-sm-3 control-label">名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group"> <div class="input-group">
<input class="form-control" type="text" id="associationName" name="associationName" onclick="selectType()" th:field="*{associationName}"> <input class="form-control" type="text" id="associationName" name="associationName" readonly="readonly" th:field="*{associationName}">
<span class="input-group-addon"><i class="fa fa-search"></i></span> <!-- <span class="input-group-addon"><i class="fa fa-search"></i></span>-->
</div> </div>
<!-- <input name="associationName" th:field="*{associationName}" class="form-control" type="text">--> <!-- <input name="associationName" th:field="*{associationName}" class="form-control" type="text">-->
</div> </div>
...@@ -120,7 +121,7 @@ ...@@ -120,7 +121,7 @@
if($("#type").val() == null || $("#type").val() == undefined){ if($("#type").val() == null || $("#type").val() == undefined){
return; return;
} }
if($("#type").val() == '0' || $("#type").val() == '1' || $("#type").val() == '2' if($("#type").val() === '0' || $("#type").val() == '1' || $("#type").val() == '2'
|| $("#type").val() == '4' || $("#type").val() == '4'){ || $("#type").val() == '4' || $("#type").val() == '4'){
// $.modal.open("选择", prefix + "/selectType?type="+$("#type").val()); // $.modal.open("选择", prefix + "/selectType?type="+$("#type").val());
var options = { var options = {
......
ruoyi-system/src/main/resources/templates/carousel/info/infoDetail.html
View file @ a9282811
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
var associationId= $("#associationId").val(); var associationId= $("#associationId").val();
var options = { var options = {
url: prefix + "/list?associationId="+associationId+"&type="+type, url: prefix + "/list?associationId="+associationId+"&type="+type,
createUrl: prefix + "/add", createUrl: prefix + "/add?associationId="+associationId+"&type="+type,
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
......
ruoyi-system/src/main/resources/templates/carrier/info/info.html
View file @ a9282811
...@@ -49,9 +49,9 @@ ...@@ -49,9 +49,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="carrier:info:remove"> <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="carrier:info:remove">
<i class="fa fa-remove"></i> 删除 <i class="fa fa-remove"></i> 删除
</a> </a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="carrier:info:export"> <!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="carrier:info:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>-->
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
...@@ -116,8 +116,8 @@ ...@@ -116,8 +116,8 @@
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>'); actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'轮播管理\',\'/carousel/info/infoDetail?associationId=' + row.id +'&type='+5+ '\')"><i class="fa fa-edit"></i>轮播管理</a> '); actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'轮播管理\',\'/carousel/info/infoDetail?associationId=' + row.id +'&type='+4+ '\')"><i class="fa fa-edit"></i>轮播管理</a> ');
actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'VR管理\',\'/carousel/VRinfo/infoDetail?associationId=' + row.id +'&type='+5+'&urlType='+3+ '\')"><i class="fa fa-edit"></i>VR管理</a> '); actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'VR管理\',\'/carousel/VRinfo/infoDetail?associationId=' + row.id +'&type='+4+'&urlType='+3+ '\')"><i class="fa fa-edit"></i>VR管理</a> ');
return actions.join(''); return actions.join('');
} }
}] }]
......
ruoyi-system/src/main/resources/templates/developmentInfo/info/edit.html
View file @ a9282811
...@@ -512,6 +512,17 @@ ...@@ -512,6 +512,17 @@
<label class="col-sm-1 control-label">元/m³</label> <label class="col-sm-1 control-label">元/m³</label>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">是否星级开发区：</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_has_no')}">
<input type="radio" th:id="${dict.dictCode}" name="isSuper" th:value="${dict.dictValue}"
th:field="*{isSuper}" >
<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">图片链接：</label> <label class="col-sm-3 control-label">图片链接：</label>
<div class="col-sm-8"> <div class="col-sm-8">
......
ruoyi-system/src/main/resources/templates/developmentInfo/info/info.html
View file @ a9282811
...@@ -238,10 +238,10 @@ ...@@ -238,10 +238,10 @@
shiro:hasPermission="developmentInfo:info:remove"> shiro:hasPermission="developmentInfo:info:remove">
<i class="fa fa-remove"></i> 删除 <i class="fa fa-remove"></i> 删除
</a> </a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" <!--<a class="btn btn-warning" onclick="$.table.exportExcel()"
shiro:hasPermission="developmentInfo:info:export"> shiro:hasPermission="developmentInfo:info:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>-->
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
...@@ -298,6 +298,13 @@ ...@@ -298,6 +298,13 @@
return $.table.selectDictLabel(datasExamineStatus, value); return $.table.selectDictLabel(datasExamineStatus, value);
} }
}, },
{
field: 'isSuper',
title: '是否星级开发区',
formatter: function (value, row, index) {
return value===1 ?"是":'否';
}
},
// { // {
// field: 'levelOther', // field: 'levelOther',
// title: '片区级别-其他' // title: '片区级别-其他'
...@@ -584,7 +591,10 @@ ...@@ -584,7 +591,10 @@
actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业用地信息\',\'/developmentInfo/industrialLand?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>用地管理</a> '); actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业用地信息\',\'/developmentInfo/industrialLand?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>用地管理</a> ');
actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'VR管理\',\'/carousel/VRinfo/infoDetail?associationId=' + row.id +'&type='+1+'&urlType='+3+ '\')"><i class="fa fa-edit"></i>VR管理</a> '); actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'VR管理\',\'/carousel/VRinfo/infoDetail?associationId=' + row.id +'&type='+1+'&urlType='+3+ '\')"><i class="fa fa-edit"></i>VR管理</a> ');
actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'轮播管理\',\'/carousel/info/infoDetail?associationId=' + row.id +'&type='+1+ '\')"><i class="fa fa-edit"></i>轮播管理</a> '); actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'轮播管理\',\'/carousel/info/infoDetail?associationId=' + row.id +'&type='+1+ '\')"><i class="fa fa-edit"></i>轮播管理</a> ');
let isSuper = row.isSuper;
if(isSuper===1){
actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'星级详情\',\'/star_object/info/infoDetail?businessId=' + row.id +'&type='+1+ '\')"><i class="fa fa-edit"></i>星级管理</a> '); actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'星级详情\',\'/star_object/info/infoDetail?businessId=' + row.id +'&type='+1+ '\')"><i class="fa fa-edit"></i>星级管理</a> ');
}
// actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业用地信息\',\'/developmentInfo/info/update?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑产业用地信息</a> '); // actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业用地信息\',\'/developmentInfo/info/update?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑产业用地信息</a> ');
let status = row.status; let status = row.status;
if (status == 2) { if (status == 2) {
......
ruoyi-system/src/main/resources/templates/land/info/info.html
View file @ a9282811
...@@ -115,8 +115,8 @@ ...@@ -115,8 +115,8 @@
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>'); actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'轮播管理\',\'/carousel/info/infoDetail?associationId=' + row.id +'&type='+4+ '\')"><i class="fa fa-edit"></i>轮播管理</a> '); actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'轮播管理\',\'/carousel/info/infoDetail?associationId=' + row.id +'&type='+3+ '\')"><i class="fa fa-edit"></i>轮播管理</a> ');
actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'VR管理\',\'/carousel/VRinfo/infoDetail?associationId=' + row.id +'&type='+4+'&urlType='+3+ '\')"><i class="fa fa-edit"></i>VR管理</a> '); actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'VR管理\',\'/carousel/VRinfo/infoDetail?associationId=' + row.id +'&type='+3+'&urlType='+3+ '\')"><i class="fa fa-edit"></i>VR管理</a> ');
return actions.join(''); return actions.join('');
} }
}] }]
......
ruoyi-system/src/main/resources/templates/parkInfo/info/info.html
View file @ a9282811
...@@ -53,9 +53,9 @@ ...@@ -53,9 +53,9 @@
shiro:hasPermission="parkinfo:info:remove"> shiro:hasPermission="parkinfo:info:remove">
<i class="fa fa-remove"></i> 删除 <i class="fa fa-remove"></i> 删除
</a> </a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="parkinfo:info:export"> <!--<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="parkinfo:info:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>-->
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
......
ruoyi-system/src/main/resources/templates/star_object/info/add.html
View file @ a9282811
...@@ -48,7 +48,11 @@ ...@@ -48,7 +48,11 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form-group">
<input id="objectType" name="objectType" th:value="${objectType}" class="form-control" type="hidden" readonly="readonly"/>
<input id="objectId" name="objectId" th:value="${objectId}" class="form-control" type="hidden" readonly="readonly"/>
<!-- <div class="form-group">
<label class="col-sm-3 control-label">类别：</label> <label class="col-sm-3 control-label">类别：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select id="objectType" name="objectType" class="form-control m-b" th:with="type=${@dict.getType('lyy_business_type')}"> <select id="objectType" name="objectType" class="form-control m-b" th:with="type=${@dict.getType('lyy_business_type')}">
...@@ -63,21 +67,21 @@ ...@@ -63,21 +67,21 @@
<input class="form-control" type="text" id="objectName" name="objectName" onclick="selectType()" > <input class="form-control" type="text" id="objectName" name="objectName" onclick="selectType()" >
<span class="input-group-addon"><i class="fa fa-search"></i></span> <span class="input-group-addon"><i class="fa fa-search"></i></span>
</div> </div>
<!-- <input name="objectName" class="form-control" type="text">--> &lt;!&ndash; <input name="objectName" class="form-control" type="text">&ndash;&gt;
</div>
</div> </div>
</div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">排序：</label> <label class="col-sm-3 control-label">排序：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="sortNumber" class="form-control" type="text"> <input name="sortNumber" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group" style="display: none"> <!--<div class="form-group" style="display: none">
<label class="col-sm-3 control-label">关联id：</label> <label class="col-sm-3 control-label">关联id：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input id="objectId" name="objectId" class="form-control" type="text" readonly="readonly"> <input id="objectId" name="objectId" class="form-control" type="text" readonly="readonly">
</div> </div>
</div> </div>-->
</form> </form>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
...@@ -98,7 +102,6 @@ ...@@ -98,7 +102,6 @@
} }
// 根据当前激活的选项卡获取（方式一） // 根据当前激活的选项卡获取（方式一）
function selectType(){ function selectType(){
console.info("@@@@@@@@@@@@@@@@@@@@@@@@@@@@"+$("#objectType").val());
if($("#objectType").val() == null || $("#objectType").val() == undefined){ if($("#objectType").val() == null || $("#objectType").val() == undefined){
return; return;
} }
......
ruoyi-system/src/main/resources/templates/star_object/info/edit.html
View file @ a9282811
...@@ -48,7 +48,10 @@ ...@@ -48,7 +48,10 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form-group">
<input id="objectType" name="objectType" th:field="*{objectType}" class="form-control" type="hidden" readonly="readonly"/>
<!--<div class="form-group">
<label class="col-sm-3 control-label">类型：</label> <label class="col-sm-3 control-label">类型：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select id="objectType" name="objectType" class="form-control m-b" <select id="objectType" name="objectType" class="form-control m-b"
...@@ -57,12 +60,12 @@ ...@@ -57,12 +60,12 @@
th:field="*{objectType}"></option> th:field="*{objectType}"></option>
</select> </select>
</div> </div>
</div> </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">名称：</label> <label class="col-sm-3 control-label">名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group"> <div class="input-group">
<input class="form-control" type="text" id="objectName" name="objectName" onclick="selectType()" <input class="form-control" type="text" id="objectName" name="objectName" readonly="readonly"
th:field="*{objectName}"> th:field="*{objectName}">
<span class="input-group-addon"><i class="fa fa-search"></i></span> <span class="input-group-addon"><i class="fa fa-search"></i></span>
</div> </div>
......
ruoyi-system/src/main/resources/templates/star_object/info/infoDetail.html
View file @ a9282811
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
$(function () { $(function () {
var options = { var options = {
url: prefix + "/list?objectId="+businessId+"&objectType="+type, url: prefix + "/list?objectId="+businessId+"&objectType="+type,
createUrl: prefix + "/add", createUrl: prefix + "/add?objectId="+businessId+"&objectType="+type,
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment