添加启用禁用的确认提示框

ZengTao

2024-04-23 a29bf5164c1b8bdd35b48f879673706db88f855f

添加启用禁用的确认提示框

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

@@ -264,7 +264,8 @@
                <el-button type="primary" @click="TaskStop(0)" :disabled="OutingQueue"

                    :class="StopTask == true ? 'hide' : ''">

                    {{ $t('Terminate Feeding') }}</el-button>

                <el-button type="primary" @click="TaskStop(1)" :disabled="StopTask" :class="StopTask == true ? 'hide' : ''">

                <el-button type="primary" @click="TaskStop(1)" :disabled="StopTask"

                    :class="StopTask == true ? 'hide' : ''">

                    {{ $t('Terminate Outing') }}</el-button>

                <el-button type="primary" @click="SoftEmergencyStop()" :disabled="SoftEmergencyStopState"

                    :class="SoftEmergencyStopState == true ? 'hide' : ''">

@@ -274,7 +275,8 @@
            </div>

            <div>

                <el-table :data="this.tasklist1" border style="width: 100%">

                    <el-table-column :min-width="180" prop="glassId" :label="$t('Outfeed glass barcode')"></el-table-column>

                    <el-table-column :min-width="180" prop="glassId"

                        :label="$t('Outfeed glass barcode')"></el-table-column>

                    <el-table-column :min-width="130" prop="cage" :label="$t('Cage No')"></el-table-column>

                    <el-table-column :min-width="130" prop="cell" :label="$t('Slot No')"></el-table-column>

                    <el-table-column :min-width="130" prop="orderId" :label="$t('Order No')"></el-table-column>

@@ -294,7 +296,8 @@
                    </el-table-column>

                </el-table>

                <el-table :data="this.tasklist2" border style="width: 100%">

                    <el-table-column :min-width="180" prop="glassId" :label="$t('Infeed glass barcode')"></el-table-column>

                    <el-table-column :min-width="180" prop="glassId"

                        :label="$t('Infeed glass barcode')"></el-table-column>

                    <el-table-column :min-width="130" prop="cage" :label="$t('Cage No')"></el-table-column>

                    <el-table-column :min-width="130" prop="cell" :label="$t('Slot No')"></el-table-column>

                    <el-table-column :min-width="130" prop="orderId" :label="$t('Order No')"></el-table-column>

@@ -361,19 +364,28 @@
                <div class="blocks-img2"></div>

                <div class="blocks-img3"></div>



                <div class="device" :style="'top: 25px;left: 1027px;background-color: ' + ShowDeviceList(0) + ';'">D01</div>

                <div class="device" :style="'top: 25px;left: 1027px;background-color: ' + ShowDeviceList(0) + ';'">D01

                </div>

                <div class="device" :style="'top: 105px;left: 1027px;background-color: ' + ShowDeviceList(1) + ';'">D02

                </div>

                <div class="device" :style="'top: 102px;left: 605px;background-color: ' + ShowDeviceList(2) + ';'">B01</div>

                <div class="device" :style="'top: 102px;left: 197px;background-color: ' + ShowDeviceList(3) + ';'">B02</div>

                <div class="blocks-img" :style="'left:' + car2 + 'px;top:175px;background-color:' + ShowDeviceList(4) + ''">

                <div class="device" :style="'top: 102px;left: 605px;background-color: ' + ShowDeviceList(2) + ';'">B01

                </div>

                <div class="device" :style="'top: 102px;left: 197px;background-color: ' + ShowDeviceList(3) + ';'">B02

                </div>

                <div class="blocks-img"

                    :style="'left:' + car2 + 'px;top:175px;background-color:' + ShowDeviceList(4) + ''">

                    A01</div>

                <div class="blocks-img" :style="'left:' + car1 + 'px;top:16px;background-color:' + ShowDeviceList(5) + ''">

                <div class="blocks-img"

                    :style="'left:' + car1 + 'px;top:16px;background-color:' + ShowDeviceList(5) + ''">

                    A02</div>

                <div class="device" :style="'top: 108px;left: 150px;background-color: ' + ShowDeviceList(6) + ';'">D03</div>

                <div class="device" :style="'top: 185px;left: 150px;background-color: ' + ShowDeviceList(7) + ';'">D04</div>

                <div class="device" :style="'top: 262px;left: 150px;background-color: ' + ShowDeviceList(8) + ';'">D05</div>

                <div class="device" :style="'top: 339px;left: 150px;background-color: ' + ShowDeviceList(9) + ';'">D06</div>

                <div class="device" :style="'top: 108px;left: 150px;background-color: ' + ShowDeviceList(6) + ';'">D03

                </div>

                <div class="device" :style="'top: 185px;left: 150px;background-color: ' + ShowDeviceList(7) + ';'">D04

                </div>

                <div class="device" :style="'top: 262px;left: 150px;background-color: ' + ShowDeviceList(8) + ';'">D05

                </div>

                <div class="device" :style="'top: 339px;left: 150px;background-color: ' + ShowDeviceList(9) + ';'">D06

                </div>



                <div class="device" :style="'top: 395px;left: 90px;background-color: ;'">E01</div>

                <div class="device" :style="'top: 395px;left: 243px;background-color: ;'">E02</div>

@@ -457,7 +469,8 @@
        <el-dialog :visible.sync="dialogFormVisible" :title="$t('Please confirm the glass information')">

            <el-form :model="form" label-width="100px" style="padding-right: 30px">

                <el-form-item :label="$t('Barcode')">

                    <el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="glassid"></el-input>

                    <el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')"

                        v-model="glassid"></el-input>

                    <el-button type="primary" @click="showform(3)">{{ $t('Query') }}</el-button>

                </el-form-item>

                <el-form-item :label="$t('Barcode')">

@@ -493,7 +506,7 @@
                            $t('confirm') }}</el-button> -->

                    <el-button @click="FeedInglassid()" :style="{ display: confirm2 == true ? '' : 'none' }"

                        type="primary">{{

                            $t('confirm') }}</el-button>

                $t('confirm') }}</el-button>

                    <el-button @click="cancel()">{{ $t('cancel') }}</el-button>

                </span>

            </template>

@@ -527,15 +540,15 @@
        <el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')" top="5vh">

            <el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="cageglassid"></el-input>

            <el-button type="primary" @click="showcageinfo(1)">{{ $t('Query') }}</el-button>

            <el-table :data="cageinfo.slice((currentPages - 1) * pagesizes, currentPages * pagesizes)" :height="700" border

                style="width: 100%;overflow: auto;">

            <el-table :data="cageinfo.slice((currentPages - 1) * pagesizes, currentPages * pagesizes)" :height="700"

                border style="width: 100%;overflow: auto;">

                <el-table-column :min-width="50" prop="cage" :label="$t('Cage No')"></el-table-column>

                <el-table-column :min-width="50" prop="cell" :label="$t('Slot No')"></el-table-column>

                <el-table-column :min-width="55" prop="tier" :label="$t('The Side')">

                    <template slot-scope='scope'>

                        {{

                            scope.row.tier == 1 ? $t('Inside') : $t('Outside')

                        }}

                scope.row.tier == 1 ? $t('Inside') : $t('Outside')

            }}

                    </template>

                </el-table-column>

                <el-table-column :min-width="145" prop="glassId" :label="$t('Barcode')"></el-table-column>

@@ -545,14 +558,16 @@
                <el-table-column :min-width="80" prop="state" :label="$t('Glass State')">

                    <template slot-scope='scope'>

                        {{

                            scope.row.state == 1 ? $t('Normal') : scope.row.state == 2 ? $t('Entering') : scope.row.state == 3 ?

                                $t('Outing') : ""

                        }}

                scope.row.state == 1 ? $t('Normal') : scope.row.state == 2 ? $t('Entering') : scope.row.state ==

                    3 ?

                    $t('Outing') : ""

            }}

                    </template>

                </el-table-column>

                <el-table-column :min-width="150" prop="lengthWidth" :label="$t('Dim')">

                    <template slot-scope='scope'>

                        {{ scope.row.glassWidthMm }}{{ scope.row.glassWidthMm > 0 ? "*" : "" }}{{ scope.row.glassHeightMm }}

                        {{ scope.row.glassWidthMm }}{{ scope.row.glassWidthMm > 0 ? "*" : "" }}{{

                scope.row.glassHeightMm }}

                    </template>

                </el-table-column>



@@ -601,10 +616,11 @@
                <el-table-column prop="glasslength" :label="$t('Length')"></el-table-column>

                <el-table-column prop="glassheight" :label="$t('Width')"></el-table-column>

            </el-table>

            <el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChange" @current-change="handleCurrentChange"

                :pager-count="7" :current-page="currentPage" :page-sizes="[5, 10, 15, 20]" :page-size="pagesize"

                layout="total, sizes, prev, pager, next, jumper" :total="GlassInfo.length > 0 ? GlassInfo.length : null"

                background style="float: right; margin-top: 20px">

            <el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChange"

                @current-change="handleCurrentChange" :pager-count="7" :current-page="currentPage"

                :page-sizes="[5, 10, 15, 20]" :page-size="pagesize" layout="total, sizes, prev, pager, next, jumper"

                :total="GlassInfo.length > 0 ? GlassInfo.length : null" background

                style="float: right; margin-top: 20px">

            </el-pagination>

        </el-dialog>

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

@@ -616,19 +632,21 @@
                            {{ this.isConfirm == true ? $t('Not Allow') : $t('Allow') }}</el-button>

                    </el-form-item>

                    <el-form-item>

                        {{ $t('Current State') }}:{{ this.Scanningmethod == false ? $t('Automatic') : $t('Hand Movement') }}

                        {{ $t('Current State') }}:{{ this.Scanningmethod == false ? $t('Automatic') : $t('Hand

                        Movement') }}

                        <el-button type="primary" @click="SwitchScanMethod()">{{ $t('Switch')

                        }}</el-button>

                            }}</el-button>

                    </el-form-item>

                    <el-form-item>

                        <el-input style="width:70%;" maxlength="13" :placeholder="$t('Enter the glass barcode')"

                            v-model="glassid1"></el-input>

                        <el-button type="primary" :disabled="!Scanningmethod" @click="WriteGlassID()">{{ $t('Add')

                        }}</el-button>

                            }}</el-button>

                    </el-form-item>

                    <el-form-item>

                        {{ $t('Barcode') }}:

                        <el-input style="width:70%;" maxlength="14" :disabled="true" v-model="CurrrentGlassId"></el-input>

                        <el-input style="width:70%;" maxlength="14" :disabled="true"

                            v-model="CurrrentGlassId"></el-input>

                    </el-form-item>

                </div>

                <div style="display: flex;justify-content: space-around;">

@@ -740,8 +758,9 @@
            {{ this.isAllowQueue

                == true ? $t('Start') : $t('Stop')

            }}

            <el-button type="primary" @click="isAllowQueueState()" :disabled="!this.isAllowReordering">{{ this.isAllowQueue

                == true ? $t('Stop') : $t('Start')

            <el-button type="primary" @click="isAllowQueueState()" :disabled="!this.isAllowReordering">{{

                this.isAllowQueue

                    == true ? $t('Stop') : $t('Start')

            }}</el-button>

            <el-button type="primary" @click="showform7()">{{ $t('Add') }}</el-button>

            <label style="background-color:yellow;font-size: 23px;" for="">

@@ -761,9 +780,9 @@
                        <el-table-column :min-width="90" prop="state" :label="$t('Glass State')">

                            <template slot-scope='scope'>

                                {{ scope.row.state == 0 ? $t('Waiting') : scope.row.state == 1 ? $t('Outing') :

                                    scope.row.state

                                        == 2

                                        ? $t('Outed') : scope.row.state == 3 ? $t('Absent') : $t('Completed') }}

                scope.row.state

                    == 2

                    ? $t('Outed') : scope.row.state == 3 ? $t('Absent') : $t('Completed') }}

                            </template>

                        </el-table-column>

                        <el-table-column prop="sequence" :label="$t('Sequence')"></el-table-column>

@@ -772,8 +791,8 @@
                                <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                                    :disabled="!(!isAllowQueue && scope.row.state != 1 && scope.row.state != 2)"

                                    @click="CompleteQueue(scope.row.id, scope.row.barcode, scope.row.glassId)">{{

                                        $t('Complete')

                                    }}</el-button>

                $t('Complete')

            }}</el-button>

                            </template>

                        </el-table-column>



@@ -781,26 +800,27 @@
                            <template slot-scope='scope'>

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

                                    :disabled="isAllowQueue" @click="deleteproductionqueueglass(scope.row.barcode)">{{

                                        $t('Delete') }}</el-button>

                $t('Delete') }}</el-button>

                            </template>

                        </el-table-column>

                    </el-table>

                </div>

                <div style="width:30%;" v-for="(item) in CurrentFrame" :key="item['barcode']">

                    <el-button style="margin-left: 42%;" type="primary" @click="FrameStateUpdate(item['barcode'])">{{

                        $t('Next') }}</el-button>

                $t('Next') }}</el-button>

                    <h1 style="font-size: 40px;text-align: center;">{{ $t('Current Frame') }}:{{ item['barcode'] }}</h1>

                    <h1 style="font-size: 30px;text-align: center;">

                        {{ item['flip'] == true ? $t('EXTERIQR OUT AND BYPASS TO THE LEFT')

                            : $t('EXTERIQR OUT AND BYPASS TO THE RIGHT') }}

                : $t('EXTERIQR OUT AND BYPASS TO THE RIGHT') }}

                    </h1>

                    <h1 style="font-size: 30px;text-align: center;">{{ item['framewidthmm'] }}*{{ item['frameheightmm'] }}

                    <h1 style="font-size: 30px;text-align: center;">{{ item['framewidthmm'] }}*{{ item['frameheightmm']

                        }}

                    </h1>



                    <div class="frame" :style="'background-color: green;margin-top:30px;margin:0 auto;width: ' +

                        FrameWidthHeight('before', item['framewidthmm'], item['frameheightmm'], item['position']) + 'px;height:' +

                        FrameWidthHeight('after', item['framewidthmm'], item['frameheightmm'], item['position']) + 'px;'

                        ">

                FrameWidthHeight('before', item['framewidthmm'], item['frameheightmm'], item['position']) + 'px;height:' +

                FrameWidthHeight('after', item['framewidthmm'], item['frameheightmm'], item['position']) + 'px;'

                ">

                    </div>

                </div>

            </div>

@@ -826,8 +846,9 @@
                <el-table-column prop="storageCage.tier" :label="$t('The Side')">

                    <template slot-scope='scope'>

                        {{

                            scope.row.storageCage == null ? "" : scope.row.storageCage.tier == 1 ? $t('Inside') : $t('Outside')

                        }}

                scope.row.storageCage == null ? "" : scope.row.storageCage.tier == 1 ? $t('Inside') :

                    $t('Outside')

            }}

                    </template>

                </el-table-column>



@@ -1017,7 +1038,7 @@
                        const specialChars = /[^\w\s]/g;

                        this.CurrrentGlassId = obj.CurrrentGlassId[0].replace(specialChars, "");

                    }

                    


                    //查询当前铝框信息

                    this.CurrentFrame = obj.CurrentFrame;



@@ -1105,6 +1126,7 @@
                    //是否需要手动确认上片

                    this.isConfirm = obj.isConfirm[0];





                    //扫码位玻璃信息

                    if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {

                        this.form3 = obj.form3[0];

@@ -1115,9 +1137,9 @@


                    if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {

                        this.loadglassheight1 = 70;

                        if (this.form5.glassId != obj.form3[0].glassId&&this.ManuallyInfeedGlass==false) {

                        if (this.form5.glassId != obj.form3[0].glassId && this.ManuallyInfeedGlass == false) {

                            this.showform3();

                            


                        }

                        this.form5 = obj.form3[0];

                        this.glassid1 = "";

@@ -1508,7 +1530,13 @@
                    if (res.data.message == 200) {

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

                        this.dialogFormVisible = false;

                        this.glassid="";

                        this.glassid = "";

                        this.form = {

                            orderId: "",

                            glassId: "",

                            height: "",

                            width: ""

                        };

                    }

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

                        this.$message.error(this.$t('The glass size is not within the range'));

@@ -1525,11 +1553,27 @@
        },

        //启用//理片笼禁用

        UpdateDisabled(cage, cell, disabled) {

            Disabled(cage, cell, disabled).then(res => {

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

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

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

                inputType: 'password',

                inputPlaceholder: this.$t('Please enter the password'),

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

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

                type: 'warning'

            }).then(({ value }) => {

                if (this.password == value) {

                    Disabled(cage, cell, disabled).then(res => {

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

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

                        }

                    });

                }

            }).catch(() => {

                this.$message({

                    type: 'info',

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

                });

            });



        },

        //删除出片队列玻璃

        deleteproductionqueueglass(id) {


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

File was deleted

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

File was deleted

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

@@ -63,9 +63,6 @@
            JSONObject jsonObject = new JSONObject();

            try {

                Thread.sleep(1000);



                String s1=S7controlalbia.getinstance().readStrings("DB14.38");

                String s2=S7controlalbia.getinstance().readStrings("DB14.40");

                // 注入mapper

                homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);

                spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);

@@ -274,7 +271,6 @@
                    boolean D01ResponseState = D01respnse.contains((short) 1);

                    // jsonObject.append("D01RequestState", D01RequestState);

                    // 自动进片

                    isConfirm = true;

                    if (isConfirm == true && form3.getglassId() != null && form3.getglassId() != "") {

                        if ((form3.getglassheight() < 380 || form3.getglasswidth() < 390

                                || form3.getglassheight() > 1810


 springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java

@@ -17,23 +17,23 @@
        //
        System.out.println("启动完成");

        //  new PlcHoldNew().start();
        //  new PLCAutoMes().start();
         new PlcHoldNew().start();
         new Plchome().start(); 
         new PlcLayout().start();
         new Plcalarm().start();
         new Plcsign().start();
         new Plcstate().start();
         new PlcPositioning1().start();
         new PlcParameter2().start();
         new PLCAutomaticParameterSetting().start();
         new PlcManualonePosition().start();
         new PlcManualonePosition2().start();
         new PlcServoManualone().start();
         new PLCManualJog().start();
         new Plclog().start();

         new Plchome().start();
        //  new PlcLayout().start();
        //  new Plcalarm().start();
        //  new Plcsign().start();
        //  new Plcstate().start();
        //  new PlcPositioning1().start();
        //  new PlcParameter2().start();
        //  new PLCAutomaticParameterSetting().start();
        //  new PlcManualonePosition().start();
        //  new PlcManualonePosition2().start();
        //  new PlcServoManualone().start();
        //  new PLCManualJog().start();
        //  new Plclog().start();

         
        //  new PlcInteractionState().start();
        //  new PlcParameter1Review().start();
        //  new PLCAutomaticParameterSettingReview2().start();

 springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java

@@ -180,7 +180,7 @@
      north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
      String flip = jdbcConnections.SelectFlipByFrameBarcode(north_glass_buffer1.getFrameBarcode());

      if (flip != null) {
      if (flip != null&&flip != "") {
        String position = jdbcConnections.SelectPositionByFrameBarcode(north_glass_buffer1.getFrameBarcode());
        if (position != null) {
          String framelength = jdbcConnections.SelectFrameLengthByFrameBarcode(north_glass_buffer1.getFrameBarcode());
@@ -362,7 +362,7 @@
    return Result.success(map);
  }

  // 修改出片队列状态与出片队列调序
  // 修是否需要确认
  @PostMapping("/isConfirmStates")
  public Result isConfirmStates(Boolean isConfirmStates) {
    Plchome.isConfirm = isConfirmStates;