From dba117185ebab076ce8ae59c1df13f0d14f6cfe0 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期日, 17 九月 2023 16:43:30 +0800
Subject: [PATCH] 主界面添加小车位置配置
---
CanadaMes-ui/src/views/home/index.vue | 59 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index b87e524..ad12103 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -241,22 +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']"
- :style="{ height: 35 * item['glassWidth'] + 'px' }" @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']"
- :style="{ height: 35 * item['glassWidth'] + 'px' }" @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:139px;left:237px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist3" :key="item['date']"
- :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px' }"
+ <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:139px;left:640px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist4" :key="item['date']"
- :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px' }"
+ <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>
@@ -264,23 +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']"
- :style="{ height: 35 * item['glassWidth'] + 'px' }"
+ <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']"
- :style="{ height: 35 * item['glassWidth'] + 'px' }"
+ <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']"
- :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px' }"
+ <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']"
- :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px' }"
+ <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>
@@ -360,7 +360,7 @@
</template>
<script>
-import { home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID } from "../../api/home";
+import { home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist } from "../../api/home";
import LanguageMixin from '../../lang/LanguageMixin'
@@ -397,12 +397,13 @@
order: "",
glassid: "",
url: "../../img/bigcar01.png",
- car1: 107,
- car2: 175,
- // car1: 150,
- // car2: 242,
+ car1: 145,
+ car2: 210,
+ // car1: 210,
+ // car2: 300,
cageinfo: [],
- cage: 0
+ cage: 0,
+ carlist:[]
};
},
created() {
@@ -434,10 +435,10 @@
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
if (obj.params != null) {
- 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.car1 = 145 + 8.15 * (obj.params[0][0]-this.carlist[0]['start'])/(this.carlist[0]['end']-this.carlist[0]['start'])*100;
+ this.car2 = 210 + 8.15 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;
+ // this.car1 = 210 + 11.25 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;
+ // this.car2 = 300 + 11.25 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;
}
this.tableData = obj.tableData[0];
this.cagelist1 = obj.cagelist1[0];
@@ -486,15 +487,17 @@
if (res.data.list.length > 0) {
this.outcell = this.tasklist2[0]['cell'];
}
-
});
loadtask(this.task2).then(res => {
this.tasklist2 = res.data.list;
-
});
SelectAlarmmgInfo().then(res => {
this.alarm = res.data.alarmmg;
});
+ Loadcarlist().then(res => {
+ this.carlist = res.data.carlist;
+ console.log(this.carlist);
+ });
},
//鏍规嵁鏍煎瓙鐘舵�佷慨鏀归鑹�
getStatusClass(state) {
--
Gitblit v1.8.0