From cc24badd0e407574ced84850dfd1feba53982bf5 Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期日, 17 九月 2023 16:10:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 72685ec..072ab2c 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -60,6 +60,8 @@
.gezi {
height: 35px;
+
+ position: absolute;
width: 3.07px;
/* width: 4.22px; */
}
@@ -75,19 +77,20 @@
.blocks {
+
- max-width: 94vw;
background-image: url('../../img/xmjc.png');
margin: 0 auto;
background-repeat: no-repeat;
background-attachment: local;
width: 1660px;
min-height: 55vh;
+ max-width: 94vw;
background-size: 1200px 510px;
/* max-width: 100vw;
background-size: 1660px 560px; */
-
-
+
+
}
.blocks-img {
@@ -238,19 +241,22 @@
<el-footer>
<div class="blocks" style="position: relative;">
<div style="display:flex;position: absolute;float:left;z-index: 999;top:102px;left:237px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist1" :key="item['date']"
- @click="showcageinfo(item['cage'])"></div>
+ <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist1" :key="item['date']"
+ :style="{ height: 35 * item['glassWidth'] + 'px',left:3.07*index+'px' }" @click="showcageinfo(item['cage'])"></div>
</div>
<div style="display:flex;position: absolute;float:left;z-index: 999;top:102px;left:640px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist2" :key="item['date']"
- @click="showcageinfo(item['cage'])"></div>
+ <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist2" :key="item['date']"
+ :style="{ height: 35 * item['glassWidth'] + 'px',left:3.07*index+'px' }" @click="showcageinfo(item['cage'])"></div>
</div>
- <div style="display:flex;position: absolute;float:left;z-index: 999;top:138px;left:237px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist3" :key="item['date']"
- @click="showcageinfo(item['cage'])"></div>
+ <div style="display:flex;position: absolute;float:left;z-index: 999;top:139px;left:237px;">
+ <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist3" :key="item['date']"
+ :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px',left:3.07*index+'px' }"
+ @click="showcageinfo(item['cage'])">
+ </div>
</div>
- <div style="display:flex;position: absolute;float:left;z-index: 999;top:138px;left:640px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist4" :key="item['date']"
+ <div style="display:flex;position: absolute;float:left;z-index: 999;top:139px;left:640px;">
+ <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist4" :key="item['date']"
+ :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px',left:3.07*index+'px' }"
@click="showcageinfo(item['cage'])"></div>
</div>
<div class="blocks-img" :style="{ left: car1 + 'px', top: '16px' }"></div>
@@ -258,19 +264,23 @@
<div class="blocks-img2"></div>
<div class="blocks-img3"></div>
<!-- <div style="display:flex;position: absolute;float:left;z-index: 999;top:112px;left:328px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist1" :key="item['date']"
+ <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist1" :key="item['date']"
+ :style="{ height: 35 * item['glassWidth'] + 'px',left:4.22*index+'px' }"
@click="showcageinfo(item['cage'])"></div>
</div>
<div style="display:flex;position: absolute;float:left;z-index: 999;top:112px;left:885px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist2" :key="item['date']"
+ <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist2" :key="item['date']"
+ :style="{ height: 35 * item['glassWidth'] + 'px',left:4.22*index+'px' }"
@click="showcageinfo(item['cage'])"></div>
</div>
<div style="display:flex;position: absolute;float:left;z-index: 999;top:154px;left:328px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist3" :key="item['date']"
+ <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist3" :key="item['date']"
+ :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px',left:4.22*index+'px' }"
@click="showcageinfo(item['cage'])"></div>
</div>
<div style="display:flex;position: absolute;float:left;z-index: 999;top:154px;left:885px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist4" :key="item['date']"
+ <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist4" :key="item['date']"
+ :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px',left:4.22*index+'px' }"
@click="showcageinfo(item['cage'])"></div>
</div>
<div class="blocks-img" :style="{ left: car1 + 'px', top: '16px' }"></div>
@@ -424,10 +434,10 @@
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
if (obj.params != null) {
- this.car1 = 107 + 17.62 * obj.params[0][0];
- this.car2 = 175 + 17.62 * obj.params[0][1];
- // this.car1 = 150 + 24.6 * obj.params[0][0];
- // this.car2 = 242 + 24.6 * obj.params[0][1];
+ this.car1 = 107 + 17.62 * obj.params[0][0]/1000;
+ this.car2 = 175 + 17.62 * obj.params[0][1]/1000;
+ // this.car1 = 150 + 24.6 * obj.params[0][0]/1000;
+ // this.car2 = 242 + 24.6 * obj.params[0][1]/1000;
}
this.tableData = obj.tableData[0];
this.cagelist1 = obj.cagelist1[0];
@@ -625,7 +635,7 @@
OutByGlassID(glassid).then(res => {
if (res.data.message3 == 200) {
this.$message.success(this.$t('Operation successful'));
- }
+ }
else if (res.data.message2 == 300) {
this.$message.success(this.$t('There is no such grid'));
}
--
Gitblit v1.8.0