From 3c6f6c1e3016e38146a4c46be6e7b625c35591f2 Mon Sep 17 00:00:00 2001
From: zhai <1528081232@qq.com>
Date: 星期四, 18 十二月 2025 11:49:18 +0800
Subject: [PATCH] 1、添加报表 2、修改添加报表报错
---
src/main/webapp/WEB-INF/view/config/setting/systemConfig.jsp | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/WEB-INF/view/config/setting/systemConfig.jsp b/src/main/webapp/WEB-INF/view/config/setting/systemConfig.jsp
index eade15b..764b45b 100644
--- a/src/main/webapp/WEB-INF/view/config/setting/systemConfig.jsp
+++ b/src/main/webapp/WEB-INF/view/config/setting/systemConfig.jsp
@@ -218,7 +218,8 @@
<tr>
<td class="tbtitle">褰撳墠Logo锛�</td>
<td>
- <img id="imgHeadLogoUrl" src="${systemConfig.headLogoUrl}" class="pt-config-logo" alt="澶撮儴 Logo">
+ <img id="imgHeadLogoUrl" src="${systemConfig.headLogoUrl}" class="pt-config-logo"
+ alt="澶撮儴 Logo">
<input type="hidden" id="headLogoUrl" name="headLogoUrl" value="${systemConfig.headLogoUrl}">
</td>
</tr>
@@ -271,6 +272,17 @@
</td>
</tr>
<tr>
+ <td class="tbtitle">瀵嗙爜绠楁硶閫夋嫨锛�</td>
+ <td>
+ <select id="encryptionAlgorithm" name="encryptionAlgorithm" class="easyui-combobox"
+ data-options="editable: false" style="width:150px;">
+ <option value="MD5">MD5绠楁硶</option>
+ <option value="SM3">SM3绠楁硶锛堝浗瀵嗭級</option>
+ </select>
+ <span class="pt-text-color" style="color:red;font-weight: bold;"> 娉細鏇存崲瀵嗙爜绠楁硶鍚庤鍦ㄩ��鍑哄綋鍓嶇敤鎴峰墠鍦ㄧ敤鎴风鐞嗕腑閲嶆柊鍒濆鍖栨墍鏈夌敤鎴风殑瀵嗙爜锛屽惁鍒欏皢鏃犳硶鐧诲綍</span>
+ </td>
+ </tr>
+ <tr>
<td class="tbtitle">鍚敤瀵嗙爜寮哄害鎺у埗锛�</td>
<td>
<input type="hidden" id="enablePasswordStrength" name="enablePasswordStrength"
@@ -320,8 +332,9 @@
<td class="tbtitle">瀵嗙爜鍒版湡鏃堕棿锛�</td>
<td>
鍓╀綑 <input class="easyui-numberspinner" type="text" id="passwordExpiredDueDays"
- name="passwordExpiredDueDays" value="${systemConfig.passwordExpiredDueDays}"
- style="width:268px;"/> 澶� <span class="pt-text-color"> 娉細涓嶈瓒呰繃瀵嗙爜杩囨湡璁剧疆鐨勫ぉ鏁�</span>
+ name="passwordExpiredDueDays" value="${systemConfig.passwordExpiredDueDays}"
+ style="width:268px;"/> 澶� <span
+ class="pt-text-color"> 娉細涓嶈瓒呰繃瀵嗙爜杩囨湡璁剧疆鐨勫ぉ鏁�</span>
</td>
</tr>
<tr>
@@ -465,7 +478,8 @@
<tr>
<td class="tbtitle">澶栭儴铏氭嫙鐩綍閰嶇疆锛�</td>
<td>
- <input id="externalVirtualDirectory" name="externalVirtualDirectory" class="easyui-textbox" type="text"
+ <input id="externalVirtualDirectory" name="externalVirtualDirectory" class="easyui-textbox"
+ type="text"
style="width:500px;" value="${systemConfig.externalVirtualDirectory}"/>
<span class="pt-text-color">绀轰緥锛欴:\CGML|/CGML/;F:\IMAGE\|/IMAGE/</span>
</td>
@@ -540,9 +554,28 @@
<select id="watermarkPosition" name="watermarkPosition" class="easyui-combobox"
data-options="editable: false" style="width:300px;">
<option value="">榛樿</option>
- <option value="leftTop">宸︿笂瑙�</option>
- <option value="topCenter">椤堕儴灞呬腑</option>
+ <option value="topLeft">宸︿笂</option>
+ <option value="topCenter">涓笂</option>
+ <option value="topRight">鍙充笂</option>
+ <option value="middleLeft">宸︿腑</option>
+ <option value="center">涓績</option>
+ <option value="middleRight">鍙充腑</option>
+ <option value="bottomLeft">宸︿笅</option>
+ <option value="bottomCenter">涓笅</option>
+ <option value="bottomRight">鍙充笅</option>
+ <option value="tile">骞抽摵</option>
</select>
+ </td>
+ </tr>
+ <tr class="watermark">
+ <td class="tbtitle">姘村嵃鏃嬭浆瑙掕壊锛�</td>
+ <td style="height: 55px">
+ <input class="easyui-slider" id="watermarkAngle" name="watermarkAngle" value="${systemConfig.watermarkAngle}" style="width:500px" data-options="
+ showTip: true,
+ min:-180,
+ max:180,
+ rule: [-180,'|',-135,'|',-90,'|',-45,'|',0,'|',45,'|',90,'|',135,'|',180]
+ ">
</td>
</tr>
<tr>
@@ -592,13 +625,23 @@
</select>
</td>
</tr>
+ <tr>
+ <td class="tbtitle">闄勪欢鏍煎紡妯℃暟鍊兼灇涓撅細</td>
+ <td>
+ <input id="fileMagicValue" name="fileMagicValue" class="easyui-textbox" name="message"
+ value="${systemConfig.fileMagicValue}"
+ data-options="multiline:true" style="height:120px;width:600px">
+ </td>
+ </tr>
<tr id="tr_CustomAttachViewScript">
<td class="tbtitle">闄勪欢鑷畾涔夋祻瑙堣剼鏈細</td>
<td>
<pre id="customAttachViewScript"
style="height:400px; width:100%;">${systemConfig.customAttachViewScript}</pre>
- <div id="customAttachViewScriptDefaultValue" style="display:none">//宸叉湁鍙橀噺 //attachExtension 闄勪欢鍚庣紑
- //agent HTTP璇锋眰鐨勭敤鎴蜂唬鐞� //request HTTP璇锋眰 /* var viewUrl = ""; switch(attachExtension){ case
+ <div id="customAttachViewScriptDefaultValue" style="display:none">//宸叉湁鍙橀噺 //attachExtension
+ 闄勪欢鍚庣紑
+ //agent HTTP璇锋眰鐨勭敤鎴蜂唬鐞� //request HTTP璇锋眰 /* var viewUrl = ""; switch(attachExtension){
+ case
".jpg": case ".png": case ".bmp": case ".jpeg": case ".gif": viewUrl =
"general/attach/viewImage"; break; case ".tiff": viewUrl = "general/attach/viewTiff"; break;
case ".pdf": if (agent.indexOf("msie")
@@ -902,6 +945,7 @@
$('#paginationPosition').combobox('setValue', '${systemConfig.paginationPosition}');
$('#verificationCodeType').combobox('setValue', '${systemConfig.verificationCodeType}');
$('#passwordCombination').combobox('setValue', '${systemConfig.passwordCombination}');
+ $('#encryptionAlgorithm').combobox('setValue', '${systemConfig.encryptionAlgorithm}');
$('#watermarkPosition').combobox('setValue', '${systemConfig.watermarkPosition}');
$('#officePlugin').combobox('setValue', '${systemConfig.officePlugin}');
$('#pdfPlugin').combobox('setValue', '${systemConfig.pdfPlugin}');
--
Gitblit v1.9.1