From 96b47d273040557a8045f4490d5ec9a1c4f6a86d Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Wed, 21 Apr 2021 17:22:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=A8=83=E5=A8=83=E6=9C=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/public/doll/index.html |  7 ----
 .../src/main/resources/public/doll/js/main.js | 35 +++++++++++++++++++
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/sino-act-web/src/main/resources/public/doll/index.html b/sino-act-web/src/main/resources/public/doll/index.html
index 16b0b489f..64db6f9c2 100644
--- a/sino-act-web/src/main/resources/public/doll/index.html
+++ b/sino-act-web/src/main/resources/public/doll/index.html
@@ -100,14 +100,7 @@
 <script src="js/iosSelect.js"></script>
 <script src="js/areaData_v2.js" charset="GBK"></script>
 <script src="../draw/js/util.js"></script>
-<script src="../../common/taglibs.js"></script>
-<script src="../../js/jsencrypt.min.js"></script>
-<script src="../../js/encryptUtil.js"></script>
 <script src="../draw/js/util.js"></script>
-<script src="../../js/mobile/login_register/login.js"></script>
-<script src="../../js/layui/layer.js"></script>
-<script src="../../js/layui/layerUtils.js"></script>
-<script src="../draw/js/draw.js"></script>
 <script src="js/main.js"></script>
 <script>
 	const DOLL = 'doll';
diff --git a/sino-act-web/src/main/resources/public/doll/js/main.js b/sino-act-web/src/main/resources/public/doll/js/main.js
index a017a18cf..80fd9995f 100644
--- a/sino-act-web/src/main/resources/public/doll/js/main.js
+++ b/sino-act-web/src/main/resources/public/doll/js/main.js
@@ -42,6 +42,40 @@ function init(facade){
     }
   });
 }
+
+function drawrule() {
+  console.log('rule');
+  console.log(drawCode);
+  $.ajax({
+    type: "POST",
+    url: contextRootPath+"/draw/describe",
+    data: {actCode: drawCode},
+    dataType: "json",
+    success: function(data){
+      var desc = removeHTMLTag(data.drawRule.drawdescribe);
+      var desc1 = escape2Html(desc);
+      console.log(desc1);
+      $(".contBox").append(desc1);
+    },
+    error: function (XMLHttpRequest, textStatus, errorThrown) {
+      console.log('网络异常', textStatus, errorThrown);
+    }
+  });
+  $('.rule').show();
+}
+//转义替换
+/*移除HTML标签代码*/
+function removeHTMLTag(str) {
+  str = str.replace(/<\/?[^>]*>/g,''); //去除HTML tag
+  str = str.replace(/[ | ]*\n/g,'\n'); //去除行尾空白
+  //str = str.replace(/\n[\s| | ]*\r/g,'\n'); //去除多余空行
+  //str=str.replace(/ /ig,'');//去掉
+  return str;
+}
+function escape2Html(str) {
+  var arrEntities={'lt':'<','gt':'>','nbsp':' ','amp':'&','quot':'"'};
+  return str.replace(/&(|lt|gt|nbsp|amp|quot);/ig,function(all,t){return arrEntities[t];});
+}
 function initAwards(){
   $.ajax({
     type:'POST',
@@ -235,4 +269,5 @@ function num(drawType){
       layerTip('网络异常，请检查网络环境');
     }
   });
+
 }
\ No newline at end of file