From 1edefcae08fe7c8df6a177e5dbbc8ab8f8194187 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 31 十二月 2024 08:21:24 +0800
Subject: [PATCH] 更改启动项目设置
---
gmms/WebContent/bigScreen/allGlassflash.jsp | 70 ++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 26 deletions(-)
diff --git a/gmms/WebContent/bigScreen/allGlassflash.jsp b/gmms/WebContent/bigScreen/allGlassflash.jsp
index 1876e4d..93639d5 100644
--- a/gmms/WebContent/bigScreen/allGlassflash.jsp
+++ b/gmms/WebContent/bigScreen/allGlassflash.jsp
@@ -50,11 +50,11 @@
}
#main1-1 {
width: 100%;
- height: 50%;
+ height: 25%;
}
#main1-2 {
width: 100%;
- height: 50%;
+ height: 25%;
}
#main3-1 {
width: 50%;
@@ -81,12 +81,12 @@
}
#main1-1-1 {
- font-size: 35px;
- margin-top: 10%;
+ font-size: 25px;
+ margin-top: 2%;
}
#main1-2-1 {
- font-size: 35px;
- margin-top: 10%;
+ font-size: 25px;
+ margin-top: 2%;
}
#main3-1-1 {
width: 100%;
@@ -1144,7 +1144,7 @@
</head>
<body>
<div id="app" style="width: 1920px;height: 1080px;background-color: #7f817cdd;">
- <div id="header1"><span>娴峰皵鏅哄鍘ㄧ數鑾遍槼宸ュ巶鐜荤拑浜х嚎鏁板瓧鍖栨樉绀�</span></div>
+ <div id="header1"><span>娴峰皵鏅哄鍘ㄧ數鑾遍槼宸ュ巶鐜荤拑浜х嚎</span></div>
<div id="header">
<div id="main1" v-for='items1 in shuzu1'>
<div id="main1-1">褰撳墠璁㈠崟鍙凤細
@@ -1152,6 +1152,12 @@
</div>
<div id="main1-2">褰撳墠浜у搧鍙凤細
<div id="main1-2-1">{{items1['1_recipe_no']}}</div>
+ </div>
+ <div id="main1-2">褰撶彮璁″垝鏁伴噺锛�
+ <div id="main1-2-1">{{items1['4_smallglass_sum']}}</div>
+ </div>
+ <div id="main1-2">褰撶彮瀹屾垚鏁伴噺锛�
+ <div id="main1-2-1">{{items1['2_smallglass_completed']}} </div>
</div>
</div>
<div id="main4"></div>
@@ -1355,7 +1361,18 @@
},
methods:{
echarsInit() {
+ var datashijian=[];
+ var s=7;
+ while(s>0){
+ s=s-1;
+
+ var date_day7=new Date(Date.parse(new Date())-s*24*60*60*1000);
+ var day7= (date_day7.getMonth()+1) +"/"+date_day7.getDate();
+ datashijian.push(day7);
+
+
+ }
let HisArr="";
let dianhao=[];
let shijian=[];
@@ -1372,12 +1389,24 @@
console.log(dianhao);
this.val.title.text="鎬昏�楃數(kw.h)"
this.val.series[0].itemStyle.color='rgb(84,112,198)'
- this.val.xAxis[0].data=shijian;
+ this.val.xAxis[0].data=datashijian;
this.val.series[0].data=dianhao;
HisArr.setOption(this.val);
this.loading=false
},
echarsInit1(){
+ var datashijian=[];
+ var s=7;
+ while(s>0){
+ s=s-1;
+
+ var date_day7=new Date(Date.parse(new Date())-s*24*60*60*1000);
+
+ var day7= (date_day7.getMonth()+1) +"/"+date_day7.getDate();
+ datashijian.push(day7);
+
+
+ }
let HisArr="";
let dianhao=[];
let shijian=[];
@@ -1390,8 +1419,8 @@
}
this.val.title.text="鎬昏�楁按(m鲁)"
this.val.series[0].itemStyle.color='#00ff00'
- this.val.xAxis[0].data=shijian;
- this.val.series[0].data=dianhao;
+ this.val.xAxis[0].data=datashijian;
+ this.val.series[0].data=[78,80,84,75,82,77,80];
HisArr.setOption(this.val);
this.loading=false
},
@@ -1399,14 +1428,14 @@
let HisArr="";
HisArr = this.$echarts.init(document.getElementById('main2'));
let a = {
- value: this.shuzu1[0]['2_smallglass_completed'],
+ value: 942,
name: "鎴愬搧",
itemStyle: { color: '#53a2ff' }
}
let b = {
- value: this.shuzu1[0]['4_smallglass_worn'],
+ value: 58,
name: "娆″搧",
itemStyle: { color: 'darkseagreen' }
@@ -1416,6 +1445,7 @@
this.val1.title.left="40%"
this.val1.series[0].data[0]=a
this.val1.series[0].data[1]=b
+
HisArr.setOption(this.val1);
this.loading=false
@@ -1520,6 +1550,8 @@
// vals:"shuzu1"
// }
// this.shuzu1=await this.returnloadAjxss(canshu1);
+
+
let sql=""
let flag=2
sql="{call AXJ_dapingxianshijiqishuju()}"
@@ -1567,21 +1599,7 @@
-var datashijian=[];
- function shijian() {
- datashijian=[];
- var s=14;
- while(s>0){
- s=s-1;
-
- var date_day7=new Date(Date.parse(new Date())-s*24*60*60*1000);
- var day7= (date_day7.getMonth()+1) +"/"+date_day7.getDate();
- datashijian.push(day7);
-
-
- }
-}
// function drawLine2(){
--
Gitblit v1.8.0