From 3d3e4173c301fd36c16b9a25cd1f8c9f27257ed0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 24 十一月 2025 16:50:18 +0800
Subject: [PATCH] 新增当月总耗电、电视机样式调整、字体更换、副屏设备图裁剪放大、24小时柱状图更换为昨天晚上8点到今天晚上8点、报警色块位置调整
---
gmms/WebContent/orderManage/order.jsp | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/gmms/WebContent/orderManage/order.jsp b/gmms/WebContent/orderManage/order.jsp
index 5fc2793..76068a5 100644
--- a/gmms/WebContent/orderManage/order.jsp
+++ b/gmms/WebContent/orderManage/order.jsp
@@ -58,7 +58,7 @@
<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"
+ <el-button v-if="orderData[scope.$index]['12_order_status']<2"
@click.native.prevent="updateOrderState(scope.$index, orderData)"
type="text"
size="small"
@@ -67,14 +67,14 @@
{{orderData[scope.$index]['11_order_status']==0?'瀹℃牳':'鍙嶅'}}
</el-button>
- <el-button v-if="orderData[scope.$index]['11_order_status']*1===0"
+ <el-button v-if="orderData[scope.$index]['12_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']==2"
+ v-if="orderData[scope.$index]['12_order_status']==2"
@click.native.prevent="open(scope.$index, orderData)"
type="text"
size="small">
@@ -107,7 +107,15 @@
<el-form-item label="灏忕墖鏁伴噺" prop="glassNum">
<el-input v-model="ruleForm.glassNum" autocomplete="off" ></el-input>
</el-form-item>
-
+ <el-form-item label="鍘熺墖鏁伴噺" prop="bigGlassNum">
+ <el-input v-model="ruleForm.bigGlassNum" autocomplete="off" ></el-input>
+ </el-form-item>
+ <el-form-item label="鍘熺墖闀�" prop="bigGlassLength:">
+ <el-input v-model="ruleForm.bigGlassLength" autocomplete="off" ></el-input>
+ </el-form-item>
+ <el-form-item label="鍘熺墖瀹�" prop="bigGlassWidth">
+ <el-input v-model="ruleForm.bigGlassWidth" autocomplete="off" ></el-input>
+ </el-form-item>
<el-form-item label="閰嶆柟鍙�" prop="produceid">
<template>
<el-select v-model="ruleForm.produceid" placeholder="璇烽�夋嫨" clearable filterable>
@@ -220,6 +228,9 @@
ruleForm: {
produceid:"",
glassNum:"",
+ bigGlassNum:"",
+ bigGlassLength:"",
+ bigGlassWidth:"",
creator:'',
},
rules: {
@@ -229,6 +240,17 @@
glassNum: [
{ validator: checkInt, trigger: 'blur' }
],
+ bigGlassLength: [
+ { validator: checkInt, trigger: 'blur' }
+ ],
+
+ bigGlassNum: [
+ { validator: checkInt, trigger: 'blur' }
+ ],
+ bigGlassWidth: [
+ { validator: checkInt, trigger: 'blur' }
+ ],
+
wornNum: [
{ validator: checkInt, trigger: 'blur' }
],
@@ -263,7 +285,7 @@
return false;
}
this.ruleForm.creator='<%= request.getParameter("xingming")%>';
- let sql="{call AXJ_a_order_add(?,?,?,?)}~"+JSON.stringify(this.ruleForm);
+ let sql="{call AXJ_a_order_add(?,?,?,?,?,?,?)}~"+JSON.stringify(this.ruleForm);
this.connects("璁㈠崟鏂板",sql,1,1);
});
},
--
Gitblit v1.8.0