diff --git a/Temp/Default.aspx b/Temp/Default.aspx
index 061227a..a54dcbc 100644
--- a/Temp/Default.aspx
+++ b/Temp/Default.aspx
@@ -190,11 +190,11 @@
标准涂点
|
-
- 锚定点
- |
<% }%>
+
+ 锚定点
+ |
增加屏蔽
|
diff --git a/js/index.js b/js/index.js
index 2449fa2..d692cd0 100644
--- a/js/index.js
+++ b/js/index.js
@@ -310,7 +310,7 @@ function SetBiaoZhunDian(obj) {
}
/////////////////锚定点//////////////////////
-function SetMaoDingDian(obj) {
+function SetMaoDingDian(obj, pageIndex) {
var zhuguan_tihao = "锚定点";
if ($(obj).attr("class") == "maodingdian_hover") {
@@ -325,13 +325,16 @@ function SetMaoDingDian(obj) {
alert("锚定点已标记");
return;
}
- var ocrText = prompt("请输入学科:");
- if (ocrText == '' || ocrText == null) {
- alert("请输入学科");
- return;
- }
+ var ocrText = '请勿在此区域作答';
+ if (pageIndex == 1) {
+ ocrText = prompt("请输入学科:");
+ if (ocrText == '' || ocrText == null) {
+ alert("请输入学科");
+ return;
+ }
+ }
- $(".main_papermain").append("" + zhuguan_tihao + "
" + ocrText +"
");
+ $(".main_papermain").append("" + zhuguan_tihao + "
" + ocrText + "
");
$("#keguan_" + zhuguan_tihao).draggable({ containment: ".main_papermain" });
$("#keguan_" + zhuguan_tihao).resizable({ containment: ".main_papermain", handles: 'all' });
}
@@ -520,10 +523,10 @@ function GetMaoDingDianPostion() {
if ($(".maodingdian_select").length == 0) {
return "";
}
-
+
$(".maodingdian_select").each(function () {
var text = $("#maodingdian").text();
-
+
xy += parseFloat($(this).position().left) + "," + parseFloat($(this).position().top) + "," + parseFloat($(this).width()) + "," + parseFloat($(this).height()) + "," + $(this).attr("wenzimiaoshu") + "," + text + "^";
})
return xy.trim('^');
@@ -696,7 +699,7 @@ function BaseDataBind() {
biaozhundian = list[9].toString().trim('^');
}
if (list[10] != undefined) {
- maodingdian = list[10].toString().trim('^');
+ maodingdian = list[10].toString().trim('^');
}
}
@@ -1065,7 +1068,7 @@ function SetMaoDingDianPostion(PostionData) {
alert("锚定点配置重复");
return;
}
- $(".main_papermain").append("" + zhuguan_tihao + "
" + zhuguanList[5] +"
");
+ $(".main_papermain").append("" + zhuguan_tihao + "
" + zhuguanList[5] + "
");
$("#keguan_" + zhuguan_tihao).draggable({ containment: ".main_papermain" });
$("#keguan_" + zhuguan_tihao).resizable({ containment: ".main_papermain", handles: 'all' });
$(".maodingdian").attr("class", "maodingdian_hover");
@@ -1239,9 +1242,9 @@ String.prototype.trim = function (char, type) {
//////////// 切换页数 ////////////////
function ChangePageNum(anotherTempID) {
//if (confirm("当前页未保存,是否继续切换?")){
- var currentURL = window.location.href;
- var newUrl = currentURL.replace(/(TempID=)\d+/, "$1" + anotherTempID);
- window.location.href = newUrl;
+ var currentURL = window.location.href;
+ var newUrl = currentURL.replace(/(TempID=)\d+/, "$1" + anotherTempID);
+ window.location.href = newUrl;
//}
}
\ No newline at end of file