廖井涛
2023-07-25 688e6146b299a386ea57ab39ccdf991c003e202b
Merge branch 'master' of http://10.153.19.150:10101/r/Haier_MES
2个文件已修改
64 ■■■■ 已修改文件
gmms/WebContent/js/mixins.js 57 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/login/bdg.jsp 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/js/mixins.js
@@ -10,33 +10,36 @@
var mixin={
    methods:{
        connects:function(gongneng,sql,flag,num){
              $.post("../mysqlInsert/mysql.jsp",
                      {"gongneng":gongneng,"sql":sql,'flag':flag,'anquanma':json["anquanma"]},
                      function(result){
                          if(num==1){
                              result=$(result).text();
                              index = result.indexOf("[[");
                              if(index>-1){
                                  if(result.indexOf("[[anquanmaerr]]")>-1){
                                        //alert('请先登录后操作');
                                        window.parent.location.href='../login/index.jsp';
                                  }else{
                                      result=result.substring(index).trim()
                                      alert(result);
                                      window.location.reload();
                                  }
                              }else{
                                  alert(gongneng+"成功!")
                                  window.location.reload();
                              }
                          }
                })
                 .fail(function(response) {
                    alert('Error: ' + "服务器数据发生错误!");
                    return false;
                });
          let param = new URLSearchParams();
          param.append("gongneng",gongneng);
          param.append("sql",sql);
          param.append("flag",flag);
          param.append("anquanma",json["anquanma"]);
          this.$http.post( '../mysqlInsert/mysql.jsp',param)
          .then(function (response) {
            if(num==1){
                  result=$(response.data).text();
                  index = result.indexOf("[[");
                  if(index>-1){
                      if(result.indexOf("[[anquanmaerr]]")>-1){
                            //alert('请先登录后操作');
                            window.parent.location.href='../login/index.jsp';
                      }else{
                          result=result.substring(index).trim()
                          alert(result);
                          window.location.reload();
                      }
                  }else{
                      alert(gongneng+"成功!")
                      window.location.reload();
                  }
              }
        })
        .catch(function (error) {
            alert('Error: ' + "服务器数据发生错误!");
        });
      },
      loadAjxss:function(gongneng,sql,flag,vals){
          let param = new URLSearchParams(); 
gmms/WebContent/login/bdg.jsp
@@ -6,15 +6,12 @@
response.setContentType("text/html; charset=utf-8");
%>
<%-- <%@ include file="/WEB-INF/../login/check.jsp" %>
 --%>
    <c:set var="ctx" value="${pageContext.request.contextPath}"/>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>北玻</title>
<link rel="shortcut icon" href="../img/3.ico" />
<link rel="shortcut icon"  href="../img/3.ico" />
<style>
#top {
    background-image: linear-gradient(to right, #C6E2FF, #C6E2FF);
@@ -74,6 +71,6 @@
    }
    
%>
 <iframe id='main'  src='machinelistcontent.jsp?adminid="+adminid+"&xingming="+xingming+"&dengji="+dengji+"&anquanma="+anquanma+"&yuyan="+yuyan+"'  style="width:87%;height:90%" frameborder='0'></iframe>
 <iframe id='main'  src='machinelistcontent.jsp?adminid="+adminid+"&xingming="+xingming+"&dengji="+dengji+"&anquanma="+anquanma+"&yuyan="+yuyan+"'  style="width:87%;height:90%" frameborder='0'></iframe>
</body>
</html>