更新

严智鑫

2024-03-31 1337b825194a8ddd3304b9d67e748badf49b6338

更新

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

@@ -506,7 +506,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"
@@ -518,15 +518,27 @@
                </div>
                <br>
                <!--显示-->
                <div style="width:1000px;height: 720px;border: 2px solid #d1d1d1;">
                <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 auto;position:absolute;width:'
                    <div :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin:'+((720-(this.LastQueue.glasswidth / 25 * 7))/2)+'px auto;width:'
                        + (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 }}
                    </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-->
                    <span class="measuretitle">长：</span> <span class="measureValue">{{ this.LastQueue.glasswidth }}</span> <span class="measureUnit">cm</span>
                    <br>
                    <span class="measuretitle">宽：</span> <span class="measureValue">{{ this.LastQueue.glassheight }}</span> <span class="measureUnit">cm</span>
                    <br>
                    <span class="measuretitle">厚：</span> <span class="measureValue">{{ this.LastQueue.thickness }}</span> <span class="measureUnit">cm</span>
                    <br>
                </div>
            </div>
        </el-dialog>
@@ -1100,7 +1112,6 @@

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

 springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java

@@ -13,7 +13,7 @@
public class PLCAutoMes extends Thread {

    // 用于存储应用程序的配置信息
    private Configuration config;
    
    private static InitUtil initUtil;
    // public static PlcParameterObject PlcMesObject;
    // public static PlcParameterObject PlcReadObject;
@@ -50,7 +50,7 @@
  
    // 私有构造函数
    public PLCAutoMes() throws IOException {
        config = new Configuration("config.properties");
        //config = new Configuration("config.properties");
        initUtil = new InitUtil();
    }


 springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java

@@ -17,7 +17,7 @@
    @Select("SELECT * FROM queue where glassid=#{glassid}")
    List<Queue> selectQueues(@Param("glassid") int glassid);

    @Select("SELECT * FROM queue order by time asc limit 1")
    @Select("SELECT * FROM queue order by time desc limit 1")
    Queue selectLastQueue();

    @Select("SELECT * FROM queue where state<=0")