严智鑫
2024-03-31 d6103e86a0a8b453a1f6bddd262ea0a5e7f2a380
测量匹配页面颜色变化
2个文件已修改
25 ■■■■ 已修改文件
Albania_Mes-ui/src/views/home/index.vue 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Albania_Mes-ui/src/views/home/index.vue
@@ -524,8 +524,9 @@
                        + (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
                        + (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
                        + (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
                        + (this.LastQueue.glassheight / 25 * 7) + 'px;background-color: #93d2f3;text-align: center;'">
                        {{ this.LastQueue.glasswidth }}*{{ this.LastQueue.glassheight }}
                        + (this.LastQueue.glassheight / 25 * 7) + 'px; background-color: '
                        + (this.LastQueue.state>0?'#4CCCE4':(this.LastQueue.state==0?'#E4CA4C':'#E4CA4C'))+';text-align: center;'">
                        {{ (this.LastQueue.glasswidth+this.LastQueue.glassheight)!=0?(this.LastQueue.glasswidth+"*"+this.LastQueue.glassheight):"" }}
                    </div>
                </div>
@@ -533,11 +534,17 @@
                <div style="width:20px;height: 720px;float: left;"></div>
                <div style="width:500px;height: 620px;border: 2px solid #d1d1d1;float: left;padding: 50px 50px;">
                    <!--玻璃图  #81b337-->
                    <span class="measuretitle">长:</span> <span class="measureValue">{{ this.LastQueue.glasswidth }}</span> <span class="measureUnit">cm</span>
                    <span class="measuretitle">长:</span> <span class="measureValue">{{ this.LastQueue.glasswidth }}</span> <span class="measureUnit">mm</span>
                    <br>
                    <span class="measuretitle">宽:</span> <span class="measureValue">{{ this.LastQueue.glassheight }}</span> <span class="measureUnit">cm</span>
                    <span class="measuretitle">宽:</span> <span class="measureValue">{{ this.LastQueue.glassheight }}</span> <span class="measureUnit">mm</span>
                    <br>
                    <span class="measuretitle">厚:</span> <span class="measureValue">{{ this.LastQueue.thickness }}</span> <span class="measureUnit">cm</span>
                    <span class="measuretitle">厚:</span> <span class="measureValue">{{ this.LastQueue.thickness }}</span> <span class="measureUnit">mm</span>
                    <br>
                    <span class="measuretitle">测量长:</span> <span class="measureValue">{{ this.LastQueue.glasswidthmm }}</span> <span class="measureUnit">mm</span>
                    <br>
                    <span class="measuretitle">测量宽:</span> <span class="measureValue">{{ this.LastQueue.glassheightmm }}</span> <span class="measureUnit">mm</span>
                    <br>
                    <span class="measuretitle">匹配结果:</span> <span class="measureValue">{{ this.LastQueue.state>0?"匹配成功":(this.LastQueue.state==0?"匹配失败":"多数据匹配") }}</span>
                    <br>
                </div>
            </div>
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -127,7 +127,7 @@
                // String MesSend=S7control.getinstance().ReadWord("DB14.170", 1).get(0)+"";
                //获取测量的长,宽
                 boolean istest = true;
                 boolean istest = false;
                // String PlcRequest = "1";
                // String MesSend = "0";
                // double width = 402;
@@ -157,8 +157,14 @@
                    nullQueue.setglassId("");
                    nullQueue.setglassheight(0);
                    nullQueue.setglasswidth(0);
                    nullQueue.setglassheightmm(0);
                    nullQueue.setglasswidthmm(0);
                    jsonObject.append("LastQueue", nullQueue);
                }else{
                    if (LastQueue.getstate()<1) {
                        LastQueue.setglasswidth(0);
                        LastQueue.setglassheight(0);
                    }
                    jsonObject.append("LastQueue", LastQueue);
                }
                // String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));