clll
2023-08-01 cc706516d531af2e5c495878bcd85b0c715237bf
Merge branch 'master' of http://10.153.19.150:10101/r/Haier_MES
2个文件已修改
36 ■■■■ 已修改文件
gmms/WebContent/login/quanxian.jsp 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/orderManage/produce.jsp 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
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],