更新

严智鑫

2024-04-09 6b8b4e4dc8a12695d51ce40f04297f2fcb2bf657

 Albania_Mes-ui/src/views/home/index.vue

@@ -306,6 +306,19 @@
.cells {
    height: 100%;
}
.measure_Content{
    margin-bottom: 20px;
    font-size: 30px;
}
.measuretitle{

}
.measureValue{

}
.measureUnit{
    margin-left: 10px;
}
</style>
<template>
    <el-container>
@@ -506,7 +519,7 @@

        <el-dialog :visible.sync="Measure" :title="$t('Measure')" top="5vh"><!--测量页面-->
            <!--测量页面主体-->
            <div>
            <div style="height: 780px;">
                <!--功能-->
                <div>
                    <el-button type="primary" @click="ManualMatching()" :disabled="SoftEmergencyStopState"
@@ -516,16 +529,48 @@
                    <el-button type="primary" @click="AnewMeasure()" :disabled="SoftEmergencyStopState"
                        style="z-index: 999;">重新测量</el-button>
                </div>
                <br>
                <!--显示-->
                <div style="width:1000px;height: 720px;border: 2px solid #d1d1d1;margin: auto auto;">
                <div style="width:1000px;height: 720px;border: 2px solid #d1d1d1;float: left;">
                    <!--玻璃图  #81b337-->
                    <div :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin: auto;position:absolute;width:'
                + (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 }}
                    <div :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin:'+((720-(this.LastQueue.glassheight / 25 * 7))/2)+'px auto;width:'
                        + (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
                        + (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
                        + (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>
                <!--显示-->
                <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-->
                    <div class="measure_Content">
                        <span class="measuretitle" style="font-size: 30px;">长：</span> 
                        <span class="measureValue">{{ this.LastQueue.glasswidth }}</span> 
                        <span class="measureUnit"> mm</span>
                    </div>
                    <div class="measure_Content">
                        <span class="measuretitle">宽：</span> 
                        <span class="measureValue">{{ this.LastQueue.glassheight }}</span> 
                        <span class="measureUnit">mm</span>
                    </div>
                    <div class="measure_Content">
                        <span class="measuretitle">测量长：</span> 
                        <span class="measureValue">{{ this.LastQueue.glasswidthmm }}</span> 
                        <span class="measureUnit">mm</span>
                    </div>
                    <div class="measure_Content">
                        <span class="measuretitle">测量宽：</span> 
                        <span class="measureValue">{{ this.LastQueue.glassheightmm }}</span> 
                        <span class="measureUnit">mm</span>
                    </div>
                    <div class="measure_Content">
                        <span class="measuretitle">匹配结果：</span> 
                        <span class="measureValue">{{ this.LastQueue.state>0?"匹配成功":(this.LastQueue.state==0?"匹配失败":"多数据匹配") }}</span>
                    </div>
                    
                </div>
            </div>
        </el-dialog>
@@ -1099,7 +1144,6 @@

        },
        importData() {
            alert(1);
            //let tbdata=JSON.stringify(this.dataList);
            let tbdata=this.dataList;
            console.log(tbdata);