更新

严智鑫

2024-03-18 d812f6f23b3f0e4ad6cd140341b494275b628ee3

更新

 Albania_Mes-ui/package.json

@@ -49,4 +49,4 @@
    "last 2 versions",
    "not dead"
  ]
}
}

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

@@ -249,7 +249,7 @@
                    </label>
                </div>
            </div>
            <div style="display:flex;justify-content: space-around;width: 9zz5%;margin: 0 auto;">
            <div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;">
                <el-button type="primary" @click="showform(1)" :disabled="SoftEmergencyStopState"
                    :class="SoftEmergencyStopState == true ? 'hide' : ''">
                    {{ $t('Import order') }}</el-button>
@@ -323,8 +323,22 @@
            top="5vh">
        </el-dialog>

        <el-dialog :visible.sync="Measure" :title="$t('Measure')"
            top="5vh"><!--测量页面-->
        <el-dialog :visible.sync="Measure" :title="$t('Measure')" top="5vh"><!--测量页面-->
            <!--测量页面主体-->
            <div>
                <!--功能-->
                <div>
                    <button v-on:click="ManualMatching" style="width: 120px;height: 60px;background-color: aquamarine;border: 0px;border-radius: 5px;">人工匹配</button>
                </div>
                <!--显示-->
                <div style="width:100%;height: 600px;border: 1px solid black;">
                    <!--玻璃图-->
                    <div style="top:0;bottom: 0;left: 0;right: 0;margin: auto;position:absolute;width: 100px;height: 200px;background-color: aqua;line-height: 200px;text-align: center;">
                        100*200
                    </div>
                    
                </div>
            </div>
        </el-dialog>

        <el-dialog :visible.sync="StorageCage" :title="$t('StorageCage')"
@@ -727,6 +741,10 @@
                const specialChars = /[^\w\s]/g;
                return this.GlassIdList[num].replace(specialChars, "");
            }
        },
        //人工匹配
        ManualMatching() {
            console.log(11111111);
        }
        
    }

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

@@ -144,10 +144,10 @@
                // }


                List result= HomeService.ReadExecl(url);
                for(int i=0;i<result.size();i++){
                    System.out.println(result.get(i));
                }
                //List result= HomeService.ReadExecl(url);
                // for(int i=0;i<result.size();i++){
                //     System.out.println(result.get(i));
                // }