Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
cfld-liyeyun-admin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cfld-backend
cfld-liyeyun-admin
Commits
a9282811
Commit
a9282811
authored
Dec 19, 2023
by
zhouxudong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新代码添加 园区开发区 处理图片 vr等
parent
74ac5807
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
182 additions
and
91 deletions
+182
-91
StarObjectExtensionInfoController.java
.../system/controller/StarObjectExtensionInfoController.java
+5
-1
SysCarouselInfoController.java
...om/ruoyi/system/controller/SysCarouselInfoController.java
+5
-1
SysCarouselVRInfoController.java
.../ruoyi/system/controller/SysCarouselVRInfoController.java
+7
-1
SysCarouselInfo.java
...rc/main/java/com/ruoyi/system/domain/SysCarouselInfo.java
+1
-1
BaseService.java
...m/src/main/java/com/ruoyi/system/service/BaseService.java
+7
-1
CarrierInfoServiceImpl.java
...com/ruoyi/system/service/impl/CarrierInfoServiceImpl.java
+6
-0
DevelopmentIndustrialLandInfoServiceImpl.java
...ervice/impl/DevelopmentIndustrialLandInfoServiceImpl.java
+6
-0
DevelopmentInfoServiceImpl.java
...ruoyi/system/service/impl/DevelopmentInfoServiceImpl.java
+7
-0
ParkInfoServiceImpl.java
...va/com/ruoyi/system/service/impl/ParkInfoServiceImpl.java
+6
-0
StarObjectExtensionInfoServiceImpl.java
...stem/service/impl/StarObjectExtensionInfoServiceImpl.java
+16
-8
SysCarouselInfoServiceImpl.java
...ruoyi/system/service/impl/SysCarouselInfoServiceImpl.java
+9
-0
add.html
...tem/src/main/resources/templates/carousel/VRinfo/add.html
+13
-12
edit.html
...em/src/main/resources/templates/carousel/VRinfo/edit.html
+10
-9
infoDetail.html
.../main/resources/templates/carousel/VRinfo/infoDetail.html
+1
-1
add.html
...ystem/src/main/resources/templates/carousel/info/add.html
+15
-12
edit.html
...stem/src/main/resources/templates/carousel/info/edit.html
+14
-14
infoDetail.html
...rc/main/resources/templates/carousel/info/infoDetail.html
+1
-1
info.html
...ystem/src/main/resources/templates/carrier/info/info.html
+4
-4
edit.html
...c/main/resources/templates/developmentInfo/info/edit.html
+12
-2
info.html
...c/main/resources/templates/developmentInfo/info/info.html
+13
-3
info.html
...i-system/src/main/resources/templates/land/info/info.html
+2
-2
info.html
...stem/src/main/resources/templates/parkInfo/info/info.html
+2
-2
add.html
...em/src/main/resources/templates/star_object/info/add.html
+12
-10
edit.html
...m/src/main/resources/templates/star_object/info/edit.html
+7
-5
infoDetail.html
...main/resources/templates/star_object/info/infoDetail.html
+1
-1
No files found.
ruoyi-system/src/main/java/com/ruoyi/system/controller/StarObjectExtensionInfoController.java
View file @
a9282811
...
...
@@ -78,8 +78,12 @@ public class StarObjectExtensionInfoController extends BaseController
* 新增星级扩展信息
*/
@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"
;
}
...
...
ruoyi-system/src/main/java/com/ruoyi/system/controller/SysCarouselInfoController.java
View file @
a9282811
...
...
@@ -123,8 +123,12 @@ public class SysCarouselInfoController extends BaseController
* 新增轮播图信息
*/
@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"
;
}
...
...
ruoyi-system/src/main/java/com/ruoyi/system/controller/SysCarouselVRInfoController.java
View file @
a9282811
...
...
@@ -112,8 +112,14 @@ public class SysCarouselVRInfoController extends BaseController
* 新增轮播图信息
*/
@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"
;
}
...
...
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCarouselInfo.java
View file @
a9282811
...
...
@@ -40,7 +40,7 @@ public class SysCarouselInfo extends BaseEntity {
/**
* 类型(0 -都市圈、1-开发区、2-园区、3-首页)
*/
@Excel
(
name
=
"类型"
,
readConverterExp
=
"0
=,-=都市圈、1-开发区、2-园区、3-首页
"
)
@Excel
(
name
=
"类型"
,
readConverterExp
=
"0
-都市圈、1-开发区、2-园区、3-土地、4-载体
"
)
private
Integer
type
;
/**
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/BaseService.java
View file @
a9282811
...
...
@@ -16,5 +16,11 @@ public interface BaseService {
* @return: java.lang.Boolean
**/
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,
carrierInfo
.
setImgUrl
(
imgUrl
);
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
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
developmentInfo
.
setImgUrl
(
imgUrl
);
return
this
.
developmentInfoMapper
.
updateDevelopmentInfo
(
developmentInfo
)==
1
;
}
@Override
public
String
getNameById
(
Long
associationId
)
{
DevelopmentInfo
developmentInfo
=
this
.
developmentInfoMapper
.
selectDevelopmentInfoById
(
associationId
);
return
developmentInfo
.
getName
();
}
/**
* @description: 设置经纬度
* @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
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
)
{
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;
import
java.util.List
;
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.stereotype.Service
;
import
com.ruoyi.system.mapper.StarObjectExtensionInfoMapper
;
...
...
@@ -11,19 +13,19 @@ import com.ruoyi.common.core.text.Convert;
/**
* 星级扩展信息Service业务层处理
*
*
* @author ruoyi
* @date 2023-11-24
*/
@Service
public
class
StarObjectExtensionInfoServiceImpl
implements
IStarObjectExtensionInfoService
public
class
StarObjectExtensionInfoServiceImpl
implements
IStarObjectExtensionInfoService
{
@Autowired
private
StarObjectExtensionInfoMapper
starObjectExtensionInfoMapper
;
/**
* 查询星级扩展信息
*
*
* @param id 星级扩展信息主键
* @return 星级扩展信息
*/
...
...
@@ -35,7 +37,7 @@ public class StarObjectExtensionInfoServiceImpl implements IStarObjectExtensionI
/**
* 查询星级扩展信息列表
*
*
* @param starObjectExtensionInfo 星级扩展信息
* @return 星级扩展信息
*/
...
...
@@ -47,20 +49,23 @@ public class StarObjectExtensionInfoServiceImpl implements IStarObjectExtensionI
/**
* 新增星级扩展信息
*
*
* @param starObjectExtensionInfo 星级扩展信息
* @return 结果
*/
@Override
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
());
return
starObjectExtensionInfoMapper
.
insertStarObjectExtensionInfo
(
starObjectExtensionInfo
);
}
/**
* 修改星级扩展信息
*
*
* @param starObjectExtensionInfo 星级扩展信息
* @return 结果
*/
...
...
@@ -68,12 +73,15 @@ public class StarObjectExtensionInfoServiceImpl implements IStarObjectExtensionI
public
int
updateStarObjectExtensionInfo
(
StarObjectExtensionInfo
starObjectExtensionInfo
)
{
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
);
}
/**
* 批量删除星级扩展信息
*
*
* @param ids 需要删除的星级扩展信息主键
* @return 结果
*/
...
...
@@ -85,7 +93,7 @@ public class StarObjectExtensionInfoServiceImpl implements IStarObjectExtensionI
/**
* 删除星级扩展信息信息
*
*
* @param id 星级扩展信息主键
* @return 结果
*/
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysCarouselInfoServiceImpl.java
View file @
a9282811
...
...
@@ -63,6 +63,11 @@ public class SysCarouselInfoServiceImpl implements ISysCarouselInfoService {
public
int
insertSysCarouselInfo
(
SysCarouselInfo
sysCarouselInfo
)
{
sysCarouselInfo
.
setCreateTime
(
DateUtils
.
getNowDate
());
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
(
","
))
{
sysCarouselInfo
.
setImgUrl
(
s
);
sysCarouselInfoMapper
.
insertSysCarouselInfo
(
sysCarouselInfo
);
...
...
@@ -112,6 +117,10 @@ public class SysCarouselInfoServiceImpl implements ISysCarouselInfoService {
public
int
updateSysCarouselInfo
(
SysCarouselInfo
sysCarouselInfo
)
{
sysCarouselInfo
.
setUpdateTime
(
DateUtils
.
getNowDate
());
setLinkType
(
sysCarouselInfo
);
Integer
type
=
sysCarouselInfo
.
getType
();
BaseService
businessByCode
=
BusinessServiceFactory
.
getBusinessByCode
(
type
);
String
name
=
businessByCode
.
getNameById
(
sysCarouselInfo
.
getAssociationId
());
sysCarouselInfo
.
setAssociationName
(
name
);
return
sysCarouselInfoMapper
.
updateSysCarouselInfo
(
sysCarouselInfo
);
}
...
...
ruoyi-system/src/main/resources/templates/carousel/VRinfo/add.html
View file @
a9282811
...
...
@@ -7,8 +7,10 @@
<body
class=
"white-bg"
>
<div
class=
"wrapper wrapper-content animated fadeInRight ibox-content"
>
<form
class=
"form-horizontal m"
id=
"form-info-add"
>
<input
type=
"hidden"
name =
'urlType'
id=
"urlType"
value=
"3"
>
<div
class=
"form-group"
>
<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"
>
<label
class=
"col-sm-3 control-label"
>
VR地址链接:
</label>
<div
class=
"col-sm-8"
>
<input
id =
'imgUrl'
name=
"imgUrl"
class=
"form-control"
type=
"text"
>
...
...
@@ -18,7 +20,7 @@
<!-- </div>-->
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
描述:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"description"
class=
"form-control"
type=
"text"
>
...
...
@@ -40,36 +42,36 @@
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<div
class=
"form-group"
>
<!--
<div class="form-group">
<label class="col-sm-3 control-label">业务类型:</label>
<div class="col-sm-8">
<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>
</select>
</div>
</div>
<div
class=
"form-group"
>
</div>
-->
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
排序:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"orderNumber"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<
!--<
div class="form-group">
<label class="col-sm-3 control-label">关联id:</label>
<div class="col-sm-8">
<input id="associationId" name="associationId" class="form-control" type="text" readonly="readonly">
</div>
</div>
<div
class=
"form-group"
>
<div class="form-group">
<label class="col-sm-3 control-label">名称:</label>
<div class="col-sm-8">
<div class="input-group">
<input class="form-control" type="text" id="associationName" name="associationName" onclick="selectType()" >
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
<!-- <input name="associationName" class="form-control" type="text">-->
<!– <input name="associationName" class="form-control" type="text">–>
</div>
</div>
</div>
-->
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
VR封面:
</label>
<div
class=
"col-sm-8"
>
...
...
@@ -142,4 +144,4 @@
});
</script>
</body>
</html>
\ No newline at end of file
</html>
ruoyi-system/src/main/resources/templates/carousel/VRinfo/edit.html
View file @
a9282811
...
...
@@ -9,7 +9,7 @@
<form
class=
"form-horizontal m"
id=
"form-info-edit"
th:object=
"${sysCarouselInfo}"
>
<input
name=
"id"
th:field=
"*{id}"
type=
"hidden"
>
<input
name=
"urlType"
th:field=
"*{urlType}"
type=
"hidden"
>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
VR地址链接:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"imgUrl"
th:field=
"*{imgUrl}"
class=
"form-control"
type=
"text"
>
...
...
@@ -19,7 +19,7 @@
<!-- </div>-->
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
描述:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"description"
th:field=
"*{description}"
class=
"form-control"
type=
"text"
>
...
...
@@ -41,21 +41,23 @@
<!-- </select>-->
<!-- </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>
<div class="col-sm-8">
<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>
</select>
</div>
</div>
<div
class=
"form-group"
>
</div>
-->
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
排序:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"orderNumber"
th:field=
"*{orderNumber}"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
关联id:
</label>
<div
class=
"col-sm-8"
>
<input
id=
"associationId"
name=
"associationId"
th:field=
"*{associationId}"
class=
"form-control"
type=
"text"
readonly=
"readonly"
>
...
...
@@ -65,7 +67,7 @@
<label
class=
"col-sm-3 control-label"
>
名称:
</label>
<div
class=
"col-sm-8"
>
<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>
</div>
<!-- <input name="associationName" th:field="*{associationName}" class="form-control" type="text">-->
...
...
@@ -151,4 +153,4 @@
</script>
</body>
</html>
\ No newline at end of file
</html>
ruoyi-system/src/main/resources/templates/carousel/VRinfo/infoDetail.html
View file @
a9282811
...
...
@@ -86,7 +86,7 @@
$
(
function
()
{
var
options
=
{
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}"
,
removeUrl
:
prefix
+
"/remove"
,
exportUrl
:
prefix
+
"/export"
,
...
...
ruoyi-system/src/main/resources/templates/carousel/info/add.html
View file @
a9282811
...
...
@@ -47,7 +47,7 @@
</div>
</div>
<div
class=
"form-group"
>
<
!--<
div class="form-group">
<label class="col-sm-3 control-label">业务类型:</label>
<div class="col-sm-8">
<select id="type" name="type" class="form-control m-b" th:with="type=${@dict.getType('lyy_business_type')}">
...
...
@@ -55,29 +55,33 @@
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
</div>
-->
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
排序:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"orderNumber"
class=
"form-control"
type=
"text"
>
</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>
<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
class=
"form-group"
>
</div>-->
<!-- <div class="form-group">
<label class="col-sm-3 control-label">名称:</label>
<div class="col-sm-8">
<div class="input-group">
<input class="form-control" type="text" id="associationName" name="associationName" onclick="selectType()" >
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
<!-- <input name="associationName" class="form-control" type="text">-->
<!– <input name="associationName" class="form-control" type="text">–>
</div>
</div>
</div>
-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">转跳链接:</label>-->
<!-- <div class="col-sm-8">-->
...
...
@@ -120,7 +124,7 @@
}
}
// 根据当前激活的选项卡获取(方式一)
function
selectType
(){
/*
function selectType(){
if($("#type").val() == null || $("#type").val() == undefined){
return;
}
...
...
@@ -135,7 +139,7 @@
$.modal.openOptions(options);
}
}
}
*/
function
doSubmit2
(
index
,
layero
){
var
rows
=
layero
.
find
(
"iframe"
)[
0
].
contentWindow
.
getSelections
();
...
...
@@ -163,4 +167,4 @@
})
</script>
</body>
</html>
\ No newline at end of file
</html>
ruoyi-system/src/main/resources/templates/carousel/info/edit.html
View file @
a9282811
...
...
@@ -9,14 +9,14 @@
<form
class=
"form-horizontal m"
id=
"form-info-edit"
th:object=
"${sysCarouselInfo}"
>
<input
name=
"id"
th:field=
"*{id}"
type=
"hidden"
>
<div
class=
"form-group"
>
<
!--<
div class="form-group">
<label class="col-sm-3 control-label">资源类型:</label>
<div class="col-sm-8">
<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>
</select>
</div>
</div>
</div>
-->
<div
id=
"upload"
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
地址链接:
</label>
<div
class=
"col-sm-8"
>
...
...
@@ -27,7 +27,7 @@
</div>
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
描述:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"description"
th:field=
"*{description}"
class=
"form-control"
type=
"text"
>
...
...
@@ -41,23 +41,24 @@
</select>
</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>
<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 value="" >所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{type}"></option>
</select>
</div>
</div>
<div
class=
"form-group"
>
</div>
-->
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
排序:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"orderNumber"
th:field=
"*{orderNumber}"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
关联id:
</label>
<div
class=
"col-sm-8"
>
<input
id=
"associationId"
name=
"associationId"
th:field=
"*{associationId}"
class=
"form-control"
type=
"text"
readonly=
"readonly"
>
...
...
@@ -67,8 +68,8 @@
<label
class=
"col-sm-3 control-label"
>
名称:
</label>
<div
class=
"col-sm-8"
>
<div
class=
"input-group"
>
<input
class=
"form-control"
type=
"text"
id=
"associationName"
name=
"associationName"
onclick=
"selectType()
"
th:field=
"*{associationName}"
>
<span
class=
"input-group-addon"
><i
class=
"fa fa-search"
></i></span
>
<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>--
>
</div>
<!-- <input name="associationName" th:field="*{associationName}" class="form-control" type="text">-->
</div>
...
...
@@ -120,7 +121,7 @@
if
(
$
(
"#type"
).
val
()
==
null
||
$
(
"#type"
).
val
()
==
undefined
){
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'
){
// $.modal.open("选择", prefix + "/selectType?type="+$("#type").val());
var
options
=
{
...
...
@@ -161,4 +162,4 @@
});
</script>
</body>
</html>
\ No newline at end of file
</html>
ruoyi-system/src/main/resources/templates/carousel/info/infoDetail.html
View file @
a9282811
...
...
@@ -68,7 +68,7 @@
var
associationId
=
$
(
"#associationId"
).
val
();
var
options
=
{
url
:
prefix
+
"/list?associationId="
+
associationId
+
"&type="
+
type
,
createUrl
:
prefix
+
"/add
"
,
createUrl
:
prefix
+
"/add
?associationId="
+
associationId
+
"&type="
+
type
,
updateUrl
:
prefix
+
"/edit/{id}"
,
removeUrl
:
prefix
+
"/remove"
,
exportUrl
:
prefix
+
"/export"
,
...
...
ruoyi-system/src/main/resources/templates/carrier/info/info.html
View file @
a9282811
...
...
@@ -49,9 +49,9 @@
<a
class=
"btn btn-danger multiple disabled"
onclick=
"$.operate.removeAll()"
shiro:hasPermission=
"carrier:info:remove"
>
<i
class=
"fa fa-remove"
></i>
删除
</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> 导出
</a>
</a>
-->
</div>
<div
class=
"col-sm-12 select-table table-striped"
>
<table
id=
"bootstrap-table"
></table>
...
...
@@ -116,8 +116,8 @@
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-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-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-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='
+
4
+
'&urlType='
+
3
+
'
\'
)"><i class="fa fa-edit"></i>VR管理</a> '
);
return
actions
.
join
(
''
);
}
}]
...
...
ruoyi-system/src/main/resources/templates/developmentInfo/info/edit.html
View file @
a9282811
...
...
@@ -512,6 +512,17 @@
<label
class=
"col-sm-1 control-label"
>
元/m³
</label>
</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"
>
<label
class=
"col-sm-3 control-label"
>
图片链接:
</label>
<div
class=
"col-sm-8"
>
...
...
@@ -603,4 +614,4 @@
});
</script>
</body>
</html>
\ No newline at end of file
</html>
ruoyi-system/src/main/resources/templates/developmentInfo/info/info.html
View file @
a9282811
...
...
@@ -238,10 +238,10 @@
shiro:hasPermission=
"developmentInfo:info:remove"
>
<i
class=
"fa fa-remove"
></i>
删除
</a>
<a
class=
"btn btn-warning"
onclick=
"$.table.exportExcel()"
<
!--<
a class="btn btn-warning" onclick="$.table.exportExcel()"
shiro:hasPermission="developmentInfo:info:export">
<i class="fa fa-download"></i> 导出
</a>
</a>
-->
</div>
<div
class=
"col-sm-12 select-table table-striped"
>
<table
id=
"bootstrap-table"
></table>
...
...
@@ -298,6 +298,13 @@
return
$
.
table
.
selectDictLabel
(
datasExamineStatus
,
value
);
}
},
{
field
:
'isSuper'
,
title
:
'是否星级开发区'
,
formatter
:
function
(
value
,
row
,
index
)
{
return
value
===
1
?
"是"
:
'否'
;
}
},
// {
// field: 'levelOther',
// title: '片区级别-其他'
...
...
@@ -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-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(
\'
星级详情
\'
,
\'
/star_object/info/infoDetail?businessId='
+
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(
\
'产业用地信息
\
',
\
'/developmentInfo/info/update?developmentId=' + row.id + '
\
')"
><
i
class
=
"fa fa-edit"
><
/i>编辑产业用地信息</
a
>
');
let status = row.status;
if (status == 2) {
...
...
ruoyi-system/src/main/resources/templates/land/info/info.html
View file @
a9282811
...
...
@@ -115,8 +115,8 @@
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-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-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-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='
+
3
+
'&urlType='
+
3
+
'
\'
)"><i class="fa fa-edit"></i>VR管理</a> '
);
return
actions
.
join
(
''
);
}
}]
...
...
ruoyi-system/src/main/resources/templates/parkInfo/info/info.html
View file @
a9282811
...
...
@@ -53,9 +53,9 @@
shiro:hasPermission=
"parkinfo:info:remove"
>
<i
class=
"fa fa-remove"
></i>
删除
</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> 导出
</a>
</a>
-->
</div>
<div
class=
"col-sm-12 select-table table-striped"
>
<table
id=
"bootstrap-table"
></table>
...
...
ruoyi-system/src/main/resources/templates/star_object/info/add.html
View file @
a9282811
...
...
@@ -16,7 +16,7 @@
</div>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
图片地址链接:
</label>
<div
class=
"col-sm-8"
>
<!-- <input name="coverUrl" class="form-control" type="text">-->
...
...
@@ -48,7 +48,11 @@
</select>
</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>
<div class="col-sm-8">
<select id="objectType" name="objectType" class="form-control m-b" th:with="type=${@dict.getType('lyy_business_type')}">
...
...
@@ -63,21 +67,21 @@
<input class="form-control" type="text" id="objectName" name="objectName" onclick="selectType()" >
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
<!-- <input name="objectName" class="form-control" type="text">-->
<!– <input name="objectName" class="form-control" type="text">–>
</div>
</div>
<div
class=
"form-group"
>
</div>
-->
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
排序:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"sortNumber"
class=
"form-control"
type=
"text"
>
</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>
<div class="col-sm-8">
<input id="objectId" name="objectId" class="form-control" type="text" readonly="readonly">
</div>
</div>
</div>
-->
</form>
</div>
<th:block
th:include=
"include :: footer"
/>
...
...
@@ -98,7 +102,6 @@
}
// 根据当前激活的选项卡获取(方式一)
function
selectType
(){
console
.
info
(
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+
$
(
"#objectType"
).
val
());
if
(
$
(
"#objectType"
).
val
()
==
null
||
$
(
"#objectType"
).
val
()
==
undefined
){
return
;
}
...
...
@@ -144,4 +147,4 @@
});
</script>
</body>
</html>
\ No newline at end of file
</html>
ruoyi-system/src/main/resources/templates/star_object/info/edit.html
View file @
a9282811
...
...
@@ -48,7 +48,10 @@
</select>
</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>
<div class="col-sm-8">
<select id="objectType" name="objectType" class="form-control m-b"
...
...
@@ -57,12 +60,12 @@
th:field="*{objectType}"></option>
</select>
</div>
</div>
</div>
-->
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
名称:
</label>
<div
class=
"col-sm-8"
>
<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}"
>
<span
class=
"input-group-addon"
><i
class=
"fa fa-search"
></i></span>
</div>
...
...
@@ -151,4 +154,4 @@
});
</script>
</body>
</html>
\ No newline at end of file
</html>
ruoyi-system/src/main/resources/templates/star_object/info/infoDetail.html
View file @
a9282811
...
...
@@ -88,7 +88,7 @@
$
(
function
()
{
var
options
=
{
url
:
prefix
+
"/list?objectId="
+
businessId
+
"&objectType="
+
type
,
createUrl
:
prefix
+
"/add
"
,
createUrl
:
prefix
+
"/add
?objectId="
+
businessId
+
"&objectType="
+
type
,
updateUrl
:
prefix
+
"/edit/{id}"
,
removeUrl
:
prefix
+
"/remove"
,
exportUrl
:
prefix
+
"/export"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment