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/centerLeft1index.vue | 63 +++++++++++++++----------------
1 files changed, 31 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/centerLeft1index.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft1index.vue"
index 996ea87..5fdfecf 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft1index.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft1index.vue"
@@ -171,7 +171,7 @@
</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>
@@ -182,7 +182,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>
@@ -199,7 +199,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>
@@ -211,7 +211,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>
@@ -225,7 +225,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>
@@ -237,7 +237,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>
@@ -255,7 +255,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>
@@ -267,7 +267,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>
@@ -293,7 +293,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>
@@ -305,7 +305,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>
@@ -320,7 +320,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>
@@ -332,7 +332,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>
@@ -353,7 +353,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>
@@ -367,7 +367,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>
@@ -444,7 +444,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>
@@ -455,7 +455,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>
@@ -474,7 +474,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>
@@ -486,7 +486,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>
@@ -500,7 +500,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>
@@ -512,7 +512,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>
@@ -530,7 +530,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>
@@ -541,7 +541,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>
@@ -568,7 +568,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>
@@ -596,7 +596,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>
@@ -623,7 +623,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>
@@ -650,7 +650,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>
@@ -663,7 +663,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>
@@ -681,7 +681,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>
@@ -693,7 +693,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>
@@ -960,7 +960,6 @@
open(staname) {
this.http.get('api/Readplc/Four_unit_plc?staname=' + staname).then(x => {
this.dataFList = x;
-
this.isModalVisible = true;
})
.catch(error => {
@@ -1015,7 +1014,7 @@
}
</script>
-<style>
+<style scoped>
.contents {
display: flex;
align-items: flex-end;
@@ -1049,7 +1048,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