From ec82d16c11f85929e5a9ab209d09310c1bef2ea6 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 26 七月 2023 14:30:37 +0800
Subject: [PATCH] 1
---
gmms/WebContent/qiegeguanli/qiegerenwu.jsp | 65 ++++++++
gmms/WebContent/js/static/js/vue.js | 12 +
gmms/WebContent/mysqlInsert/toPlc.jsp | 16 ++
gmms/.settings/org.eclipse.core.resources.prefs | 1
gmms/WebContent/js/mixins.js | 57 ++++---
gmms/WebContent/yuanpiancangchu/cangchurenwuxinxi.jsp | 18 +-
gmms/WebContent/orderManage/order.jsp | 31 ++-
gmms/WebContent/orderManage/produce.jsp | 12
gmms/WebContent/dapingxianshi/dakongdaping.jsp | 185 ++++++++++++++++++++++++++
9 files changed, 336 insertions(+), 61 deletions(-)
diff --git a/gmms/.settings/org.eclipse.core.resources.prefs b/gmms/.settings/org.eclipse.core.resources.prefs
index 5824ff9..f833d73 100644
--- a/gmms/.settings/org.eclipse.core.resources.prefs
+++ b/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
diff --git a/gmms/WebContent/dapingxianshi/dakongdaping.jsp b/gmms/WebContent/dapingxianshi/dakongdaping.jsp
new file mode 100644
index 0000000..5393b21
--- /dev/null
+++ b/gmms/WebContent/dapingxianshi/dakongdaping.jsp
@@ -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>
\ No newline at end of file
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/js/static/js/vue.js b/gmms/WebContent/js/static/js/vue.js
index d800532..f900346 100644
--- a/gmms/WebContent/js/static/js/vue.js
+++ b/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)
+ }
+ })
+ }
+});
diff --git a/gmms/WebContent/mysqlInsert/toPlc.jsp b/gmms/WebContent/mysqlInsert/toPlc.jsp
index 3924bcf..eea7076 100644
--- a/gmms/WebContent/mysqlInsert/toPlc.jsp
+++ b/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
%>
\ No newline at end of file
diff --git a/gmms/WebContent/orderManage/order.jsp b/gmms/WebContent/orderManage/order.jsp
index 1d04cfd..bffba31 100644
--- a/gmms/WebContent/orderManage/order.jsp
+++ b/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) {//鎵撳紑鍒虹牬鐣岄潰
diff --git a/gmms/WebContent/orderManage/produce.jsp b/gmms/WebContent/orderManage/produce.jsp
index c7a6aac..56ae598 100644
--- a/gmms/WebContent/orderManage/produce.jsp
+++ b/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>
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