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 +++---
代码管理/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs | 421 ++++++++++++++++++++++++++++++-------
代码管理/PCS/WCS_Client/src/views/Homes/Homest/centerLeft3index.vue | 65 +++--
代码管理/PCS/WCS_Client/src/views/Homes/Homest/centerLeft1index.vue | 63 ++--
4 files changed, 436 insertions(+), 186 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;
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;
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;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs"
index 8bb61cc..34252f0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs"
@@ -1,4 +1,6 @@
锘縰sing Microsoft.AspNetCore.Mvc;
+using OfficeOpenXml.Drawing.Chart;
+using System;
using System.Collections.Generic;
using System.Linq;
using WIDESEA_Comm;
@@ -16,7 +18,7 @@
public class ReadplcController : Controller
{
#region PCS骞抽潰鍥�
- public class SectionData //姝诲弬鏁�
+ public class SectionData //闈欐�佸弬鏁�
{
public int r_direction { get; set; }
public bool r_machine_nr { get; set; }
@@ -25,6 +27,8 @@
public string r_wheel_SN { get; set; }
public int r_wheel_type { get; set; }
public string stackerNo { get; set; }
+ public string Name { get; set; }
+ public int vk_state { get; set; }
}
#region 杈婇亾1
@@ -33,16 +37,61 @@
{
var DBIems = WheelDBItem.VK4WheelDBItem; //鑾峰彇杈婇亾锛岃緭閫佺嚎淇℃伅
var DBIems2 = VKDBItem.VK4DBItem; //VK4鐘舵�佷俊鎭璞￠泦鍚�
- var DBIems3 = GantryDBItem.VK4GantryDBItem.Where(x => x.Name == "Gantry1").FirstOrDefault(); // VK4妗佹灦鏈烘鎵嬪璞￠泦鍚�
+ // VK4妗佹灦鏈烘鎵嬪璞￠泦鍚�
+ if (DBIems.Count == 0)
+ {
+ List<SectionData> DBIemss = new List<SectionData>();
+ for (int i = 0; i < 32; i++)
+ {
+ var seDataList = new SectionData
+ {
+ r_direction = 0,
+ r_machine_nr = false,
+ r_part_process = 1,
+ r_part_status = 0,
+ r_wheel_SN = "",
+ r_wheel_type = 3,
+ stackerNo = "4." + i.ToString(),
+ };
+ switch (i)
+ {
+ case 27:
+ seDataList.stackerNo = "鏈烘鎵�1";
+ break;
+ case 28:
+ seDataList.stackerNo = "10.11";
+ break;
+ case 29:
+ seDataList.stackerNo = "10.12";
+ break;
+ case 30:
+ seDataList.stackerNo = "10.5";
+ break;
+ case 31:
+ seDataList.stackerNo = "10.6";
+ break;
+ default:
+ break;
+ }
+ DBIemss.Add(seDataList);
+ }
+
+
+
+ List<WheelDBItem> convertedList = DBIemss.Select(sd => new WheelDBItem
+ {
+ StackerNo = sd.stackerNo,
+ }).ToList();
+
+ DBIems = convertedList;
+ }
var Section_one = DBIems.Where(x => IsInRange(x.StackerNo, 4, 13, 4, 24)).ToList();
var Section_two = DBIems.Where(x => IsInRange(x.StackerNo, 4, 11, 4, 12)).ToList();
var Section_three = DBIems.Where(x => IsInRange(x.StackerNo, 4, 9, 4, 10)).ToList();
var Section_four = DBIems.Where(x => IsInRange(x.StackerNo, 4, 1, 4, 8)).ToList();
-
-
var Section_six = DBIems.Where(x => IsInRange(x.StackerNo, 10, 1, 10, 2)).ToList(); //10.1-10.2
var Section_seven = DBIems.Where(x => IsInRange(x.StackerNo, 10, 3, 10, 4)).ToList(); //10.3-10.4
var Section_eight = DBIems.Where(x => IsInRange(x.StackerNo, 10, 7, 10, 8)).ToList(); //10.7-10.8
@@ -50,44 +99,17 @@
+
#region
-
- //var Section_five = DBIems.Where(x => IsInRange(x.StackerNo, 10, 5, 10, 6) || IsInRange(x.StackerNo, 10, 11, 10, 12)).ToList();
-
var Section_five = DBIems
.Where(x => IsInRange(x.StackerNo, 10, 5, 10, 6) || IsInRange(x.StackerNo, 10, 11, 10, 12))
.Select(x => CreateSectionFiveItem(x))
.ToList();
#endregion
-
-
-
-
//鑰佹満姊版墜
var Section_ten = DBIems.Where(x => x.StackerNo == "鏈烘鎵�1")
- .Select(x => new
- {
- stackerNo = x.StackerNo,
- r_wheel_SN = x.R_wheel_SN,
- r_wheel_type = x.R_wheel_type,
- r_part_status = x.R_part_status,
- r_part_process = x.R_part_process,
- g_name = DBIems3.Name,
- g_communication_IO = DBIems3.communication_IO,
- g_drive_fault = DBIems3.drive_fault,
- g_emergency_stop_portal = DBIems3.emergency_stop_portal,
- g_gantry_state = DBIems3.gantry_state,
- g_portal_fault = DBIems3.portal_fault,
- g_power_on = DBIems3.power_on,
- g_programm_running = DBIems3.programm_running,
- g_ready_for_auto_start = DBIems3.ready_for_auto_start,
- g_ready_for_operate = DBIems3.ready_for_operate,
- g_state_AUTO = DBIems3.state_AUTO,
- g_state_JOG = DBIems3.state_JOG,
- g_state_MDA = DBIems3.state_MDA,
-
- })
+ .Select(x => CreateSectionFiveItem4(x, 1))
.ToList();
@@ -101,9 +123,6 @@
r_wheel_type = x.R_wheel_type,
r_part_status = x.R_part_status,
r_part_process = x.R_part_process,
-
-
-
})
.ToList();
@@ -127,7 +146,24 @@
var Section_thirteen = DBIems.Where(x => x.StackerNo == "4.11").ToList(); //瑙嗚妫�娴嬪彴
var Section_fourteen = DBIems.Where(x => x.StackerNo == "4.12").ToList(); //瑙嗚妫�娴嬪彴
+
var Section_fifteen = DBIems2.ToList();
+ if (DBIems2.Count == 0)
+ {
+ List<SectionData> sectDataList1 = new List<SectionData>();
+ var seDataList1 = new SectionData
+ {
+ Name = "VK4",
+ vk_state = 0,
+
+ };
+ sectDataList1.Add(seDataList1);
+ List<VKDBItem> convertedList = sectDataList1.Select(sd => new VKDBItem
+ {
+ Name = sd.Name,
+ }).ToList();
+ Section_fifteen = convertedList;
+ }
var data = new
{
@@ -152,7 +188,7 @@
return Ok(data);
}
- private object CreateSectionFiveItem(WheelDBItem x)
+ private object CreateSectionFiveItem(WheelDBItem x) //杞﹀簥鏁版嵁
{
var stackerToMachineMap = new Dictionary<string, string>
{
@@ -179,11 +215,17 @@
{
return new
{
- StackerNo = (string)null,
-
+ stackerNo = x.StackerNo,
+ r_wheel_SN = x.R_wheel_SN,
+ r_wheel_type = x.R_wheel_type,
+ r_part_status = x.R_part_status,
+ r_part_process = x.R_part_process,
+ c_machine_state = 0,
};
}
}
+
+
[HttpGet("Four_unit_plc")]
public IActionResult Four_unit_plc(string staname)
@@ -194,12 +236,122 @@
}
#endregion
+ #region 鍏辩敤鏂规硶锛堣緤閬�1-2锛�
+ private object CreateSectionFiveItem4(WheelDBItem x, int k) //鏈烘鎵嬫暟鎹�
+ {
+ var DBIems3 = GantryDBItem.VK4GantryDBItem.Where(x => x.Name == "Gantry1").FirstOrDefault();
+ if (k == 2)
+ {
+ DBIems3 = GantryDBItem.VK4GantryDBItem.Where(x => x.Name == "Gantry2").FirstOrDefault();
+ }
+ if (DBIems3 == null)
+ {
+ return new
+ {
+ stackerNo = x.StackerNo,
+ r_wheel_SN = x.R_wheel_SN,
+ r_wheel_type = x.R_wheel_type,
+ r_part_status = x.R_part_status,
+ r_part_process = x.R_part_process,
+ g_name = false,
+ g_communication_IO = false,
+ g_drive_fault = false,
+ g_emergency_stop_portal = false,
+ g_gantry_state = false,
+ g_portal_fault = false,
+ g_power_on = false,
+ g_programm_running = false,
+ g_ready_for_auto_start = false,
+ g_ready_for_operate = false,
+ g_state_AUTO = false,
+ g_state_JOG = false,
+ g_state_MDA = false,
+
+ };
+ }
+ else
+ {
+ return new
+ {
+ stackerNo = x.StackerNo,
+ r_wheel_SN = x.R_wheel_SN,
+ r_wheel_type = x.R_wheel_type,
+ r_part_status = x.R_part_status,
+ r_part_process = x.R_part_process,
+ g_name = DBIems3.Name,
+ g_communication_IO = DBIems3.communication_IO,
+ g_drive_fault = DBIems3.drive_fault,
+ g_emergency_stop_portal = DBIems3.emergency_stop_portal,
+ g_gantry_state = DBIems3.gantry_state,
+ g_portal_fault = DBIems3.portal_fault,
+ g_power_on = DBIems3.power_on,
+ g_programm_running = DBIems3.programm_running,
+ g_ready_for_auto_start = DBIems3.ready_for_auto_start,
+ g_ready_for_operate = DBIems3.ready_for_operate,
+ g_state_AUTO = DBIems3.state_AUTO,
+ g_state_JOG = DBIems3.state_JOG,
+ g_state_MDA = DBIems3.state_MDA,
+
+ };
+ }
+ }
+ #endregion
+
+
#region 杈婇亾2
[HttpPost("Two_unit_plc")]
public IActionResult Two_unit_plc()
{
var DBIems = WheelDBItem.VK4WheelDBItem;
var DBIems3 = GantryDBItem.VK4GantryDBItem.Where(x => x.Name == "Gantry2").FirstOrDefault();
+ if (DBIems.Count == 0)
+ {
+ List<SectionData> DBIemss = new List<SectionData>();
+ for (int i = 0; i < 32; i++)
+ {
+ var seDataList = new SectionData
+ {
+ r_direction = 0,
+ r_machine_nr = false,
+ r_part_process = 1,
+ r_part_status = 0,
+ r_wheel_SN = "",
+ r_wheel_type = 3,
+ stackerNo = "5." + i.ToString(),
+ };
+ switch (i)
+ {
+ case 27:
+ seDataList.stackerNo = "鏈烘鎵�2";
+ break;
+ case 28:
+ seDataList.stackerNo = "20.11";
+ break;
+ case 29:
+ seDataList.stackerNo = "20.12";
+ break;
+ case 30:
+ seDataList.stackerNo = "20.5";
+ break;
+ case 31:
+ seDataList.stackerNo = "20.6";
+ break;
+ default:
+ break;
+ }
+ DBIemss.Add(seDataList);
+ }
+
+
+
+ List<WheelDBItem> convertedList = DBIemss.Select(sd => new WheelDBItem
+ {
+ StackerNo = sd.stackerNo,
+ }).ToList();
+
+ DBIems = convertedList;
+ }
+
List<SectionData> DataList2 = new List<SectionData>();
var Section_one = DBIems.Where(x => IsInRange(x.StackerNo, 5, 13, 5, 24)).ToList();
@@ -226,28 +378,7 @@
//鑰佹満姊版墜锛堟満搴婁綅锛�
var Section_ten = DBIems.Where(x => x.StackerNo == "鏈烘鎵�2")
- .Select(x => new
- {
- stackerNo = x.StackerNo,
- r_wheel_SN = x.R_wheel_SN,
- r_wheel_type = x.R_wheel_type,
- r_part_status = x.R_part_status,
- r_part_process = x.R_part_process,
- g_name = DBIems3.Name,
- g_communication_IO = DBIems3.communication_IO,
- g_drive_fault = DBIems3.drive_fault,
- g_emergency_stop_portal = DBIems3.emergency_stop_portal,
- g_gantry_state = DBIems3.gantry_state,
- g_portal_fault = DBIems3.portal_fault,
- g_power_on = DBIems3.power_on,
- g_programm_running = DBIems3.programm_running,
- g_ready_for_auto_start = DBIems3.ready_for_auto_start,
- g_ready_for_operate = DBIems3.ready_for_operate,
- g_state_AUTO = DBIems3.state_AUTO,
- g_state_JOG = DBIems3.state_JOG,
- g_state_MDA = DBIems3.state_MDA,
-
- })
+ .Select(x => CreateSectionFiveItem4(x, 2))
.ToList();
@@ -322,7 +453,12 @@
{
return new
{
- StackerNo = (string)null,
+ stackerNo = x.StackerNo,
+ r_wheel_SN = x.R_wheel_SN,
+ r_wheel_type = x.R_wheel_type,
+ r_part_status = x.R_part_status,
+ r_part_process = x.R_part_process,
+ c_machine_state = 0,
};
}
@@ -346,7 +482,59 @@
var DBIems = WheelDBItem.VK5WheelDBItem;
var DBIems2 = VKDBItem.VK5DBItem; //VK4鐘舵�佷俊鎭璞￠泦鍚�
- var DBIems3 = GantryDBItem.VK5GantryDBItem.Where(x => x.Name == "Gantry3").FirstOrDefault();
+
+
+ if (DBIems.Count == 0)
+ {
+ List<SectionData> DBIemss = new List<SectionData>();
+ for (int i = 0; i < 31; i++)
+ {
+ var seDataList = new SectionData
+ {
+ r_direction = 0,
+ r_machine_nr = false,
+ r_part_process = 0,
+ r_part_status = 0,
+ r_wheel_SN = "",
+ r_wheel_type = 0,
+ stackerNo = "6." + i.ToString(),
+ };
+ switch (i)
+ {
+ case 25:
+ seDataList.stackerNo = "7.21";
+ break;
+ case 26:
+ seDataList.stackerNo = "30.9";
+ break;
+ case 27:
+ seDataList.stackerNo = "30.10";
+ break;
+ case 28:
+ seDataList.stackerNo = "30.4";
+ break;
+ case 29:
+ seDataList.stackerNo = "30.5";
+ break;
+ case 30:
+ seDataList.stackerNo = "鏈烘鎵�3";
+ break;
+ default:
+ break;
+ }
+ DBIemss.Add(seDataList);
+ }
+
+
+
+ List<WheelDBItem> convertedList = DBIemss.Select(sd => new WheelDBItem
+ {
+ StackerNo = sd.stackerNo,
+ }).ToList();
+
+ DBIems = convertedList;
+ }
+
var Section_one = DBIems.Where(x => IsInRange(x.StackerNo, 6, 13, 6, 20) || x.StackerNo == "6.24" || x.StackerNo == "7.21").ToList();
var Section_two = DBIems.Where(x => IsInRange(x.StackerNo, 6, 11, 6, 12)).ToList();
var Section_three = DBIems.Where(x => IsInRange(x.StackerNo, 6, 9, 6, 10)).ToList();
@@ -372,28 +560,7 @@
//鑰佹満姊版墜锛堟満搴婁綅锛�
var Section_ten = DBIems.Where(x => x.StackerNo == "鏈烘鎵�3")
- .Select(x => new
- {
- stackerNo = x.StackerNo,
- r_wheel_SN = x.R_wheel_SN,
- r_wheel_type = x.R_wheel_type,
- r_part_status = x.R_part_status,
- r_part_process = x.R_part_process,
- g_name = DBIems3.Name,
- g_communication_IO = DBIems3.communication_IO,
- g_drive_fault = DBIems3.drive_fault,
- g_emergency_stop_portal = DBIems3.emergency_stop_portal,
- g_gantry_state = DBIems3.gantry_state,
- g_portal_fault = DBIems3.portal_fault,
- g_power_on = DBIems3.power_on,
- g_programm_running = DBIems3.programm_running,
- g_ready_for_auto_start = DBIems3.ready_for_auto_start,
- g_ready_for_operate = DBIems3.ready_for_operate,
- g_state_AUTO = DBIems3.state_AUTO,
- g_state_JOG = DBIems3.state_JOG,
- g_state_MDA = DBIems3.state_MDA,
-
- })
+ .Select(x => CreateSectionFiveItem4(x))
.ToList();
var Section_twelve = DBIems.Where(x => x.StackerNo == "鏈烘鎵�3").ToList(); //鏂版満姊版墜锛堜笅鏂欏彛浣嶏級
@@ -415,6 +582,22 @@
var Section_eleven = sectDataList7.ToList(); //娑傛补鏈�
var Section_fifteen = DBIems2.ToList();
+ if (DBIems2.Count == 0)
+ {
+ List<SectionData> sectDataList1 = new List<SectionData>();
+ var seDataList1 = new SectionData
+ {
+ Name = "VK5",
+ vk_state = 0,
+
+ };
+ sectDataList1.Add(seDataList1);
+ List<VKDBItem> convertedList = sectDataList1.Select(sd => new VKDBItem
+ {
+ Name = sd.Name,
+ }).ToList();
+ Section_fifteen = convertedList;
+ }
var data = new
{
@@ -464,11 +647,71 @@
{
return new
{
- StackerNo = (string)null,
+ stackerNo = x.StackerNo,
+ r_wheel_SN = x.R_wheel_SN,
+ r_wheel_type = x.R_wheel_type,
+ r_part_status = x.R_part_status,
+ r_part_process = x.R_part_process,
+ c_machine_state = 0
};
}
}
+ private object CreateSectionFiveItem4(WheelDBItem x) //鏈烘鎵嬫暟鎹�
+ {
+ var DBIems3 = GantryDBItem.VK5GantryDBItem.Where(x => x.Name == "Gantry3").FirstOrDefault();
+ if (DBIems3 == null)
+ {
+ return new
+ {
+ stackerNo = x.StackerNo,
+ r_wheel_SN = x.R_wheel_SN,
+ r_wheel_type = x.R_wheel_type,
+ r_part_status = x.R_part_status,
+ r_part_process = x.R_part_process,
+ g_name = false,
+ g_communication_IO = false,
+ g_drive_fault = false,
+ g_emergency_stop_portal = false,
+ g_gantry_state = false,
+ g_portal_fault = false,
+ g_power_on = false,
+ g_programm_running = false,
+ g_ready_for_auto_start = false,
+ g_ready_for_operate = false,
+ g_state_AUTO = false,
+ g_state_JOG = false,
+ g_state_MDA = false,
+
+ };
+ }
+ else
+ {
+ return new
+ {
+ stackerNo = x.StackerNo,
+ r_wheel_SN = x.R_wheel_SN,
+ r_wheel_type = x.R_wheel_type,
+ r_part_status = x.R_part_status,
+ r_part_process = x.R_part_process,
+ g_name = DBIems3.Name,
+ g_communication_IO = DBIems3.communication_IO,
+ g_drive_fault = DBIems3.drive_fault,
+ g_emergency_stop_portal = DBIems3.emergency_stop_portal,
+ g_gantry_state = DBIems3.gantry_state,
+ g_portal_fault = DBIems3.portal_fault,
+ g_power_on = DBIems3.power_on,
+ g_programm_running = DBIems3.programm_running,
+ g_ready_for_auto_start = DBIems3.ready_for_auto_start,
+ g_ready_for_operate = DBIems3.ready_for_operate,
+ g_state_AUTO = DBIems3.state_AUTO,
+ g_state_JOG = DBIems3.state_JOG,
+ g_state_MDA = DBIems3.state_MDA,
+
+ };
+ }
+ }
+
[HttpGet("Four_unit_plc3")]
public IActionResult Four_unit_plc3(string staname)
@@ -477,6 +720,9 @@
return Ok(data);
}
+
+
+
#endregion
@@ -508,7 +754,8 @@
Idt_mes_headRepository db = new dt_mes_headRepository(volContext);
Idt_mes_detailRepository dbs = new dt_mes_detailRepository(volContext);
var data = db.Find(_ => true).Where(x => x.processCode == "28").OrderByDescending(x => x.CreateTime).Take(10).ToList();
- var dataList = data.Select(x => new {
+ var dataList = data.Select(x => new
+ {
jobID = x.jobID,
drawingNo = x.drawingNo,
quantity = x.quantity,
--
Gitblit v1.9.3