diff --git a/interface-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/service/picturestemplatearea/IPicturesTemplateAreaService.java b/interface-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/service/picturestemplatearea/IPicturesTemplateAreaService.java index 8488ec9..3ed7bbe 100644 --- a/interface-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/service/picturestemplatearea/IPicturesTemplateAreaService.java +++ b/interface-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/service/picturestemplatearea/IPicturesTemplateAreaService.java @@ -156,7 +156,7 @@ public interface IPicturesTemplateAreaService { SuccessResult updatePicturesTemplateAreaPoint(String picturesTemplateAreaId, PicturesTemplateAreaPiointVO picturesTemplateAreaPiointVO) throws Exception; - SuccessResult copyPicturesTemplateAreaPoint(String picturesTemplateAreaId) throws Exception; + SuccessResult copyPicturesTemplateAreaPoint(String picturesTemplateAreaId, String templateAreaSource) throws Exception; SuccessResult updatePicturesTemplateAreaPointModuleData(String picturesTemplateAreaId, String templateAreaModuleData) throws Exception; } \ No newline at end of file diff --git a/module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/controller/apis/picturestemplatearea/PicturesTemplateAreaController.java b/module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/controller/apis/picturestemplatearea/PicturesTemplateAreaController.java index d8204e3..42158d1 100644 --- a/module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/controller/apis/picturestemplatearea/PicturesTemplateAreaController.java +++ b/module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/controller/apis/picturestemplatearea/PicturesTemplateAreaController.java @@ -56,10 +56,10 @@ public class PicturesTemplateAreaController extends DefaultBaseController { @ApiImplicitParam(name = "showTemplateAreaId", value = "大数据模块区域ID", paramType = "path") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PutMapping("copypicturestemplatearea/{picturesTemplateAreaId}") + @PutMapping("copypicturestemplatearea/{picturesTemplateAreaId}/{templateAreaSource}") @CheckRequestBodyAnnotation - public SuccessResult copyPicturesTemplateAreaPoint(@PathVariable("picturesTemplateAreaId") String picturesTemplateAreaId) throws Exception { - return picturesTemplateAreaService.copyPicturesTemplateAreaPoint(picturesTemplateAreaId); + public SuccessResult copyPicturesTemplateAreaPoint(@PathVariable("picturesTemplateAreaId") String picturesTemplateAreaId, @PathVariable("templateAreaSource") String templateAreaSource) throws Exception { + return picturesTemplateAreaService.copyPicturesTemplateAreaPoint(picturesTemplateAreaId, templateAreaSource); } @ApiOperation(value = "修改大数据模块区域", notes = "修改大数据模块区域接口") diff --git a/module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/service/picturestemplatearea/impl/PicturesTemplateAreaServiceImpl.java b/module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/service/picturestemplatearea/impl/PicturesTemplateAreaServiceImpl.java index 53444d0..02118ea 100644 --- a/module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/service/picturestemplatearea/impl/PicturesTemplateAreaServiceImpl.java +++ b/module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/service/picturestemplatearea/impl/PicturesTemplateAreaServiceImpl.java @@ -92,7 +92,9 @@ public class PicturesTemplateAreaServiceImpl extends DefaultBaseService implemen picturesTemplateAreaVO.setTemplateAreaTop(10.0); picturesTemplateAreaVO.setTemplateAreaHeight(300.0); picturesTemplateAreaVO.setTemplateAreaWidth(300.0); - + /** + * 判断字段标识, 相同模板不能出现同样的字段标识 + */ Map params = HashMapUtil.beanToMap(picturesTemplateAreaVO); params.put("picturesTemplateAreaId", picturesTemplateAreaId); if (StringUtils.isBlank(token)) { @@ -100,6 +102,42 @@ public class PicturesTemplateAreaServiceImpl extends DefaultBaseService implemen } else { setAppSaveInfo(token, params); } + if (StringUtils.isEmpty(picturesTemplateAreaVO.getTemplateAreaSource())) { + throw new SaveException("标识不能为空"); + } + picturesTemplateAreaVO.setTemplateAreaSource(picturesTemplateAreaVO.getTemplateAreaSource().trim()); + char[] c = picturesTemplateAreaVO.getTemplateAreaSource().toCharArray(); + for(int i = 0; i < c.length; i ++) { + String len = Integer.toBinaryString(c[i]); + if(len.length() > 8) { + throw new SaveException("标识中不能含有中文"); + } + } + if(!Character.isLowerCase(c[0])) { + throw new SaveException("首字母需要小写"); + } + if("1".equals(picturesTemplateAreaVO.getTemplateAreaServerLink())) { + if(StringUtils.isEmpty(picturesTemplateAreaVO.getTemplateAreaFontValue())) { + throw new SaveException("示例文字不能为空"); + } + if(StringUtils.isEmpty(picturesTemplateAreaVO.getTemplateAreaFontSize())) { + throw new SaveException("字体大小不能为空"); + } + if(!StringUtils.isNumeric(picturesTemplateAreaVO.getTemplateAreaFontSize())) { + throw new SaveException("字体大小输入不合法"); + } + Integer size = Integer.valueOf(picturesTemplateAreaVO.getTemplateAreaFontSize()); + if(size > 100 || size < 1) { + throw new SaveException("字体大小范围为1-100"); + } + } + Map query = new HashMap(); + query.put("picturesTemplateId", picturesTemplateAreaVO.getPicturesTemplateId() ); + query.put("templateAreaSource", picturesTemplateAreaVO.getTemplateAreaSource()); + List dto = picturesTemplateAreaDao.getPicturesTemplateAreaByPicturesTemplateId(query); + if(dto != null && dto.size() > 0) { + throw new SaveException("当前标识已存在"); + } picturesTemplateAreaDao.savePicturesTemplateArea(params); return picturesTemplateAreaId; } @@ -167,6 +205,48 @@ public class PicturesTemplateAreaServiceImpl extends DefaultBaseService implemen } else { setAppUpdateInfo(token, params); } + if (StringUtils.isEmpty(picturesTemplateAreaVO.getTemplateAreaSource())) { + throw new SaveException("标识不能为空"); + } + picturesTemplateAreaVO.setTemplateAreaSource(picturesTemplateAreaVO.getTemplateAreaSource().trim()); + char[] c = picturesTemplateAreaVO.getTemplateAreaSource().toCharArray(); + for(int i = 0; i < c.length; i ++) { + String len = Integer.toBinaryString(c[i]); + if(len.length() > 8) { + throw new SaveException("标识中不能含有中文"); + } + } + if(!Character.isLowerCase(c[0])) { + throw new SaveException("首字母需要小写"); + } + if("1".equals(picturesTemplateAreaVO.getTemplateAreaServerLink())) { + if(StringUtils.isEmpty(picturesTemplateAreaVO.getTemplateAreaFontValue())) { + throw new SaveException("示例文字不能为空"); + } + if(StringUtils.isEmpty(picturesTemplateAreaVO.getTemplateAreaFontSize())) { + throw new SaveException("字体大小不能为空"); + } + if(!StringUtils.isNumeric(picturesTemplateAreaVO.getTemplateAreaFontSize())) { + throw new SaveException("字体大小输入不合法"); + } + Integer size = Integer.valueOf(picturesTemplateAreaVO.getTemplateAreaFontSize()); + if(size > 100 || size < 1) { + throw new SaveException("字体大小范围为1-100"); + } + } + Map query = new HashMap(); + query.put("picturesTemplateId", picturesTemplateAreaVO.getPicturesTemplateId() ); + query.put("templateAreaSource", picturesTemplateAreaVO.getTemplateAreaSource()); + List dto = picturesTemplateAreaDao.getPicturesTemplateAreaByPicturesTemplateId(query); + if(dto != null && dto.size() > 0) { + if(dto.size() == 1) { + if(!dto.get(0).getPicturesTemplateAreaId().equals(picturesTemplateAreaId)) { + throw new SaveException("当前标识已存在"); + } + }else{ + throw new SaveException("当前标识已存在"); + } + } picturesTemplateAreaDao.updatePicturesTemplateArea(params); } @@ -225,11 +305,33 @@ public class PicturesTemplateAreaServiceImpl extends DefaultBaseService implemen } @Override - public SuccessResult copyPicturesTemplateAreaPoint(String picturesTemplateAreaId) throws Exception { + public SuccessResult copyPicturesTemplateAreaPoint(String picturesTemplateAreaId, String templateAreaSource) throws Exception { PicturesTemplateAreaDTO dto = getPicturesTemplateAreaById(picturesTemplateAreaId); if(dto == null) { throw new UpdateException("需要复制的区域不存在"); } + + if (StringUtils.isEmpty(templateAreaSource)) { + throw new SaveException("标识不能为空"); + } + templateAreaSource = templateAreaSource.trim(); + char[] c = templateAreaSource.toCharArray(); + for(int i = 0; i < c.length; i ++) { + String len = Integer.toBinaryString(c[i]); + if(len.length() > 8) { + throw new SaveException("标识中不能含有中文"); + } + } + if(!Character.isLowerCase(c[0])) { + throw new SaveException("首字母需要小写"); + } + Map query = new HashMap(); + query.put("picturesTemplateId", dto.getPicturesTemplateId() ); + query.put("templateAreaSource", templateAreaSource); + List dtoList = picturesTemplateAreaDao.getPicturesTemplateAreaByPicturesTemplateId(query); + if(dto != null && dtoList.size() > 0) { + throw new SaveException("当前标识已存在"); + } String newPicturesTemplateAreaId = UUIDUtil.getUUID(); dto.setTemplateAreaLeft(10.0); dto.setTemplateAreaDown(0.0); @@ -237,6 +339,7 @@ public class PicturesTemplateAreaServiceImpl extends DefaultBaseService implemen dto.setTemplateAreaTop(10.0); dto.setTemplateAreaHeight(300.0); dto.setTemplateAreaWidth(300.0); + dto.setTemplateAreaSource(templateAreaSource); dto.setPicturesTemplateAreaId(newPicturesTemplateAreaId); Map params = HashMapUtil.beanToMap(dto); setSaveInfo(params); diff --git a/module-building-pictures/src/main/resources/mybatis/mapper/picturestemplatearea/picturesmplatearea-mapper.xml b/module-building-pictures/src/main/resources/mybatis/mapper/picturestemplatearea/picturesmplatearea-mapper.xml index 57c5120..2ee7a55 100644 --- a/module-building-pictures/src/main/resources/mybatis/mapper/picturestemplatearea/picturesmplatearea-mapper.xml +++ b/module-building-pictures/src/main/resources/mybatis/mapper/picturestemplatearea/picturesmplatearea-mapper.xml @@ -5,7 +5,6 @@ - @@ -20,6 +19,12 @@ + + + + + + @@ -56,7 +61,6 @@ SELECT t1.pictures_template_area_id, t1.pictures_template_id, - t1.template_area_module_data, t1.template_area_source, t1.template_area_color, t1.template_area_remark, @@ -68,7 +72,13 @@ t1.template_area_height, t1.template_area_width, t1.template_area_file, - t1.template_area_server_link + t1.template_area_server_link, + t1.template_area_font_center, + t1.template_area_font_size, + t1.template_area_font_bold, + t1.template_area_font_family, + t1.template_area_font_color, + t1.template_area_font_value FROM pictures_template_area t1 WHERE @@ -77,6 +87,10 @@ AND t1.pictures_template_id = #{picturesTemplateId} + + AND + t1.template_area_source = #{templateAreaSource} + ORDER BY t1.gmt_create @@ -85,7 +99,6 @@ INSERT INTO pictures_template_area( pictures_template_area_id, pictures_template_id, - template_area_module_data, template_area_source, template_area_left, template_area_top, @@ -98,6 +111,12 @@ template_area_status, template_area_file, template_area_server_link, + template_area_font_center, + template_area_font_size, + template_area_font_bold, + template_area_font_family, + template_area_font_color, + template_area_font_value, creator, gmt_create, modifier, @@ -106,7 +125,6 @@ ) VALUES( #{picturesTemplateAreaId}, #{picturesTemplateId}, - #{templateAreaModuleData}, #{templateAreaSource}, #{templateAreaLeft}, #{templateAreaTop}, @@ -119,6 +137,12 @@ #{templateAreaStatus}, #{templateAreaFile}, #{templateAreaServerLink}, + #{templateAreaFontCenter}, + #{templateAreaFontSize}, + #{templateAreaFontBold}, + #{templateAreaFontFamily}, + #{templateAreaFontColor}, + #{templateAreaFontValue}, #{creator}, #{gmtCreate}, #{modifier}, @@ -169,6 +193,24 @@ template_area_remark = #{templateAreaRemark}, + + + template_area_font_center = #{templateAreaFontCenter}, + + + template_area_font_size = #{templateAreaFontSize}, + + + template_area_font_bold = #{templateAreaFontBold}, + + + template_area_font_family = #{templateAreaFontFamily}, + + + template_area_font_color = #{templateAreaFontColor}, + + + template_area_font_value = #{templateAreaFontValue}, template_area_file = #{templateAreaFile}, template_area_server_link = #{templateAreaServerLink}, @@ -180,17 +222,22 @@ SELECT t1.pictures_template_id, - t1.template_area_module_data, t1.template_area_source, t1.template_area_color, t1.template_area_remark, @@ -214,7 +260,13 @@ t1.pictures_template_area_id, t3.pictures_template_title, t1.template_area_file, - t1.template_area_server_link + t1.template_area_server_link, + t1.template_area_font_center, + t1.template_area_font_size, + t1.template_area_font_bold, + t1.template_area_font_family, + t1.template_area_font_color, + t1.template_area_font_value FROM pictures_template_area t1 LEFT JOIN @@ -233,14 +285,19 @@ - - - - - +
+
+ +
+ +
-
@@ -45,177 +54,109 @@
-
- +
- - - + + + +
-
- -
- -
-
- -
- - -
-
-
-
- -
- - - -
-
-
- -
- -
-
- -
-
+
+ +
- +
- +
@@ -239,7 +180,7 @@ base: 'assets/layuiadmin/' //静态资源所在路径 }).extend({ index: 'lib/index' //主入口模块 - }).use(['index', 'form', 'slider','laydate', 'laytpl'], function(){ + }).use(['index', 'form', 'slider','laydate', 'laytpl', 'colorpicker'], function(){ var $ = layui.$; var form = layui.form; var laytpl = layui.laytpl; @@ -248,90 +189,58 @@ var slider = layui.slider; var wangEditorObj = {}; var viewerObj = {}; - var bigdataTemplateId = top.restAjax.params(window.location.href).bigdataTemplateId; + var colorpicker = layui.colorpicker; + var picturesTemplateId = top.restAjax.params(window.location.href).picturesTemplateId; + function closeBox() { parent.layer.close(parent.layer.getFrameIndex(window.name)); } + $(document).on('click', '.selectColor', function() { + selectColor(this, $(this).val()) + }); + + function selectColor(ele, color) { + //开启全功能 + colorpicker.render({ + elem: '#test-all' + ,color: color + ,format: 'rgb' + ,predefine: true + ,alpha: false + ,offset: 'rb' + ,size: 'xs' + ,shadeClose: true + ,done: function(color){ + $(ele).val(color); + $(ele).next().css("background",color); + } + ,change: function(color){ + $(ele).val(color); + $(ele).next().css("background",color); + } + }); + $('.layui-colorpicker').click(); + } + function refreshDownloadTemplet(fileName, file) { var dataRander = {}; dataRander[fileName] = file; laytpl(document.getElementById(fileName +'FileDownload').innerHTML).render(dataRander, function(html) { - document.getElementById(fileName +'FileBox').innerHTML = html; + if($('input[name="templateAreaServerLink"]:checked').val() == "2") { + document.getElementById(fileName +'FileBox').innerHTML = html; + }else{ + document.getElementById(fileName +'FileBox').innerHTML = ""; + } }); } - form.on('radio(templateAreaJumpFilter)', function (data) { - console.log(data); - laytpl(document.getElementById('showDataScript').innerHTML).render(data.value + "", function(html) { - document.getElementById('showDataDiv').innerHTML = html; + form.on('radio(templateAreaServerLinkFilter)', function (data) { + initTemplateAreaFileUploadFile(); + laytpl(document.getElementById('areaFontValueScript').innerHTML).render(data.value + "", function(html) { + document.getElementById('areaFontValueDiv').innerHTML = html; form.render(null, 'dataForm'); }); - // 隐藏掉跳转模板输入框 - if(data.value == '0') { - laytpl(document.getElementById('templateAreaJumpModeScript').innerHTML).render(data.value + "", function(html) { - document.getElementById('templateAreaJumpModeDiv').innerHTML = html; - form.render(null, 'dataForm'); - }); - } - }); - - // 绑定监听 - form.on('checkbox(templateAreaServerLinkFilter)', function (data) { - // if($("#bigdataModuleLink").val() == '0') { - // layer.msg("当前模块不支持联动刷新"); - // $(data.elem).prop("checked", false); - // form.render(); - // } - }); - - form.on('radio(templateAreaJumpModeFilter)', function (data) { - laytpl(document.getElementById('templateAreaJumpModeScript').innerHTML).render(data.value + "", function(html) { - document.getElementById('templateAreaJumpModeDiv').innerHTML = html; - form.render(null, 'dataForm'); - }); - }); - - form.on('radio(templateAreaSourceFilter)', function (data) { - laytpl(document.getElementById('templateAreaSourceScript').innerHTML).render(data.value + "", function(html) { - document.getElementById('templateAreaSourceDiv').innerHTML = html; - form.render(null, 'dataForm'); - onToTemplateAreaServer(); - }); - }); - - $(document).on('click', '#bigdataModuleName', function() { - top.dialog.open({ - url: top.restAjax.path('route/bigdatamodule/listbigdatamoduleselect', []), - title: '选择模块', - width: '60%', - height: '100%', - onClose: function(data) { - $("#templateAreaModuleData").val(""); - $("#templateAreaServerData").val(""); - $("#bigdataModuleId").val(top.dialog.dialogData.bigdataModuleId); - $("#bigdataModuleName").val(top.dialog.dialogData.bigdataModuleName); - $("#bigdataModuleCode").val(top.dialog.dialogData.bigdataModuleCode); - $("#bigdataModuleModuleJson").val(top.dialog.dialogData.bigdataModuleModuleJson); - $("#bigdataModuleServerJson").val(top.dialog.dialogData.bigdataModuleServerJson); - $("#bigdataModuleLink").val(top.dialog.dialogData.bigdataModuleLink); - $(".templateAreaServerLink").prop("checked", false); - form.render(null, 'dataForm'); - } - }); - }); - - $(document).on('click', '#templateAreaJumpTemplateTitle', function() { - top.dialog.open({ - url: top.restAjax.path('route/bigdatatemplate/listbigdatatemplateselect?bigdataTemplateId={bigdataTemplateId}', [bigdataTemplateId]), - title: '选择模板', - width: '60%', - height: '100%', - onClose: function(data) { - $("#templateAreaJumpTemplateId").val(top.dialog.dialogData.bigdataTemplateId); - $("#templateAreaJumpTemplateTitle").val(top.dialog.dialogData.bigdataTemplateTitle); - } - }); }); // 初始化文件列表 @@ -339,7 +248,6 @@ var dataForm = {}; dataForm[fileName] = ids; form.val('dataForm', dataForm); - if(!ids) { refreshDownloadTemplet(fileName, []); if(callback) { @@ -347,8 +255,7 @@ } return; } - - top.restAjax.get(top.restAjax.path('api/file/listfilebyfileid', []), { + top.restAjax.get(top.restAjax.path('api/file/list', []), { ids: ids }, null, function(code, data) { refreshDownloadTemplet(fileName, data); @@ -360,31 +267,15 @@ }); } - // 初始化视频 - function initVideo(fileName, data) { - for(var i = 0, item; item = data[i++];) { - var player = new ckplayer({ - container: '#'+ fileName + i, - variable: 'player', - flashplayer: false, - video: { - file: 'route/file/downloadfile/true/'+ item.fileId, - type: 'video/mp4' - } - }); - } - } - // 初始化区域插件文件文件上传 function initTemplateAreaFileUploadFile() { var files = $('#templateAreaFile').val(); initFileList('templateAreaFile', files); - form.on('button(templateAreaFileUploadFile)', function(obj) { var name = this.dataset.name; var explain = this.dataset.explain; top.dialog.file({ - type: 'file', + type: 'image', title: '上传'+ explain, width: '400px', height: '420px', @@ -421,22 +312,8 @@ // 初始化内容 function initData() { - slider.render({ - elem: '#templateAreaFrequencyDiv' - ,setTips: function(value){ //自定义提示文本 - if(value == 0) { - return '不开启'; - } - return value + '秒'; - }, - min:0, - max:600, - change: function(value){ - $("#templateAreaFrequency").val(value.replace("秒","").replace("不开启","0")); - } - }); initTemplateAreaFileUploadFile(); - top.restAjax.get(top.restAjax.path('api/bigdatatemplatearea/getcurrentuseridinfo', []), {}, null, function(code, data) { + top.restAjax.get(top.restAjax.path('api/picturestemplatearea/getcurrentuseridinfo', []), {}, null, function(code, data) { }, function(code, data) { top.dialog.msg(data.msg); }, function() { @@ -452,9 +329,9 @@ top.dialog.confirm(top.dataMessage.commit, function(index) { top.dialog.close(index); var loadLayerIndex; - formData.field.bigdataTemplateId = bigdataTemplateId; - formData.field['templateAreaServerLink'] = top.restAjax.checkBoxToString(formData.field, 'templateAreaServerLink'); - top.restAjax.post(top.restAjax.path('api/bigdatatemplatearea/savebigdatatemplatearea', []), formData.field, null, function(code, data) { + formData.field.picturesTemplateId = picturesTemplateId; + alert(formData.field['templateAreaServerLink']); + top.restAjax.post(top.restAjax.path('api/picturestemplatearea/savepicturestemplatearea', []), formData.field, null, function(code, data) { var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, { time: 0, btn: [top.dataMessage.button.yes, top.dataMessage.button.no], @@ -482,63 +359,6 @@ closeBox(); }); - function onToTemplateAreaModule() { - $('#templateAreaModule').on('click', function() { - var templateAreaModuleData = $("#templateAreaModuleData").val(); - if(templateAreaModuleData == "") { - if (!$("#bigdataModuleCode").val()) { - layer.msg("请先选择模块"); - return; - } - templateAreaModuleData = $("#bigdataModuleModuleJson").val(); - } - templateAreaModuleData = templateAreaModuleData.replace(/\?/g,"#问号#").replace(/\=/g,"#等号#"); - top.layer.open({ - type: 2, - title: false, - closeBtn: 0, - area: ['80%', '98%'], - shadeClose: false, - anim: 2, - content: top.restAjax.path(encodeURI("route/bigdatatemplatearea/savebigdatatemplateareajson?jsonData=" + templateAreaModuleData), []), - end: function() { - if(top.dialog.dialogData.jsonViewerData) { - $("#templateAreaModuleData").val(top.dialog.dialogData.jsonViewerData); - } - } - }); - }); - } - onToTemplateAreaModule(); - - function onToTemplateAreaServer() { - $('#templateAreaServer').on('click', function() { - var templateAreaServerData = $("#templateAreaServerData").val(); - if(templateAreaServerData == "") { - if (!$("#bigdataModuleCode").val()) { - layer.msg("请先选择模块"); - return; - } - templateAreaServerData = $("#bigdataModuleServerJson").val(); - } - templateAreaServerData = templateAreaServerData.replace(/\?/g,"#问号#").replace(/\=/g,"#等号#"); - top.layer.open({ - type: 2, - title: false, - closeBtn: 0, - area: ['80%', '98%'], - shadeClose: false, - anim: 2, - content: top.restAjax.path(encodeURI("route/bigdatatemplatearea/savebigdatatemplateareajson?jsonData=" + templateAreaServerData), []), - end: function() { - if(top.dialog.dialogData.jsonViewerData) { - $("#templateAreaServerData").val(top.dialog.dialogData.jsonViewerData); - } - } - }); - }); - } - // 校验 form.verify({ }); diff --git a/module-building-pictures/src/main/resources/templates/picturestemplatearea/update-picturestemplatearea.html b/module-building-pictures/src/main/resources/templates/picturestemplatearea/update-picturestemplatearea.html index 33ee7f5..7876f7d 100644 --- a/module-building-pictures/src/main/resources/templates/picturestemplatearea/update-picturestemplatearea.html +++ b/module-building-pictures/src/main/resources/templates/picturestemplatearea/update-picturestemplatearea.html @@ -10,6 +10,19 @@ +
@@ -22,19 +35,15 @@
-->
- -
- -
- - - - - - + +
+
+ +
+ +
-
@@ -46,184 +55,115 @@
-
- +
- - - + + + +
-
- -
- -
-
- -
- - -
-
-
-
- -
- - - -
-
-
- - -
- -
-
- -
-
-
- -
- -
- +
-
+
- +
- +
- +
@@ -236,26 +176,12 @@ - - - - - -