From 28a7821e43bd5763739fe67384cfea6693b3500b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 九月 2020 13:19:26 +0800
Subject: [PATCH] Merge branches 'gdwcs' and 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs
---
src/main/webapp/views/console.html | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 4a38662..57c5e84 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -659,7 +659,7 @@
}
}
} else if (res.code === 403){
- window.location.href = baseUrl+"/login";
+ parent.location.href = baseUrl+"/login";
} else {
console.log(res.msg);
}
@@ -827,17 +827,17 @@
}
- // 鍙拌溅鐐瑰嚮浜嬩欢
- $(document).on("click", ".item", function () {
- var value = prompt('鐩爣绔欙細', "1");
- if (value == null) {
- alert('涓嶈兘涓虹┖锛�');
- } else if (value === '') {
- alert('涓嶈兘涓虹┖锛�');
- } else {
- carAnimate(8, Number(value));
- }
- })
+ // // 鍙拌溅鐐瑰嚮浜嬩欢
+ // $(document).on("click", ".item", function () {
+ // var value = prompt('鐩爣绔欙細', "1");
+ // if (value == null) {
+ // alert('涓嶈兘涓虹┖锛�');
+ // } else if (value === '') {
+ // alert('涓嶈兘涓虹┖锛�');
+ // } else {
+ // carAnimate(8, Number(value));
+ // }
+ // })
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1