主界面添加操作确认提示，添加图片

ZengTao

2023-09-13 61930e5488faa1a457661b87902c53c2889989b1

主界面添加操作确认提示，添加图片

 CanadaMes-ui/src/img/dipan.png

 CanadaMes-ui/src/img/taimian.png

 CanadaMes-ui/src/lang/locales/en-US.json

@@ -231,6 +231,19 @@
  "glassid":"glassid",

  "order number":"order number",

  "delete":"delete",

  "out":"out"

  "out":"out",



  "Operation successful":"Operation successful",

  "Operation canceled":"Operation canceled",

  "There is no glass for this order":"There is no glass for this order",

  "There are currently tasks":"There are currently tasks",

  "There is no such glass":"There is no such glass",

  "There is no such grid":"There is no such grid",

  "No delete allowed":"No delete allowed",

  "No out allowed":"No out allowed",

  "Are you sure to perform this operation ?":"Are you sure to perform this operation ?",

  "prompt":"prompt",

  "Yes":"Yes",

  "No":"No"



}

 CanadaMes-ui/src/lang/locales/zh-CN.json

@@ -228,5 +228,18 @@
  "glassid":"玻璃id",

  "order number":"订单",

  "delete":"删除",

  "out":"出片"

  "out":"出片",



  "Operation successful":"操作成功",

  "Operation canceled":"操作取消",

  "There is no such order":"没有此订单的玻璃",

  "There are currently tasks":"当前有任务",

  "There is no such glass":"没有此玻璃",

  "There is no such grid":"没有空闲格子",

  "No delete allowed":"不能删除",

  "No out allowed":"不能出片",

  "Are you sure to perform this operation ?":"确定执行此操作?",

  "prompt":"提示",

  "Yes":"是",

  "No":"否"

}

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

@@ -91,11 +91,36 @@
    background-size: 46px 94px;

    background-attachment: local;

    width: 32px;



    position: absolute;

    /* left: 116px; */

    /* left:1060px;18.88px */

    background-image: url('../../img/bigcar01.png');

}



.blocks-img2 {

    height: 100px;

    max-width: 100vw;

    background-repeat: no-repeat;

    background-size: 85px 100px;

    background-attachment: local;

    width: 100px;

    position: absolute;

    /* left: 116px; */

    /* left:1060px;18.88px */

    background-image: url('../../img/dipan.png');

}



.blocks-img3 {

    height: 90px;

    max-width: 100vw;

    background-repeat: no-repeat;

    background-size: 160px 40px;

    background-attachment: local;

    width: 160px;

    position: absolute;

    /* left: 116px; */

    /* left:1060px;18.88px */

    background-image: url('../../img/taimian.png');

}



.el-table td,

@@ -167,7 +192,7 @@
                    <el-table-column :label="$t('Operate')">

                        <template slot-scope='scope'>

                            <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                                @click="endtask(0, scope.row.glassId, scope.row.cell)">{{$t('end task')}}</el-button>

                                @click="endtask(0, scope.row.glassId, scope.row.cell)">{{ $t('end task') }}</el-button>

                        </template>

                    </el-table-column>

                </el-table>

@@ -181,7 +206,7 @@
                    <el-table-column :label="$t('Operate')">

                        <template slot-scope='scope'>

                            <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                                @click="endtask(1, scope.row.glassId, scope.row.cell)">{{$t('end task')}}</el-button>

                                @click="endtask(1, scope.row.glassId, scope.row.cell)">{{ $t('end task') }}</el-button>

                        </template>

                    </el-table-column>

                </el-table>

@@ -219,6 +244,8 @@
                </div>

                <div class="blocks-img" :style="{ left: car1 + 'px', top: '16px' }"></div>

                <div class="blocks-img" :style="{ left: car2 + 'px', top: '194px' }"></div>

                <div class="blocks-img2" :style="{ left: '912px', top: '366px' }"></div>

                <div class="blocks-img3" :style="{ left: '875px', top: '455px' }"></div>

            </div>

        </el-footer>

        <el-dialog :visible.sync="dialogFormVisible" :title="$t('Please confirm the glass information')">

@@ -280,6 +307,8 @@
                    <template slot-scope='scope'>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                            @click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('delete') }}</el-button>

                        <!-- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" @click="open">{{ $t('delete')

                        }}</el-button> -->

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                            @click="outglass(scope.row.glassId, scope.row.state)">{{ $t('out') }}</el-button>

                    </template>

@@ -441,11 +470,11 @@
            if (this.form1.order != "") {

                InsertOrder(this.order).then(res => {

                    if (res.data.message == 200) {

                        this.dialogFormVisible1=false;

                        this.$message.success("Operation successful");

                        this.dialogFormVisible1 = false;

                        this.$message.success(this.$t('Operation successful'));



                    } else {

                        this.$message.success("There is no such order");

                        this.$message.success(this.$t('There is no glass for this order'));

                    }

                    this.load();

                });

@@ -457,16 +486,16 @@
            if (this.form.order != "") {

                Addglassid(this.glassid).then(res => {

                    if (res.data.message2 == 200) {

                        this.$message.success("Operation successful");

                        this.$message.success(this.$t('Operation successful'));

                        this.cancal();

                    } else if(res.data.message2 == 500) {

                        this.$message.success("There are currently tasks");

                    } else if (res.data.message2 == 500) {

                        this.$message.success(this.$t('There are currently tasks'));

                    }

                    else if(res.data.message2 == 300) {

                        this.$message.success("There is no such glass");

                    else if (res.data.message2 == 300) {

                        this.$message.success(this.$t('There is no such glass'));

                    }

                    else if(res.data.message2 == 400) {

                        this.$message.success("There is no such grid");

                    else if (res.data.message2 == 400) {

                        this.$message.success(this.$t('There is no such grid'));

                    }

                });

            }

@@ -504,11 +533,23 @@
            this.form1 = {};

        },

        endtask(type, glassid, cell) {

            UpdateTask(type, glassid, cell).then(res => {

                if (res.data.message3 == 200) {

                    this.$message.success("Operation successful");

                }

            this.$confirm(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {

                confirmButtonText: this.$t('Yes'),

                cancelButtonText: this.$t('No'),

                type: 'warning'

            }).then(() => {

                UpdateTask(type, glassid, cell).then(res => {

                    if (res.data.message3 == 200) {

                        this.$message.success(this.$t('Operation successful'));

                    }

                });

            }).catch(() => {

                this.$message({

                    type: 'info',

                    message: this.$t('Operation canceled')

                });

            });



        },

        showcageinfo(cage) {

            this.cage = cage;

@@ -518,31 +559,52 @@
            });

        },

        deleteglass(glassid, state) {

            if (state == 1) {

                DeleteByGlassID(glassid).then(res => {

                    if (res.data.message3 == 200) {

                        this.$message.success("Operation successful");

                    }

            this.$confirm(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {

                confirmButtonText: this.$t('Yes'),

                cancelButtonText: this.$t('No'),

                type: 'warning'

            }).then(() => {

                if (state == 1) {

                    DeleteByGlassID(glassid).then(res => {

                        if (res.data.message3 == 200) {

                            this.$message.success(this.$t('Operation successful'));

                        }

                    });

                } else {

                    this.$message.success(this.$t('No delete allowed'));

                }

            }).catch(() => {

                this.$message({

                    type: 'info',

                    message: this.$t('Operation canceled')

                });

            } else {

                this.$message.success("No out allowed");

            }

            });

        },

        outglass(glassid, state) {

            if (state == 1) {

                OutByGlassID(glassid).then(res => {

                    if (res.data.message3 == 200) {

                        this.$message.success("Operation successful");

                    }

            this.$confirm(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {

                confirmButtonText: this.$t('Yes'),

                cancelButtonText: this.$t('No'),

                type: 'warning'

            }).then(() => {

                if (state == 1) {

                    OutByGlassID(glassid).then(res => {

                        if (res.data.message3 == 200) {

                            this.$message.success(this.$t('Operation successful'));

                        }

                    });

                } else {

                    this.$message.success(this.$t('No out allowed'));

                }

            }).catch(() => {

                this.$message({

                    type: 'info',

                    message: this.$t('Operation canceled')

                });

            } else {

                this.$message.success("No out allowed");

            }

            });



        }



    }



}







</script>

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

@@ -17,7 +17,7 @@
    public void run() {
        while (this != null) {
            try {
                Thread.sleep(5000);
                Thread.sleep(1000);
            } catch (InterruptedException e) {
                e.printStackTrace();
            }

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

@@ -113,7 +113,7 @@
                    datas.add((short) 2);
                    datas.add((short) 1);
                    // 转移原调拨格子数据
                    spianMapper.UpdataAddCage(glasswidth, cages, cells);//减少新格子宽度
                    spianMapper.UpdataAddCage1(glasswidth, cages, cells);//减少新格子宽度
                    spianMapper.UpdateDBCage(ids, cage, cell);// 将原格子数据更新到新格子里
                    spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 清除原格子数据
                    spianMapper.UpdataOutCage(glasswidth, cage, cell);//增加原格子宽度