From 09a05342f4c60c834c3ee17a13529cd91c624f34 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 26 七月 2023 10:05:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.150:10101/r/Haier_MES
---
gmms/WebContent/WEB-INF/lib/mysql-connector-java-8.0.20.jar | 0
gmms/WebContent/qiegeguanli/qiegerenwu.jsp | 65 +++++++++++++++++++--
gmms/WebContent/mysqlInsert/toPlc.jsp | 18 ++++++
.gitignore | 1
gmms/WebContent/login/bdg.jsp | 7 -
gmms/WebContent/js/mixins.js | 57 ++++++++++---------
gmms/WebContent/WEB-INF/lib/nglib.jar | 0
gmms/WebContent/yuanpiancangchu/cangchurenwuxinxi.jsp | 18 +++---
gmms/WebContent/WEB-INF/lib/fastjson-1.2.76.jar | 0
9 files changed, 118 insertions(+), 48 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..4d6ba86
--- /dev/null
+++ b/gmms/WebContent/WEB-INF/lib/nglib.jar
Binary files differ
diff --git a/gmms/WebContent/js/mixins.js b/gmms/WebContent/js/mixins.js
index 7181c91..dae06b2 100644
--- a/gmms/WebContent/js/mixins.js
+++ b/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();
diff --git a/gmms/WebContent/login/bdg.jsp b/gmms/WebContent/login/bdg.jsp
index 5c579ae..788e2e6 100644
--- a/gmms/WebContent/login/bdg.jsp
+++ b/gmms/WebContent/login/bdg.jsp
@@ -6,15 +6,12 @@
response.setContentType("text/html; charset=utf-8");
%>
-<%-- <%@ include file="/WEB-INF/../login/check.jsp" %>
- --%>
- <c:set var="ctx" value="${pageContext.request.contextPath}"/>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>鍖楃幓</title>
-<link rel="shortcut icon" href="../img/3.ico" />
+<link rel="shortcut icon" href="../img/3.ico" />
<style>
#top {
background-image: linear-gradient(to right, #C6E2FF, #C6E2FF);
@@ -74,6 +71,6 @@
}
%>
- <iframe id='main' src='machinelistcontent.jsp?adminid="+adminid+"&xingming="+xingming+"&dengji="+dengji+"&anquanma="+anquanma+"&yuyan="+yuyan+"' style="width:87%;height:90%" frameborder='0'></iframe>
+ <iframe id='main' src='machinelistcontent.jsp?adminid="+adminid+"&xingming="+xingming+"&dengji="+dengji+"&anquanma="+anquanma+"&yuyan="+yuyan+"' style="width:87%;height:90%" frameborder='0'></iframe>
</body>
</html>
\ No newline at end of file
diff --git a/gmms/WebContent/mysqlInsert/toPlc.jsp b/gmms/WebContent/mysqlInsert/toPlc.jsp
new file mode 100644
index 0000000..b091225
--- /dev/null
+++ b/gmms/WebContent/mysqlInsert/toPlc.jsp
@@ -0,0 +1,18 @@
+<%@page import="builder.Manager"%>
+<%
+
+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);
+ }
+
+%>
\ No newline at end of file
diff --git a/gmms/WebContent/qiegeguanli/qiegerenwu.jsp b/gmms/WebContent/qiegeguanli/qiegerenwu.jsp
index 0201536..ce9c01d 100644
--- a/gmms/WebContent/qiegeguanli/qiegerenwu.jsp
+++ b/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>
- <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");
}
})
diff --git a/gmms/WebContent/yuanpiancangchu/cangchurenwuxinxi.jsp b/gmms/WebContent/yuanpiancangchu/cangchurenwuxinxi.jsp
index ca9905e..f8a42c0 100644
--- a/gmms/WebContent/yuanpiancangchu/cangchurenwuxinxi.jsp
+++ b/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>
--
Gitblit v1.8.0