From 0deffcf086c01690773682b5c4e461386ab059e9 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期三, 26 六月 2024 14:43:58 +0800
Subject: [PATCH] 提交
---
代码管理/PCS/WCS_Client/src/views/Homes/Homest/centerLeft2index.vue | 73 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 35 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft2index.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft2index.vue"
index 02d600c..175c012 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft2index.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft2index.vue"
@@ -1,8 +1,10 @@
<template>
<div class="container">
- <!--杞﹂棿涔嬩笂鐨勮緤閬撶嚎-->
+ <div>
+ <!--杞﹂棿涔嬩笂鐨勮緤閬撶嚎-->
<div class="box" style="margin-left: 203px;">
+ <div style="height: 1px;"></div>
<div v-for="items in plcList_one.section_four" class="box_sto"
:style="{ 'background-color': getBackgroundColor2(items.r_wheel_SN) }">
<el-tooltip class="item" effect="dark" placement="right">
@@ -27,6 +29,7 @@
</div>
</div>
<!--杞﹂棿涔嬩笂鐨勮緤閬撶嚎-->
+ </div>
<!--涓婅溅闂�-->
<div style="margin-top: -6px;margin-left: 58px;">
@@ -38,7 +41,7 @@
<div style="width: 40px;height: 43px;" :style="{ 'background-color': getBackgroundColor4(items.c_machine_state) }"></div>
<div style="width: 100px;">
<el-tooltip class="item" effect="dark" placement="right">
- <template #content v-if="items.r_wheel_SN !=''">
+ <template #content v-if="items.r_wheel_SN !='' && items.r_wheel_SN != null">
<div >r_wheel_SN锛歿{ items.r_wheel_SN }}</div>
<div>r_wheel_type锛歿{ items.r_wheel_type }}</div>
<div>r_part_status锛歿{ items.r_part_status }}</div>
@@ -49,7 +52,7 @@
<div>鐩墠鏆傛棤杞﹁疆淇℃伅</div>
<div>stackerNo:{{ items.stackerNo }}</div>
</template>
- <div class="quan_div" style="margin: 0px auto;" v-if="items.r_wheel_SN != ''">
+ <div class="quan_div" style="margin: 0px auto;" v-if="items.r_wheel_SN != '' && items.r_wheel_SN != null">
<img src="../../../assets/imgs/pcs_lun.png" style="width: 100%;">
</div>
<div v-else>{{ items.stackerNo }}</div>
@@ -66,7 +69,7 @@
<div style="display: flex;">
<div v-for="items in plcList_one.section_six">
<el-tooltip class="item" effect="dark" placement="top">
- <template #content v-if="items.r_wheel_SN !=''">
+ <template #content v-if="items.r_wheel_SN !='' && items.r_wheel_SN != null">
<div >r_wheel_SN锛歿{ items.r_wheel_SN }}</div>
<div>r_wheel_type锛歿{ items.r_wheel_type }}</div>
<div>r_part_status锛歿{ items.r_part_status }}</div>
@@ -78,7 +81,7 @@
<div>stackerNo:{{ items.stackerNo }}</div>
</template>
<div class="box_stoy">
- <div class="quan_div" v-if="items.r_wheel_SN != ''">
+ <div class="quan_div" v-if="items.r_wheel_SN != '' && items.r_wheel_SN != null">
<img src="../../../assets/imgs/pcs_lun.png" style="width: 100%;">
</div>
<div v-else>{{ items.stackerNo }}</div>
@@ -92,7 +95,7 @@
<div style="display: flex;margin-left: 5px;">
<div v-for="items in plcList_one.section_seven">
<el-tooltip class="item" effect="dark" placement="top">
- <template #content v-if="items.r_wheel_SN !=''">
+ <template #content v-if="items.r_wheel_SN !='' && items.r_wheel_SN != null">
<div >r_wheel_SN锛歿{ items.r_wheel_SN }}</div>
<div>r_wheel_type锛歿{ items.r_wheel_type }}</div>
<div>r_part_status锛歿{ items.r_part_status }}</div>
@@ -104,7 +107,7 @@
<div>stackerNo:{{ items.stackerNo }}</div>
</template>
<div class="box_stoy">
- <div class="quan_div" v-if="items.r_wheel_SN != ''">
+ <div class="quan_div" v-if="items.r_wheel_SN != '' && items.r_wheel_SN != null">
<img src="../../../assets/imgs/pcs_lun.png" style="width: 100%;">
</div>
<div v-else>{{ items.stackerNo }}</div>
@@ -122,7 +125,7 @@
<div style="width: 40px;height: 43px;" :style="{ 'background-color': getBackgroundColor4(items.c_machine_state) }"></div>
<div style="width: 100px;">
<el-tooltip class="item" effect="dark" placement="right">
- <template #content v-if="items.r_wheel_SN !=''">
+ <template #content v-if="items.r_wheel_SN !='' && items.r_wheel_SN != null">
<div >r_wheel_SN锛歿{ items.r_wheel_SN }}</div>
<div>r_wheel_type锛歿{ items.r_wheel_type }}</div>
<div>r_part_status锛歿{ items.r_part_status }}</div>
@@ -133,7 +136,7 @@
<div>鐩墠鏆傛棤杞﹁疆淇℃伅</div>
<div>stackerNo:{{ items.stackerNo }}</div>
</template>
- <div class="quan_div" style="margin: 0px auto;" v-if="items.r_wheel_SN != ''">
+ <div class="quan_div" style="margin: 0px auto;" v-if="items.r_wheel_SN != '' && items.r_wheel_SN != null">
<img src="../../../assets/imgs/pcs_lun.png" style="width: 100%;">
</div>
<div v-else>{{ items.stackerNo }}</div>
@@ -155,7 +158,7 @@
<div v-for="items in plcList_one.section_three" class="box_sto"
:style="{ 'background-color': getBackgroundColor2(items.r_wheel_SN) }">
<el-tooltip class="item" effect="dark" placement="right">
- <template #content v-if="items.r_wheel_SN !=''">
+ <template #content v-if="items.r_wheel_SN !='' && items.r_wheel_SN != null">
<div >r_wheel_SN锛歿{ items.r_wheel_SN }}</div>
<div>r_wheel_type锛歿{ items.r_wheel_type }}</div>
<div>r_part_status锛歿{ items.r_part_status }}</div>
@@ -167,7 +170,7 @@
<div>stackerNo:{{ items.stackerNo }}</div>
</template>
<div class="box_sto_dt">
- <div class="quan_div" v-if="items.r_wheel_SN != ''">
+ <div class="quan_div" v-if="items.r_wheel_SN != '' && items.r_wheel_SN != null">
<img src="../../../assets/imgs/pcs_lun.png" style="width: 100%;">
</div>
<div v-else>{{ items.stackerNo }}</div>
@@ -182,7 +185,7 @@
<div v-for="items in plcList_one.section_two" class="box_sto"
:style="{ 'background-color': getBackgroundColor2(items.r_wheel_SN) }">
<el-tooltip class="item" effect="dark" placement="right">
- <template #content v-if="items.r_wheel_SN !=''">
+ <template #content v-if="items.r_wheel_SN !='' && items.r_wheel_SN != null">
<div >r_wheel_SN锛歿{ items.r_wheel_SN }}</div>
<div>r_wheel_type锛歿{ items.r_wheel_type }}</div>
<div>r_part_status锛歿{ items.r_part_status }}</div>
@@ -194,7 +197,7 @@
<div>stackerNo:{{ items.stackerNo }}</div>
</template>
<div class="box_sto_dt">
- <div class="quan_div" v-if="items.r_wheel_SN != ''">
+ <div class="quan_div" v-if="items.r_wheel_SN != '' && items.r_wheel_SN != null">
<img src="../../../assets/imgs/pcs_lun.png" style="width: 100%;">
</div>
<div v-else>{{ items.stackerNo }}</div>
@@ -215,7 +218,7 @@
<div>
<div>
<el-tooltip class="item" effect="dark" placement="top">
- <template #content v-if="items.r_wheel_SN !==''">
+ <template #content v-if="items.r_wheel_SN !=='' && items.r_wheel_SN != null">
<div>r_wheel_SN锛歿{ items.r_wheel_SN }}</div>
<div>r_wheel_type锛歿{ items.r_wheel_type }}</div>
<div>r_part_status锛歿{ items.r_part_status }}</div>
@@ -227,7 +230,7 @@
<div>stackerNo:{{ items.stackerNo }}</div>
</template>
<div class="box2_sto_yj" :style="{ 'background-color': getBackgroundColor4(items.g_gantry_state) }">
- <img src="../../../assets/imgs/jxscl.png" style="width: 100%;" v-if="items.r_wheel_SN !=''">
+ <img src="../../../assets/imgs/jxscl.png" style="width: 100%;" v-if="items.r_wheel_SN !='' && items.r_wheel_SN != null">
<img src="../../../assets/imgs/jxsk.png" style="width: 100%;" v-else>
</div>
</el-tooltip>
@@ -304,7 +307,7 @@
<div style="width: 40px;height: 43px;" :style="{ 'background-color': getBackgroundColor4(items.c_machine_state) }"></div>
<div style="width: 100px;">
<el-tooltip class="item" effect="dark" placement="right">
- <template #content v-if="items.r_wheel_SN !=''">
+ <template #content v-if="items.r_wheel_SN !='' && items.r_wheel_SN != null">
<div >r_wheel_SN锛歿{ items.r_wheel_SN }}</div>
<div>r_wheel_type锛歿{ items.r_wheel_type }}</div>
<div>r_part_status锛歿{ items.r_part_status }}</div>
@@ -315,7 +318,7 @@
<div>鐩墠鏆傛棤杞﹁疆淇℃伅</div>
<div>stackerNo:{{ items.stackerNo }}</div>
</template>
- <div class="quan_div" style="margin: 0px auto;" v-if="items.r_wheel_SN != ''">
+ <div class="quan_div" style="margin: 0px auto;" v-if="items.r_wheel_SN != '' && items.r_wheel_SN != null">
<img src="../../../assets/imgs/pcs_lun.png" style="width: 100%;">
</div>
<div v-else>{{ items.stackerNo }}</div>
@@ -334,7 +337,7 @@
<div style="display: flex;">
<div v-for="items in plcList_one.section_eight">
<el-tooltip class="item" effect="dark" placement="right">
- <template #content v-if="items.r_wheel_SN !=''">
+ <template #content v-if="items.r_wheel_SN !='' && items.r_wheel_SN != null">
<div >r_wheel_SN锛歿{ items.r_wheel_SN }}</div>
<div>r_wheel_type锛歿{ items.r_wheel_type }}</div>
<div>r_part_status锛歿{ items.r_part_status }}</div>
@@ -346,7 +349,7 @@
<div>stackerNo:{{ items.stackerNo }}</div>
</template>
<div class="box_stoy">
- <div class="quan_div" v-if="items.r_wheel_SN != ''">
+ <div class="quan_div" v-if="items.r_wheel_SN != '' && items.r_wheel_SN != null">
<img src="../../../assets/imgs/pcs_lun.png" style="width: 100%;">
</div>
<div v-else>{{ items.stackerNo }}</div>
@@ -360,7 +363,7 @@
<div style="display: flex;margin-left: 5px;">
<div v-for="items in plcList_one.section_nine">
<el-tooltip class="item" effect="dark" placement="right">
- <template #content v-if="items.r_wheel_SN !=''">
+ <template #content v-if="items.r_wheel_SN !='' && items.r_wheel_SN != null">
<div >r_wheel_SN锛歿{ items.r_wheel_SN }}</div>
<div>r_wheel_type锛歿{ items.r_wheel_type }}</div>
<div>r_part_status锛歿{ items.r_part_status }}</div>
@@ -372,7 +375,7 @@
<div>stackerNo:{{ items.stackerNo }}</div>
</template>
<div class="box_stoy">
- <div class="quan_div" v-if="items.r_wheel_SN != ''">
+ <div class="quan_div" v-if="items.r_wheel_SN != '' && items.r_wheel_SN != null">
<img src="../../../assets/imgs/pcs_lun.png" style="width: 100%;">
</div>
<div v-else>{{ items.stackerNo }}</div>
@@ -391,7 +394,7 @@
<div style="width: 40px;height: 43px;" :style="{ 'background-color': getBackgroundColor4(items.c_machine_state) }"></div>
<div style="width: 100px;">
<el-tooltip class="item" effect="dark" placement="right">
- <template #content v-if="items.r_wheel_SN !=''">
+ <template #content v-if="items.r_wheel_SN !='' && items.r_wheel_SN != null">
<div >r_wheel_SN锛歿{ items.r_wheel_SN }}</div>
<div>r_wheel_type锛歿{ items.r_wheel_type }}</div>
<div>r_part_status锛歿{ items.r_part_status }}</div>
@@ -402,7 +405,7 @@
<div>鐩墠鏆傛棤杞﹁疆淇℃伅</div>
<div>stackerNo:{{ items.stackerNo }}</div>
</template>
- <div class="quan_div" style="margin: 0px auto;" v-if="items.r_wheel_SN != ''">
+ <div class="quan_div" style="margin: 0px auto;" v-if="items.r_wheel_SN != '' && items.r_wheel_SN != null">
<img src="../../../assets/imgs/pcs_lun.png" style="width: 100%;">
</div>
<div v-else>{{ items.stackerNo }}</div>
@@ -430,7 +433,7 @@
<div>
<div>
<el-tooltip class="item" effect="dark" placement="top">
- <template #content v-if="items.r_wheel_SN !=''">
+ <template #content v-if="items.r_wheel_SN !='' && items.r_wheel_SN != null">
<div>r_wheel_SN锛歿{ items.r_wheel_SN }}</div>
<div>r_wheel_type锛歿{ items.r_wheel_type }}</div>
<div>r_part_status锛歿{ items.r_part_status }}</div>
@@ -442,7 +445,7 @@
<div>stackerNo:{{ items.stackerNo }}</div>
</template>
<div style="border: 1px solid #ffffff; width: 45px; height: 42px; ">
- <img src="../../../assets/imgs/huojialun.png" style="width: 100%;" v-if="items.r_wheel_SN !=''">
+ <img src="../../../assets/imgs/huojialun.png" style="width: 100%;" v-if="items.r_wheel_SN !='' && items.r_wheel_SN != null">
<img src="../../../assets/imgs/huojia.png" style="width: 100%;" v-else>
</div>
</el-tooltip>
@@ -455,7 +458,7 @@
<div>
<div>
<el-tooltip class="item" effect="dark" placement="top">
- <template #content v-if="items.r_wheel_SN !=''">
+ <template #content v-if="items.r_wheel_SN !='' && items.r_wheel_SN != null">
<div>r_wheel_SN锛歿{ items.r_wheel_SN }}</div>
<div>r_wheel_type锛歿{ items.r_wheel_type }}</div>
<div>r_part_status锛歿{ items.r_part_status }}</div>
@@ -467,7 +470,7 @@
<div>stackerNo:{{ items.stackerNo }}</div>
</template>
<div style="border: 1px solid #ffffff; width: 45px; height: 42px; ">
- <img src="../../../assets/imgs/huojialun.png" style="width: 100%;" v-if="items.r_wheel_SN !=''">
+ <img src="../../../assets/imgs/huojialun.png" style="width: 100%;" v-if="items.r_wheel_SN !='' && items.r_wheel_SN != null">
<img src="../../../assets/imgs/huojia.png" style="width: 100%;" v-else>
</div>
</el-tooltip>
@@ -480,7 +483,7 @@
<div>
<div>
<el-tooltip class="item" effect="dark" placement="top">
- <template #content v-if="items.r_wheel_SN !=''">
+ <template #content v-if="items.r_wheel_SN !='' && items.r_wheel_SN != null">
<div>r_wheel_SN锛歿{ items.r_wheel_SN }}</div>
<div>r_wheel_type锛歿{ items.r_wheel_type }}</div>
<div>r_part_status锛歿{ items.r_part_status }}</div>
@@ -492,7 +495,7 @@
<div>stackerNo:{{ items.stackerNo }}</div>
</template>
<div style="border: 1px solid #ffffff; width: 45px; height: 67px; ">
- <img src="../../../assets/imgs/tuyoujilun.png" style="width: 100%;" v-if="items.r_wheel_SN !=''">
+ <img src="../../../assets/imgs/tuyoujilun.png" style="width: 100%;" v-if="items.r_wheel_SN !='' && items.r_wheel_SN != null">
<img src="../../../assets/imgs/tuyouji.png" style="width: 100%;" v-else>
</div>
</el-tooltip>
@@ -506,7 +509,7 @@
<div>
<div>
<el-tooltip class="item" effect="dark" placement="top">
- <template #content v-if="items.r_wheel_SN !==''">
+ <template #content v-if="items.r_wheel_SN !=='' && items.r_wheel_SN != null">
<div >r_wheel_SN锛歿{ items.r_wheel_SN }}</div>
<div>r_wheel_type锛歿{ items.r_wheel_type }}</div>
<div>r_part_status锛歿{ items.r_part_status }}</div>
@@ -518,7 +521,7 @@
<div>stackerNo:{{ items.stackerNo }}</div>
</template>
<div class="box2_sto_yj">
- <img src="../../../assets/imgs/jxscl.png" style="width: 100%;" v-if="items.r_wheel_SN !=''">
+ <img src="../../../assets/imgs/jxscl.png" style="width: 100%;" v-if="items.r_wheel_SN !='' && items.r_wheel_SN != null">
<img src="../../../assets/imgs/jxsk.png" style="width: 100%;" v-else>
</div>
</el-tooltip>
@@ -536,7 +539,7 @@
<div v-for="items in plcList_one.section_one" class="box_sto"
:style="{ 'background-color': getBackgroundColor2(items.r_wheel_SN) }">
<el-tooltip class="item" effect="dark" placement="right">
- <template #content v-if="items.r_wheel_SN != ''">
+ <template #content v-if="items.r_wheel_SN != '' && items.r_wheel_SN != null">
<div>r_wheel_SN锛歿{ items.r_wheel_SN }}</div>
<div>r_wheel_type锛歿{ items.r_wheel_type }}</div>
<div>r_part_status锛歿{ items.r_part_status }}</div>
@@ -548,7 +551,7 @@
<div>stackerNo:{{ items.stackerNo }}</div>
</template>
<div class="box_sto_dt">
- <div class="quan_div" v-if="items.r_wheel_SN != ''">
+ <div class="quan_div" v-if="items.r_wheel_SN != '' && items.r_wheel_SN != null">
<img src="../../../assets/imgs/pcs_lun.png" style="width: 100%;">
</div>
<div v-else>{{ items.stackerNo }}</div>
@@ -871,7 +874,7 @@
}
</script>
-<style>
+<style scoped>
.contents {
display: flex;
align-items: flex-end;
@@ -881,7 +884,7 @@
.box {
background-color: rgb(129, 179, 182);
width: 80px;
- height: 405px;
+ height: 415px;
margin-left: 3px;
color: rgb(255, 255, 255);
font-size: 16px;
--
Gitblit v1.9.3