Haier_MES.git - Gitblit

parent: 5e9875e9 | 补丁 | 提交 | ignore whitespace

ZengTao

2023-07-26 ec82d16c11f85929e5a9ab209d09310c1bef2ea6

8个文件已修改

1个文件已添加

	gmms/.settings/org.eclipse.core.resources.prefs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/dapingxianshi/dakongdaping.jsp	185 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/js/mixins.js	57 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/js/static/js/vue.js	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/mysqlInsert/toPlc.jsp	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/orderManage/order.jsp	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/orderManage/produce.jsp	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/qiegeguanli/qiegerenwu.jsp	65 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/yuanpiancangchu/cangchurenwuxinxi.jsp	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -1,2 +1,3 @@
eclipse.preferences.version=1
encoding//WebContent/dapingxianshi/dakongdaping.jsp=UTF-8
encoding//WebContent/login/machinelistcontent.jsp=UTF-8

 gmms/WebContent/dapingxianshi/dakongdaping.jsp

New file
@@ -0,0 +1,185 @@
<%@page import="ng.db.DBHelper"%>
<%@ page contentType="text/html;charset=UTF-8"%>
<%-- <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> --%>
<c:set var="ctx" value="${pageContext.request.contextPath}" />
<html>
<head>
<title>打孔大屏</title>

<!-- Font Awesome -->
<link rel="stylesheet" href="../static/AdminLTE/bower_components/font-awesome/css/font-awesome.min.css">
<!-- Ionicons -->
<link rel="stylesheet" href="../static/AdminLTE/bower_components/Ionicons/css/ionicons.min.css">
<!-- Theme style -->
<link rel="stylesheet" href="../static/AdminLTE/dist/css/AdminLTE.min.css">
<link rel="stylesheet" href="../static/AdminLTE/dist/css/skins/skin-blue.min.css">
<link rel="stylesheet" href="..//static/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css">
<style type="text/css">
@IMPORT url("../static/global/showtask/showtask.css");
</style>

<script>
    var contextPath = "${pageContext.request.contextPath}";
</script>

<link type="text/css" rel="stylesheet"
    href="../static/css/dataTables.bootstrap.css" />
<link type="text/css" rel="stylesheet"
    href="../static/css/dataTables.tableTools.css" />

<script src="../js/jquery-3.4.1.min.js"></script>
<script src="../js/echarts.min.js"></script>
<script type="text/javascript" src="../static/js/jquery.dataTables.min.js"></script>
<script type="text/javascript" src="../static/js/dataTables.bootstrap.js"></script>
<script type="text/javascript" src="../static/js/dataTables.tableTools.js"></script>
<script type="text/javascript" src="../static/js/moment.js"></script>
<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>
    *{
        margin:0;
        padding:0;
    }
    #top{
        height:30%;
        display:flex;
    }
    #center{
        height:40%;
        display:flex;
    }
    #bottom{
        height:30%;
        display:flex;
    }
    .top_div{
        width:25%;
        htight:100%;
    }
    .center_div{
        width:30%;
        htight:100%;
        display:flex;
        flex-wrap: wrap;
    }
    .center_divs{
        width:40%;
        htight:100%;
    }
    .center_div_details{
        height:50%;
        width:100%;
    }
    .bottom_div{
        width:25%;
        htight:100%;
    }
</style>

</head>
<body>
    <div  id='app' style='background-color:#D5EAFF;width:100%;height: 100%;'>
        <div id="top">
            <div class="top_div">打孔机1产品图</div>
            <div class="top_div" id="qw">打孔机1电耗</div>
            <div class="top_div">打孔机2电耗</div>
            <div class="top_div">打孔机2产品图</div>
        </div>
        <div id="center">
            <div class="center_div">
                <div class="center_div_details">打孔机1用水</div>
                <div class="center_div_details">打孔机3用水</div>
            </div>
            <div class="center_divs">
                查询
            </div>
            <div class="center_div">
                <div class="center_div_details">打孔机2用水</div>
                <div class="center_div_details">打孔机4用水</div>
            </div>
        </div>
        <div id="bottom">
            <div class="bottom_div">打孔机1产品图</div>
            <div class="bottom_div">打孔机1电耗</div>
            <div class="bottom_div">打孔机2电耗</div>
            <div class="bottom_div">打孔机2产品图</div>
        </div>
    </div>
    <script>
    window.onload=function(){
        zhutu();
    }
    function zhutu () {

            var chartDom = document.getElementById('qw');
            var myChart = echarts.init(chartDom);
            var option;

            option = {
              tooltip: {
                trigger: 'axis',
                axisPointer: {
                  type: 'shadow'
                }
              },
              grid: {
                left: '3%',
                right: '4%',
                bottom: '3%',
                containLabel: true
              },
              xAxis: [
                {
                  type: 'category',
                  data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
                  axisLine: { lineStyle: { color: 'rgb(30, 144, 255)' } },
                  axisLabel: { color: 'rgb(30, 144, 255)' },
                  splitLine: { lineStyle: { color: 'rgb(30, 144, 255)', type: 'dashed' } }
                }
              ],
              yAxis: [
                {
                  type: "value",
                  name: "水耗",
                  nameTextStyle: {
                    color: "rgb(30, 144, 255)",
                    fontSize: 12,
                    padding: [0, 0, 0, -30], //name文字位置 对应 上右下左
                  },
                  splitLine: {
                    // 网格线
                    show: true,
                    lineStyle: { //分割线
                      color: "rgb(30, 144, 255)",
                      width: 1,
                      type: "dashed" //dotted：虚线 solid:实线
                    }
                  },
                  axisLabel: {
                    // 轴文字
                    color: "rgb(30, 144, 255)",
                    fontSize: 12,
                  },
                },

              ],
              series: [
                {
                  name: '电耗',
                  type: 'bar',
                  barWidth: '80%',
                  data: [10, 52, 200, 334, 390, 330, 220],
                  itemStyle: { color: 'rgb(30, 144, 255)' }
                },

              ]
            };

            option && myChart.setOption(option);
          }
    </script>
</body>
</html>

 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/js/static/js/vue.js

@@ -12012,3 +12012,15 @@
  return Vue;

}));
Vue.directive('preventreclick', {
    inserted(el, binding) {
         el.addEventListener('click', () => {
         if (!el.disabled) {
           el.disabled = true
           setTimeout(() => {
             el.disabled = false
           }, binding.value || 2000)
         }
       })
     }
});

 gmms/WebContent/mysqlInsert/toPlc.jsp

@@ -1,8 +1,24 @@
<%@page import="builder.Manager"%>
<%

<<<<<<< HEAD

Manager.sendtoPLC(76,20,4,new byte[]{0,1,0,1},0);
Manager.sendtoPLC(77,20,4,new byte[]{0,1,0,1},0);
=======
String zt=request.getParameter("zt");
String peifanhao=request.getParameter("peifanhao");

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

/*  Manager.sendtoPLC(76,20,4,new byte[]{0,1,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);
 }
>>>>>>> 09a05342f4c60c834c3ee17a13529cd91c624f34

%>

 gmms/WebContent/orderManage/order.jsp

@@ -24,7 +24,7 @@
</head>
<body>
  <div id="app" >
    <el-container >
    <el-container v-loading="loading" >
      <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%;"
@@ -43,7 +43,6 @@
      </el-header>
      <el-main  >
        <el-table v-show="showFlag"
          v-loading="loading"
          :data="orderData"
          max-height="600"
          style="width: 100%;">
@@ -60,7 +59,9 @@
                <el-button v-if="orderData[scope.$index]['11_order_status']<2"
                  @click.native.prevent="updateOrderState(scope.$index, orderData)"
                  type="text"
                  size="small">
                  size="small"
                  v-preventReClick
                  >
                  {{orderData[scope.$index]['11_order_status']==0?'审核':'反审'}}
                </el-button>

@@ -68,13 +69,14 @@
                  @click.native.prevent="updateRow(scope.$index, orderData)"
                  type="text"
                  size="small">
                  修改
                          修改
                </el-button>
                <el-button 
                  v-if="orderData[scope.$index]['11_order_status']>1"
                  @click.native.prevent="open(scope.$index, orderData)"
                  type="text"
                  size="small">
                  次破
                          次破
                </el-button>

                
@@ -94,8 +96,8 @@
        
        <el-form v-show="!showFlag" :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" style="width: 25%;margin: auto;">
          <el-form-item>
            <el-button v-show="updateShowFlag" type="primary" @click="updateGlassSub('ruleForm')">修改</el-button>
            <el-button v-show="!updateShowFlag" type="primary" @click="submitForm('ruleForm')">提交</el-button>
            <el-button v-show="updateShowFlag" type="primary" @click="updateGlassSub('ruleForm')" v-preventReClick >修改</el-button>
            <el-button v-show="!updateShowFlag" type="primary" @click="submitForm('ruleForm')" v-preventReClick >提交</el-button>
            <el-button @click="resetForm('ruleForm')">重置</el-button>
          </el-form-item>
          
@@ -136,7 +138,7 @@
              
              <el-form-item>
                <el-button @click="resetForm('wornGlass');wornGlassFLAG = false">取 消</el-button>
                <el-button v-show="!updateShowFlag" type="primary" @click="wornSub('wornGlass')">提交</el-button>
                <el-button v-show="!updateShowFlag" type="primary" @click="wornSub('wornGlass')" v-preventReClick>提交</el-button>
              </el-form-item>
            </el-form>
            
@@ -215,7 +217,7 @@
          ruleForm: {
          produceid:"",
          glassNum:"",
          creator:""
          creator:'<%= request.getParameter("xingming") %>'
        },
        rules: {
          produceid: [
@@ -258,7 +260,7 @@
              return false;
            }
            let sql="{call AXJ_a_order_add(?,?,?,?)}~"+JSON.stringify(this.ruleForm);
                  this.connects("订单新增",sql,1,1);
            this.connects("订单新增",sql,1,1);
          });
        },
        resetForm(formName) {//清除新增重置
@@ -274,7 +276,7 @@
          this.updateShowFlag=true;
          let rowObj=row[index]
          this.ruleForm.glassNum=rowObj["5_smallglass_no"]
          this.ruleForm.produceid=rowObj["2_recipe_no"]
          this.ruleForm.produceid=rowObj["12_id"]
          this.updateOrder.id=rowObj["0_id"]
          
        },
@@ -318,7 +320,8 @@
          if(arrFlag==0){
            sql="{call AXJ_a_order_select_into()}"
          }
          loadAjxs('产品查询',sql,2,"orderData")
          this.loading=true
          this.loadAjxss('订单查询',sql,2,"orderData")
        },
        selectTimeOrder:function(){
          let arrObj={}
@@ -335,7 +338,9 @@
            arrObj.endtime=''
            sql="{call AXJ_a_order_select_into()}"
          }
          loadAjxs('产品查询',sql,2,"orderData")
          this.loading=true
          this.loadAjxss('订单查询',sql,2,"orderData")
          //loadAjxs('产品查询',sql,2,"orderData")

        },
        open(index,row) {//打开刺破界面

 gmms/WebContent/orderManage/produce.jsp

@@ -46,7 +46,7 @@
                  @click.native.prevent="updateRow(scope.$index, produceData)"
                  type="text"
                  size="small">
                  修改
                       修改
                </el-button>
              </template>
            </el-table-column>
@@ -67,8 +67,8 @@
        
        <el-form v-show="!showFlag" :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" style="width: 25%;float: right;margin-right: 20%;">
          <el-form-item>
            <el-button v-show="updateShowFlag" type="primary" @click="updateGlassSub('ruleForm')">修改</el-button>
            <el-button v-show="!updateShowFlag" type="primary" @click="submitForm('ruleForm')">提交</el-button>
            <el-button v-show="updateShowFlag" type="primary" @click="updateGlassSub('ruleForm')" v-preventReClick ='3000'>修改</el-button>
            <el-button v-show="!updateShowFlag" type="primary" @click="submitForm('ruleForm')" v-preventReClick='3000'>提交</el-button>
            <el-button @click="resetForm('ruleForm')">重置</el-button>
          </el-form-item>
          
@@ -189,7 +189,7 @@
          thickness: '',
          color:'',
          optNum:'',
          creator:'',
          creator:'<%= request.getParameter("xingming") %>',
          route:''
        },
        rules: {
@@ -237,8 +237,9 @@
            if (!valid) { 
              return false;
            }
            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) {
@@ -326,7 +327,6 @@

    })
    



  </script>

 gmms/WebContent/qiegeguanli/qiegerenwu.jsp

@@ -1,4 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@page import="ng.db.DBHelper"%>
<c:set var="ctx" value="${pageContext.request.contextPath}" />

<html>
@@ -122,7 +123,7 @@
                                    
                                    <button @click="dainjishijian('结束任务',item['0_id'])" style='background-color: #5CADFE' 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>
                                    <button @click="dainjishijian('取消任务',item['0_id'])" style='background-color: #5CADFE' class='btn btn-large btn-success' >取消任务</button>
                                </td>
                                <!-- <td  v-else-if="item[11]==2">
                                    <button @click="dainjishijian('重新下发',item[0])" style='background-color: #5CADFE' class='btn btn-large btn-success' >重新下发</button>
@@ -154,7 +155,7 @@
                                <button type="button" @click='renwuguanliquxiao' class="btn btn-default btn-lg"
                                    data-dismiss="modal">取消</button>

                                <button id="dianjishijian" @click='renwuguanli' type="button" class="btn btn-primary btn-lg"
                                <button id="dianjishijian" @click='getMSg' type="button" class="btn btn-primary btn-lg"
                                    id="surefinish">确认</button>
                            </div>
                        </div>
@@ -168,9 +169,11 @@
<script src="../js/jquery-3.4.1.min.js"></script>
<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>
Vue.prototype.$http= axios
 let app = new Vue({
      el:'#app',
      mixins:[mixin],
@@ -178,6 +181,7 @@
          shuzu:[],
          shuzu1:[],
          lines:<%= request.getParameter("id") %>,
          peifanhao:[],
          subval:{
              id:'',
              type:''
@@ -198,10 +202,57 @@
              }
               this.subval.id=id
          },
          renwuguanli:function(){
              sql="{call AXJ_qiegeguanli_threelinetask_renwuguanli(?,?,?)}~"+JSON.stringify(this.subval);
              console.log(sql);
              this.connects("任务修改",sql,1,1)
          getMSg(){
              //this.getMSgs();
              this.renwuguanli();
          },
          getMSgs(){
              return new Promise((resolve, reject) => {
                  // 发送第一个请求，获取 id
                  sql="{call AXJ_qiegeguanli_threelinetask_renwuguanli(?,?,?)}~"+JSON.stringify(this.subval);
                  let param = new URLSearchParams(); 
                  param.append("gongneng",'任务修改');
                  param.append("sql",sql);
                  param.append("flag",1);
                  param.append("anquanma",json["anquanma"]);
				  
                  this.$http.post('../mysqlInsert/mysql.jsp',param).then(({ data }) => {
                     let result=$(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);
                              resolve();
                              window.location.reload();
                          }
                      }else{
                          alert("任务修改成功！")
                          window.location.reload();
						  
                      } 
                    }).catch(err => {
                      console.log(err.msg);
                    });
                })
          },
          renwuguanli(){
              this.getMSgs().then(() => {
                  let param = new URLSearchParams(); 
                  param.append("zt",this.subval.type); 
                  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: ' + "服务器机器连接发生错误！"); 
                    });  
              })
          },
          renwuguanliquxiao:function(){
              this.subval='';
@@ -216,6 +267,8 @@
          let sql="{call AXJ_qiegeguanli_threelinetask_list1()}";
         let flag=2;
         loadAjxs('任务查询成功',sql,flag,"shuzu"); 
         sql="{call AXJ_qiegeguanli_peifanghao_cahxun()}";
         loadAjxs('配方号查询',sql,flag,"peifanhao"); 
      }

})

 gmms/WebContent/yuanpiancangchu/cangchurenwuxinxi.jsp

@@ -67,7 +67,7 @@
    </script>
</head>

<body style="padding: 20px;background-color:#D5EAFF;height:100%">
<body style="background-color:#D5EAFF;height:100%">
    <!-- Content Wrapper. Contains page content -->
    <div class="" id='app' style='background-color:#D5EAFF;height:100%'>
        <!-- Content Header (Page header) -->
@@ -90,13 +90,13 @@
            <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]">{{connect[0][0]}}</span> 
                <span :class="connect[0]['1_classname']">{{connect[0]['0_connect_state']}}</span> 
                </div>
                <!-- /.box-header -->
                <button type="button" @click="delAll('重新开始')" class="btn btn-primary ">重新开始</button>
                <button type="button" @click="delAll('完成')" class="btn btn-primary ">任务完成</button>
                <button type="button" @click="delAll('删除')" class="btn btn-primary ">删除任务</button>
                <div class="box-body" style="height:450px;overflow-y:auto;">
                <div class="box-body" style="height:365px;overflow-y:auto;">
                    <table class="table table-striped table-hover"
                    style="font-size: 18px;" id="example2">
                    <thead>
@@ -113,12 +113,12 @@
                    <tbody>
                        <tr v-for="items in shuzu">
                            <td><input v-model="shelftaskids" type='checkbox'  :value="items[0]"/></td>
                            <td>{{items["0"]}}</td>
                             <td>{{items[1]}}</td> 
                            <td>{{items[2]}}</td>
                            <td>{{items[8]}}</td>
                            <td>{{items[9]}}</td>
                            <td>{{items[6]}}</td> 
                            <td>{{items['0_id']}}</td>
                             <td>{{items['1_task_type']}}</td> 
                            <td>{{items['2_task_state']}}</td>
                            <td>{{items['8_raw_thickness']}}</td>
                            <td>{{items['9_color']}}</td>
                            <td>{{items['6_start_time']}}</td> 
                        </tr> 
                    </tbody>
                </table>

			@@ -1,2 +1,3 @@
			eclipse.preferences.version=1
			encoding//WebContent/dapingxianshi/dakongdaping.jsp=UTF-8
			encoding//WebContent/login/machinelistcontent.jsp=UTF-8

New file
			@@ -0,0 +1,185 @@
			<%@page import="ng.db.DBHelper"%>
			<%@ page contentType="text/html;charset=UTF-8"%>
			<%-- <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> --%>
			<c:set var="ctx" value="${pageContext.request.contextPath}" />
			<html>
			<head>
			<title>打孔大屏</title>

			<!-- Font Awesome -->
			<link rel="stylesheet" href="../static/AdminLTE/bower_components/font-awesome/css/font-awesome.min.css">
			<!-- Ionicons -->
			<link rel="stylesheet" href="../static/AdminLTE/bower_components/Ionicons/css/ionicons.min.css">
			<!-- Theme style -->
			<link rel="stylesheet" href="../static/AdminLTE/dist/css/AdminLTE.min.css">
			<link rel="stylesheet" href="../static/AdminLTE/dist/css/skins/skin-blue.min.css">
			<link rel="stylesheet" href="..//static/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css">
			<style type="text/css">
			@IMPORT url("../static/global/showtask/showtask.css");
			</style>

			<script>
			var contextPath = "${pageContext.request.contextPath}";
			</script>

			<link type="text/css" rel="stylesheet"
			href="../static/css/dataTables.bootstrap.css" />
			<link type="text/css" rel="stylesheet"
			href="../static/css/dataTables.tableTools.css" />

			<script src="../js/jquery-3.4.1.min.js"></script>
			<script src="../js/echarts.min.js"></script>
			<script type="text/javascript" src="../static/js/jquery.dataTables.min.js"></script>
			<script type="text/javascript" src="../static/js/dataTables.bootstrap.js"></script>
			<script type="text/javascript" src="../static/js/dataTables.tableTools.js"></script>
			<script type="text/javascript" src="../static/js/moment.js"></script>
			<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>
			*{
			margin:0;
			padding:0;
			}
			#top{
			height:30%;
			display:flex;
			}
			#center{
			height:40%;
			display:flex;
			}
			#bottom{
			height:30%;
			display:flex;
			}
			.top_div{
			width:25%;
			htight:100%;
			}
			.center_div{
			width:30%;
			htight:100%;
			display:flex;
			flex-wrap: wrap;
			}
			.center_divs{
			width:40%;
			htight:100%;
			}
			.center_div_details{
			height:50%;
			width:100%;
			}
			.bottom_div{
			width:25%;
			htight:100%;
			}
			</style>

			</head>
			<body>
			<div id='app' style='background-color:#D5EAFF;width:100%;height: 100%;'>
			<div id="top">
			<div class="top_div">打孔机1产品图</div>
			<div class="top_div" id="qw">打孔机1电耗</div>
			<div class="top_div">打孔机2电耗</div>
			<div class="top_div">打孔机2产品图</div>
			</div>
			<div id="center">
			<div class="center_div">
			<div class="center_div_details">打孔机1用水</div>
			<div class="center_div_details">打孔机3用水</div>
			</div>
			<div class="center_divs">
			查询
			</div>
			<div class="center_div">
			<div class="center_div_details">打孔机2用水</div>
			<div class="center_div_details">打孔机4用水</div>
			</div>
			</div>
			<div id="bottom">
			<div class="bottom_div">打孔机1产品图</div>
			<div class="bottom_div">打孔机1电耗</div>
			<div class="bottom_div">打孔机2电耗</div>
			<div class="bottom_div">打孔机2产品图</div>
			</div>
			</div>
			<script>
			window.onload=function(){
			zhutu();
			}
			function zhutu () {

			var chartDom = document.getElementById('qw');
			var myChart = echarts.init(chartDom);
			var option;

			option = {
			tooltip: {
			trigger: 'axis',
			axisPointer: {
			type: 'shadow'
			}
			},
			grid: {
			left: '3%',
			right: '4%',
			bottom: '3%',
			containLabel: true
			},
			xAxis: [
			{
			type: 'category',
			data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
			axisLine: { lineStyle: { color: 'rgb(30, 144, 255)' } },
			axisLabel: { color: 'rgb(30, 144, 255)' },
			splitLine: { lineStyle: { color: 'rgb(30, 144, 255)', type: 'dashed' } }
			}
			],
			yAxis: [
			{
			type: "value",
			name: "水耗",
			nameTextStyle: {
			color: "rgb(30, 144, 255)",
			fontSize: 12,
			padding: [0, 0, 0, -30], //name文字位置对应上右下左
			},
			splitLine: {
			// 网格线
			show: true,
			lineStyle: { //分割线
			color: "rgb(30, 144, 255)",
			width: 1,
			type: "dashed" //dotted：虚线 solid:实线
			}
			},
			axisLabel: {
			// 轴文字
			color: "rgb(30, 144, 255)",
			fontSize: 12,
			},
			},

			],
			series: [
			{
			name: '电耗',
			type: 'bar',
			barWidth: '80%',
			data: [10, 52, 200, 334, 390, 330, 220],
			itemStyle: { color: 'rgb(30, 144, 255)' }
			},

			]
			};

			option && myChart.setOption(option);
			}
			</script>
			</body>
			</html>

			@@ -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();

			@@ -12012,3 +12012,15 @@
			return Vue;

			}));
			Vue.directive('preventreclick', {
			inserted(el, binding) {
			el.addEventListener('click', () => {
			if (!el.disabled) {
			el.disabled = true
			setTimeout(() => {
			el.disabled = false
			}, binding.value \|\| 2000)
			}
			})
			}
			});

			@@ -1,8 +1,24 @@
			<%@page import="builder.Manager"%>
			<%

			<<<<<<< HEAD

			Manager.sendtoPLC(76,20,4,new byte[]{0,1,0,1},0);
			Manager.sendtoPLC(77,20,4,new byte[]{0,1,0,1},0);
			=======
			String zt=request.getParameter("zt");
			String peifanhao=request.getParameter("peifanhao");

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

			/* Manager.sendtoPLC(76,20,4,new byte[]{0,1,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);
			}
			>>>>>>> 09a05342f4c60c834c3ee17a13529cd91c624f34

			%>

			@@ -24,7 +24,7 @@
			</head>
			<body>
			<div id="app" >
			<el-container >
			<el-container v-loading="loading" >
			<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%;"
			@@ -43,7 +43,6 @@
			</el-header>
			<el-main >
			<el-table v-show="showFlag"
			v-loading="loading"
			:data="orderData"
			max-height="600"
			style="width: 100%;">
			@@ -60,7 +59,9 @@
			<el-button v-if="orderData[scope.$index]['11_order_status']<2"
			@click.native.prevent="updateOrderState(scope.$index, orderData)"
			type="text"
			size="small">
			size="small"
			v-preventReClick
			>
			{{orderData[scope.$index]['11_order_status']==0?'审核':'反审'}}
			</el-button>

			@@ -68,13 +69,14 @@
			@click.native.prevent="updateRow(scope.$index, orderData)"
			type="text"
			size="small">
			修改
			修改
			</el-button>
			<el-button
			v-if="orderData[scope.$index]['11_order_status']>1"
			@click.native.prevent="open(scope.$index, orderData)"
			type="text"
			size="small">
			次破
			次破
			</el-button>


			@@ -94,8 +96,8 @@

			<el-form v-show="!showFlag" :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" style="width: 25%;margin: auto;">
			<el-form-item>
			<el-button v-show="updateShowFlag" type="primary" @click="updateGlassSub('ruleForm')">修改</el-button>
			<el-button v-show="!updateShowFlag" type="primary" @click="submitForm('ruleForm')">提交</el-button>
			<el-button v-show="updateShowFlag" type="primary" @click="updateGlassSub('ruleForm')" v-preventReClick >修改</el-button>
			<el-button v-show="!updateShowFlag" type="primary" @click="submitForm('ruleForm')" v-preventReClick >提交</el-button>
			<el-button @click="resetForm('ruleForm')">重置</el-button>
			</el-form-item>

			@@ -136,7 +138,7 @@

			<el-form-item>
			<el-button @click="resetForm('wornGlass');wornGlassFLAG = false">取消</el-button>
			<el-button v-show="!updateShowFlag" type="primary" @click="wornSub('wornGlass')">提交</el-button>
			<el-button v-show="!updateShowFlag" type="primary" @click="wornSub('wornGlass')" v-preventReClick>提交</el-button>
			</el-form-item>
			</el-form>

			@@ -215,7 +217,7 @@
			ruleForm: {
			produceid:"",
			glassNum:"",
			creator:""
			creator:'<%= request.getParameter("xingming") %>'
			},
			rules: {
			produceid: [
			@@ -258,7 +260,7 @@
			return false;
			}
			let sql="{call AXJ_a_order_add(?,?,?,?)}~"+JSON.stringify(this.ruleForm);
			this.connects("订单新增",sql,1,1);
			this.connects("订单新增",sql,1,1);
			});
			},
			resetForm(formName) {//清除新增重置
			@@ -274,7 +276,7 @@
			this.updateShowFlag=true;
			let rowObj=row[index]
			this.ruleForm.glassNum=rowObj["5_smallglass_no"]
			this.ruleForm.produceid=rowObj["2_recipe_no"]
			this.ruleForm.produceid=rowObj["12_id"]
			this.updateOrder.id=rowObj["0_id"]

			},
			@@ -318,7 +320,8 @@
			if(arrFlag==0){
			sql="{call AXJ_a_order_select_into()}"
			}
			loadAjxs('产品查询',sql,2,"orderData")
			this.loading=true
			this.loadAjxss('订单查询',sql,2,"orderData")
			},
			selectTimeOrder:function(){
			let arrObj={}
			@@ -335,7 +338,9 @@
			arrObj.endtime=''
			sql="{call AXJ_a_order_select_into()}"
			}
			loadAjxs('产品查询',sql,2,"orderData")
			this.loading=true
			this.loadAjxss('订单查询',sql,2,"orderData")
			//loadAjxs('产品查询',sql,2,"orderData")

			},
			open(index,row) {//打开刺破界面

			@@ -46,7 +46,7 @@
			@click.native.prevent="updateRow(scope.$index, produceData)"
			type="text"
			size="small">
			修改
			修改
			</el-button>
			</template>
			</el-table-column>
			@@ -67,8 +67,8 @@

			<el-form v-show="!showFlag" :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" style="width: 25%;float: right;margin-right: 20%;">
			<el-form-item>
			<el-button v-show="updateShowFlag" type="primary" @click="updateGlassSub('ruleForm')">修改</el-button>
			<el-button v-show="!updateShowFlag" type="primary" @click="submitForm('ruleForm')">提交</el-button>
			<el-button v-show="updateShowFlag" type="primary" @click="updateGlassSub('ruleForm')" v-preventReClick ='3000'>修改</el-button>
			<el-button v-show="!updateShowFlag" type="primary" @click="submitForm('ruleForm')" v-preventReClick='3000'>提交</el-button>
			<el-button @click="resetForm('ruleForm')">重置</el-button>
			</el-form-item>

			@@ -189,7 +189,7 @@
			thickness: '',
			color:'',
			optNum:'',
			creator:'',
			creator:'<%= request.getParameter("xingming") %>',
			route:''
			},
			rules: {
			@@ -237,8 +237,9 @@
			if (!valid) {
			return false;
			}
			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) {
			@@ -326,7 +327,6 @@

			})




			</script>

			@@ -1,4 +1,5 @@
			<%@ page contentType="text/html;charset=UTF-8"%>
			<%@page import="ng.db.DBHelper"%>
			<c:set var="ctx" value="${pageContext.request.contextPath}" />

			<html>
			@@ -122,7 +123,7 @@

			<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: #5CADFE' class='btn btn-large btn-success' >手动完成</button>
			<button @click="dainjishijian('取消任务',item['0_id'])" style='background-color: #5CADFE' class='btn btn-large btn-success' >取消任务</button>
			</td>
			<!-- <td v-else-if="item[11]==2">
			<button @click="dainjishijian('重新下发',item[0])" style='background-color: #5CADFE' class='btn btn-large btn-success' >重新下发</button>
			@@ -154,7 +155,7 @@
			<button type="button" @click='renwuguanliquxiao' class="btn btn-default btn-lg"
			data-dismiss="modal">取消</button>

			<button id="dianjishijian" @click='renwuguanli' type="button" class="btn btn-primary btn-lg"
			<button id="dianjishijian" @click='getMSg' type="button" class="btn btn-primary btn-lg"
			id="surefinish">确认</button>
			</div>
			</div>
			@@ -168,9 +169,11 @@
			<script src="../js/jquery-3.4.1.min.js"></script>
			<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>
			Vue.prototype.$http= axios
			let app = new Vue({
			el:'#app',
			mixins:[mixin],
			@@ -178,6 +181,7 @@
			shuzu:[],
			shuzu1:[],
			lines:<%= request.getParameter("id") %>,
			peifanhao:[],
			subval:{
			id:'',
			type:''
			@@ -198,10 +202,57 @@
			}
			this.subval.id=id
			},
			renwuguanli:function(){
			sql="{call AXJ_qiegeguanli_threelinetask_renwuguanli(?,?,?)}~"+JSON.stringify(this.subval);
			console.log(sql);
			this.connects("任务修改",sql,1,1)
			getMSg(){
			//this.getMSgs();
			this.renwuguanli();
			},
			getMSgs(){
			return new Promise((resolve, reject) => {
			// 发送第一个请求，获取 id
			sql="{call AXJ_qiegeguanli_threelinetask_renwuguanli(?,?,?)}~"+JSON.stringify(this.subval);
			let param = new URLSearchParams();
			param.append("gongneng",'任务修改');
			param.append("sql",sql);
			param.append("flag",1);
			param.append("anquanma",json["anquanma"]);

			this.$http.post('../mysqlInsert/mysql.jsp',param).then(({ data }) => {
			let result=$(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);
			resolve();
			window.location.reload();
			}
			}else{
			alert("任务修改成功！")
			window.location.reload();

			}
			}).catch(err => {
			console.log(err.msg);
			});
			})
			},
			renwuguanli(){
			this.getMSgs().then(() => {
			let param = new URLSearchParams();
			param.append("zt",this.subval.type);
			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: ' + "服务器机器连接发生错误！");
			});
			})
			},
			renwuguanliquxiao:function(){
			this.subval='';
			@@ -216,6 +267,8 @@
			let sql="{call AXJ_qiegeguanli_threelinetask_list1()}";
			let flag=2;
			loadAjxs('任务查询成功',sql,flag,"shuzu");
			sql="{call AXJ_qiegeguanli_peifanghao_cahxun()}";
			loadAjxs('配方号查询',sql,flag,"peifanhao");
			}

			})

			@@ -67,7 +67,7 @@
			</script>
			</head>

			<body style="padding: 20px;background-color:#D5EAFF;height:100%">
			<body style="background-color:#D5EAFF;height:100%">
			<!-- Content Wrapper. Contains page content -->
			<div class="" id='app' style='background-color:#D5EAFF;height:100%'>
			<!-- Content Header (Page header) -->
			@@ -90,13 +90,13 @@
			<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]">{{connect[0][0]}}</span>
			<span :class="connect[0]['1_classname']">{{connect[0]['0_connect_state']}}</span>
			</div>
			<!-- /.box-header -->
			<button type="button" @click="delAll('重新开始')" class="btn btn-primary ">重新开始</button>
			<button type="button" @click="delAll('完成')" class="btn btn-primary ">任务完成</button>
			<button type="button" @click="delAll('删除')" class="btn btn-primary ">删除任务</button>
			<div class="box-body" style="height:450px;overflow-y:auto;">
			<div class="box-body" style="height:365px;overflow-y:auto;">
			<table class="table table-striped table-hover"
			style="font-size: 18px;" id="example2">
			<thead>
			@@ -113,12 +113,12 @@
			<tbody>
			<tr v-for="items in shuzu">
			<td><input v-model="shelftaskids" type='checkbox' :value="items[0]"/></td>
			<td>{{items["0"]}}</td>
			<td>{{items[1]}}</td>
			<td>{{items[2]}}</td>
			<td>{{items[8]}}</td>
			<td>{{items[9]}}</td>
			<td>{{items[6]}}</td>
			<td>{{items['0_id']}}</td>
			<td>{{items['1_task_type']}}</td>
			<td>{{items['2_task_state']}}</td>
			<td>{{items['8_raw_thickness']}}</td>
			<td>{{items['9_color']}}</td>
			<td>{{items['6_start_time']}}</td>
			</tr>
			</tbody>
			</table>