Haier_MES.git - Gitblit

parent: 6de264bc | 补丁 | 提交 | ignore whitespace

guoyuji

2023-07-19 eff850a3a8fdde1eac34751e125569a7b29f9792

修改连接

4个文件已修改

	gmms/WebContent/login/index.jsp	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/login/machinelistcontent.jsp	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/login/quanxian.jsp	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/orderManage/order.jsp	93 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 gmms/WebContent/login/index.jsp

@@ -242,7 +242,7 @@
                       anquanma=css.getString(5);
                       dengji=css.getString(6);
                       if(fanhui1==5000){
                             out.print("<script type='text/javascript'>window.location.href='bdg.jsp?loginname="+uname+"&xingming="+xingming+"&bumen="+bumen+"&dengji="+dengji+"&anquanma="+anquanma+"&adminid="+aid+"&yuyan="+yuyan+"';</script>");
                             out.print("<script type='text/javascript'>localStorage.clear();window.location.href='bdg.jsp?loginname="+uname+"&xingming="+xingming+"&bumen="+bumen+"&dengji="+dengji+"&anquanma="+anquanma+"&adminid="+aid+"&yuyan="+yuyan+"';</script>");
                       }
                       else{
                             out.print("<script type='text/javascript'>alert('安全码无效')</script>");

 gmms/WebContent/login/machinelistcontent.jsp

@@ -37,7 +37,7 @@
      >
      <el-table-column
        prop="name"
        label="设备">
        label="设备">
      </el-table-column>
      <el-table-column
        prop="ip"
@@ -49,11 +49,11 @@
      </el-table-column>
      <el-table-column
        prop="st"
        label="״̬">
        label="状态̬">
      </el-table-column>
      <el-table-column
        prop="count"
        label="调用次数">
        label="调用次数">
      </el-table-column>
     </el-table>
</div>
@@ -68,7 +68,7 @@
      methods:{
          tableRowClassName({row, rowIndex}) {
              
                if (row['st'] == '未连接') {
                if (row['st'] == '未连接') {
                 return 'success-row';
               }
               return ''; 

 gmms/WebContent/login/quanxian.jsp

@@ -99,8 +99,16 @@
        
    </div>
    <script>
    
    window.onload=function(){
        if(localStorage.getItem("newPage")!=null){
            let url=localStorage.getItem("newPage");
            url=url+'&'+window.parent.location.search.substr(1);
            window.parent.document.getElementById("main").src = url;	
        }
    	
    }
        function tiaoz(n){
            localStorage.setItem("newPage",n);
            n=n+'&'+window.parent.location.search.substr(1);
            window.parent.document.getElementById("main").src = n;
            //window.open(n);

 gmms/WebContent/orderManage/order.jsp

@@ -25,7 +25,7 @@
<body>
  <div id="app" >
    <el-container >
      <el-header style="height: 3%;">
      <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"
@@ -53,7 +53,7 @@
            :key="index"
            :label="item"
            >
            <el-table-column :prop="keys" v-if="index==0">
            <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"
@@ -69,6 +69,13 @@
                  size="small">
                  修改
                </el-button>
                <el-button 
                  @click.native.prevent="open(scope.$index, orderData)"
                  type="text"
                  size="small">
                  次破
                </el-button>

                
              </template>
            </el-table-column>
@@ -112,24 +119,35 @@
          
          
        </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')">提交</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>
  <!-- import Vue before Element -->
@@ -182,7 +200,7 @@
         let reg = new RegExp(`^[0-9]*[1-9][0-9]*$`)

          if (!reg.test(value)) { 
            callback(new Error('请输入正整数的厚度'));
            callback(new Error('请输入正整数'));
          }else {
              callback();
          }
@@ -201,7 +219,10 @@
          ],
          glassNum: [
            { validator: checkInt, trigger: 'blur' }
          ]
          ],
          wornNum: [
            { validator: checkInt, trigger: 'blur' }
          ],
          
        },
        tableHead:[],
@@ -214,7 +235,13 @@
        orderProduce:[],
        fileList:[],
        slectOrder:["","","","","","","","","",""],
        selectdate:["",""]
        selectdate:["",""],
        wornGlassFLAG: false,//次破界面显示标记
        wornGlass:{
          glassID:'',
          wornNum:'',
          reason:''
        }


      };
@@ -287,7 +314,7 @@
          if(arrFlag==0){
            sql="{call AXJ_a_order_select_into()}"
          }
          loadAjxs('订单查询',sql,2,"orderData")
          loadAjxs('产品查询',sql,2,"orderData")
        },
        selectTimeOrder:function(){
          let arrObj={}
@@ -304,9 +331,27 @@
            arrObj.endtime=''
            sql="{call AXJ_a_order_select_into()}"
          }
          loadAjxs('订单查询',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:{
        
@@ -324,9 +369,5 @@
      },

    })
    



  </script>
</html>

			@@ -242,7 +242,7 @@
			anquanma=css.getString(5);
			dengji=css.getString(6);
			if(fanhui1==5000){
			out.print("<script type='text/javascript'>window.location.href='bdg.jsp?loginname="+uname+"&xingming="+xingming+"&bumen="+bumen+"&dengji="+dengji+"&anquanma="+anquanma+"&adminid="+aid+"&yuyan="+yuyan+"';</script>");
			out.print("<script type='text/javascript'>localStorage.clear();window.location.href='bdg.jsp?loginname="+uname+"&xingming="+xingming+"&bumen="+bumen+"&dengji="+dengji+"&anquanma="+anquanma+"&adminid="+aid+"&yuyan="+yuyan+"';</script>");
			}
			else{
			out.print("<script type='text/javascript'>alert('安全码无效')</script>");

			@@ -37,7 +37,7 @@
			>
			<el-table-column
			prop="name"
			label="设备">
			label="设备">
			</el-table-column>
			<el-table-column
			prop="ip"
			@@ -49,11 +49,11 @@
			</el-table-column>
			<el-table-column
			prop="st"
			label="״̬">
			label="状态̬">
			</el-table-column>
			<el-table-column
			prop="count"
			label="调用次数">
			label="调用次数">
			</el-table-column>
			</el-table>
			</div>
			@@ -68,7 +68,7 @@
			methods:{
			tableRowClassName({row, rowIndex}) {

			if (row['st'] == '未连接') {
			if (row['st'] == '未连接') {
			return 'success-row';
			}
			return '';

			@@ -99,8 +99,16 @@

			</div>
			<script>

			window.onload=function(){
			if(localStorage.getItem("newPage")!=null){
			let url=localStorage.getItem("newPage");
			url=url+'&'+window.parent.location.search.substr(1);
			window.parent.document.getElementById("main").src = url;
			}

			}
			function tiaoz(n){
			localStorage.setItem("newPage",n);
			n=n+'&'+window.parent.location.search.substr(1);
			window.parent.document.getElementById("main").src = n;
			//window.open(n);

			@@ -25,7 +25,7 @@
			<body>
			<div id="app" >
			<el-container >
			<el-header style="height: 3%;">
			<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"
			@@ -53,7 +53,7 @@
			:key="index"
			:label="item"
			>
			<el-table-column :prop="keys" v-if="index==0">
			<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"
			@@ -69,6 +69,13 @@
			size="small">
			修改
			</el-button>
			<el-button
			@click.native.prevent="open(scope.$index, orderData)"
			type="text"
			size="small">
			次破
			</el-button>


			</template>
			</el-table-column>
			@@ -112,24 +119,35 @@


			</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')">提交</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>
			<!-- import Vue before Element -->
			@@ -182,7 +200,7 @@
			let reg = new RegExp(`^[0-9][1-9][0-9]$`)

			if (!reg.test(value)) {
			callback(new Error('请输入正整数的厚度'));
			callback(new Error('请输入正整数'));
			}else {
			callback();
			}
			@@ -201,7 +219,10 @@
			],
			glassNum: [
			{ validator: checkInt, trigger: 'blur' }
			]
			],
			wornNum: [
			{ validator: checkInt, trigger: 'blur' }
			],

			},
			tableHead:[],
			@@ -214,7 +235,13 @@
			orderProduce:[],
			fileList:[],
			slectOrder:["","","","","","","","","",""],
			selectdate:["",""]
			selectdate:["",""],
			wornGlassFLAG: false,//次破界面显示标记
			wornGlass:{
			glassID:'',
			wornNum:'',
			reason:''
			}


			};
			@@ -287,7 +314,7 @@
			if(arrFlag==0){
			sql="{call AXJ_a_order_select_into()}"
			}
			loadAjxs('订单查询',sql,2,"orderData")
			loadAjxs('产品查询',sql,2,"orderData")
			},
			selectTimeOrder:function(){
			let arrObj={}
			@@ -304,9 +331,27 @@
			arrObj.endtime=''
			sql="{call AXJ_a_order_select_into()}"
			}
			loadAjxs('订单查询',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:{

			@@ -324,9 +369,5 @@
			},

			})




			</script>
			</html>