提交海尔项目

廖井涛

2024-03-04 9304249873268653bc6acd58538506e34933af9d

提交海尔项目

 gmms/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +1,8 @@
eclipse.preferences.version=1
encoding//WebContent/bigScreen/allGlassflashVice.jsp=UTF-8
encoding//WebContent/bigScreen/dakongdaping.jsp=UTF-8
encoding//WebContent/bigScreen/glassStorage.jsp=UTF-8
encoding//WebContent/login/machinelistcontent.jsp=UTF-8
encoding//WebContent/mysqlInsert/getPicture.jsp=UTF-8
encoding//WebContent/mysqlInsert/mysqllist.jsp=UTF-8
encoding//WebContent/mysqlInsert/toPlc.jsp=UTF-8

 gmms/WebContent/ganhuaxiapian/ganghuaxiapian.jsp

File was deleted

 gmms/WebContent/ganhuaxiapian/Êý¾Ýͼ.png

Binary files differ

 gmms/WebContent/js/static/css/style.css

@@ -12,7 +12,8 @@
#app{
  width: 100%;
  height: 100%;
  background-color: bule;
  margin: 0;
  padding: 0;
}
#divHead,#left,#main,.shelf{
  box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
@@ -23,4 +24,28 @@
}
*{
  text-align: center;
}
#mains{
  height: 100%;
    width: 100%;
  padding: 0;
  margin: 0;
}
*{
    padding: 0%;
    margin: 0%;
}
.imgCenter{
  max-width: 100%;
  max-height: 100%;
  position: absolute;
    top: 0;
    left: 0;
    right: 0;
    bottom: 0;
    margin: auto;
}
.el-dialog__body{
  height: 40vh;
   overflow: auto;
}

 gmms/WebContent/js/static/js/mixins.js

@@ -1,3 +1,9 @@
Vue.prototype.global={
  polling:null,
  pollingIndex:0,
  timer:30000
}


let str = window.location.href.substr(window.location.href.indexOf('?') + 1)
let json = new Object()
@@ -39,7 +45,7 @@
      },
        connects:function(gongneng,sql,flag,num){
            $.ajax({ 
                url :'http://localhost:8080/gmms/mysqlInsert/mysql.jsp',
                url :'../mysqlInsert/mysql.jsp',
                type : "post",//不局限于get 
                data:{"gongneng":gongneng,"sql":sql,'flag':flag,'anquanma':json["anquanma"]}, 
                async : true, 
@@ -72,7 +78,7 @@
}
//gongneng:自定义，sql存储过程，flag标志(0,是用张工之前功能插入，1存储过程查询，2存储过程插入)，vals：vue里data参数
function loadAjxs1(gongneng,sql,flag,vals){
    $.post("localhost:8080/gmms/mysqlInsert/mysql.jsp",
    $.post("../mysqlInsert/mysql.jsp",
              {"yemian":"123","gongneng":gongneng,"sql":sql,'flag':flag,'anquanma':json["anquanma"]},
              function(result){
            if(flag==2){
@@ -97,7 +103,7 @@

function loadAjxs(gongneng,sql,flag,vals){
    $.ajax({ 
        url :'http://localhost:8080/gmms/mysqlInsert/mysql.jsp',
        url :'../mysqlInsert/mysql.jsp',
        type : "GET",//不局限于get 
        data:{"yemian":"123","gongneng":gongneng,"sql":sql,'flag':flag,'anquanma':json["anquanma"]}, 
        async : true, 

 gmms/WebContent/js/static/js/vue.js

@@ -12012,7 +12012,8 @@
  return Vue;

}));
Vue.directive('preventreclick', {

Vue.directive('preventreclick', {//防止重复点击
    inserted(el, binding) {
         el.addEventListener('click', () => {
         if (!el.disabled) {
@@ -12024,3 +12025,6 @@
       })
     }
});




 gmms/WebContent/login/admin/shezhi1.jsp

@@ -7,7 +7,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>设置权限</title>
<%-- <link rel="stylesheet" href="${ctx}/pp/css/baobiaoyangshi.css"> --%>
<script src="../../js/jquery-3.4.1.js"></script>
<script src="../../js/jquery-3.4.1.min.js"></script>
<link rel="stylesheet" href="../../css/quanxiang.css">

 <style>

 gmms/WebContent/login/admin/shezhi2.jsp

@@ -64,7 +64,7 @@
  top:55px;
           }
</style>
<script src="../../js/jquery-3.4.1.js"></script>
<script src="../../js/jquery-3.4.1.min.js"></script>
<link rel="stylesheet" href="../../css/quanxiang.css">
<link rel="shortcut icon" href="../../img/3.ico" />


 gmms/WebContent/login/bdg.jsp

@@ -61,7 +61,7 @@
        /* if(true){ */
        if(coun!=0){
             out.println("<iframe id='top' height='10%' width='100%'  src='shuoming.jsp?adminid="+adminid+"&xingming="+xingming+"&dengji="+dengji+"&anquanma="+anquanma+"&yuyan="+yuyan+"' frameborder='0'></iframe>");
             out.println("<iframe id='left' height='90%' width='13%' style='float: left;' src='quanxian.jsp?adminid="+adminid+"&anquanma="+anquanma+"&yuyan="+yuyan+"' frameborder='0'></iframe>");
             out.println("<iframe id='left' height='90%' width='13%' style='float: left;overflow-y: hidden;' src='quanxian.jsp?adminid="+adminid+"&anquanma="+anquanma+"&yuyan="+yuyan+"' frameborder='0'></iframe>");
                   
          }
          else{

 gmms/WebContent/login/index.jsp

@@ -247,10 +247,6 @@
                       else{
                             out.print("<script type='text/javascript'>alert('安全码无效')</script>");
                         }
				    
				    
				     
			    	 
                 }
                 else{
                     out.print("<script type='text/javascript'>alert('用户名或者密码错误')</script>");

 gmms/WebContent/login/machinelistcontent.jsp

@@ -6,13 +6,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<link rel="stylesheet" href="../js/static/css/element.css">
<link rel="stylesheet" href="../js/static/css/style.css">
<script src="../js/static/js/vue.js"></script>
<script src="../js/mixins.js"></script>
<!-- import JavaScript -->
<script src="../js/static/js/element.js"></script>
<script src="../js/static/js/echarts.min.js"></script>
<script src="../js/main.js"></script>
<style type="text/css">
<style>
  .el-table .warning-row {
@@ -28,10 +22,21 @@
<title>Insert title here</title>
</head>
<body>
 <div id="app" style="display:width:100%">
<% 
String a=null;
try{
    a=Manager.getDevice().toString();
}
catch(Exception e){
    a="[{}]";
}


%>
 <div id="app" style="width:100%">
     <el-table border
      :data="machine"
      height='700'
      height='100%'
      style="width: 100%;"
       :cell-class-name="tableRowClassName"
      >
@@ -63,7 +68,7 @@
      el: '#app',
      mixins:[mixin],
      data:{
        machine:<%out.print(  Manager.getDevice().toString());%>,
         machine:<%=  a%>,
      },
      methods:{
          tableRowClassName({row,column,rowIndex,columnIndex}) {
@@ -77,7 +82,7 @@
          }
      }
     })
    //console.log(app.$data.machine);
   // console.log(app.$data.machine);
    </script>
</body>
</html>

 gmms/WebContent/login/quanxian.jsp

@@ -44,7 +44,7 @@


<%@include file="mysqlconnect.jsp"%>
<body  style='background-color:#D5EAFF'>
<body  style='background-color:#D5EAFF;overflow-y:hidden'>
    <!--主页面左侧菜单栏实现-->
    
    <div class="menu" >
@@ -60,7 +60,7 @@
    Connection con=DriverManager.getConnection( urlglass,user,password);
    
    CallableStatement cs = con.prepareCall("{call mokuai(?,?,?)}");
    id="A001";
    id=request.getParameter("adminid");
    cn="cn";
       cs.setString(1, id);
       cs.setString(2, cn);
@@ -69,7 +69,6 @@
    while(rs.next())
    {
        
	   		 
                  mid=rs.getInt(1);
                 String mokuainame=rs.getString(2);
                 out.println("<div class='menu_title'>"+mokuainame+"<span class='indicator' id='indicator'>▼</span></div><ul class='test'>");
@@ -84,7 +83,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 +106,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/login/run.jsp

@@ -1,6 +1,11 @@
<%@page import="builder.Manager"%>
<%@page import="builder.ThreadHttpServer"%>
<%@page import="toTcp.TcpMain"%>
<%@include file="../mysqlInsert/mysql_connect.jsp"%>
<%
Manager.appStart(new String[]{url,user,password });
response.sendRedirect("bdg.jsp");
ThreadHttpServer.mains();
//TcpMain.getElectric();
//Manager.appStart(new String[]{url,user,password });

//response.sendRedirect("bdg.jsp");
%>

 gmms/WebContent/mysqlInsert/mysql.jsp

@@ -6,10 +6,6 @@
response.setContentType("text/html; charset=utf-8");
response.setHeader("Access-Control-Allow-Origin","*");
%>
<html>
<head>
</head>
<body>
<%@include file="mysql_connect.jsp"%>
<%@page import="java.util.LinkedHashMap"%>
<%@page import="java.util.HashMap"%>
@@ -23,13 +19,9 @@
String sltcSql =request.getParameter("sql"); 
String anquanma=request.getParameter("anquanma");
try{
	
    Class.forName(driverClass);{
    Connection conAnquan=DriverManager.getConnection( urlglass,user,password);
	    
         //通过connection数据库链接对象 åˆ›å»ºä¸€ä¸ªstatement对象数据库操作对象
    /* Connection conAnquan=DriverManager.getConnection( urlglass,user,password);
     Statement stmts=conAnquan.createStatement();
    //执行sql语句
     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS");
     Date time = new Date();
     long timestamp = time.getTime() / 1000L;
@@ -40,14 +32,15 @@
     {
      coun++;
     }
     conAnquan.close();
     rss.close();
     stmts.close();
     conAnquan.close(); */
    //coun>0    
    if(true){
    Connection con=DriverManager.getConnection( url,user,password);
     
    //通过connection数据库链接对象 åˆ›å»ºä¸€ä¸ªstatement对象数据库操作对象
    String flag="";
    //sltcSql="{call AXJ_celiangguanli_oneLineSet(?)}~{'lines':'1'}";
    flag=request.getParameter("flag");
    if(!flag.equals("0")){
         String[] sql=sltcSql.split("~");
@@ -97,31 +90,30 @@
              
          } 
          
		  
        cs.close();	  
    }else{
        Statement stmtss=con.createStatement();
        
        stmtss.execute(sltcSql);
        //stmtss.execute(sltcSql);
        //stmtss.close();
    }
    
		
            con.close();
    }else{
        out.print("[[anquanmaerr]]"); 
    }    
} 	
}	
}catch(Exception e){
      Class.forName(driverClass);{
       Connection con=DriverManager.getConnection(url,user,password);
     CallableStatement bs =con.prepareCall("{call AXJ_err(?,?,?)}");
     bs.setString(1, e.toString());
     bs.setString(2, gongneng);
     bs.setString(3, sltcSql+','+anquanma);
     bs.setString(3, sltcSql);
     bs.execute();
     bs.close();
     con.close();
    }
     out.print("[['发生未知错误，请联系相关人员']]");
    out.print("[['发生未知错误，请联系相关人员']]");
}  
%>
</body>
</html>
%>

 gmms/WebContent/mysqlInsert/mysql_connect.jsp

@@ -11,17 +11,19 @@

    <%
//连接数据库
String ip="localhost:3307";
 String driverClass = "com.mysql.cj.jdbc.Driver";
String url="jdbc:mysql://10.153.19.150/gmms?serverTimezone=GMT%2B8";
String url="jdbc:mysql://"+ip+"/gmms?serverTimezone=GMT%2B8";
String user = "root"; 
 String password = "beibo.123/";   
String url1 = "jdbc:mysql://10.153.19.150/gmms";
String url1 = "jdbc:mysql://"+ip+"/gmms";

String urlglass="jdbc:mysql://10.153.19.150/mesgglass?serverTimezone=GMT%2B8";
String url3="jdbc:mysql://10.153.19.150/glog?serverTimezone=GMT%2B8";
String urlglass="jdbc:mysql://"+ip+"/mesgglass?serverTimezone=GMT%2B8";
String url3="jdbc:mysql://"+ip+"/glog?serverTimezone=GMT%2B8";
System.out.println(11);

/* localhost:3307 */

/* 192.168.20.42 */
%>
</body>
</html>

 gmms/WebContent/mysqlInsert/toPlc.jsp

@@ -1,18 +1,213 @@
<%@page import="builder.Manager"%>
<%@page import="ng.devices.HexUtil"%>
<%@page import="ng.db.sendOptFile"%>
<%

String zt=request.getParameter("zt");
String peifanhao=request.getParameter("peifanhao");
 String zt=request.getParameter("zt");
String peifanhao=request.getParameter("peifanhao"); 
String changpinghao=request.getParameter("changpinghao"); 

String way_of_working=request.getParameter("way_of_working"); 
String thickness=request.getParameter("thickness"); 
String glass_type=request.getParameter("glass_type"); 
String production_type=request.getParameter("production_type"); 

int zts =Integer.valueOf(zt);
int peifanhaos =Integer.valueOf(peifanhao);

/*  Manager.sendtoPLC(76,20,4,new byte[]{0,1,0,zt},0);

String a=HexUtil.intTo2ByteHex(peifanhaos)+HexUtil.intTo2ByteHex(0); 
String as=HexUtil.intTo2ByteHex(peifanhaos)+HexUtil.intTo2ByteHex(0)+HexUtil.intTo2ByteHex(0); 
String b=HexUtil.intTo2ByteHex(0)+HexUtil.intTo2ByteHex(1); 
String bs=HexUtil.intTo2ByteHex(0)+HexUtil.intTo2ByteHex(0)+HexUtil.intTo2ByteHex(1); 

String ganghua=HexUtil.intTo2ByteHex(Integer.valueOf(way_of_working))
+HexUtil.intTo2ByteHex(Integer.valueOf(thickness))+HexUtil.intTo2ByteHex(Integer.valueOf(glass_type))
+HexUtil.intTo2ByteHex(Integer.valueOf(production_type)); 

String ganghuas=HexUtil.intTo2ByteHex(0)
+HexUtil.intTo2ByteHex(0)+HexUtil.intTo2ByteHex(0)
+HexUtil.intTo2ByteHex(0); 
/*  Manager.sendtoPLC(76,20,4,new byte[]{0,(byte)(peifanhaos&0xff),0,zt},0);
 Manager.sendtoPLC(77,20,4,new byte[]{0,1,0,zt},0); */
 if(zts==2){
     Manager.sendtoPLC(76,20,4,new byte[]{0,(byte)(peifanhaos&0xff),0,0},0);
 }else if(zts==3){
     Manager.sendtoPLC(76,20,4,new byte[]{0,0,0,0},0);
 }
 

	 
	 
     if(zts==2){
         /* Manager.sendtoPLC(6,88,4,a,0);
         Manager.sendtoPLC(45,88,4,a,0);
         Manager.sendtoPLC(46,88,4,a,0);
         Manager.sendtoPLC(47,88,4,a,0);
         Manager.sendtoPLC(48,88,4,a,0);
         Manager.sendtoPLC(49,88,4,a,0);
         Manager.sendtoPLC(50,88,4,a,0);
         Manager.sendtoPLC(51,88,4,a,0);
         Manager.sendtoPLC(52,88,4,a,0);
         Manager.sendtoPLC(53,88,4,a,0); */
         //Manager.dayin(1,changpinghao);
         //掰片机
           Manager.sendtoPLC(5,88,4,a,0);
         //机械手
		 
         //磨边机
         Manager.sendtoPLC(7,6088,4,a,0);
         //倒角机
         Manager.sendtoPLC(9,13360,4,a,0);
		 
         //钻孔机
         Manager.sendtoPLC(11,88,4,a,0);
         Manager.sendtoPLC(31,88,4,a,0);
         Manager.sendtoPLC(32,88,4,a,0);
         Manager.sendtoPLC(33,88,4,a,0); 
         //水刀
         Manager.sendtoPLC(12,176,6,as,0);
          Manager.sendtoPLC(34,176,6,as,0);
         Manager.sendtoPLC(35,176,6,as,0);
         Manager.sendtoPLC(36,176,6,as,0);
         //加工中心
         Manager.sendtoPLC(14,88,4,a,0);
         Manager.sendtoPLC(37,88,4,a,0);
         Manager.sendtoPLC(38,88,4,a,0);
         Manager.sendtoPLC(39,88,4,a,0);
         //支线后片台
         Manager.sendtoPLC(13,236,4,a,0);
         //丝印烘干
         Manager.sendtoPLC(19,10088,4,a,0);
         Manager.sendtoPLC(20,10088,4,a,0);
         Manager.sendtoPLC(21,10088,4,a,0);
         Manager.sendtoPLC(22,10088,4,a,0);
         //钢前
         Manager.sendtoPLC(23,88,4,a,0);
         //钢化
         Manager.sendtoPLC(24,26,8,ganghua,0);
         Manager.sendtoPLC(24,2,2,"0001",0);
         //钢后
           Manager.sendtoPLC(25,88,4,a,0);
         //贴膜
         //Manager.sendtoPLC(26,88,4,a,0);
         //Manager.sendtoPLC(76,88,4,a,0);
         //Manager.sendtoPLC(77,88,4,a,0);  
         //sendOptFile.sendOpt("\\\\192.168.10.25\\optfile/", "file://192.168.20.42/d/optfile/");   

     }else if(zts==3){

         /* Manager.sendtoPLC(6,88,4,b,0);
         Manager.sendtoPLC(45,88,4,b,0);
         Manager.sendtoPLC(46,88,4,b,0);
         Manager.sendtoPLC(47,88,4,b,0);
         Manager.sendtoPLC(48,88,4,b,0);
         Manager.sendtoPLC(49,88,4,b,0);
         Manager.sendtoPLC(50,88,4,b,0);
         Manager.sendtoPLC(51,88,4,b,0);
         Manager.sendtoPLC(52,88,4,b,0);
         Manager.sendtoPLC(53,88,4,b,0); */

		


             //Manager.dayin(2,changpinghao);
        //掰片机
             Manager.sendtoPLC(5,88,4,b,0);
             //机械手
                          //磨边机
             Manager.sendtoPLC(7,6088,4,b,0);
             //倒角机
             Manager.sendtoPLC(9,13360,4,b,0);
			 
             //钻孔机
             Manager.sendtoPLC(11,88,4,b,0);
             Manager.sendtoPLC(31,88,4,b,0);
             Manager.sendtoPLC(32,88,4,b,0);
             Manager.sendtoPLC(33,88,4,b,0);
             //水刀
             Manager.sendtoPLC(12,176,6,bs,0);
             Manager.sendtoPLC(34,176,6,bs,0);
             Manager.sendtoPLC(35,176,6,bs,0);
             Manager.sendtoPLC(36,176,6,bs,0);
             //加工中心
             Manager.sendtoPLC(14,88,4,b,0);
             Manager.sendtoPLC(37,88,4,b,0);
             Manager.sendtoPLC(38,88,4,b,0);
             Manager.sendtoPLC(39,88,4,b,0);
             //支线后片台
             Manager.sendtoPLC(13,236,4,b,0);
             //丝印烘干
             Manager.sendtoPLC(19,10088,4,b,0);
             Manager.sendtoPLC(20,10088,4,b,0);
             Manager.sendtoPLC(21,10088,4,b,0);
             Manager.sendtoPLC(22,10088,4,b,0);
             //钢前
             Manager.sendtoPLC(23,88,4,b,0);
             //钢化
             Manager.sendtoPLC(24,26,8,ganghuas,0);
             Manager.sendtoPLC(24,2,2,"0000",0);
             //钢后
             Manager.sendtoPLC(25,88,4,b,0);
             //贴膜
             /* Manager.sendtoPLC(26,88,4,b,0);
             Manager.sendtoPLC(76,88,4,b,0);
             Manager.sendtoPLC(77,88,4,b,0); */
     } else if(zts==98){
         /* Manager.sendtoPLC(6,88,4,a,0);
         Manager.sendtoPLC(45,88,4,a,0);
         Manager.sendtoPLC(46,88,4,a,0);
         Manager.sendtoPLC(47,88,4,a,0);
         Manager.sendtoPLC(48,88,4,a,0);
         Manager.sendtoPLC(49,88,4,a,0);
         Manager.sendtoPLC(50,88,4,a,0);
         Manager.sendtoPLC(51,88,4,a,0);
         Manager.sendtoPLC(52,88,4,a,0);
         Manager.sendtoPLC(53,88,4,a,0); */

         //掰片机
          Manager.sendtoPLC(5,88,4,a,0);
         //机械手
                  //磨边机
         Manager.sendtoPLC(7,6088,4,a,0);
         //倒角机
         Manager.sendtoPLC(9,13400,4,a,0);
		 
         //钻孔机
         Manager.sendtoPLC(11,88,4,a,0);
         Manager.sendtoPLC(31,88,4,a,0);
         Manager.sendtoPLC(32,88,4,a,0);
         Manager.sendtoPLC(33,88,4,a,0); 
         //水刀
         Manager.sendtoPLC(12,176,6,as,0);
          Manager.sendtoPLC(34,176,6,as,0);
         Manager.sendtoPLC(35,176,6,as,0);
         Manager.sendtoPLC(36,176,6,as,0);
         //加工中心
         Manager.sendtoPLC(14,88,4,a,0);
         Manager.sendtoPLC(37,88,4,a,0);
         Manager.sendtoPLC(38,88,4,a,0);
         Manager.sendtoPLC(39,88,4,a,0);
         //支线后片台
         Manager.sendtoPLC(13,236,4,a,0);
         //丝印烘干
         Manager.sendtoPLC(19,10088,4,a,0);
         Manager.sendtoPLC(20,10088,4,a,0);
         Manager.sendtoPLC(21,10088,4,a,0);
         Manager.sendtoPLC(22,10088,4,a,0);
         //钢前
         Manager.sendtoPLC(23,88,4,a,0);
         //钢化
         Manager.sendtoPLC(24,26,8,ganghua,0);
         Manager.sendtoPLC(24,2,2,"0001",0);
         //钢后
         Manager.sendtoPLC(25,88,4,a,0);
         //贴膜
      /* Manager.sendtoPLC(26,88,4,a,0);
         Manager.sendtoPLC(76,88,4,a,0);
         Manager.sendtoPLC(77,88,4,a,0);  */
		
     }
     else if(zts==99){
         Manager.dayin(1,changpinghao);
     }
	 

 

%>

 gmms/WebContent/orderManage/order.jsp

@@ -24,7 +24,7 @@
</head>
<body>
  <div id="app" >
    <el-container v-loading="loading" >
    <el-container v-loading="loading" style="width:100%;height:100%" >
      <el-header style="margin-top: 3%;height: 3%;">
        <el-button  @click="showFlagFuc" type="primary" round style="float:right;">{{showFlag==false?'返回订单':'新增订单'}}</el-button>
        <el-date-picker  v-show="showFlag"  style="float: left;margin-bottom: 0.3%;"
@@ -32,7 +32,9 @@
          type="daterange"
          range-separator="至"
          start-placeholder="开始日期"
          end-placeholder="结束日期">
          end-placeholder="结束日期"
          value-format="yyyy-MM-dd"
          >
          </el-date-picker>

          <el-button @click="selectTimeOrder"  v-show="showFlag" type="primary" icon="el-icon-search"
@@ -41,10 +43,10 @@
          </el-button>

      </el-header>
      <el-main  >
      <el-main  style="width:100%;height:97%">
        <el-table v-show="showFlag"
          :data="orderData"
          max-height="600"
          height="95%"
          style="width: 100%;">

          
@@ -72,7 +74,7 @@
                          ä¿®æ”¹
                </el-button>
                <el-button 
                  v-if="orderData[scope.$index]['11_order_status']>1"
                  v-if="orderData[scope.$index]['11_order_status']==2"
                  @click.native.prevent="open(scope.$index, orderData)"
                  type="text"
                  size="small">
@@ -157,6 +159,7 @@
  <script src="../js/jquery-3.4.1.min.js"></script>
  
  <script src="../js/static/js/vue.js"></script>
  <script src="../js/global.js"></script>
  <script src="../js/axios.min.js"></script>
  <script src="../js/mixins.js"></script>
  <!-- import JavaScript -->
@@ -217,7 +220,7 @@
          ruleForm: {
          produceid:"",
          glassNum:"",
          creator:'<%= request.getParameter("xingming") %>'
          creator:'',
        },
        rules: {
          produceid: [
@@ -259,6 +262,7 @@
            if (!valid) { 
              return false;
            }
            this.ruleForm.creator='<%= request.getParameter("xingming")%>';
            let sql="{call AXJ_a_order_add(?,?,?,?)}~"+JSON.stringify(this.ruleForm);
            this.connects("订单新增",sql,1,1);
          });
@@ -285,10 +289,12 @@
            if (!valid) { 
              return false;
            }
            this.ruleForm.creator='<%= request.getParameter("xingming")%>';
            let updateGlassObj=this.ruleForm
            updateGlassObj.id=this.updateOrder.id
            
            let sql="{call AXJ_a_order_update(?,?,?,?,?)}~"+JSON.stringify(updateGlassObj);
            this.connects("产品修改",sql,1,1);
            this.connects("订单修改",sql,1,1);
          });
          
        },
@@ -299,7 +305,7 @@
          let sql="{call AXJ_a_order_updateState(?,?,?)}~"+JSON.stringify(updateState);
                this.connects("订单状态审核修改",sql,1,1);
        },
        selectSub:function(){
        async selectSub(){
          let arrObj={}
          let  arrFlag=0
          for(let i in this.slectOrder){
@@ -321,9 +327,10 @@
            sql="{call AXJ_a_order_select_into()}"
          }
          this.loading=true
          this.loadAjxss('订单查询',sql,2,"orderData")
          await this.loadAjxss('订单查询',sql,2,"orderData")
          this.loading=false
        },
        selectTimeOrder:function(){
        async selectTimeOrder(){
          let arrObj={}
          for(let i in this.slectOrder){
            arrObj[i]='n*'
@@ -339,8 +346,8 @@
            sql="{call AXJ_a_order_select_into()}"
          }
          this.loading=true
          this.loadAjxss('订单查询',sql,2,"orderData")
          //loadAjxs('产品查询',sql,2,"orderData")
          await this.loadAjxss('订单查询',sql,2,"orderData")
          this.loading=false

        },
        open(index,row) {//打开刺破界面
@@ -365,18 +372,19 @@
      computed:{
        
      },
      mounted() {
      async mounted() {
        let sql="{call AXJ_a_order_select_into()}"
        let flag=2;
        this.loadAjxss('订单初始查询',sql,flag,"orderData")
        await this.loadAjxss('订单初始查询',sql,flag,"orderData")
        
        /* loadAjxs('订单初始查询',sql,flag,"orderData") */
        
        sql="{call AXJ_a_orderHeader_select()}"
        loadAjxs('订单表头',sql,flag,"tableHead")
        await this.loadAjxss('订单表头',sql,flag,"tableHead")

        sql="{call AXJ_a_order_produce_select()}"
        loadAjxs('订单产品查询',sql,flag,"orderProduce")
        await this.loadAjxss('订单产品查询',sql,flag,"orderProduce") 
        this.loading=false
      },

    })

 gmms/WebContent/orderManage/produce.jsp

@@ -5,8 +5,41 @@
  <meta charset="UTF-8">
  <!-- import CSS -->
  <link rel="stylesheet" href="../js/static/css/element.css">
  <link rel="stylesheet" href="../js/static/css/style.css">
  <!-- <link rel="stylesheet" href="../js/static/css/style.css"> -->
  <style >
    html,body{
  width: 99%;
  height: 99%;
  background-color: #D5EAFF;
  padding: 0%;
  margin: auto;
  text-align: center;
display: flex;
justify-content: center;
align-items: center;
}
#app{
  width: 100%;
  height: 100%;
  margin: 0;
  padding: 0;
}
#divHead,#left,#main,.shelf{
  box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
}
input::-webkit-outer-spin-button,
input::-webkit-inner-spin-button { 
    -webkit-appearance: none; 
}
*{
  text-align: center;
}
#mains{
  height: 100%;
    width: 100%;
  padding: 0;
  margin: 0;
}
    .page-scroll {
      height: 100%;
    }
@@ -24,14 +57,14 @@
</head>
<body>
  <div id="app" >
    <el-container >
    <el-container style="width:100%;height:100%" >
      <el-header style="height: 3%;">
        <el-button  @click="showFlagFuc" type="primary" round style="float:left;">{{showFlag==false?'返回产品':'添加产品'}}</el-button>
      </el-header>
      <el-main  >
      <el-main style="width:100%;height:97%" >
        <el-table v-show="showFlag"
          :data="produceData"
          max-height="600"
          height="100%"
          style="width: 100%;">

          
@@ -40,7 +73,7 @@
            :key="index"
            :label="item"
            >
            <el-table-column :prop="keys" v-if="index==0">
            <el-table-column :prop="keys" v-if="index==0" >
              <template slot-scope="scope" v-if="Object.keys(produceData[0]).length!=0">
                <el-button 
                  @click.native.prevent="updateRow(scope.$index, produceData)"
@@ -61,7 +94,7 @@
          </el-table-column>
        </el-table>
<!-- æ–°å¢žä¿®æ”¹ -->
        <div v-show="updateShowFlag" style="width: 30%;float: left;margin-top: 10%;margin-left: 10%; ">
        <div v-show="updateShowFlag" style="width: 30%;height: 50vh;float: left;margin-top: 10%;margin-left: 10%; ">
          <img  :src="ruleForm.route"  > 
        </div>
        
@@ -125,8 +158,9 @@
</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/global.js"></script>
  <script src="../js/mixins.js"></script>
  <!-- import JavaScript -->
  <script src="../js/static/js/element.js"></script>
@@ -135,6 +169,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],
@@ -239,7 +274,7 @@
            }
            this.ruleForm.creator='<%= request.getParameter("xingming") %>';
            let sql="{call AXJ_a_produce_insert(?,?,?,?,?,?,?,?,?)}~"+JSON.stringify(this.ruleForm);
            this.connects("新增产品",sql,1,1);
                  this.connects("新增产品",sql,1,1);
          });
        },
        resetForm(formName) {
@@ -307,7 +342,7 @@
            arrObj[i]=this.selectGlass[i]
          }
          let sql="{call AXJ_a_produce_select(?,?,?,?,?,?,?,?,?)}~"+JSON.stringify(arrObj);
          loadAjxs('产品查询',sql,2,"produceData");
          this.loadAjxss('产品查询',sql,2,"produceData");
        }
      },
      computed:{
@@ -316,13 +351,13 @@
      mounted() {
        let sql="{call AXJ_a_produce_select_into()}";
        let flag=2;
        loadAjxs('产品初始查询',sql,flag,"produceData");
        this.loadAjxss('产品初始查询',sql,flag,"produceData");
        
        sql="{call AXJ_a_produceHeader_select()}";
        loadAjxs('产品表头',sql,flag,"tableHead");
        this.loadAjxss('产品表头',sql,flag,"tableHead");
        
        sql="{call AXJ_a_optFile_select()}";
        loadAjxs('产品opt编码查询',sql,flag,"optList");
        this.loadAjxss('产品opt编码查询',sql,flag,"optList");
      },

    })

 gmms/WebContent/qiegeguanli/qiegerenwu.jsp

@@ -47,7 +47,7 @@
    <div id='app'>
    <!-- <div style='height:20px;width:300px;background-color:#3C8DBC;float:right;'><span style = 'color:#fff;' >故障情况:</span><span id='infos'></span></div> -->
        <section class="content-header" style="padding: 0px 15px 0 15px;">
            <h1>订单任务&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<small></small></h1>
            <h1 @dblclick="dangqianpeifang()">订单任务&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h1>
            
            <ol class="breadcrumb">
            
@@ -86,7 +86,7 @@
                            </tr>
                        </thead>
                        <tbody>
                            <tr v-for="item in shuzu">
                            <tr v-for="item in shuzu" style="height: 51px;">
                                <td>{{item['1_order_id']}}</td>
                                <td>{{item['2_original_width']}}</td>
                                <td>{{item['3_original_height']}}</td>
@@ -121,7 +121,7 @@
                                </td>
                                <td  v-else-if="item['11_order_status']==2">
                                    
                                    <button @click="dainjishijian('结束任务',item['0_id'])" style='background-color: #5CADFE' class='btn btn-large btn-success' >结束任务</button>
                                    <button @click="dainjishijian('结束任务',item['0_id'])" style='background-color: red' class='btn btn-large btn-success' >结束任务</button>
                                    &nbsp;&nbsp;&nbsp;
                                    <button @click="dainjishijian('取消任务',item['0_id'])" style='background-color: #5CADFE' class='btn btn-large btn-success' >取消任务</button>
                                </td>
@@ -148,7 +148,7 @@
                                <h3 class="modal-title" id="myModalLabel">提示信息</h3>
                            </div>
                            <div class="modal-body" style="text-align: left;">
                                <h3>您确定要执行当前操作吗？</h3>
                                <h1>请进行人脸识别，有效期两分钟</h1>
                            </div>
                            <div class="modal-footer">

@@ -156,11 +156,56 @@
                                    data-dismiss="modal">取消</button>

                                <button id="dianjishijian" @click='getMSg' type="button" class="btn btn-primary btn-lg"
                                    id="surefinish">确认</button>
                                    id="surefinish">我已识别，确认</button>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
			
			
            <div class="modal fade" id="modify-infos" tabindex="-1" role="dialog"
                aria-labelledby="myModalLabel" aria-hidden="true" style="height: 800px;">
				
                    <div class="modal-dialog" style="width: 800px;" >
                        <div class="modal-content" >
                        <table class="table table-striped table-hover"
                        style="overflow-x: auto;font-size: 12px;">
                        <thead>
                            <tr>
                                <th>机器编号</th>
                                <th>机器名称</th>
                                <th>配方类型</th>
                                <th>当前配方值</th>
                                <th>发送配方值</th>
								
                            </tr>
                        </thead>
                        <tbody>
                            <tr v-for="item in shuzu2">
                                <td>{{item['0_id']}}</td>
                                <td>{{item['1_machine_name']}}</td>
                                <td>{{item['2_class_html']}}</td>
                                <td>{{item['3_content_value']}}</td>
                                <td>{{item['4_content_value1']}}</td>
                            </tr>
                        </tbody>
                    </table>
                    <div class="modal-footer">
                                <button type="button" class="btn btn-default btn-lg"
                                    data-dismiss="modal">关闭</button>
                                        <button v-if="peifanhao[0]['0_recipe_no']!=null" id="tiebiaoji" @click="peifangxiafa(1)" type="button" class="btn btn-primary btn-lg"
                                        id="tiebiaoji">贴标机数据下发</button>
                                        <button v-if="peifanhao[0]['0_recipe_no']!=null" id="peifangxiafa" @click="peifangxiafa(2)" type="button" class="btn btn-primary btn-lg"
                                        id="peifangxiafa">配方下发</button>
									
								
							
                            </div>
                        </div>
						
                    </div>
				
            </div>
            
        </section>
@@ -180,16 +225,27 @@
      data:{
          shuzu:[],
          shuzu1:[],
          shuzu2:[],
          lines:<%= request.getParameter("id") %>,
          peifanhao:[],
          peifanhao:[{}],
          subval:{
              id:'',
              type:''
          }
      },
      methods:{
          dainjishijian:function(type,id){
              console.log(type,id);
          dangqianpeifang(){
			 
              this.shuzu2="";
              let sql="{call AXJ_a_get_machine_recipe_select()}";
              let flag=2;
              this.loadAjxss('任务查询成功',sql,flag,"shuzu2"); 
              let sql1="{call AXJ_qiegeguanli_peifanghao_cahxun1()}";
              this.loadAjxss('配方号查询',sql1,2,"peifanhao")
			  
              $("#modify-infos").modal('show');
          },
           dainjishijian(type,id){
              $("#modify-info").modal('show');
               if(type=="领取任务"){
                  this.subval.type=2;
@@ -201,9 +257,15 @@
                  this.subval.type=1;
              }
               this.subval.id=id
               let para={
                       ids:id
               }
               let sql="{call AXJ_qiegeguanli_peifanghao_cahxun(?,?)}~"+JSON.stringify(para);
                this.loadAjxss('配方号查询',sql,2,"peifanhao")
          },
          getMSg(){
              //this.getMSgs();
			 
              this.renwuguanli();
          },
          getMSgs(){
@@ -216,8 +278,8 @@
                  param.append("flag",1);
                  param.append("anquanma",json["anquanma"]);
                  
                  this.$http.post('../mysqlInsert/mysql.jsp',param).then(({ data }) => {
                     let result=$(data).text();
                  this.$http.post('../mysqlInsert/mysql.jsp',param).then(( datas ) => {
                     let result=datas.data;
                     index = result.indexOf("[[");
                     if(index>-1){
                          if(result.indexOf("[[anquanmaerr]]")>-1){
@@ -226,11 +288,12 @@
                          }else{
                              result=result.substring(index).trim()
                              alert(result);
                              resolve();
                              reject();
                              window.location.reload();
                          }
                      }else{
                          alert("任务修改成功！")
                          resolve();
                          window.location.reload();
                          
                      } 
@@ -244,6 +307,11 @@
                  let param = new URLSearchParams(); 
                  param.append("zt",this.subval.type); 
                  param.append("peifanhao",this.peifanhao[0]['0_recipe_no']);
                  param.append("changpinghao",this.peifanhao[0]['1_changpinghao']);
                  param.append("way_of_working",this.peifanhao[0]['2_way_of_working']);
                  param.append("thickness",this.peifanhao[0]['3_thickness']);
                  param.append("glass_type",this.peifanhao[0]['4_glass_type']);
                  param.append("production_type",this.peifanhao[0]['5_production_type']);
                 this.$http.post( '../mysqlInsert/toPlc.jsp',param)
                  .then(function (response) {
                        console.log(response);
@@ -253,6 +321,40 @@
                        alert('Error: ' + "服务器机器连接发生错误！"); 
                    });  
              })
          },
          peifangxiafa(leixing){
              if(leixing==1){
                  let param = new URLSearchParams(); 
                  param.append("zt",98); 
                  param.append("peifanhao",this.peifanhao[0]['0_recipe_no']);
                 this.$http.post( '../mysqlInsert/toPlc.jsp',param)
                  .then(function (response) {
                        console.log(response);
                   })
				   
                    .catch(function (error) {
                        alert('Error: ' + "服务器机器连接发生错误！"); 
                    });  
              }else if(leixing==2){
                  let param = new URLSearchParams(); 
                  param.append("zt",99); 
                  param.append("peifanhao",this.peifanhao[0]['0_recipe_no']);
                  param.append("changpinghao",this.peifanhao[0]['1_changpinghao']);
                  param.append("way_of_working",this.peifanhao[0]['2_way_of_working']);
                  param.append("thickness",this.peifanhao[0]['3_thickness']);
                  param.append("glass_type",this.peifanhao[0]['4_glass_type']);
                  param.append("production_type",this.peifanhao[0]['5_production_type']);
                 this.$http.post( '../mysqlInsert/toPlc.jsp',param)
                  .then(function (response) {
                        console.log(response);
                   })
				   
                    .catch(function (error) {
                        alert('Error: ' + "服务器机器连接发生错误！"); 
                    });  
              }
				  
			  
          },
          renwuguanliquxiao:function(){
              this.subval='';
@@ -266,9 +368,9 @@
         this.shuzu="";
          let sql="{call AXJ_qiegeguanli_threelinetask_list1()}";
         let flag=2;
         loadAjxs('任务查询成功',sql,flag,"shuzu"); 
         sql="{call AXJ_qiegeguanli_peifanghao_cahxun()}";
         loadAjxs('配方号查询',sql,flag,"peifanhao"); 
         this.loadAjxss('任务查询成功',sql,flag,"shuzu"); 
         /* sql="{call AXJ_qiegeguanli_peifanghao_cahxun()}";
         loadAjxs('配方号查询',sql,flag,"peifanhao");  */
      }

})

 gmms/WebContent/qiegeguanli/shangpianweixinxi.jsp

@@ -271,7 +271,7 @@
                                                </button>
                                                <ul class="dropdown-menu" style="height: 320px; overflow: auto;">
                                                    <li v-for='items in shelfRack' style="font-size: 20px">
                                                        <a href="#" onclick="$('#shelfRankInput').val($(this).text())">{{items[0]}}</a>
                                                        <a href="#" onclick="$('#shelfRankInput').val($(this).text())">{{items['0_number']}}</a>
                                                    </li>
                                                </ul>
                                            </div>
@@ -295,7 +295,7 @@
                                            </button>
                                            <ul class="dropdown-menu" style="height: 280px; overflow: auto;background-color:bule">
                                                <li v-for='color in colors' style="font-size: 20px;background-color:bule"><a href="#"
                                                onclick="$('#colors').val($(this).text())">{{color[0]}}</a></li>
                                                onclick="$('#colors').val($(this).text())">{{color['0_glass_id']}}</a></li>
                                            </ul>
                                        </div>

@@ -497,17 +497,20 @@
</body>

<script type="text/javascript" src="../static/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="../js/vue.min.js"></script>
 <script src="../js/axios.min.js"></script>
<script src="../js/mixins.js"></script>
<script src="../js/vue.min.js"></script>

<script>
Vue.prototype.$http= axios
 let app = new Vue({
      el:'#app',
      mixins:[mixin],
      data:{
          shuzu:[],
          shuzu1:[],
          shelfRack:<%= DBHelper.getDBHelper("mes").query(false,"SELECT number from storage_rack where state='使用中' and falg='启用';") %>,
          colors:<%= DBHelper.getDBHelper("mes").query(false,"SELECT glass_id from glass_number_color ") %>,
          shelfRack:[{}],
          colors:[{}],
          updateGlassId:"",
          pieces:"",
          clearGlassMsg:{
@@ -601,10 +604,14 @@
         this.shuzu1="";
         let sql="{call AXJ_qiegeguanli_shangpianwei_chaxun()}";
         let flag=2;
         loadAjxs('仓储任务上面查询',sql,flag,"shuzu");
         this.loadAjxss('仓储任务上面查询',sql,flag,"shuzu");
         let sql1="{call AXJ_qiegeguanli_shangpianwei_chaxun1()}";

         loadAjxs('仓储任务上面查询',sql1,flag,"shuzu1");
         this.loadAjxss('仓储任务上面查询',sql1,flag,"shuzu1");
         sql="{call AXJ_liaojiaguanli_colors(?)}";
         this.loadAjxss('上片位颜色查询',sql,flag,"colors");
         sql="{call AXJ_liaojiaguanli_shelfrack_shangpianwei()}";
         this.loadAjxss('上片位架子查询',sql,flag,"shelfRack");
      }

})

 gmms/WebContent/tiemotaizu/tiemotaizu.jsp

File was deleted

 gmms/WebContent/tiemotaizu/Êý¾Ýͼ.png

Binary files differ

 gmms/WebContent/yuanpiancangchu/cangchurenwuxinxi.jsp

@@ -19,8 +19,7 @@
<!-- jQuery 3 -->
<script src="../js/jquery-3.4.1.min.js"></script>
<!-- Bootstrap 3.3.7 -->
<script
    src="../static/AdminLTE/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>

<!-- DataTables -->
<!-- SlimScroll -->
<!-- FastClick -->
@@ -90,7 +89,7 @@
            <div class="box box-default" style="background-color:#D5EAFF;">
                <div class="box-header with-border">
                    <h3 class="box-title">仓储</h3>
                <span :class="connect[0]['1_classname']">{{connect[0]['0_connect_state']}}</span> 
                <span :class="classname">{{connect[0]['0_connect_state']}}</span> 
                </div>
                <!-- /.box-header -->
                <button type="button" @click="delAll('重新开始')" class="btn btn-primary ">重新开始</button>
@@ -112,7 +111,7 @@
                    </thead>
                    <tbody>
                        <tr v-for="items in shuzu">
                            <td><input v-model="shelftaskids" type='checkbox'  :value="items[0]"/></td>
                            <td><input v-model="shelftaskids" type='checkbox'  :value="items['0_id']"/></td>
                            <td>{{items['0_id']}}</td>
                             <td>{{items['1_task_type']}}</td> 
                            <td>{{items['2_task_state']}}</td>
@@ -147,9 +146,10 @@
    <!-- /.content-wrapper -->
    <!-- page script -->

<script src="../js/main.js"></script>
<script
    src="../static/AdminLTE/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>

<script src="../js/vue.min.js"></script>
<script src="../js/mixins.js"></script>
<script>
 let app = new Vue({
      el:'#app',
@@ -157,7 +157,8 @@
      data:{
          shuzu:[],
          connect:"",
          shelftaskids:[]
          shelftaskids:[],
          classname:''
      },
      methods:{
          delAll:function(types){
@@ -173,12 +174,37 @@
             }
          }
      },
      mounted:function(){
      watch:{
          shuzu(newVal){
                for(let i=0;i<newVal.length;i++){
                    switch (newVal[i]['1_task_type']) {
                        case "从仓位到上片位": 
                            newVal[i]['1_task_type']="从【"+newVal[i]['3_shelf_rack']+"】仓位到【"+newVal[i]['4_load_rack']+"】上片位";
                            break;
                        case "从上片位到仓位":
                            newVal[i]['1_task_type']="从【"+newVal[i]['4_load_rack']+"】上片位到【"+newVal[i]['3_shelf_rack']+"】仓位";
                            break;

                        case "从仓位到吊装位":
                            newVal[i]['1_task_type']="从【"+newVal[i]['3_shelf_rack']+"】仓位到【"+newVal[i]['4_load_rack']+"】吊装位";
                            break;
                        case "从吊装位到仓位":
                            newVal[i]['1_task_type']="从【"+newVal[i]['4_load_rack']+"】吊装位到【"+newVal[i]['3_shelf_rack']+"】仓位";
                            break;
					
                        default:
                            break;
                    }
                }
          }
      },
     async mounted(){
         let sql="{call AXJ_liaojiaguanli_cangchurenwuxiangxi(?)}";
         let flag=2;
         loadAjxs('仓储任务上面查询',sql,flag,"shuzu");
         this.loadAjxss('仓储任务上面查询',sql,flag,"shuzu");
          sql="{call AXJ_liaojiaguanli_cangchurenwu_lianjie(?)}";
         loadAjxs('仓储任务连接',sql,flag,"connect");
         await this.loadAjxss('仓储任务连接',sql,flag,"connect");
         this.classname=this.connect[0]['1_classname']
      }

})

 gmms/WebContent/yuanpiancangchu/liaojiaguanli.jsp

@@ -38,7 +38,7 @@
<script type="text/javascript" src="../static/js/sucaijiayuan.js"></script>
<script type="text/javascript" src="../static/laydate/laydate.js"></script>
<script type="text/javascript" src="../static/util/utilAlert.js"></script>
<script type="text/javascript" src="../static/bootstrap/3.3.7/js/bootstrap.min.js"></script>

<style type="text/css">
.rank {
    font-weight: bolder;
@@ -103,11 +103,11 @@

<script type="text/javascript">

/* var interval = setInterval('refreshStatus()', 20000); */
 //let interval = setInterval('refreshStatus()', 20000);
//设备页面自动刷新
/* function refreshStatus() {
    window.location.reload();
} */
} 
//停止页面自动刷新
 function disableAutoRefresh() {
    clearInterval(interval);
@@ -568,7 +568,6 @@
                                <div v-show="item['9_rukutime']*1>7" :style="{height:item['10_bfb']}" class='progress-bar progress-bar-danger progress-bar-striped progress-bar-red'>
                                    <span>{{item['5_left_pieces']}}/{{item['8_pieces']}}</span>
                                </div>
								
                            </div>
                            <div>{{item['0_number']}}</div>
                        </td>
@@ -578,8 +577,8 @@

            <!--表格 -->
            <select id="dzw" class="btn btn-primary">
                <option value="1">吊装位1</option>
                <option value="2">吊装位2</option>
                <option value="98">吊装位1</option>
                <option value="99">吊装位2</option>
            </select>
            <button type="button" onclick="ruku()"  class="btn btn-primary ">入库</button>
            <!-- <button type="button" onclick="ruku1()"  class="btn btn-primary ">扫码入库</button> -->
@@ -596,7 +595,7 @@
            <table id="example" class="table table-bordered table-condensed" style="font-size: 12px;">
                <thead style="font-size: 20px; Height: 40px">
                    <tr>
                        <th><input type="checkbox" name="allChecked" /></th>
                        <th><input type="checkbox" v-model="checkFlag" name="allChecked" @click="quanxuan" /></th>
                        <th style="display:none">编号</th>
                        <th>库位号</th>
                        <th>类型</th>
@@ -1065,8 +1064,10 @@
        </section>
    </div>
</body>
<script src="../js/mixins.js"></script>
<script src="../js/vue.min.js"></script>

<script src="../js/main.js"></script>
<script type="text/javascript" src="../static/bootstrap/3.3.7/js/bootstrap.min.js"></script>

<script>
 let app = new Vue({
      mixins:[mixin],
@@ -1101,6 +1102,7 @@
          shuzu:[],
         shelfRack:[],
         colors:[],
         checkFlag:false
      },
      methods:{
          start:function(func){
@@ -1158,7 +1160,6 @@
                 }
                 //获取选择的吊装位
                 this.glass.dzw=$("#dzw").val();
                 alert(JSON.stringify(this.glass));
                 let sql="{call AXJ_liaojiaguanli_ruku(?,?,?,?,?,?,?,?,?,?)}~"+JSON.stringify(this.glass);
                 //console.log(sql);
                 $("#myModal-add-info").modal('hide');
@@ -1244,17 +1245,30 @@
              this.load_rack=$("#dzw").val();
              let sql="{call AXJ_liaojiaguanli_diaozhuangweiruku(?,?)}~"+"{'load_rack':'"+this.load_rack+"'}";
              this.connects("吊装位入库",sql,1,1);
          },
          quanxuan(){
              this.checkFlag=!this.checkFlag;
              this.shelfId=[];
              if(this.checkFlag){
                  for(let item in this.shuzu){
                      this.shelfId.push(this.shuzu[item]["0_number"]);
                  } 
              }else{
                  this.shelfId=[];
              }
			  
			 
          }
          
      },
      mounted:function(){
             let sql="{call AXJ_liaojiaguanli_kucunchaxun(?)}";
             let flag=2;
             loadAjxs('原片仓储玻璃查询',sql,flag,"shuzu");
             this.loadAjxss('原片仓储玻璃查询',sql,flag,"shuzu");
             sql="{call AXJ_liaojiaguanli_shelfrack(?)}";
             loadAjxs('原片仓储架子查询',sql,flag,"shelfRack");
             this.loadAjxss('原片仓储架子查询',sql,flag,"shelfRack");
             sql="{call AXJ_liaojiaguanli_colors(?)}";
             loadAjxs('原片仓储颜色查询',sql,flag,"colors");
             this.loadAjxss('原片仓储颜色查询',sql,flag,"colors");
    }
        
})