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/centerLeft3index.vue | 65 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 32 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft3index.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft3index.vue"
index 9a07461..efdc9cf 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft3index.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft3index.vue"
@@ -3,6 +3,7 @@
<!--杞﹂棿涔嬩笂鐨勮緤閬撶嚎-->
<div class="box" style="margin-left: 170px;">
+ <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">
@@ -38,7 +39,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 style="width: 100px;">杞﹁疆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 +50,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 +67,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 +79,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 +93,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 +105,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 +123,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 +134,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 +156,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="left">
- <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 +168,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 +183,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="left">
- <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 +195,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>
@@ -317,7 +318,7 @@
<div>
<div>
<el-tooltip class="item" effect="dark" placement="left">
- <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>
@@ -330,7 +331,7 @@
</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 != ''">
+ 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>
@@ -407,7 +408,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="left">
- <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>
@@ -418,7 +419,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>
@@ -437,7 +438,7 @@
<div style="display: flex;">
<div v-for="items in plcList_one.section_eight">
<el-tooltip class="item" effect="dark" placement="left">
- <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>
@@ -449,7 +450,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>
@@ -463,7 +464,7 @@
<div style="display: flex;margin-left: 5px;">
<div v-for="items in plcList_one.section_nine">
<el-tooltip class="item" effect="dark" placement="left">
- <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>
@@ -475,7 +476,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>
@@ -494,7 +495,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="left">
- <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>
@@ -505,7 +506,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>
@@ -535,7 +536,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>
@@ -548,7 +549,7 @@
</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 != ''">
+ 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>
@@ -563,7 +564,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>
@@ -576,7 +577,7 @@
</template>
<div class="box2_sto_yj">
<img src="../../../assets/imgs/jxscl.png" style="width: 100%;"
- v-if="items.r_wheel_SN != ''">
+ 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>
@@ -629,7 +630,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>
@@ -641,7 +642,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>
@@ -659,7 +660,7 @@
<div v-for="items in plcList_one.section_thirteen" class="box_sto2"
:style="{ 'background-color': getBackgroundColor2(items.r_wheel_SN) }">
<el-tooltip class="item" effect="dark" placement="left">
- <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>
@@ -671,7 +672,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>
@@ -985,7 +986,7 @@
}
</script>
-<style>
+<style scoped>
.contents {
display: flex;
align-items: flex-end;
@@ -995,7 +996,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