From 0b6edba995cdf03c7dae3911c88d4e12dfb33be5 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 26 七月 2023 15:53:21 +0800
Subject: [PATCH] 大屏显示丝印,瑕疵

---
 /dev/null |  294 ----------------------------------------------------------
 1 files changed, 0 insertions(+), 294 deletions(-)

diff --git a/gmms/WebContent/xiacisiyin/siyinceshi.jsp b/gmms/WebContent/xiacisiyin/siyinceshi.jsp
deleted file mode 100644
index 3ced68c..0000000
--- a/gmms/WebContent/xiacisiyin/siyinceshi.jsp
+++ /dev/null
@@ -1,393 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8"%>
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="UTF-8">
-  <!-- import CSS -->
-  <link rel="stylesheet" href="../js/static/css/element.css">
-  <link rel="stylesheet" href="../js/static/css/style.css">
-  <style >
-    .page-scroll {
-      height: 100%;
-    }
-  
-    .page-scroll .el-scrollbar__wrap {
-      overflow-x: hidden;
-    }
-    img{  
-    width: auto;  
-    height: auto;  
-    max-width: 100%;  
-    max-height: 100%;     
-}
-  </style>
-</head>
-<body>
-  <div id="app" >
-    <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%;"
-          v-model="selectdate"
-          type="daterange"
-          range-separator="鑷�"
-          start-placeholder="寮�濮嬫棩鏈�"
-          end-placeholder="缁撴潫鏃ユ湡">
-          </el-date-picker>
-
-          <el-button @click="selectTimeOrder"  v-show="showFlag" type="primary" icon="el-icon-search"
-            style="float: left;margin-left: 0.2%;margin-bottom: 0.3%;"
-            >鎼滅储
-          </el-button>
-
-      </el-header>
-      <el-main  >
-        <el-table v-show="showFlag"
-          :data="orderData"
-          max-height="600"
-          style="width: 100%;">
-
-          
-          <el-table-column 
-            v-for="(item,keys,index) in tableHead[0]" 
-            :key="index"
-            :label="item"
-            >
-            <el-table-column :prop="keys" v-if="index==0" width=130>
-              <template slot-scope="scope" v-if="Object.keys(orderData[0]).length!=0">
-
-                <el-button v-if="orderData[scope.$index]['11_order_status']<2"
-                  @click.native.prevent="updateOrderState(scope.$index, orderData)"
-                  type="text"
-                  size="small"
-                  v-preventReClick
-                  >
-                  {{orderData[scope.$index]['11_order_status']==0?'瀹℃牳':'鍙嶅'}}
-                </el-button>
-
-                <el-button v-if="orderData[scope.$index]['11_order_status']*1===0"
-                  @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>
-
-                
-              </template>
-            </el-table-column>
-
-            <el-table-column :prop="keys" v-if="index>0">
-              <template slot="header" slot-scope="scope" >
-                <el-input v-model="slectOrder[index-1]" @keyup.enter.native="selectSub" type="text"  size="mini" />
-              </template>
-              
-            </el-table-column>
-            
-          </el-table-column>
-        </el-table>
-<!-- 鏂板淇敼 -->
-        
-        <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')" 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>
-          
-          
-          <el-form-item label="灏忕墖鏁伴噺" prop="glassNum">
-            <el-input  v-model="ruleForm.glassNum"  autocomplete="off" ></el-input>
-          </el-form-item>
-
-          <el-form-item label="閰嶆柟鍙�" prop="produceid">
-            <template>
-              <el-select v-model="ruleForm.produceid" placeholder="璇烽�夋嫨" clearable filterable>
-                <el-option
-                  v-for="item in orderProduce"
-                  :key="item['0_id']"
-                  :label="item['1_val']"
-                  :value="item['0_id']">
-                </el-option>
-              </el-select>
-            </template>
-          </el-form-item>
-  
-          
-          
-        </el-form>
-        <el-dialog
-          title="鍒虹牬"
-          :visible.sync="wornGlassFLAG"
-          width="30%"
-          center>
-          <span style="text-align: center;">
-            <el-form :model="wornGlass" ref="wornGlass" :rules="rules">
-              <el-form-item label="娆$牬鏁伴噺:" prop="wornNum">
-                <el-input for="a" style="width: 50%;"  v-model.number="wornGlass.wornNum"  autocomplete="off" ></el-input>
-              </el-form-item>
-              <el-form-item label="娆$牬鍘熷洜:" >
-                <el-input  for="b" style="width: 50%;"  v-model.number="wornGlass.reason"  autocomplete="off" ></el-input>
-              </el-form-item>
-              
-              <el-form-item>
-                <el-button @click="resetForm('wornGlass');wornGlassFLAG = false">鍙� 娑�</el-button>
-                <el-button v-show="!updateShowFlag" type="primary" @click="wornSub('wornGlass')" v-preventReClick>鎻愪氦</el-button>
-              </el-form-item>
-            </el-form>
-            
-          </span>
-          <!-- <span slot="footer" class="dialog-footer">
-            
-            <el-button type="primary" @click="wornSub">纭� 瀹�</el-button>
-          </span> -->
-        </el-dialog>
-      </el-main>
-      <!-- <el-footer style="background-color: azure;"></el-footer> -->
-    </el-container>
-  </div>
-</body>
-  <script src="../js/jquery-3.4.1.min.js"></script>
-  
-  <script src="../js/static/js/vue.js"></script>
-  <script src="../js/axios.min.js"></script>
-  <script src="../js/mixins.js"></script>
-  <!-- import JavaScript -->
-  <script src="../js/static/js/element.js"></script>
-  <script src="../js/static/js/echarts.min.js"></script>
-  <script >
-    //import * as echarts from '../js/echarts.min.js';
-    Vue.prototype.$echarts = echarts
-    Vue.prototype.$http= axios
-    let app =new Vue({
-      el: '#app',
-      mixins:[mixin],
-      data(){
-        var checkNum = (rule, value, callback) => {
-        if (!value) {
-          return callback(new Error('涓嶈兘涓虹┖'));
-        }
-        setTimeout(() => {
-         let reg = new RegExp(`^[0-9]{1,4}(\.[0-9]{0,2})?$`)
-
-          if (!reg.test(value)) { 
-            callback(new Error('璇疯緭鍏�0.01-9999.99鐨勬暟瀛�'));
-          }else {
-              callback();
-          }
-          
-        }, 1000);
-      };
-        var checkString = (rule, value, callback) => {
-          if (!value) {
-            return callback(new Error('涓嶈兘涓虹┖'));
-          }
-          setTimeout(() => {
-            if (value.length>255) { 
-              callback(new Error('鏈�澶ч暱搴�255'));
-            }else {
-                callback();
-            }
-          }, 1000);
-        };
-      var checkInt = (rule, value, callback) => {
-        if (!value) {
-          return callback(new Error('涓嶈兘涓虹┖鎴栬��0'));
-        }
-        setTimeout(() => {
-         let reg = new RegExp(`^[0-9]*[1-9][0-9]*$`)
-
-          if (!reg.test(value)) { 
-            callback(new Error('璇疯緭鍏ユ鏁存暟'));
-          }else {
-              callback();
-          }
-          
-        }, 1000);
-      };
-      return {
-    	  loading:true,//椤甸潰鍔犺浇flag
-          ruleForm: {
-          produceid:"",
-          glassNum:"",
-          creator:'<%= request.getParameter("xingming") %>'
-        },
-        rules: {
-          produceid: [
-            { validator: checkInt, trigger: 'blur' }
-          ],
-          glassNum: [
-            { validator: checkInt, trigger: 'blur' }
-          ],
-          wornNum: [
-            { validator: checkInt, trigger: 'blur' }
-          ],
-          
-        },  
-        tableHead:[],
-        orderData:[],
-        showFlag:true,
-        updateShowFlag:false,
-        updateOrder:{
-          id:''
-        },
-        orderProduce:[],
-        fileList:[],
-        slectOrder:["","","","","","","","","",""],//绛涢�夊弬鏁�
-        selectdate:["",""],//鏃ユ湡鍙傛暟
-        wornGlassFLAG: false,//娆$牬鐣岄潰鏄剧ず鏍囪
-        wornGlass:{//鐮存崯鎻愪氦鍙傛暟
-          glassID:'',
-          wornNum:'',
-          reason:''
-        }
-
-
-      };
-        
-      },
-      methods: {
-        submitForm(formName) {//鏂板璁㈠崟
-        this.$refs[formName].validate((valid) => {
-            if (!valid) { 
-              return false;
-            }
-            let sql="{call AXJ_a_order_add(?,?,?,?)}~"+JSON.stringify(this.ruleForm);
-			this.connects("璁㈠崟鏂板",sql,1,1);
-          });
-        },
-        resetForm(formName) {//娓呴櫎鏂板閲嶇疆
-          this.$refs[formName].resetFields();
-        },
-        showFlagFuc(){//鏄剧ず璁㈠崟鏂板鐣岄潰
-          Object.keys(this.ruleForm).forEach((key) => (this.ruleForm[key] = ''));
-          this.showFlag=!this.showFlag
-          this.updateShowFlag=false;
-        },
-        updateRow(index,row){//淇敼浜у搧鏁版嵁鏄剧ず
-          this.showFlag=!this.showFlag
-          this.updateShowFlag=true;
-          let rowObj=row[index]
-          this.ruleForm.glassNum=rowObj["5_smallglass_no"]
-          this.ruleForm.produceid=rowObj["12_id"]
-          this.updateOrder.id=rowObj["0_id"]
-          
-        },
-        updateGlassSub(formName){//璁㈠崟淇敼鎻愪氦
-          this.$refs[formName].validate((valid) => {
-            if (!valid) { 
-              return false;
-            }
-            let updateGlassObj=this.ruleForm
-            updateGlassObj.id=this.updateOrder.id
-            let sql="{call AXJ_a_order_update(?,?,?,?,?)}~"+JSON.stringify(updateGlassObj);
-            this.connects("浜у搧淇敼",sql,1,1);
-          });
-          
-        },
-        updateOrderState(index,row){//瀹℃牳璁㈠崟
-          let updateState={}
-          updateState.id=row[index]['0_id']
-          updateState.state=row[index]['11_order_status']*1===0?1:0
-          let sql="{call AXJ_a_order_updateState(?,?,?)}~"+JSON.stringify(updateState);
-			    this.connects("璁㈠崟鐘舵�佸鏍镐慨鏀�",sql,1,1);
-        },
-        selectSub:function(){
-          let arrObj={}
-          let  arrFlag=0
-          for(let i in this.slectOrder){
-            if(this.slectOrder[i]!=''){
-              arrFlag=1
-            }
-            arrObj[i]=this.slectOrder[i]==''?"n*":this.slectOrder[i]
-          }
-          if(this.selectdate!=null){
-            arrObj.starttime=this.selectdate[0]
-            arrObj.endtime=this.selectdate[1]
-          }else{
-            arrObj.starttime=''
-            arrObj.endtime=''
-          }
-
-          let sql="{call AXJ_a_order_select(?,?,?,?,?,?,?,?,?,?,?,?,?)}~"+JSON.stringify(arrObj)
-          if(arrFlag==0){
-            sql="{call AXJ_a_order_select_into()}"
-          }
-          this.loading=true
-          this.loadAjxss('璁㈠崟鏌ヨ',sql,2,"orderData")
-        },
-        selectTimeOrder:function(){
-          let arrObj={}
-          for(let i in this.slectOrder){
-            arrObj[i]='n*'
-          }
-          let sql=''
-          if(this.selectdate!=null){
-            arrObj.starttime=this.selectdate[0]
-            arrObj.endtime=this.selectdate[1]
-            sql="{call AXJ_a_order_select(?,?,?,?,?,?,?,?,?,?,?,?,?)}~"+JSON.stringify(arrObj)
-          }else{
-            arrObj.starttime=''
-            arrObj.endtime=''
-            sql="{call AXJ_a_order_select_into()}"
-          }
-          this.loading=true
-          this.loadAjxss('璁㈠崟鏌ヨ',sql,2,"orderData")
-          //loadAjxs('浜у搧鏌ヨ',sql,2,"orderData")
-
-        },
-        open(index,row) {//鎵撳紑鍒虹牬鐣岄潰
-          this.wornGlassFLAG= true
-          this.wornGlass.glassID=row[index]['0_id']
-          //wornGlass.wornNum:'',
-          //wornGlass.reason:''
-        },
-        wornSub(formName){//鍒虹牬鎻愪氦
-          
-          this.$refs[formName].validate((valid) => {
-            if (!valid) { 
-              return false;
-            }
-            this.wornGlassFLAG = false
-            let sql="{call AXJ_a_order_glassWorn(?,?,?,?)}~"+JSON.stringify(this.wornGlass);
-			      this.connects("璁㈠崟灏忕墖鐮存崯",sql,1,1);
-          });
-        }
-        
-      },
-      computed:{
-        
-      },
-      mounted() {//椤甸潰杩樻湭鍔犺浇鏃惰繍琛�
-        let sql="{call AXJ_a_order_select_into()}"
-        let flag=2;
-        this.loadAjxss('璁㈠崟鍒濆鏌ヨ',sql,flag,"orderData")
-        
-        /* loadAjxs('璁㈠崟鍒濆鏌ヨ',sql,flag,"orderData") */
-        
-        sql="{call AXJ_a_orderHeader_select()}"
-        loadAjxs('璁㈠崟琛ㄥご',sql,flag,"tableHead")
-
-        sql="{call AXJ_a_order_produce_select()}"
-        loadAjxs('璁㈠崟浜у搧鏌ヨ',sql,flag,"orderProduce")
-        
-        
-        
-        //甯﹀弬鏁扮殑
-       /*  let arrObj={
-        	a:1,
-        	b:2
-        } */
-        
-        // sql="{call AXJ_a_order_select(?,?,?,?,?,?,?,?,?,?,?,?,?)}~"+JSON.stringify(arrObj)
-      },
-
-    })
-  </script>
-</html>
\ No newline at end of file
diff --git a/gmms/WebContent/xiacisiyin/siyinxian1.jsp b/gmms/WebContent/xiacisiyin/siyinxian1.jsp
deleted file mode 100644
index 6ad3df3..0000000
--- a/gmms/WebContent/xiacisiyin/siyinxian1.jsp
+++ /dev/null
@@ -1,308 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@page import="builder.Manager"%>
-<%@page import="ng.db.*"%>
-<!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">
-
-<link rel="stylesheet" href="../js/static/css/element.css">
-<link rel="stylesheet" href="../js/static/css/style.css">
-<script src="../js/static/js/vue.js"></script>
-<script src="../js/mixins.js"></script>
-<script src="../js/echarts.min.js"></script>
-<!-- import JavaScript -->
-<script src="../js/static/js/element.js"></script>
-<script src="../js/static/js/echarts.min.js"></script>
-<title>涓濆嵃绾�</title>
-</head>
-<style>
-body{
-height: 100%;
-width:100%;
-flex-wrap: nowrap;
-}
-  .page-scroll {
-      height: 100%;
-    }
-  
-    .page-scroll .el-scrollbar__wrap {
-      overflow-x: hidden;
-    }
-
-.el-table__header
-{
-height:20%;
-
-} 
-#app{
-width:100%;
-height:100%;
-}
-#app1{
-width:60%;  
-position:absolute;
-left:2%;
-top:3%;  
-}
-#youtu{
-height:50%;
-width:30%;
-background-color: aliceblue;
-position:absolute;
-right: 2%;
-top:2%;
-text-align: center;
-line-height: 250px;
-}
-#time{
-height:50%;
-width:30%;
-position:absolute;
-top:50%;
-}
-#har{
-width:100%;
-position:absolute;
-height:2%;
-top:53%;  
-background-color: darkgrey;
-}   
-#app2{
-width:60%;
-position:absolute;
-left:2%;
-top:62%;
-}
-#chart-wrap {
-  width:30%;
-  height:40%;
-  position:absolute;
-  right:2%; 
-  top:55%;  
-}
-#time{
-  width:50%;
-  height:5%;
-  position:absolute;
-  left:2%; 
-  top:35%;  
-}
-#time2{
-  width:50%;
-  height:10%;  
-  position:absolute;
-  left:2%;   
-  top:40%;     
-}
-</style>
-<body>   
-<div id='app' style=''>
-<div id='app1'>
-<el-table border 
-      :data="machine"
-      height='200'
-      width='200'
-      style="width: 100%;"
-       :cell-class-name="tableRowClassName"
-      >
-      <el-table-column
-        prop="name"
-        label="璁㈠崟鍙�">
-      </el-table-column>
-      <el-table-column
-        prop="ip"  
-        label="宸插姞宸ユ暟閲�">
-      </el-table-column>
-      <el-table-column
-        prop="port"
-        label="浠e姞宸ユ暟閲�">
-      </el-table-column>
-      <el-table-column
-        prop="st"
-        label="鐩撮�氱巼">
-      </el-table-column>
-      <el-table-column
-        prop="count"
-        label="NG鏁伴噺">
-      </el-table-column>
-       <el-table-column
-        prop="energy"
-        label="鑳借��">
-      </el-table-column>
- 	</el-table>
-  </div>
-<div id='time'>
- <el-header style="margin-top: 3%;height: 3%;background-color:black">
-      <el-date-picker  v-show="showFlag"  style="float: left;margin-bottom: 0.3%;"
-          v-model="selectdate1"
-          type="daterange"
-          range-separator="鑷�"
-          start-placeholder="寮�濮嬫棩鏈�"
-          end-placeholder="缁撴潫鏃ユ湡">
-          </el-date-picker>
-           <el-button @click="selectTimeOrder"  v-show="showFlag" type="primary" icon="el-icon-search"
-            style="float: left;margin-left: 0.2%;margin-bottom: 0.3%;"
-            >鎼滅储
-          </el-button>
- </el-header>  
-</div>
-<div id='time2'>
- <el-header style="margin-top: 3%;height: 3%;">
-      <el-date-picker   style="float: left;margin-bottom: 0.3%;"
-          v-model="selectdate2"
-          type="daterange"
-          range-separator="鑷�"
-          start-placeholder="鏇存崲鏃ユ湡"
-          end-placeholder="寤鸿鏃ユ湡">
-          </el-date-picker>
-           <el-button @click="selectTimeOrder"  v-show="showFlag" type="primary" icon="el-icon-search"
-            style="float: left;margin-left: 0.2%;margin-bottom: 0.3%;"
-            >鏇存柊
-          </el-button>
- </el-header>  
-</div>
-<div id='youtu'>
-<img alt="" src="">
-<p>涓濆嵃鍥�</p>
-</div>
-<div id='har'></div>
-<div id='app2' style=''>
-<el-table border
-      :data="machine2"
-      height='200'
-      width='200'
-      style="width: 100%;"
-       :cell-class-name="tableRowClassName"
-      >
-      <el-table-column
-        prop="name2"
-        label="璁㈠崟鍙�">
-      </el-table-column>
-      <el-table-column
-        prop="ip2"  
-        label="宸插姞宸ユ暟閲�">
-      </el-table-column>
-      <el-table-column
-        prop="port2"
-        label="鐮存崯鏁伴噺">
-      </el-table-column>
-      <el-table-column
-        prop="st2"
-        label="鑳借�楁暟">
-      </el-table-column>
-      <el-table-column
-        prop="count2"
-        label="鐩撮�氱巼">
-      </el-table-column>
-     
- 	</el-table> 
- 	</div>
-</div>
-<div id="chart-wrap">
-</div>
-</body>
-<script type="text/javascript">
-
- 
-    
-    Vue.prototype.$echarts = echarts
-    let app =new Vue({
-      el: '#app',
-      mixins:[mixin],
-      data:{
-        machine:<%out.print(  Manager.getDevice().toString());%>,
-      },
-      methods:{
-    	  tableRowClassName({row,column,rowIndex,columnIndex}) {
-    		  
-   	        if (row['st'] == '鏈繛鎺�' && columnIndex==3 ) {
-   	          return 'success-row';
-   	        }else{
-   	          return '';    
-   	        }  
-   	        
-    	  }
-      }, mounted(){
-      }
-     })
-      
-    
-    //鏌辩姸鍥�
-   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: ['7/1', '7/2', '7/3', '7/4', '7/5', '7/6', '7/7'],
-聽 聽 聽 聽 聽 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: false,
-聽 聽 聽 聽 聽 聽 lineStyle: { //鍒嗗壊绾�
-聽 聽 聽 聽 聽 聽 聽 color: "rgb(180, 180, 180)",
-聽 聽 聽 聽 聽 聽 聽 width: 1,
-聽 聽 聽 聽 聽 聽 聽 type: "dashed" //dotted锛氳櫄绾� solid:瀹炵嚎
-聽 聽 聽 聽 聽 聽 }
-聽 聽 聽 聽 聽 },
-聽 聽 聽 聽 聽 axisLabel: {
-聽 聽 聽 聽 聽 聽 // 杞存枃瀛�
-聽 聽 聽 聽 聽 聽 color: "rgb(30, 144, 255)",
-聽 聽 聽 聽 聽 聽 fontSize: 12,
-聽 聽 聽 聽 聽 },  
-聽 聽 聽 聽 },
-
-聽 聽 聽 ],
-聽 聽 聽 series: [
-聽 聽 聽 聽 {
-聽 聽 聽 聽 聽 name: '鑳借��',
-聽 聽 聽 聽 聽 type: 'bar',
-聽 聽 聽 聽 聽 barWidth: '80%',
-聽 聽 聽 聽 聽 data: [220, 152, 200, 334, 390, 330, 220],
-聽 聽 聽 聽 聽 itemStyle: { color: 'rgb(180, 180, 180)' }
-聽 聽 聽 聽 },
-
-聽 聽 聽 ]  
-聽 聽 };
-        
-聽 聽 option && myChart.setOption(option);
-聽 }
-    window.onload = function () {  
-    	zhutu();
-    	
-    }
-    </script>
-  
-
-</html>
\ No newline at end of file
diff --git a/gmms/WebContent/xiacisiyin/xiacijiance1.jsp b/gmms/WebContent/xiacisiyin/xiacijiance1.jsp
deleted file mode 100644
index b9ea4cb..0000000
--- a/gmms/WebContent/xiacisiyin/xiacijiance1.jsp
+++ /dev/null
@@ -1,294 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@page import="builder.Manager"%>
-<%@page import="ng.db.*"%>
-<!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">
-
-<link rel="stylesheet" href="../js/static/css/element.css">
-<link rel="stylesheet" href="../js/static/css/style.css">
-<script src="../js/static/js/vue.js"></script>
-<script src="../js/mixins.js"></script>
-<script src="../js/echarts.min.js"></script>
-<!-- import JavaScript -->
-<script src="../js/static/js/element.js"></script>
-<script src="../js/static/js/echarts.min.js"></script>
-<title>鐟曠柕绾�</title>
-</head>
-<style>
-body{
-height: 100%;
-width:100%;
-flex-wrap: nowrap;
-}
-  .page-scroll {
-      height: 100%;
-    }
-  
-    .page-scroll .el-scrollbar__wrap {
-      overflow-x: hidden;
-    }
-
-.el-table__header
-{
-height:20%;
-
-} 
-#app{
-width:100%;
-height:100%;
-}
-#app1{
-width:60%;  
-position:absolute;
-left:2%;
-top:3%;  
-}
-#youtu{
-height:50%;
-width:30%;
-background-color: aliceblue;
-position:absolute;
-right: 2%;
-top:2%;
-text-align: center;
-line-height: 250px;
-}
-#time{
-height:50%;
-width:30%;
-position:absolute;
-top:50%;
-}
-#har{
-width:100%;
-position:absolute;
-height:2%;
-top:53%;  
-background-color: darkgrey;
-}   
-#app2{
-width:60%;
-position:absolute;
-left:2%;
-top:62%;
-}
-#chart-wrap {
-  width:30%;
-  height:40%;
-  position:absolute;
-  right:2%; 
-  top:55%;  
-}
-#time{
-  width:50%;
-  height:5%;
-  position:absolute;
-  left:2%; 
-  top:35%;  
-}
-#time2{
-  width:50%;
-  height:10%;  
-  position:absolute;
-  left:2%;   
-  top:40%;     
-}
-</style>
-<body>   
-<div id='app' style=''>
-<div id='app1'>
-<el-table border 
-      :data="machine"
-      height='200'
-      width='200'
-      style="width: 100%;"
-       :cell-class-name="tableRowClassName"
-      >
-      <el-table-column
-        prop="name"
-        label="璁㈠崟鍙�">
-      </el-table-column>
-      <el-table-column
-        prop="ip"  
-        label="宸插姞宸ユ暟閲�">
-      </el-table-column>
-      <el-table-column
-        prop="port"
-        label="浠e姞宸ユ暟閲�">
-      </el-table-column>
-      <el-table-column
-        prop="st"
-        label="鐩撮�氱巼">
-      </el-table-column>
-      <el-table-column
-        prop="count"
-        label="NG鏁伴噺">
-      </el-table-column>
-       <el-table-column
-        prop="energy"
-        label="鑳借��">
-      </el-table-column>
- 	</el-table>
-  </div>
-<div id='time'>
- <el-header style="margin-top: 3%;height: 3%;">
-      <el-date-picker   style="float: left;margin-bottom: 0.3%;"
-          v-model="selectdate2"
-          type="daterange"
-          range-separator="鑷�"
-          start-placeholder="寮�濮嬫棩鏈�"
-          end-placeholder="缁撴潫鏃ユ湡">
-          </el-date-picker>
-           <el-button @click="selectTimeOrder"  v-show="showFlag" type="primary" icon="el-icon-search"
-            style="float: left;margin-left: 0.2%;margin-bottom: 0.3%;"
-            >鏇存柊
-          </el-button>
- </el-header>  
-</div>
-
-<div id='youtu'>
-<img alt="" src="">
-<p>浜у搧鍥�</p>
-</div>
-<div id='har'></div>
-<div id='app2' style=''>
-<el-table border
-      :data="machine2"
-      height='200'
-      width='200'
-      style="width: 100%;"
-       :cell-class-name="tableRowClassName"
-      >
-      <el-table-column
-        prop="name2"
-        label="鏃ユ湡">
-      </el-table-column>
-      <el-table-column
-        prop="ip2"  
-        label="宸插姞宸ユ暟閲�">
-      </el-table-column>
-      <el-table-column
-        prop="port2"
-        label="鐮存崯鏁伴噺">
-      </el-table-column>
-      <el-table-column
-        prop="st2"
-        label="鑳借�楁暟">
-      </el-table-column>
-      <el-table-column
-        prop="count2"
-        label="鐩撮�氱巼">
-      </el-table-column>
-     
- 	</el-table> 
- 	</div>
-</div>
-<div id="chart-wrap">
-</div>
-</body>
-<script type="text/javascript">
-
- 
-    
-    Vue.prototype.$echarts = echarts
-    let app =new Vue({
-      el: '#app',
-      mixins:[mixin],
-      data:{
-        machine:<%out.print(  Manager.getDevice().toString());%>,
-      },
-      methods:{
-    	  tableRowClassName({row,column,rowIndex,columnIndex}) {
-    		  
-   	        if (row['st'] == '鏈繛鎺�' && columnIndex==3 ) {
-   	          return 'success-row';
-   	        }else{
-   	          return '';    
-   	        }  
-   	        
-    	  }
-      }, mounted(){
-      }
-     })
-      
-    
-    //鏌辩姸鍥�
-   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: ['7/1', '7/2', '7/3', '7/4', '7/5', '7/6', '7/7'],
-聽 聽 聽 聽 聽 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: false,
-聽 聽 聽 聽 聽 聽 lineStyle: { //鍒嗗壊绾�
-聽 聽 聽 聽 聽 聽 聽 color: "rgb(180, 180, 180)",
-聽 聽 聽 聽 聽 聽 聽 width: 1,
-聽 聽 聽 聽 聽 聽 聽 type: "dashed" //dotted锛氳櫄绾� solid:瀹炵嚎
-聽 聽 聽 聽 聽 聽 }
-聽 聽 聽 聽 聽 },
-聽 聽 聽 聽 聽 axisLabel: {
-聽 聽 聽 聽 聽 聽 // 杞存枃瀛�
-聽 聽 聽 聽 聽 聽 color: "rgb(30, 144, 255)",
-聽 聽 聽 聽 聽 聽 fontSize: 12,
-聽 聽 聽 聽 聽 },  
-聽 聽 聽 聽 },
-
-聽 聽 聽 ],
-聽 聽 聽 series: [
-聽 聽 聽 聽 {
-聽 聽 聽 聽 聽 name: '鑳借��',
-聽 聽 聽 聽 聽 type: 'bar',
-聽 聽 聽 聽 聽 barWidth: '80%',
-聽 聽 聽 聽 聽 data: [220, 152, 200, 334, 390, 330, 220],
-聽 聽 聽 聽 聽 itemStyle: { color: 'rgb(180, 180, 180)' }
-聽 聽 聽 聽 },
-
-聽 聽 聽 ]  
-聽 聽 };
-        
-聽 聽 option && myChart.setOption(option);
-聽 }
-    window.onload = function () {  
-    	zhutu();
-    	
-    }
-    </script>
-  
-
-</html>
\ No newline at end of file

--
Gitblit v1.8.0