From 4f3d3d2c77d5d81290c4cbf09fc5938c4e4f3d96 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 七月 2023 15:58:11 +0800
Subject: [PATCH] 1
---
gmms/WebContent/WEB-INF/lib/mysql-connector-java-8.0.20.jar | 0
gmms/WebContent/qiegeguanli/qiegerenwu.jsp | 276 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
.gitignore | 1
gmms/WebContent/WEB-INF/lib/nglib.jar | 0
gmms/WebContent/WEB-INF/lib/fastjson-1.2.76.jar | 0
5 files changed, 276 insertions(+), 1 deletions(-)
diff --git a/.gitignore b/.gitignore
index 32858aa..d33629a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
.mtj.tmp/
# Package Files #
-*.jar
*.war
*.ear
diff --git a/gmms/WebContent/WEB-INF/lib/fastjson-1.2.76.jar b/gmms/WebContent/WEB-INF/lib/fastjson-1.2.76.jar
new file mode 100644
index 0000000..c241c1d
--- /dev/null
+++ b/gmms/WebContent/WEB-INF/lib/fastjson-1.2.76.jar
Binary files differ
diff --git a/gmms/WebContent/WEB-INF/lib/mysql-connector-java-8.0.20.jar b/gmms/WebContent/WEB-INF/lib/mysql-connector-java-8.0.20.jar
new file mode 100644
index 0000000..f4bd739
--- /dev/null
+++ b/gmms/WebContent/WEB-INF/lib/mysql-connector-java-8.0.20.jar
Binary files differ
diff --git a/gmms/WebContent/WEB-INF/lib/nglib.jar b/gmms/WebContent/WEB-INF/lib/nglib.jar
new file mode 100644
index 0000000..bc242b8
--- /dev/null
+++ b/gmms/WebContent/WEB-INF/lib/nglib.jar
Binary files differ
diff --git a/gmms/WebContent/qiegeguanli/qiegerenwu.jsp b/gmms/WebContent/qiegeguanli/qiegerenwu.jsp
new file mode 100644
index 0000000..c56e61d
--- /dev/null
+++ b/gmms/WebContent/qiegeguanli/qiegerenwu.jsp
@@ -0,0 +1,276 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@page import="ng.db.DBHelper"%>
+<c:set var="ctx" value="${pageContext.request.contextPath}" />
+
+<html>
+<head>
+<link rel="stylesheet" href="../static/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css">
+<!-- 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/css/element.css">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+
+
+<script type="text/javascript">
+/* var interval = setInterval('refreshStatus()', 20000);
+ $(document).ready(function(){
+ var info = $("#info").attr("info");
+ $("#infos").html(info);
+ }); */
+ // 璁惧椤甸潰鑷姩鍒锋柊
+/* function refreshStatus() {
+ window.location.reload();
+ }
+ // 鍋滄椤甸潰鑷姩鍒锋柊
+ function disableAutoRefresh() {
+ clearInterval(interval);
+ } */
+
+
+
+
+</script>
+<style>
+ .box table tr th,.box table tr td{
+ text-align:center;
+ }
+</style>
+<title>浠诲姟</title>
+</head>
+<body style="padding: 20px;background-color:#D5EAFF;height:100%">
+ <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>璁㈠崟浠诲姟 <small></small></h1>
+
+ <ol class="breadcrumb">
+
+
+ </a></li>
+ </ol>
+ </section>
+
+ <div id = "allstatu" ></div>
+ <div id = "info" ></div>
+ <!-- Main content -->
+ <input style="display:none" type="text" name="groups" value="${groups}" />
+ <section class="content container-fluid" style="padding: 0px;">
+ <div>
+ </div>
+
+ <div class="box" style="height: 600px; overflow: auto;margin-top: 10px;">
+ <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>
+ <th>鍘氬害</th>
+ <th>鍘熺墖鎬绘暟閲�</th>
+ <th>鍘熺墖宸插姞宸ユ暟閲�</th>
+ <th>灏忕墖鎬绘暟閲�</th>
+ <th>灏忕墖宸插姞宸ユ暟閲�</th>
+ <th>璁㈠崟鐘舵��</th>
+ <th>鍒跺崟浜�</th>
+ <th>鎿嶄綔</th>
+
+ </tr>
+ </thead>
+ <tbody>
+ <tr v-for="item in shuzu">
+ <td>{{item['1_order_id']}}</td>
+ <td>{{item['2_original_width']}}</td>
+ <td>{{item['3_original_height']}}</td>
+ <td>{{item['4_width']}}</td>
+ <td>{{item['5_height']}}</td>
+ <td>{{item['6_thickness']}}</td>
+ <td>{{item['7_largeglass_no']}}</td>
+ <td>{{item['8_largeglass_completed']}}</td>
+ <td>{{item['9_smallglass_no']}}</td>
+ <td>{{item['10_smallglass_completed']}}</td>
+ <td v-if="item['11_order_status']==1">
+ 宸蹭笅鍙�
+ </td>
+ <td v-else-if="item['11_order_status']==2">
+ 宸查鍙�
+ </td>
+ <td v-else-if="item['11_order_status']==3">
+ 宸插畬鎴�
+ </td>
+ <td v-else-if="item['11_order_status']==4">
+ 鎵嬪姩瀹屾垚
+ </td>
+ <td v-else>
+
+
+ </td>
+ <td>{{item['12_order_maker']}}</td>
+ <td v-if="item['11_order_status']==1">
+ <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_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: #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>
+ </td> -->
+ <td v-else>
+
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <div class="modal fade" id="modify-info" tabindex="-1" role="dialog"
+ aria-labelledby="myModalLabel" aria-hidden="true">
+ <form class="form-horizontal" role="form">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <input type='hidden' id = "lineprint">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal"
+ aria-hidden="true">×</button>
+ <h3 class="modal-title" id="myModalLabel">鎻愮ず淇℃伅</h3>
+ </div>
+ <div class="modal-body" style="text-align: left;">
+ <h3>鎮ㄧ‘瀹氳鎵ц褰撳墠鎿嶄綔鍚楋紵</h3>
+ </div>
+ <div class="modal-footer">
+
+ <button type="button" @click='renwuguanliquxiao' class="btn btn-default btn-lg"
+ data-dismiss="modal">鍙栨秷</button>
+
+ <button id="dianjishijian" @click='getMSg' type="button" class="btn btn-primary btn-lg"
+ id="surefinish">纭</button>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+
+ </section>
+ <!-- /.content -->
+ </div>
+<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],
+ data:{
+ shuzu:[],
+ shuzu1:[],
+ lines:<%= request.getParameter("id") %>,
+ peifanhao:[],
+ subval:{
+ id:'',
+ type:''
+ }
+ },
+ methods:{
+ dainjishijian:function(type,id){
+ console.log(type,id);
+ $("#modify-info").modal('show');
+ if(type=="棰嗗彇浠诲姟"){
+ this.subval.type=2;
+ }else if(type=="缁撴潫浠诲姟"){
+ this.subval.type=3;
+ }else if(type=="鎵嬪姩瀹屾垚"){
+ this.subval.type=4;
+ }else if(type=="鍙栨秷浠诲姟"){
+ this.subval.type=1;
+ }
+ this.subval.id=id
+ },
+ 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='';
+ }
+
+ },
+ mounted:function(){
+ let canshu={
+ line:<%= request.getParameter("id") %>
+ }
+ 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");
+ }
+
+})
+ </script>
+</body>
+</html>
\ No newline at end of file
--
Gitblit v1.8.0