From cc706516d531af2e5c495878bcd85b0c715237bf Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期二, 01 八月 2023 14:30:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.150:10101/r/Haier_MES
---
gmms/WebContent/orderManage/produce.jsp | 3 ++-
gmms/WebContent/login/quanxian.jsp | 33 ++++++++++++++++-----------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/gmms/WebContent/login/quanxian.jsp b/gmms/WebContent/login/quanxian.jsp
index 2d7342d..12a4a20 100644
--- a/gmms/WebContent/login/quanxian.jsp
+++ b/gmms/WebContent/login/quanxian.jsp
@@ -84,7 +84,7 @@
String caidanname=rss.getString(1);
String yemian=rss.getString(2);
//out.println("<li><a onclick='tiaoz('"+yemian+"')' >"+caidanname+"</a></li>");
- out.println("<li onclick="+"tiaoz('"+yemian+"')"+" >"+caidanname+"</li>");
+ out.println("<li onclick="+"tiaoz('"+yemian+"',"+mid+")"+" >"+caidanname+"</li>");
out.println("<li class='item_divider'></li>");
}
out.println("</ul>");
@@ -107,22 +107,21 @@
}
}
- function tiaoz(n){
- localStorage.setItem("newPage",n);
- n=n+'&'+window.parent.location.search.substr(1);
-
-
- if (n.includes('caidanid=9')) {
- window.open(n, '_blank'); // 鍦ㄦ柊绐楀彛涓墦寮�鎸囧畾 URL
- }else{
- window.parent.document.getElementById("main").src = n;
-
- }
-
-
-
- //window.open(n);
- }
+ function tiaoz(n,mid){
+ if(mid!=90){
+ localStorage.setItem("newPage",n);
+ }
+
+ n=n+'&'+window.parent.location.search.substr(1);
+
+
+ if (mid==90) {
+ window.open(n, '_blank'); // 鍦ㄦ柊绐楀彛涓墦寮�鎸囧畾 URL
+ }else{
+ window.parent.document.getElementById("main").src = n;
+
+ }
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git a/gmms/WebContent/orderManage/produce.jsp b/gmms/WebContent/orderManage/produce.jsp
index 56ae598..5602e19 100644
--- a/gmms/WebContent/orderManage/produce.jsp
+++ b/gmms/WebContent/orderManage/produce.jsp
@@ -125,7 +125,7 @@
</body>
<!-- import Vue before Element -->
<script src="../js/jquery-3.4.1.min.js"></script>
-
+ <script src="../js/axios.min.js"></script>
<script src="../js/static/js/vue.js"></script>
<script src="../js/mixins.js"></script>
<!-- import JavaScript -->
@@ -135,6 +135,7 @@
<script >
//import * as echarts from '../js/echarts.min.js';
Vue.prototype.$echarts = echarts
+ Vue.prototype.$http= axios
let app =new Vue({
el: '#app',
mixins:[mixin],
--
Gitblit v1.8.0