From ec524f7cff28830529a437c41dfe442c629e08ee Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 26 七月 2023 16:01:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.150:10101/r/Haier_MES
---
gmms/WebContent/qiegeguanli/qiegerenwu.jsp | 65 +++++++++++++++++++++++++++++---
1 files changed, 59 insertions(+), 6 deletions(-)
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");
}
})
--
Gitblit v1.8.0