wuyouming666
2023-07-26 4a0e6972253a55af025a739a69ddafe2364e2f97
Merge branch 'master' of http://10.153.19.150:10101/r/Haier_MES
5个文件已修改
7个文件已添加
2284 ■■■■■ 已修改文件
.gitignore 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/WEB-INF/lib/fastjson-1.2.76.jar 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/WEB-INF/lib/mysql-connector-java-8.0.20.jar 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/WEB-INF/lib/nglib.jar 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/jiagongzhongxin/jiagongzhongxin.jsp 847 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/js/mixins.js 57 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/login/bdg.jsp 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/mysqlInsert/toPlc.jsp 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/qiegeguanli/qiegerenwu.jsp 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/shuidao/shuidao.jsp 847 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/xiapianduiduo/xiapianduiduo.jsp 424 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/yuanpiancangchu/cangchurenwuxinxi.jsp 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.gitignore
@@ -4,7 +4,6 @@
.mtj.tmp/
# Package Files #
*.jar
*.war
*.ear
gmms/WebContent/WEB-INF/lib/fastjson-1.2.76.jar
Binary files differ
gmms/WebContent/WEB-INF/lib/mysql-connector-java-8.0.20.jar
Binary files differ
gmms/WebContent/WEB-INF/lib/nglib.jar
Binary files differ
gmms/WebContent/jiagongzhongxin/jiagongzhongxin.jsp
New file
@@ -0,0 +1,847 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
    pageEncoding="UTF-8"%>
<!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>
<script src="../js/jquery-3.4.1.min.js"></script>
<script src="../js/echarts.min.js"></script>
</head>
<style>
  * {
    margin: 0px;
    padding: 0px;
    font-size: 14px;
  }
  body,
  html {
    width: 100%;
    height: 100%;
    background-color: #00008B;
  }
  #wai {
    width: 100%;
    height: 100%;
    display: flex;
    flex-wrap: wrap;
    position: relative;
    margin: 0px;
    padding: 0px;
    justify-content: center;
  }
  .wai_zs {
    width: 50%;
    height: 49%;
    background-color: #00008B;
    border-right: 1px solid white;
    border-bottom: 1px solid white;
  }
  .wai_ys {
    width: 49%;
    height: 49%;
    background-color: #00008B;
    border-bottom: 1px solid white;
  }
  .wai_zx {
    width: 50%;
    height: 50%;
    background-color: #00008B;
    border-right: 1px solid white;
  }
  .wai_yx {
    width: 49%;
    height: 50%;
    background-color: #00008B;
  }
  .msgtab {
    width: 50%;
    height: 40%;
    border: 1px solid white;
    border-collapse: collapse;
    position: absolute;
    top: 33%;
    left: 25%;
  }
  .one1,
  .one1 input {
    background-color: #F0FFFF;
  }
  .double1,
  .double1 input {
    background-color: #e1f0fd;
  }
  .msgtab tr th {
    color: white;
    white-space: nowrap;
    text-align: center;
    height: 20px;
    line-height: 20px;
    overflow: hidden;
  }
  .msgtab tr td {
    white-space: nowrap;
    text-align: center;
    height: 20px;
    line-height: 20px;
    overflow: hidden;
  }
  #container {
    width: 50%;
    position: absolute;
    top: 17%;
  }
  #chart-wrap {
    width: 50%;
    height: 60%;
    position: relative;
    top: 39%;
    left: 0%
  }
  #chart-suibian {
    width: 50%;
    height: 60%;
    position: relative;
    top: -65%;
    left: 50%
  }
  #chart-youx {
    width: 50%;
    height: 60%;
    position: relative;
    top: -65%;
    left: 0%
  }
  #chart-yous {
    width: 50%;
    height: 60%;
    position: relative;
    top: 39%;
    left: 50%
  }
  #chart-zuoshang {
    width: 50%;
    height: 60%;
    position: relative;
    top: -65%;
    left: 0%
  }
  #chart-zuoxia {
    width: 50%;
    height: 58%;
    position: relative;
    top: 42%;
    left: 50%
  }
  #chart-youshang {
    width: 50%;
    height: 60%;
    position: relative;
    top: -5%;
    left: 50%
  }
  #chart-youxia {
    width: 50%;
    height: 58%;
    position: relative;
    top: -19%;
    left: 0%;
  }
  .centdv_time {
    color: white;
    width: 50%;
    height: 30%;
    position: relative;
    top: -71%;
    left: 0%;
  }
  .centdv_time input {
    height: 25px;
  }
  .btn {
    text-align: center;
    width: 100px;
    height: 29px;
    /*   outline: none; */
    border: none;
    background-color: white;
    box-shadow: 15 8px 16px 15 rgba(0, 0, 0, 0), 15 6px 5px 15 rgba(0, 0, 0, 0.19);
  }
</style>
<body>
<div id="wai">
    <div class="wai_zs">
      <div id="chart-wrap"></div>
      <div id="chart-suibian"></div>
    </div>
    <div class="wai_ys">
      <div id="chart-yous"></div>
      <div id="chart-youx"></div>
    </div>
    <div class="wai_zx">
      <div id="chart-zuoxia"></div>
      <div id="chart-zuoshang"></div>
    </div>
    <div class="wai_yx">
      <div id="chart-youshang"></div>
      <div id="chart-youxia"></div>
    </div>
    <div class="centdv_time"><input type="date">~<input type="date">
      &nbsp;&nbsp;&nbsp;&nbsp;
      <button class="btn" type="button">查询</button>
    </div>
    <table class="msgtab">
      <thead>
        <tr>
          <th>设备</th>
          <th>订单号</th>
          <th>已加工数</th>
          <th>未加工数</th>
          <th>破损数</th>
          <th>更换倒计时</th>
          <th>耗材周期</th>
          <th>更换材料</th>
        </tr>
      </thead>
      <tbody>
        <tr class="one1">
          <td>测试</td>
          <td>测试测试测试测试</td>
          <td>测试</td>
          <td>测试</td>
          <td>测试</td>
          <td>测试测试</td>
          <td>测试测试</td>
          <td>测试测试</td>
        </tr>
        <tr class="double1">
          <td>测试</td>
          <td>测试测试测试测试</td>
          <td>测试</td>
          <td>测试</td>
          <td>测试</td>
          <td>测试测试</td>
          <td>测试测试</td>
          <td>测试测试</td>
        </tr>
        <tr class="one1">
          <td>测试</td>
          <td>测试测试测试测试</td>
          <td>测试</td>
          <td>测试</td>
          <td>测试</td>
          <td>测试测试</td>
          <td>测试测试</td>
          <td>测试测试</td>
        </tr>
        <tr class="double1">
          <td>测试</td>
          <td>测试测试测试测试</td>
          <td>测试</td>
          <td>测试</td>
          <td>测试</td>
          <td>测试测试</td>
          <td>测试测试</td>
          <td>测试测试</td>
        </tr>
      </tbody>
    </table>
  </div>
</body>
<script>
  // 1-下 --------------------------------------------------------------------------------------------------
  function zhutu () {
    var chartDom = document.getElementById('chart-wrap');
    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: '#87CEFA' } },
          axisLabel: { color: '#87CEFA' },
          splitLine: { lineStyle: { color: '#87CEFA', type: 'dashed' } }
        }
      ],
      yAxis: [
        {
          type: "value",
          name: "水耗",
          nameTextStyle: {
            color: "#87CEFA",
            fontSize: 12,
            padding: [0, 0, 0, -30], //name文字位置 对应 上右下左
          },
          splitLine: {
            // 网格线
            show: true,
            lineStyle: { //分割线
              color: "#87CEFA",
              width: 1,
              type: "dashed" //dotted:虚线 solid:实线
            }
          },
          axisLabel: {
            // 轴文字
            color: "#87CEFA",
            fontSize: 12,
          },
        },
      ],
      series: [
        {
          name: '水耗',
          type: 'bar',
          barWidth: '80%',
          data: [10, 52, 200, 334, 390, 330, 220],
          itemStyle: { color: '#87CEFA' }
        },
      ]
    };
    option && myChart.setOption(option);
  }
  function zhutu2 () {
    var chartDom = document.getElementById('chart-suibian');
    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: '#FFFFF0' } },
          axisLabel: { color: '#FFFFF0' },
          splitLine: { lineStyle: { color: '#FFFFF0', type: 'dashed' } }
        }
      ],
      yAxis: [
        {
          type: "value",
          name: "电耗",
          nameTextStyle: {
            color: "#FFFFF0",
            fontSize: 12,
            padding: [0, 0, 0, -30], //name文字位置 对应 上右下左
          },
          splitLine: {
            // 网格线
            show: true,
            lineStyle: { //分割线
              color: "#FFFFF0",
              width: 1,
              type: "dashed" //dotted:虚线 solid:实线
            }
          },
          axisLabel: {
            // 轴文字
            color: "#FFFFF0",
            fontSize: 12,
          },
        },
      ],
      series: [
        {
          name: 'Direct',
          type: 'bar',
          barWidth: '80%',
          data: [10, 52, 200, 334, 390, 330, 220],
          itemStyle: { color: '#FFFFF0' }
        },
      ]
    };
    option && myChart.setOption(option);
  }
  function zhutu3 () {
    var chartDom = document.getElementById('chart-yous');
    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: '#87CEFA' } },
          axisLabel: { color: '#87CEFA' },
          splitLine: { lineStyle: { color: '#87CEFA', type: 'dashed' } }
        }
      ],
      yAxis: [
        {
          type: "value",
          name: "水耗",
          nameTextStyle: {
            color: "#87CEFA",
            fontSize: 12,
            padding: [0, 0, 0, -30], //name文字位置 对应 上右下左
          },
          splitLine: {
            // 网格线
            show: true,
            lineStyle: { //分割线
              color: "#87CEFA",
              width: 1,
              type: "dashed" //dotted:虚线 solid:实线
            }
          },
          axisLabel: {
            // 轴文字
            color: "#87CEFA",
            fontSize: 12,
          },
        },
      ],
      series: [
        {
          name: '水耗',
          type: 'bar',
          barWidth: '80%',
          data: [10, 52, 200, 334, 390, 330, 220],
          itemStyle: { color: '#87CEFA' }
        },
      ]
    };
    option && myChart.setOption(option);
  }
  function zhutu4 () {
    var chartDom = document.getElementById('chart-youx');
    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: '#FFFFF0' } },
          axisLabel: { color: '#FFFFF0' },
          splitLine: { lineStyle: { color: '#FFFFF0', type: 'dashed' } }
        }
      ],
      yAxis: [
        {
          type: "value",
          name: "电耗",
          nameTextStyle: {
            color: "#FFFFF0",
            fontSize: 12,
            padding: [0, 0, 0, -30], //name文字位置 对应 上右下左
          },
          splitLine: {
            // 网格线
            show: true,
            lineStyle: { //分割线
              color: "#FFFFF0",
              width: 1,
              type: "dashed" //dotted:虚线 solid:实线
            }
          },
          axisLabel: {
            // 轴文字
            color: "#FFFFF0",
            fontSize: 12,
          },
        },
      ],
      series: [
        {
          name: 'Direct',
          type: 'bar',
          barWidth: '80%',
          data: [10, 52, 200, 334, 390, 330, 220],
          itemStyle: { color: '#FFFFF0' }
        },
      ]
    };
    option && myChart.setOption(option);
  }
  function zhutu5 () {
    var chartDom = document.getElementById('chart-zuoxia');
    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: '#FFFFF0' } },
          axisLabel: { color: '#FFFFF0' },
          splitLine: { lineStyle: { color: '#FFFFF0', type: 'FFFFF0' } }
        }
      ],
      yAxis: [
        {
          type: "value",
          name: "电耗",
          nameTextStyle: {
            color: "#FFFFF0",
            fontSize: 12,
            padding: [0, 0, 0, -30], //name文字位置 对应 上右下左
          },
          splitLine: {
            // 网格线
            show: true,
            lineStyle: { //分割线
              color: "#FFFFF0",
              width: 1,
              type: "dashed" //dotted:虚线 solid:实线
            }
          },
          axisLabel: {
            // 轴文字
            color: "#FFFFF0",
            fontSize: 12,
          },
        },
      ],
      series: [
        {
          name: '电耗',
          type: 'bar',
          barWidth: '80%',
          data: [10, 52, 200, 334, 390, 330, 220],
          itemStyle: { color: '#FFFFF0' }
        },
      ]
    };
    option && myChart.setOption(option);
  }
  function zhutu6 () {
    var chartDom = document.getElementById('chart-zuoshang');
    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: '#87CEFA' } },
          axisLabel: { color: '#87CEFA' },
          splitLine: { lineStyle: { color: '#87CEFA', type: 'dashed' } }
        }
      ],
      yAxis: [
        {
          type: "value",
          name: "水耗",
          nameTextStyle: {
            color: "#87CEFA",
            fontSize: 12,
            padding: [0, 0, 0, -30], //name文字位置 对应 上右下左
          },
          splitLine: {
            // 网格线
            show: true,
            lineStyle: { //分割线
              color: "#87CEFA",
              width: 1,
              type: "dashed" //dotted:虚线 solid:实线
            }
          },
          axisLabel: {
            // 轴文字
            color: "#87CEFA",
            fontSize: 12,
          },
        },
      ],
      series: [
        {
          name: '水耗',
          type: 'bar',
          barWidth: '80%',
          data: [10, 52, 200, 334, 390, 330, 220],
          itemStyle: { color: '#87CEFA' }
        },
      ]
    };
    option && myChart.setOption(option);
  }
  function zhutu7 () {
    var chartDom = document.getElementById('chart-youxia');
    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: '#FFFFF0' } },
          axisLabel: { color: '#FFFFF0' },
          splitLine: { lineStyle: { color: '#FFFFF0', type: 'dashed' } }
        }
      ],
      yAxis: [
        {
          type: "value",
          name: "电耗",
          nameTextStyle: {
            color: "#FFFFF0",
            fontSize: 12,
            padding: [0, 0, 0, -30], //name文字位置 对应 上右下左
          },
          splitLine: {
            // 网格线
            show: true,
            lineStyle: { //分割线
              color: "#FFFFF0",
              width: 1,
              type: "dashed" //dotted:虚线 solid:实线
            }
          },
          axisLabel: {
            // 轴文字
            color: "#FFFFF0",
            fontSize: 12,
          },
        },
      ],
      series: [
        {
          name: 'Direct',
          type: 'bar',
          barWidth: '80%',
          data: [10, 52, 200, 334, 390, 330, 220],
          itemStyle: { color: '#FFFFF0' }
        },
      ]
    };
    option && myChart.setOption(option);
  }
  function zhutu8 () {
    var chartDom = document.getElementById('chart-youshang');
    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: '#87CEFA' } },
          axisLabel: { color: '#87CEFA' },
          splitLine: { lineStyle: { color: '#87CEFA', type: 'dashed' } }
        }
      ],
      yAxis: [
        {
          type: "value",
          name: "水耗",
          nameTextStyle: {
            color: "#87CEFA",
            fontSize: 12,
            padding: [0, 0, 0, -30], //name文字位置 对应 上右下左
          },
          splitLine: {
            // 网格线
            show: true,
            lineStyle: { //分割线
              color: "#87CEFA",
              width: 1,
              type: "dashed" //dotted:虚线 solid:实线
            }
          },
          axisLabel: {
            // 轴文字
            color: "#87CEFA",
            fontSize: 12,
          },
        },
      ],
      series: [
        {
          name: '水耗',
          type: 'bar',
          barWidth: '80%',
          data: [10, 52, 200, 334, 390, 330, 220],
          itemStyle: { color: '#87CEFA' }
        },
      ]
    };
    option && myChart.setOption(option);
  }
  window.onload = function () {
    zhutu();
    zhutu2();
    zhutu3();
    zhutu4();
    zhutu5();
    zhutu6();
    zhutu7();
    zhutu8();
  }
</script>
</html>
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(); 
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>
gmms/WebContent/mysqlInsert/toPlc.jsp
New file
@@ -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);
 }
%>
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>
                                    &nbsp;&nbsp;&nbsp;
                                    <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");
      }
})
gmms/WebContent/shuidao/shuidao.jsp
New file
@@ -0,0 +1,847 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
    pageEncoding="UTF-8"%>
<!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>
<script src="../js/jquery-3.4.1.min.js"></script>
<script src="../js/echarts.min.js"></script>
</head>
<style>
  * {
    margin: 0px;
    padding: 0px;
    font-size: 14px;
  }
  body,
  html {
    width: 100%;
    height: 100%;
    background-color: #00008B;
  }
  #wai {
    width: 100%;
    height: 100%;
    display: flex;
    flex-wrap: wrap;
    position: relative;
    margin: 0px;
    padding: 0px;
    justify-content: center;
  }
  .wai_zs {
    width: 50%;
    height: 49%;
    background-color: #00008B;
    border-right: 1px solid white;
    border-bottom: 1px solid white;
  }
  .wai_ys {
    width: 49%;
    height: 49%;
    background-color: #00008B;
    border-bottom: 1px solid white;
  }
  .wai_zx {
    width: 50%;
    height: 50%;
    background-color: #00008B;
    border-right: 1px solid white;
  }
  .wai_yx {
    width: 49%;
    height: 50%;
    background-color: #00008B;
  }
  .msgtab {
    width: 50%;
    height: 40%;
    border: 1px solid white;
    border-collapse: collapse;
    position: absolute;
    top: 33%;
    left: 25%;
  }
  .one1,
  .one1 input {
    background-color: #F0FFFF;
  }
  .double1,
  .double1 input {
    background-color: #e1f0fd;
  }
  .msgtab tr th {
    color: white;
    white-space: nowrap;
    text-align: center;
    height: 20px;
    line-height: 20px;
    overflow: hidden;
  }
  .msgtab tr td {
    white-space: nowrap;
    text-align: center;
    height: 20px;
    line-height: 20px;
    overflow: hidden;
  }
  #container {
    width: 50%;
    position: absolute;
    top: 17%;
  }
  #chart-wrap {
    width: 50%;
    height: 60%;
    position: relative;
    top: 39%;
    left: 0%
  }
  #chart-suibian {
    width: 50%;
    height: 60%;
    position: relative;
    top: -65%;
    left: 50%
  }
  #chart-youx {
    width: 50%;
    height: 60%;
    position: relative;
    top: -65%;
    left: 0%
  }
  #chart-yous {
    width: 50%;
    height: 60%;
    position: relative;
    top: 39%;
    left: 50%
  }
  #chart-zuoshang {
    width: 50%;
    height: 60%;
    position: relative;
    top: -65%;
    left: 0%
  }
  #chart-zuoxia {
    width: 50%;
    height: 58%;
    position: relative;
    top: 42%;
    left: 50%
  }
  #chart-youshang {
    width: 50%;
    height: 60%;
    position: relative;
    top: -5%;
    left: 50%
  }
  #chart-youxia {
    width: 50%;
    height: 58%;
    position: relative;
    top: -19%;
    left: 0%;
  }
  .centdv_time {
    color: white;
    width: 50%;
    height: 30%;
    position: relative;
    top: -71%;
    left: 0%;
  }
  .centdv_time input {
    height: 25px;
  }
  .btn {
    text-align: center;
    width: 100px;
    height: 29px;
    /*   outline: none; */
    border: none;
    background-color: white;
    box-shadow: 15 8px 16px 15 rgba(0, 0, 0, 0), 15 6px 5px 15 rgba(0, 0, 0, 0.19);
  }
</style>
<body>
<div id="wai">
    <div class="wai_zs">
      <div id="chart-wrap"></div>
      <div id="chart-suibian"></div>
    </div>
    <div class="wai_ys">
      <div id="chart-yous"></div>
      <div id="chart-youx"></div>
    </div>
    <div class="wai_zx">
      <div id="chart-zuoxia"></div>
      <div id="chart-zuoshang"></div>
    </div>
    <div class="wai_yx">
      <div id="chart-youshang"></div>
      <div id="chart-youxia"></div>
    </div>
    <div class="centdv_time"><input type="date">~<input type="date">
      &nbsp;&nbsp;&nbsp;&nbsp;
      <button class="btn" type="button">查询</button>
    </div>
    <table class="msgtab">
      <thead>
        <tr>
          <th>设备</th>
          <th>订单号</th>
          <th>已加工数</th>
          <th>未加工数</th>
          <th>破损数</th>
          <th>更换倒计时</th>
          <th>耗材周期</th>
          <th>更换材料</th>
        </tr>
      </thead>
      <tbody>
        <tr class="one1">
          <td>测试</td>
          <td>测试测试测试测试</td>
          <td>测试</td>
          <td>测试</td>
          <td>测试</td>
          <td>测试测试</td>
          <td>测试测试</td>
          <td>测试测试</td>
        </tr>
        <tr class="double1">
          <td>测试</td>
          <td>测试测试测试测试</td>
          <td>测试</td>
          <td>测试</td>
          <td>测试</td>
          <td>测试测试</td>
          <td>测试测试</td>
          <td>测试测试</td>
        </tr>
        <tr class="one1">
          <td>测试</td>
          <td>测试测试测试测试</td>
          <td>测试</td>
          <td>测试</td>
          <td>测试</td>
          <td>测试测试</td>
          <td>测试测试</td>
          <td>测试测试</td>
        </tr>
        <tr class="double1">
          <td>测试</td>
          <td>测试测试测试测试</td>
          <td>测试</td>
          <td>测试</td>
          <td>测试</td>
          <td>测试测试</td>
          <td>测试测试</td>
          <td>测试测试</td>
        </tr>
      </tbody>
    </table>
  </div>
</body>
<script>
  // 1-下 --------------------------------------------------------------------------------------------------
  function zhutu () {
    var chartDom = document.getElementById('chart-wrap');
    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: '#87CEFA' } },
          axisLabel: { color: '#87CEFA' },
          splitLine: { lineStyle: { color: '#87CEFA', type: 'dashed' } }
        }
      ],
      yAxis: [
        {
          type: "value",
          name: "水耗",
          nameTextStyle: {
            color: "#87CEFA",
            fontSize: 12,
            padding: [0, 0, 0, -30], //name文字位置 对应 上右下左
          },
          splitLine: {
            // 网格线
            show: true,
            lineStyle: { //分割线
              color: "#87CEFA",
              width: 1,
              type: "dashed" //dotted:虚线 solid:实线
            }
          },
          axisLabel: {
            // 轴文字
            color: "#87CEFA",
            fontSize: 12,
          },
        },
      ],
      series: [
        {
          name: '水耗',
          type: 'bar',
          barWidth: '80%',
          data: [10, 52, 200, 334, 390, 330, 220],
          itemStyle: { color: '#87CEFA' }
        },
      ]
    };
    option && myChart.setOption(option);
  }
  function zhutu2 () {
    var chartDom = document.getElementById('chart-suibian');
    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: '#FFFFF0' } },
          axisLabel: { color: '#FFFFF0' },
          splitLine: { lineStyle: { color: '#FFFFF0', type: 'dashed' } }
        }
      ],
      yAxis: [
        {
          type: "value",
          name: "电耗",
          nameTextStyle: {
            color: "#FFFFF0",
            fontSize: 12,
            padding: [0, 0, 0, -30], //name文字位置 对应 上右下左
          },
          splitLine: {
            // 网格线
            show: true,
            lineStyle: { //分割线
              color: "#FFFFF0",
              width: 1,
              type: "dashed" //dotted:虚线 solid:实线
            }
          },
          axisLabel: {
            // 轴文字
            color: "#FFFFF0",
            fontSize: 12,
          },
        },
      ],
      series: [
        {
          name: 'Direct',
          type: 'bar',
          barWidth: '80%',
          data: [10, 52, 200, 334, 390, 330, 220],
          itemStyle: { color: '#FFFFF0' }
        },
      ]
    };
    option && myChart.setOption(option);
  }
  function zhutu3 () {
    var chartDom = document.getElementById('chart-yous');
    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: '#87CEFA' } },
          axisLabel: { color: '#87CEFA' },
          splitLine: { lineStyle: { color: '#87CEFA', type: 'dashed' } }
        }
      ],
      yAxis: [
        {
          type: "value",
          name: "水耗",
          nameTextStyle: {
            color: "#87CEFA",
            fontSize: 12,
            padding: [0, 0, 0, -30], //name文字位置 对应 上右下左
          },
          splitLine: {
            // 网格线
            show: true,
            lineStyle: { //分割线
              color: "#87CEFA",
              width: 1,
              type: "dashed" //dotted:虚线 solid:实线
            }
          },
          axisLabel: {
            // 轴文字
            color: "#87CEFA",
            fontSize: 12,
          },
        },
      ],
      series: [
        {
          name: '水耗',
          type: 'bar',
          barWidth: '80%',
          data: [10, 52, 200, 334, 390, 330, 220],
          itemStyle: { color: '#87CEFA' }
        },
      ]
    };
    option && myChart.setOption(option);
  }
  function zhutu4 () {
    var chartDom = document.getElementById('chart-youx');
    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: '#FFFFF0' } },
          axisLabel: { color: '#FFFFF0' },
          splitLine: { lineStyle: { color: '#FFFFF0', type: 'dashed' } }
        }
      ],
      yAxis: [
        {
          type: "value",
          name: "电耗",
          nameTextStyle: {
            color: "#FFFFF0",
            fontSize: 12,
            padding: [0, 0, 0, -30], //name文字位置 对应 上右下左
          },
          splitLine: {
            // 网格线
            show: true,
            lineStyle: { //分割线
              color: "#FFFFF0",
              width: 1,
              type: "dashed" //dotted:虚线 solid:实线
            }
          },
          axisLabel: {
            // 轴文字
            color: "#FFFFF0",
            fontSize: 12,
          },
        },
      ],
      series: [
        {
          name: 'Direct',
          type: 'bar',
          barWidth: '80%',
          data: [10, 52, 200, 334, 390, 330, 220],
          itemStyle: { color: '#FFFFF0' }
        },
      ]
    };
    option && myChart.setOption(option);
  }
  function zhutu5 () {
    var chartDom = document.getElementById('chart-zuoxia');
    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: '#FFFFF0' } },
          axisLabel: { color: '#FFFFF0' },
          splitLine: { lineStyle: { color: '#FFFFF0', type: 'FFFFF0' } }
        }
      ],
      yAxis: [
        {
          type: "value",
          name: "电耗",
          nameTextStyle: {
            color: "#FFFFF0",
            fontSize: 12,
            padding: [0, 0, 0, -30], //name文字位置 对应 上右下左
          },
          splitLine: {
            // 网格线
            show: true,
            lineStyle: { //分割线
              color: "#FFFFF0",
              width: 1,
              type: "dashed" //dotted:虚线 solid:实线
            }
          },
          axisLabel: {
            // 轴文字
            color: "#FFFFF0",
            fontSize: 12,
          },
        },
      ],
      series: [
        {
          name: '电耗',
          type: 'bar',
          barWidth: '80%',
          data: [10, 52, 200, 334, 390, 330, 220],
          itemStyle: { color: '#FFFFF0' }
        },
      ]
    };
    option && myChart.setOption(option);
  }
  function zhutu6 () {
    var chartDom = document.getElementById('chart-zuoshang');
    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: '#87CEFA' } },
          axisLabel: { color: '#87CEFA' },
          splitLine: { lineStyle: { color: '#87CEFA', type: 'dashed' } }
        }
      ],
      yAxis: [
        {
          type: "value",
          name: "水耗",
          nameTextStyle: {
            color: "#87CEFA",
            fontSize: 12,
            padding: [0, 0, 0, -30], //name文字位置 对应 上右下左
          },
          splitLine: {
            // 网格线
            show: true,
            lineStyle: { //分割线
              color: "#87CEFA",
              width: 1,
              type: "dashed" //dotted:虚线 solid:实线
            }
          },
          axisLabel: {
            // 轴文字
            color: "#87CEFA",
            fontSize: 12,
          },
        },
      ],
      series: [
        {
          name: '水耗',
          type: 'bar',
          barWidth: '80%',
          data: [10, 52, 200, 334, 390, 330, 220],
          itemStyle: { color: '#87CEFA' }
        },
      ]
    };
    option && myChart.setOption(option);
  }
  function zhutu7 () {
    var chartDom = document.getElementById('chart-youxia');
    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: '#FFFFF0' } },
          axisLabel: { color: '#FFFFF0' },
          splitLine: { lineStyle: { color: '#FFFFF0', type: 'dashed' } }
        }
      ],
      yAxis: [
        {
          type: "value",
          name: "电耗",
          nameTextStyle: {
            color: "#FFFFF0",
            fontSize: 12,
            padding: [0, 0, 0, -30], //name文字位置 对应 上右下左
          },
          splitLine: {
            // 网格线
            show: true,
            lineStyle: { //分割线
              color: "#FFFFF0",
              width: 1,
              type: "dashed" //dotted:虚线 solid:实线
            }
          },
          axisLabel: {
            // 轴文字
            color: "#FFFFF0",
            fontSize: 12,
          },
        },
      ],
      series: [
        {
          name: 'Direct',
          type: 'bar',
          barWidth: '80%',
          data: [10, 52, 200, 334, 390, 330, 220],
          itemStyle: { color: '#FFFFF0' }
        },
      ]
    };
    option && myChart.setOption(option);
  }
  function zhutu8 () {
    var chartDom = document.getElementById('chart-youshang');
    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: '#87CEFA' } },
          axisLabel: { color: '#87CEFA' },
          splitLine: { lineStyle: { color: '#87CEFA', type: 'dashed' } }
        }
      ],
      yAxis: [
        {
          type: "value",
          name: "水耗",
          nameTextStyle: {
            color: "#87CEFA",
            fontSize: 12,
            padding: [0, 0, 0, -30], //name文字位置 对应 上右下左
          },
          splitLine: {
            // 网格线
            show: true,
            lineStyle: { //分割线
              color: "#87CEFA",
              width: 1,
              type: "dashed" //dotted:虚线 solid:实线
            }
          },
          axisLabel: {
            // 轴文字
            color: "#87CEFA",
            fontSize: 12,
          },
        },
      ],
      series: [
        {
          name: '水耗',
          type: 'bar',
          barWidth: '80%',
          data: [10, 52, 200, 334, 390, 330, 220],
          itemStyle: { color: '#87CEFA' }
        },
      ]
    };
    option && myChart.setOption(option);
  }
  window.onload = function () {
    zhutu();
    zhutu2();
    zhutu3();
    zhutu4();
    zhutu5();
    zhutu6();
    zhutu7();
    zhutu8();
  }
</script>
</html>
gmms/WebContent/xiapianduiduo/xiapianduiduo.jsp
New file
@@ -0,0 +1,424 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
    pageEncoding="UTF-8"%>
<!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>
<script src="../js/jquery-3.4.1.min.js"></script>
<script src="../js/echarts.min.js"></script>
</head>
<style>
  * {
    margin: 0px;
    padding: 0px;
  }
  body,
  html {
    width: 100%;
    height: 100%;
    background-color: #00008B;
  }
  #wai {
    width: 100%;
    height: 100%;
    display: flex;
    flex-wrap: wrap;
    position: relative;
    margin: 0px;
    padding: 0px;
    justify-content: center;
  }
  #wai_shang {
    width: 100%;
    height: 50%;
    display: flex;
    flex-wrap: nowrap;
  }
  #wai_xia {
    width: 100%;
    height: 50%;
    display: flex;
    flex-wrap: nowrap;
  }
  .shang_zuo {
    height: 100%;
    width: 50%;
  }
  .shang_you {
    height: 100%;
    width: 50%;
  }
  .centdv_time {
    color: white;
    width: 70%;
    height: 10%;
    position: relative;
  }
  .centdv_time input {
    height: 25px;
  }
  .btn {
    text-align: center;
    width: 100px;
    height: 29px;
    /*   outline: none; */
    border: none;
    background-color: white;
    box-shadow: 15 8px 16px 15 rgba(0, 0, 0, 0), 15 6px 5px 15 rgba(0, 0, 0, 0.19);
  }
  .msgtab {
    width: 100%;
    height: 90%;
    /* border: 1px solid white; */
    padding: 5px;
  }
  .msgtab1 {
    width: 100%;
    height: 90%;
    /* border: 1px solid white; */
    padding: 5px;
  }
  .one1,
  .one1 input {
    background-color: #F0FFFF;
  }
  .double1,
  .double1 input {
    background-color: #e1f0fd;
  }
  .msgtab tr th {
    color: white;
    white-space: nowrap;
    text-align: center;
    height: 20px;
    line-height: 20px;
    overflow: hidden;
  }
  .msgtab tr td {
    white-space: nowrap;
    text-align: center;
    height: 20px;
    line-height: 20px;
    overflow: hidden;
  }
  .msgtab1 tr th {
    color: white;
    white-space: nowrap;
    text-align: center;
    height: 20px;
    line-height: 20px;
    overflow: hidden;
  }
  .msgtab1 tr td {
    white-space: nowrap;
    text-align: center;
    height: 20px;
    line-height: 20px;
    overflow: hidden;
  }
  .xia_zuo {
    height: 100%;
    width: 50%;
  }
  .xia_you {
    height: 100%;
    width: 50%;
  }
  #chart-wrap {
    width: 90%;
    height: 80%;
  }
  .title {
    color: white;
    height: 10%;
    font-size: 18px;
  }
  .centdv_time {
    font-size: 18px;
  }
  #tuopan {
    width: 80%;
    height: 90%;
    background-color: white;
    border-radius: 25px 25px 0 0;
    margin: 0 auto;
    transform: rotate(180deg);
  }
  .tuopan_jindu {
    border-radius: 0 0 25px 25px;
    width: 100%;
    height: 80%;
    background-color: #87CEFA;
    transform: rotate(180deg);
  }
  .xptile {
    color: white;
    height: 10%;
    font-size: 18px;
    text-align: center;
  }
  .jindu {
    color: black;
    width: 150px;
    height: 5%;
    font-size: 18px;
    position: relative;
    top: -50%;
    left: 42%
  }
</style>
<body>
 <div id="wai">
    <div id="wai_shang">
      <div class="shang_zuo">
        <div class="title">
          当前生产信息:
          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
          等待托盘数:
          &nbsp;&nbsp;&nbsp;&nbsp;
          已完工托盘数:
        </div>
        <table class="msgtab">
          <thead>
            <tr>
              <th>订单号</th>
              <th>产品信息</th>
              <th>已加工数</th>
              <th>待加工数</th>
              <th>破损数</th>
            </tr>
          </thead>
          <tbody>
            <tr class="one1">
              <td></td>
              <td></td>
              <td></td>
              <td></td>
              <td></td>
            </tr>
            <tr class="double1">
              <td></td>
              <td></td>
              <td></td>
              <td></td>
              <td></td>
            </tr>
            <tr class="one1">
              <td></td>
              <td></td>
              <td></td>
              <td></td>
              <td></td>
            </tr>
            <tr class="double1">
              <td></td>
              <td></td>
              <td></td>
              <td></td>
              <td></td>
            </tr>
            <tr class="one1">
              <td></td>
              <td></td>
              <td></td>
              <td></td>
              <td></td>
            </tr>
            <tr class="double1">
              <td></td>
              <td></td>
              <td></td>
              <td></td>
              <td></td>
            </tr>
          </tbody>
        </table>
      </div>
      <div class="shang_you">
        <div class="centdv_time">
          总产量查询:
          <input type="date">~<input type="date">
          &nbsp;&nbsp;&nbsp;&nbsp;
          <button class="btn" type="button">查询</button>
        </div>
        <table class="msgtab1">
          <thead>
            <tr>
              <th>订单号</th>
              <th>产品信息</th>
              <th>已加工数</th>
              <th>待加工数</th>
              <th>破损数</th>
            </tr>
          </thead>
          <tbody>
            <tr class="one1">
              <td></td>
              <td></td>
              <td></td>
              <td></td>
              <td></td>
            </tr>
            <tr class="double1">
              <td></td>
              <td></td>
              <td></td>
              <td></td>
              <td></td>
            </tr>
            <tr class="one1">
              <td></td>
              <td></td>
              <td></td>
              <td></td>
              <td></td>
            </tr>
            <tr class="double1">
              <td></td>
              <td></td>
              <td></td>
              <td></td>
              <td></td>
            </tr>
            <tr class="one1">
              <td></td>
              <td></td>
              <td></td>
              <td></td>
              <td></td>
            </tr>
            <tr class="double1">
              <td></td>
              <td></td>
              <td></td>
              <td></td>
              <td></td>
            </tr>
          </tbody>
        </table>
      </div>
    </div>
    <div id="wai_xia">
      <div class="xia_zuo">
        <div id="chart-wrap"></div>
      </div>
      <div class="xia_you">
        <div id="tuopan">
          <div class="tuopan_jindu"></div>
        </div>
        <div class="xptile">当前下片进度</div>
        <div class="jindu">数量:40/50</div>
      </div>
    </div>
  </div>
</body>
<script>
  function zhutu () {
    var chartDom = document.getElementById('chart-wrap');
    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: '#FFFFF0' } },
          axisLabel: { color: '#FFFFF0' },
          splitLine: { lineStyle: { color: '#FFFFF0', type: 'dashed' } }
        }
      ],
      yAxis: [
        {
          type: "value",
          name: "电耗",
          nameTextStyle: {
            color: "#FFFFF0",
            fontSize: 12,
            padding: [0, 0, 0, -30], //name文字位置 对应 上右下左
          },
          splitLine: {
            // 网格线
            show: true,
            lineStyle: { //分割线
              color: "#FFFFF0",
              width: 1,
              type: "dashed" //dotted:虚线 solid:实线
            }
          },
          axisLabel: {
            // 轴文字
            color: "#FFFFF0",
            fontSize: 12,
          },
        },
      ],
      series: [
        {
          name: '电耗',
          type: 'bar',
          barWidth: '80%',
          data: [10, 52, 200, 334, 390, 330, 220],
          itemStyle: { color: '#FFFFF0' }
        },
      ]
    };
    option && myChart.setOption(option);
  }
  window.onload = function () {
    zhutu();
  }
</script>
</html>
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>