海尔mes项目
parent: f7572dc1 | 补丁 | 提交 | ignore whitespace
ZengTao
2023-07-20 2f8eda97306800b58723e95e620d4de3c8017cf3 
Merge branch 'master' of http://10.153.19.150:10101/r/Haier_MES
10个文件已修改
194 ■■■■■ 已修改文件
gmms/WebContent/js/mixins.js 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/login/bdg.jsp 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/login/index.jsp 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/login/machinelistcontent.jsp 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/login/quanxian.jsp 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/login/shuoming.jsp 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/mysqlInsert/mysql.jsp 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/orderManage/order.jsp 101 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/qiegeguanli/qiegerenwu.jsp 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/yuanpiancangchu/cangchurenwuxinxi.jsp 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 gmms/WebContent/js/mixins.js


@@ -38,6 +38,35 @@


                    return false;


                });


      },


      loadAjxss:function(gongneng,sql,flag,vals){


          let param = new URLSearchParams(); 


          param.append("yemian","123"); 


          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(flag==2){


                    let result=$(response.data).text();


                    let index = result.indexOf("[{");


                    if(index>-1){


                        result=result.substring(index).trim();


                        app.$data[vals]=JSON.parse(result);


                        app.$data["loading"]=false;


                        console.log(vals+":");


                        console.log(app.$data[vals]);


                    }else if(result.indexOf("[[anquanmaerr]]")>-1){


                        //alert('请先登录后操作');


                        window.parent.location.href='../login/index.jsp';


                    }


                }


            })


            .catch(function (error) {


                alert('Error: ' + "服务器数据发生错误！"); 


            });


        }


    }


}


//gongneng:自定义，sql存储过程，flag标志(0,是用张工之前功能插入，1存储过程查询，2存储过程插入)，vals：vue里data参数




 gmms/WebContent/login/bdg.jsp


@@ -26,6 +26,7 @@


    border-radius: 0px 2px 2px 0px;


}


html,body{




    height:99%;


    width:100%;


    margin:0;


@@ -67,7 +68,7 @@


                   


          }


          else{


             out.print("<script type='text/javascript'>alert('请先登录后操作');document.location.href='index.jsp';</script>");


             out.print("<script type='text/javascript'>alert('请先登录后操作');window.parent.location.href='index.jsp';</script>");


         }  


         


    }




 gmms/WebContent/login/index.jsp


@@ -242,7 +242,7 @@


                       anquanma=css.getString(5);


                       dengji=css.getString(6);


                       if(fanhui1==5000){


                             out.print("<script type='text/javascript'>window.location.href='bdg.jsp?loginname="+uname+"&xingming="+xingming+"&bumen="+bumen+"&dengji="+dengji+"&anquanma="+anquanma+"&adminid="+aid+"&yuyan="+yuyan+"';</script>");


                             out.print("<script type='text/javascript'>localStorage.clear();window.location.href='bdg.jsp?loginname="+uname+"&xingming="+xingming+"&bumen="+bumen+"&dengji="+dengji+"&anquanma="+anquanma+"&adminid="+aid+"&yuyan="+yuyan+"';</script>");


                       }


                       else{


                             out.print("<script type='text/javascript'>alert('安全码无效')</script>");




 gmms/WebContent/login/machinelistcontent.jsp


@@ -22,20 +22,16 @@


  .el-table .success-row {


    background: oldlace;


  }


  html,body{


    height:99%;


    width:100%;


    margin:0;


    padding:0


}


</style>




</style>


<title>Insert title here</title>


</head>


<body>


 <div id="app" style="width:100%">


 <div id="app" style="display:width:100%">


     <el-table border


      :data="machine"


      height='650'


      height='700'


      style="width: 100%;"


       :row-class-name="tableRowClassName"


      >


@@ -53,7 +49,7 @@


      </el-table-column>


      <el-table-column


        prop="st"


        label="状态">


        label="状态̬">


      </el-table-column>


      <el-table-column


        prop="count"




 gmms/WebContent/login/quanxian.jsp


@@ -99,8 +99,16 @@


        


    </div>


    <script>


    


    window.onload=function(){


        if(localStorage.getItem("newPage")!=null){


            let url=localStorage.getItem("newPage");


            url=url+'&'+window.parent.location.search.substr(1);


            window.parent.document.getElementById("main").src = url;	


        }


    	


    }


        function tiaoz(n){


            localStorage.setItem("newPage",n);


            n=n+'&'+window.parent.location.search.substr(1);


            window.parent.document.getElementById("main").src = n;


            //window.open(n);




 gmms/WebContent/login/shuoming.jsp


@@ -40,7 +40,7 @@


     }


     if(coun!=0){


         if("cn".equals(cn)){


             out.println("<img  src='../img/2.ico'; style='float:left;width:70px; height: 46px;' />");


             out.println("<img onclick='dataOpen2()' src='../img/2.ico'; style='float:left;width:70px; height: 46px;' />");


             out.println(" <span>&nbsp;&nbsp;&nbsp;&nbsp;欢迎&nbsp;&nbsp;&nbsp;<label style='color:#5CADFE;'>"+xingming+"</label>&nbsp;&nbsp;使用北玻MES系统！</span><span id='spanTime' style=''color: red'>距离自动离开本系统还有"+dengji+"分钟</span>");


         }


         


@@ -54,7 +54,7 @@


         if("cn".equals(cn)){


             out.print("<script type='text/javascript'>alert('请先登录后操作!');top.window.location.href='index.jsp';</script>");


         }else if("en".equals(cn)){


             out.print("<script type='text/javascript'>alert('Please login before operation');document.location.href='index.jsp';</script>");


             out.print("<script type='text/javascript'>alert('Please login before operation');top.window.location.href='index.jsp';</script>");


         } 


        


     }


@@ -223,6 +223,15 @@


    window.open('./admin/adminSet.jsp?adminid=<%out.print(request.getParameter("adminid"));%>&yuyan=<% out.print(request.getParameter("yuyan")); %>&anquanma=<% out.print(request.getParameter("anquanma")); %>');


    


}


function dataOpen2(){


	


    let n='machinelistcontent.jsp?id=machinelistcontent'


    n=n+'&'+window.parent.location.search.substr(1)


    localStorage.setItem("newPage",n);


    window.parent.document.getElementById("main").src = n


	


	


}


    








 gmms/WebContent/mysqlInsert/mysql.jsp


@@ -4,6 +4,7 @@


request.setCharacterEncoding("UTF-8");


response.setCharacterEncoding("UTF-8");


response.setContentType("text/html; charset=utf-8");


response.setHeader("Access-Control-Allow-Origin","*");


%>


<html>


<head>




 gmms/WebContent/orderManage/order.jsp


@@ -25,7 +25,7 @@


<body>


  <div id="app" >


    <el-container >


      <el-header style="height: 3%;">


      <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%;"


          v-model="selectdate"


@@ -43,6 +43,7 @@


      </el-header>


      <el-main  >


        <el-table v-show="showFlag"


          v-loading="loading"


          :data="orderData"


          max-height="600"


          style="width: 100%;">


@@ -53,7 +54,7 @@


            :key="index"


            :label="item"


            >


            <el-table-column :prop="keys" v-if="index==0">


            <el-table-column :prop="keys" v-if="index==0" width=130>


              <template slot-scope="scope" v-if="Object.keys(orderData[0]).length!=0">




                <el-button v-if="orderData[scope.$index]['11_order_status']<2"


@@ -69,6 +70,13 @@


                  size="small">


                  修改


                </el-button>


                <el-button 


                  @click.native.prevent="open(scope.$index, orderData)"


                  type="text"


                  size="small">


                  次破


                </el-button>




                


              </template>


            </el-table-column>


@@ -112,30 +120,42 @@


          


          


        </el-form>


        


        <el-dialog


          title="刺破"


          :visible.sync="wornGlassFLAG"


          width="30%"


          center>


          <span style="text-align: center;">


            <el-form :model="wornGlass" ref="wornGlass" :rules="rules">


              <el-form-item label="次破数量:" prop="wornNum">


                <el-input for="a" style="width: 50%;"  v-model.number="wornGlass.wornNum"  autocomplete="off" ></el-input>


              </el-form-item>


              <el-form-item label="次破原因:" >


                <el-input  for="b" style="width: 50%;"  v-model.number="wornGlass.reason"  autocomplete="off" ></el-input>


              </el-form-item>


              


              <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-form-item>


            </el-form>


            


          </span>


          <!-- <span slot="footer" class="dialog-footer">


            


            <el-button type="primary" @click="wornSub">确 定</el-button>


          </span> -->


        </el-dialog>


      </el-main>


      <!-- <el-footer style="background-color: azure;"></el-footer> -->


    </el-container>


    


    


      






    




    




     








     


  </div>


</body>


  <!-- import Vue before Element -->


  <script src="../js/jquery-3.4.1.min.js"></script>


  


  <script src="../js/static/js/vue.js"></script>


  <script src="../js/axios.min.js"></script>


  <script src="../js/mixins.js"></script>


  <!-- import JavaScript -->


  <script src="../js/static/js/element.js"></script>


@@ -143,6 +163,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],


@@ -182,7 +203,7 @@


         let reg = new RegExp(`^[0-9]*[1-9][0-9]*$`)




          if (!reg.test(value)) { 


            callback(new Error('请输入正整数的厚度'));


            callback(new Error('请输入正整数'));


          }else {


              callback();


          }


@@ -190,7 +211,8 @@


        }, 1000);


      };


      return {


        ruleForm: {


          loading:true,//页面加载flag


          ruleForm: {


          produceid:"",


          glassNum:"",


          creator:""


@@ -201,7 +223,10 @@


          ],


          glassNum: [


            { validator: checkInt, trigger: 'blur' }


          ]


          ],


          wornNum: [


            { validator: checkInt, trigger: 'blur' }


          ],


          


        },


        tableHead:[],


@@ -213,8 +238,14 @@


        },


        orderProduce:[],


        fileList:[],


        slectOrder:["","","","","","","","","",""],


        selectdate:''


        slectOrder:["","","","","","","","","",""],//筛选参数


        selectdate:["",""],//日期参数


        wornGlassFLAG: false,//次破界面显示标记


        wornGlass:{//破损提交参数


          glassID:'',


          wornNum:'',


          reason:''


        }






      };


@@ -306,7 +337,25 @@


          }


          loadAjxs('产品查询',sql,2,"orderData")




        },


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


          this.wornGlassFLAG= true


          this.wornGlass.glassID=row[index]['0_id']


          //wornGlass.wornNum:'',


          //wornGlass.reason:''


        },


        wornSub(formName){//刺破提交


          


          this.$refs[formName].validate((valid) => {


            if (!valid) { 


              return false;


            }


            this.wornGlassFLAG = false


            let sql="{call AXJ_a_order_glassWorn(?,?,?,?)}~"+JSON.stringify(this.wornGlass);


                  this.connects("订单小片破损",sql,1,1);


          });


        }


        


      },


      computed:{


        


@@ -314,7 +363,9 @@


      mounted() {


        let sql="{call AXJ_a_order_select_into()}"


        let flag=2;


        loadAjxs('订单初始查询',sql,flag,"orderData")


        this.loadAjxss('订单初始查询',sql,flag,"orderData")


        


        /* loadAjxs('订单初始查询',sql,flag,"orderData") */


        


        sql="{call AXJ_a_orderHeader_select()}"


        loadAjxs('订单表头',sql,flag,"tableHead")


@@ -324,9 +375,5 @@


      },




    })


    








  </script>


</html>




 gmms/WebContent/qiegeguanli/qiegerenwu.jsp


@@ -109,7 +109,8 @@


                                    手动完成


                                </td>


                                <td v-else>


									


									 


									 


                                </td>


                                <td>{{item['12_order_maker']}}</td>


                                <td  v-if="item['11_order_status']==1">




 gmms/WebContent/yuanpiancangchu/cangchurenwuxinxi.jsp


@@ -67,7 +67,7 @@


    </script>


</head>




<body style="background-color:#D5EAFF;height:100%">


<body style="padding: 20px;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_classname']">{{connect[0]['0_connect_state']}}</span> 


                <span :class="connect[0][1]">{{connect[0][0]}}</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:365px;overflow-y:auto;">


                <div class="box-body" style="height:450px;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_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> 


                            <td>{{items["0"]}}</td>


                             <td>{{items[1]}}</td> 


                            <td>{{items[2]}}</td>


                            <td>{{items[8]}}</td>


                            <td>{{items[9]}}</td>


                            <td>{{items[6]}}</td> 


                        </tr> 


                    </tbody>


                </table>