添加最大铝框限制

ZengTao

2024-05-24 07d30105e9cddf0d4a744ae27222a682be56ef61

添加最大铝框限制

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

@@ -1209,7 +1209,7 @@
                    this.CurrentFrame = obj.CurrentFrame;

                    if (obj.CurrentFrame.length!=0) {

                        if (this.CurrentFrame[0].frameheightmm > this.CurrentFrame[0].framewidthmm) {

                            if (this.CurrentFrame[0].frameheightmm < 23.62205 || this.CurrentFrame[0].framewidthmm < 15.748) {

                            if (this.CurrentFrame[0].frameheightmm < 23.62205 || this.CurrentFrame[0].framewidthmm < 15.748||this.CurrentFrame[0].frameheightmm > 144.094488 || this.CurrentFrame[0].framewidthmm > 70.8661417) {

                                this.framecolor1 = "red";

                            } else {

                                if (this.CurrentFrame[0].flip == 2) {

@@ -1220,7 +1220,7 @@


                            }

                        } else {

                            if (this.CurrentFrame[0].frameheightmm < 15.748 || this.CurrentFrame[0].framewidthmm < 23.62205) {

                            if (this.CurrentFrame[0].frameheightmm < 15.748 || this.CurrentFrame[0].framewidthmm < 23.62205||this.CurrentFrame[0].frameheightmm > 70.8661417 || this.CurrentFrame[0].framewidthmm > 144.094488) {

                                this.framecolor1 = "red";

                            } else {

                                if (this.CurrentFrame[0].flip == 2) {

@@ -1258,7 +1258,7 @@
                    if (obj.AluminumFrameInfo != null) {

                        this.AluminumFrameInfo = obj.AluminumFrameInfo;

                        if (this.AluminumFrameInfo[0].frameheightmm > this.AluminumFrameInfo[0].framelengthmm) {

                            if (this.AluminumFrameInfo[0].frameheightmm < 600 || this.AluminumFrameInfo[0].framelengthmm < 400) {

                            if (this.AluminumFrameInfo[0].frameheightmm < 600 || this.AluminumFrameInfo[0].framelengthmm < 400||this.AluminumFrameInfo[0].frameheightmm > 3660|| this.AluminumFrameInfo[0].framelengthmm > 1800) {

                                this.framestate = true;

                                this.framecolor = "red";

                            } else {

@@ -1271,7 +1271,7 @@


                            }

                        } else {

                            if (this.AluminumFrameInfo[0].frameheightmm < 400 || this.AluminumFrameInfo[0].framelengthmm < 600) {

                            if (this.AluminumFrameInfo[0].frameheightmm < 400 || this.AluminumFrameInfo[0].framelengthmm < 600||this.AluminumFrameInfo[0].frameheightmm > 1800 || this.AluminumFrameInfo[0].framelengthmm > 3660) {

                                this.framestate = true;

                                this.framecolor = "red";

                            } else {


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

@@ -304,7 +304,7 @@
                                    framewidth=frameInfo.getframeheightmm();

                                    frameheight=frameInfo.getframelengthmm();

                                }

                                if(framewidth<600||frameheight<400){

                                if(framewidth<600||frameheight<400||framewidth>3660||frameheight>1800){

                                    Plchome.AluminumFrame = north_glass_buffer1s;

                                    Plchome.AluminumFrameInfo=frameInfo;

                                }else{


 springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java

@@ -466,12 +466,12 @@
    public static Connection getConn() throws SQLException {
        try {
            Connection conn = null;
            conn =
            DriverManager.getConnection("jdbc:mysql://localhost:3306/test?serverTimezone=GMT%2B8&characterEncoding=utf-8",
            "root", "beibo.123/");
            // conn = DriverManager.getConnection(
            //         "jdbc:mysql://192.168.102.9:3306/production?serverTimezone=GMT%2B8&characterEncoding=utf-8&useSSL=false",
            //         "northglass", "n0rthgla55");
            // conn =
            // DriverManager.getConnection("jdbc:mysql://localhost:3306/test?serverTimezone=GMT%2B8&characterEncoding=utf-8",
            // "root", "beibo.123/");
            conn = DriverManager.getConnection(
                    "jdbc:mysql://192.168.102.9:3306/production?serverTimezone=GMT%2B8&characterEncoding=utf-8&useSSL=false",
                    "northglass", "n0rthgla55");
            return conn;
        } catch (Exception e) {
            // TODO: handle exception