From 63650b635ac59b24292c584a80a9ad3496a14748 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 12 十二月 2023 09:22:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/views/home/index.vue | 1613 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 1,543 insertions(+), 70 deletions(-)

diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 45ec6d0..daa8132 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -9,7 +9,7 @@
     width: 10%;
     background-color: white;
     margin: 0px 8px 0px 8px;
-    border: 1px black solid;
+    border: 1px #EBEEF5 solid;
     text-align: center;
     padding: 5px;
 }
@@ -31,11 +31,13 @@
     padding: 3px;
     min-height: 40vh;
 }
+
 .el-footer {
     max-height: 60vh;
     padding: 0px;
     margin: 0px;
 }
+
 .green {
     background-color: green;
 }
@@ -57,142 +59,942 @@
 }
 
 .gezi {
-    height: 23px;
-    width: 1.74px;
+    height: 35px;
+
+    position: absolute;
+    width: 3.08px;
+    /* width: 4.22px; */
 }
 
-.gezi:nth-child(22) {
-    margin-left: 4px;
+.blocks {
+    background-image: url('../../img/xmjc.png');
+    margin: 0 auto;
+    background-repeat: no-repeat;
+    background-attachment: local;
+    min-height: 55vh;
+    width: 1400px;
+    max-width: 94vw;
+    background-size: 1200px 510px;
+    margin: 0 auto;
+    /* width: 1660px;
+    max-width: 100vw;
+    background-size: 1660px 560px; */
+
+
 }
 
-.gezi:nth-child(43) {
-    margin-left: 4px;
+.blocks-img {
+    height: 100px;
+    max-width: 100vw;
+    background-repeat: no-repeat;
+    background-attachment: local;
+    width: 32px;
+    position: absolute;
+    background-image: url('../../img/bigcar01.png');
+    background-size: 40px 87px;
+    /* background-size: 46px 94px; */
 }
 
-.gezi:nth-child(64) {
-    margin-left: 4px;
+.blocks-img2 {
+    height: 100px;
+    max-width: 100vw;
+    background-repeat: no-repeat;
+    background-attachment: local;
+    width: 100px;
+    position: absolute;
+    background-image: url('../../img/dipan.png');
+    background-size: 70px 85px;
+    left: 501px;
+    top: 333px;
+    /* background-size: 85px 100px;
+    left: 912px;
+    top: 366px; */
 }
 
-.gezi:nth-child(85) {
-    margin-left: 4px;
+.orderbutton1 {
+    position: absolute;
+    left: 1070px;
+    top: 70px;
 }
 
-.block {
-    min-height: 50vh;
-    max-width: 100vw;  
-    background-image: url('xmjc.png');
-    margin: 0px;
-    background-repeat:no-repeat ;
-    background-size:100% 100%;
-    background-attachment:local;
+.orderbutton2 {
+    position: absolute;
+    left: 500px;
+    top: -10px;
 }
+
+.blocks-img3 {
+    height: 90px;
+    max-width: 100vw;
+    background-repeat: no-repeat;
+    background-attachment: local;
+    width: 160px;
+    position: absolute;
+    background-image: url('../../img/taimian.png');
+    background-size: 120px 30px;
+    left: 477px;
+    top: 420px;
+    /* background-size: 160px 40px;
+    left: 875px;
+    top: 455px;  */
+}
+
+.el-table td,
+.el-table th {
+    padding: 5px 0;
+}
+
+.el-table__empty-block {
+    min-height: 41px;
+}
+
+.el-table__empty-text {
+    line-height: 41px;
+}
+
+.box {
+    width: 90%;
+    margin-left: 5%;
+    color: red;
+    font-size: 12px;
+    overflow: hidden;
+    height: 20px;
+    /* height: 35px; */
+}
+
+.text {
+    width: auto;
+
+    white-space: nowrap;
+    animation: textScroll 20s linear infinite;
+    margin: 0 auto;
+    line-height: 20px;
+    /* line-height: 35px; */
+}
+
+@keyframes textScroll {
+    0% {
+        transform: translateX(100%);
+    }
+
+    100% {
+        transform: translateX(-150%);
+    }
+}
+
+.el-dialog {
+    width: 90%;
+}
+
+.el-message-box__message {
+    font-size: 27px;
+}
+
+.el-message-box {
+    height: 200px;
+    width: 600px;
+}
+
+.el-button--small {
+    font-size: 25px;
+}
+
+@media screen and (min-width: 1900px) {
+    .blocks {
+        transform: scale(1.5, 1.05);
+        width: 1210px;
+    }
+}
+
+.el-message-box__btns {
+    padding: 0px 15px 0;
+    text-align: right;
+}
+
+/* .el-table td,
+.el-table th {
+    padding: 0px 0;
+} */
 </style>
 <template>
     <el-container>
         <!-- <el-header style="padding: 10px;"></el-header> -->
         <el-main>
-            <div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;">
-                <el-input style="width:15%;" placeholder="Enter the glass lD"></el-input>
-                <el-button type="primary">Manually feed the glass</el-button>
-                <el-input style="width:15%;" placeholder="Enter the order number" v-model="order"></el-input>
-                <el-button type="warning" @click="getOrder()">Exit the glass by order number</el-button>
+            <div class="box" @click="dialogFormVisible2 = true">
+                <div class="text">
+                    <!-- Alarm: -->
+                    {{ this.text }}
+                    <label v-for="item in this.alarm" :key="item['id']">
+                        {{ item['content'] }}
+                    </label>
+                </div>
+            </div>
+            <div style="display:flex;justify-content: space-around;width: 9zz5%;margin: 0 auto;">
+                <el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="glassid1"></el-input>
+                <el-button type="primary" @click="SelectGlassByGlassIDs(2)" :disabled="ManuallyInfeedGlass">
+                    {{ $t('Manually Infeed Glass') }}</el-button>
+                <!-- <el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="order"></el-input>
+                <el-button type="warning" @click="showform1();">{{ $t('Exit the glass by order number') }}</el-button> -->
             </div>
             <div>
                 <el-table :data="this.tasklist1" border style="width: 100%">
-                    <el-table-column prop="glassId" label="Coming out glass ID"></el-table-column>
-                    <el-table-column prop="cage" label="The Grille number being used"></el-table-column>
-                    <el-table-column label="Order number">orderNo</el-table-column>
-                    <el-table-column prop="address" label="Length and width"></el-table-column>
-                    <el-table-column prop="address" label="coating"></el-table-column>
+                    <el-table-column :width="180" prop="glassId" :label="$t('Outfeed glass barcode')"></el-table-column>
+                    <el-table-column :width="130" prop="cage" :label="$t('Cage No')"></el-table-column>
+                    <el-table-column :width="130" prop="cell" :label="$t('Slot No')"></el-table-column>
+                    <el-table-column :width="130" prop="orderId" :label="$t('Order No')"></el-table-column>
+                    <el-table-column prop="orderId" :label="$t('List No')"></el-table-column>
+                    <el-table-column prop="orderId" :label="$t('Box No')"></el-table-column>
+                    <el-table-column :width="130" prop="lengthWidth" :label="$t('Dim')">
+                        <template slot-scope='scope'>
+                            {{ scope.row.glasswidthmm }}*{{ scope.row.glassheightmm }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="$t('Terminate Task')">
+                        <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('Terminate Task')
+                                }}</el-button>
+                        </template>
+                    </el-table-column>
                 </el-table>
                 <el-table :data="this.tasklist2" border style="width: 100%">
-                    <el-table-column prop="glassId" label="Incoming glass ID"></el-table-column>
-                    <el-table-column prop="cage" label="The Grille number being used"></el-table-column>
-                    <el-table-column label="Order number">orderNo</el-table-column>
-                    <el-table-column prop="address" label="Length and width"></el-table-column>
-                    <el-table-column prop="address" label="coating"></el-table-column>
+                    <el-table-column :width="180" prop="glassId" :label="$t('Infeed glass barcode')"></el-table-column>
+                    <el-table-column :width="130" prop="cage" :label="$t('Cage No')"></el-table-column>
+                    <el-table-column :width="130" prop="cell" :label="$t('Slot No')"></el-table-column>
+                    <el-table-column :width="130" prop="orderId" :label="$t('Order No')"></el-table-column>
+                    <el-table-column prop="orderId" :label="$t('List No')"></el-table-column>
+                    <el-table-column prop="orderId" :label="$t('Box No')"></el-table-column>
+                    <el-table-column :width="130" prop="lengthWidth" :label="$t('Dim')">
+                        <template slot-scope='scope'>
+                            {{ scope.row.glasswidthmm }}*{{ scope.row.glassheightmm }}
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="$t('Terminate Task')">
+                        <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('Terminate Task')
+                                }}</el-button>
+                        </template>
+                    </el-table-column>
                 </el-table>
             </div>
             <div style="padding: 10px;display: flex;height:85px;">
                 <div v-for="item in tableData" :key="item['cageno']" class="occupy">
                     <el-col style="text-align:left;font-weight: bold;">#{{ item['cage'] }}</el-col>
                     <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
-                        <span class="biao">Usage</span><span class="zhi">{{ item['cell'] }}%</span>
+                        <span class="biao">{{ $t('Usage') }}</span><span class="zhi">{{ item['cell'] }}%</span>
                     </el-col>
                     <hr style="width:80%;margin: 0 auto;" />
                     <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
-                        <span class="biao">Space (Pieces)</span><span class="zhi">{{ item['state'] }}</span>
+                        <span class="biao">{{ $t('Space (Pieces)') }}</span><span class="zhi">{{ item['state'] }}</span>
                     </el-col>
                 </div>
             </div>
         </el-main>
-        <el-footer> 
-                <div class="block" style="text-align: center;position: relative;">
-                    <div style="display:flex;position: absolute;float:left;z-index: 999;top:71px;left:136px;">
-                        <div :class="getStatusClass(item.state)" v-for="item in cagelist1" :key="item['date']"></div>
+        <el-footer>
+            <div class="blocks" style="position: relative;">
+                <div style="display:flex;position: absolute;float:left;z-index: 999;top:102px;left:237px;">
+                    <div :class="getStatusClass(item.state)" v-for="(item, index) in cagelist1" :key="item['date']"
+                        :style="{ height: 35 * item['glassWidth'] + 'px', left: 3.07 * index + Math.abs(item['cage'] - 10) * 6.8 + 'px' }"
+                        @click="showcageinfo(item['cage'])"></div>
+                </div>
+                <div style="display:flex;position: absolute;float:left;z-index: 999;top:102px;left:640px;">
+                    <div :class="getStatusClass(item.state)" v-for="(item, index) in cagelist2" :key="item['date']"
+                        :style="{ height: 35 * item['glassWidth'] + 'px', left: 3.07 * index + Math.abs(item['cage'] - 5) * 6.8 + 'px' }"
+                        @click="showcageinfo(item['cage'])"></div>
+                </div>
+                <div style="display:flex;position: absolute;float:left;z-index: 999;top:139px;left:237px;">
+                    <div :class="getStatusClass(item.state)" v-for="(item, index) in cagelist3" :key="item['date']"
+                        :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px', left: 3.07 * index + Math.abs(item['cage'] - 10) * 6.8 + 'px' }"
+                        @click="showcageinfo(item['cage'])">
                     </div>
-                    <div style="display:flex;position: absolute;float:left;z-index: 999;top:71px;left:366px;">
-                        <div :class="getStatusClass(item.state)" v-for="item in cagelist2" :key="item['date']"></div>
-                    </div>
-                    <div style="display:flex;position: absolute;float:left;z-index: 999;top:96px;left:136px;">
-                        <div :class="getStatusClass(item.state)" v-for="item in cagelist3" :key="item['date']"></div>
-                    </div>
-                    <div style="display:flex;position: absolute;float:left;z-index: 999;top:96px;left:366px;">
-                        <div :class="getStatusClass(item.state)" v-for="item in cagelist4" :key="item['date']"></div>
-                    </div>
-                </div> 
+                </div>
+                <div style="display:flex;position: absolute;float:left;z-index: 999;top:139px;left:640px;">
+                    <div :class="getStatusClass(item.state)" v-for="(item, index) in cagelist4" :key="item['date']"
+                        :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px', left: 3.07 * index + Math.abs(item['cage'] - 5) * 6.8 + 'px' }"
+                        @click="showcageinfo(item['cage'])"></div>
+                </div>
+                <div class="blue gezi"
+                    :style="{ display: 'flex', position: 'absolute', float: 'left', top: 28 + 'px', left: 1050 + 'px', height: loadglassheight1 + 'px', width: 4 + 'px' }">
+                </div>
+                <div class="blue gezi"
+                    :style="{ display: 'flex', position: 'absolute', float: 'left', top: 105 + 'px', left: 1050 + 'px', height: loadglassheight2 + 'px', width: 4 + 'px' }">
+                </div>
+                <div class="blocks-img" :style="{ left: car1 + 'px', top: '16px' }"></div>
+                <div class="blocks-img" :style="{ left: car2 + 'px', top: '175px' }"></div>
+                <div class="blocks-img2"></div>
+                <div class="blocks-img3"></div>
+                <el-button class="orderbutton1" type="primary" @click="showform2()" :disabled="OrderInfo">{{ $t('OrderInfo')
+                }}</el-button>
+                <el-button class="orderbutton2" type="primary" @click="showform6()" :disabled="OutingQueue">
+                    {{ $t('Outing Queue') }}</el-button>
+
+                <!-- <div style="display:flex;position: absolute;float:left;z-index: 999;top:112px;left:328px;">
+                    <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist1" :key="item['date']"
+                        :style="{ height: 35 * item['glassWidth'] + 'px',left:4.22*index+'px' }"
+                        @click="showcageinfo(item['cage'])"></div>
+                </div>
+                <div style="display:flex;position: absolute;float:left;z-index: 999;top:112px;left:885px;">
+                    <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist2" :key="item['date']"
+                        :style="{ height: 35 * item['glassWidth'] + 'px',left:4.22*index+'px' }"
+                        @click="showcageinfo(item['cage'])"></div>
+                </div>
+                <div style="display:flex;position: absolute;float:left;z-index: 999;top:154px;left:328px;">
+                    <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist3" :key="item['date']"
+                        :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px',left:4.22*index+'px' }"
+                        @click="showcageinfo(item['cage'])"></div>
+                </div>
+                <div style="display:flex;position: absolute;float:left;z-index: 999;top:154px;left:885px;">
+                    <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist4" :key="item['date']"
+                        :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px',left:4.22*index+'px' }"
+                        @click="showcageinfo(item['cage'])"></div>
+                </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')">
+            <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-button type="primary" @click="showform(3)">{{ $t('Query') }}</el-button>
+                </el-form-item>
+                <el-form-item :label="$t('Barcode')">
+                    <el-input v-model="form.glassId" readonly autocomplete="off" />
+                </el-form-item>
+                <el-form-item :label="$t('Order No')">
+                    <el-input v-model="form.orderId" readonly autocomplete="off" />
+                </el-form-item>
+                <el-form-item :label="$t('List No')">
+                    <el-input v-model="form.listId" readonly autocomplete="off" />
+                </el-form-item>
+                <el-form-item :label="$t('Box No')">
+                    <el-input v-model="form.boxId" readonly autocomplete="off" />
+                </el-form-item>
+                <el-form-item :label="$t('Length')">
+                    <el-input v-model="form.glasswidthmm" readonly autocomplete="off" />
+                </el-form-item>
+                <el-form-item :label="$t('Width')">
+                    <el-input v-model="form.glassheightmm" readonly autocomplete="off" />
+                </el-form-item>
+                <el-form-item :label="$t('Length')">
+                    <el-input v-model="form.glasswidth" readonly autocomplete="off" />
+                </el-form-item>
+                <el-form-item :label="$t('Width')">
+                    <el-input v-model="form.glassheight" readonly autocomplete="off" />
+                </el-form-item>
+
+            </el-form>
+            <template #footer>
+                <span class="dialog-footer">
+                    <!-- <el-button @click="sbumitglassid()" :style="{ display: confirm1 == true ? '' : 'none' }"
+                        type="primary">{{
+                            $t('confirm') }}</el-button> -->
+                    <el-button @click="FeedInglassid()" :style="{ display: confirm2 == true ? '' : 'none' }"
+                        type="primary">{{
+                            $t('confirm') }}</el-button>
+                    <el-button @click="cancel()">{{ $t('cancel') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+
+        <el-dialog :visible.sync="dialogFormVisible1" :title="$t('Please confirm the Ordering Information')">
+            <el-form :model="form1" label-width="100px" style="padding-right: 30px">
+                <el-form-item :label="$t('Order No')">
+                    <el-input v-model="form1.order" autocomplete="off" />
+                </el-form-item>
+                <el-form-item :label="$t('Number')">
+                    <el-input v-model="form1.number" autocomplete="off" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="getOrder();" type="primary">{{ $t('confirm') }}</el-button>
+                    <el-button @click="cancel1()">{{ $t('cancel') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+
+        <el-dialog :visible.sync="dialogFormVisible2" :title="$t('Alarm Information')">
+            <el-table :data="this.alarm" border style="width: 100%;">
+                <el-table-column prop="id" :label="$t('id')"></el-table-column>
+                <el-table-column prop="content" :label="$t('content')"></el-table-column>
+                <el-table-column prop="timeons" :label="$t('timeon')"></el-table-column>
+                <el-table-column prop="endTime" :label="$t('endTime')"></el-table-column>
+            </el-table>
+        </el-dialog>
+
+        <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-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')"></el-table-column>
+                <el-table-column :min-width="145" prop="glassId" :label="$t('Barcode')"></el-table-column>
+                <el-table-column :min-width="100" prop="orderId" :label="$t('Order No')"></el-table-column>
+                <el-table-column :min-width="80" prop="listId" :label="$t('List No')"></el-table-column>
+                <el-table-column :min-width="100" prop="boxId" :label="$t('Box No')"></el-table-column>
+                <el-table-column :min-width="90" 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') : ""
+                        }}
+                    </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 }}
+                    </template>
+                </el-table-column>
+                <el-table-column :min-width="250" :label="$t('Operate')">
+                    <template slot-scope='scope'>
+                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="scope.row.state == 1 ? false : true"
+                            @click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('Delete') }}</el-button>
+                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+                            :disabled="scope.row.state == 1 ? false : true"
+                            @click="outglass(scope.row.glassId, scope.row.state)">{{ $t('Out') }}</el-button>
+                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+                            @click="UpdateDisabled(scope.row.cage, scope.row.cell, scope.row.disabled == 0 ? 1 : 0)">
+                            {{ scope.row.disabled == 0 ? $t('Enable') : $t('Disable') }}</el-button>
+                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+                            :disabled="scope.row.glassId != null ? true : false"
+                            @click="insertglass(scope.row.cage, scope.row.cell, scope.row.tier)">{{ $t('Increase')
+                            }}</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChanges"
+                @current-change="handleCurrentChanges" :pager-count="7" :current-page="currentPages"
+                :page-sizes="[21, 42, 84, 420]" :page-size="pagesizes" layout="total, sizes, prev, pager, next, jumper"
+                :total="cageinfo.length > 0 ? cageinfo.length : null" background style="float: right; margin-top: 20px">
+            </el-pagination>
+
+        </el-dialog>
+
+        <el-dialog :visible.sync="dialogFormVisible4" :title="$t('OrderInfo')" top="5vh">
+            <el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="orderid"></el-input>
+            <el-button type="primary" @click="selectglassinfo()">{{ $t('Query') }}</el-button>
+            <el-table :data="GlassInfo.slice((currentPage - 1) * pagesize, currentPage * pagesize)
+                " :height="700" border style="width: 100%;overflow: auto;">
+                <el-table-column prop="barcode" :label="$t('Barcode')"></el-table-column>
+                <el-table-column prop="ordernumber" :label="$t('Order No')"></el-table-column>
+                <el-table-column prop="listnumber" :label="$t('List No')"></el-table-column>
+                <el-table-column prop="boxnumber" :label="$t('Box No')"></el-table-column>
+                <el-table-column prop="frameBarcode" :label="$t('Frame No')"></el-table-column>
+                <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>
+        </el-dialog>
+        <el-dialog :visible.sync="dialogFormVisible5" :title="$t('Please confirm the glass information')">
+            <el-form :model="form" label-width="100px" style="padding-right: 30px">
+                <div style="display: flex;justify-content: space-around;">
+                    <label for="">{{ $t('Upper film position') }}</label>
+                    <el-button type="primary" @click="isConfirmState()">
+                        {{ this.isConfirm == true ? "Allow" : "Not Allow" }}</el-button>
+                    <label for="">{{ $t('Scan Code Point') }}</label>
+                </div>
+                <div style="display: flex;justify-content: space-around;height: 40px;">
+                    <label for="">{{ $t('current Information') }}</label>
+                    <label for="">{{ $t('Modify Information') }}</label>
+                    <label for="">{{ $t('current Information') }}</label>
+                    <label for="">{{ $t('Modify Information') }}</label>
+                </div>
+                <div style="display: flex;justify-content: space-around;">
+                    <el-form-item>
+                        <el-input style="width:50%;margin-left: 20%;" :placeholder="$t('Enter the glass barcode')"
+                            v-model="glassid2"></el-input>
+                        <el-button type="primary" @click="SelectGlassByGlassIDs(1)">{{ $t('Query')
+                        }}</el-button>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-input style="width:50%;margin-left: 20%;" :placeholder="$t('Enter the glass barcode')"
+                            v-model="glassid1"></el-input>
+                        <el-button type="primary" @click="SelectGlassByGlassIDs(2)">{{ $t('Query')
+                        }}</el-button>
+                    </el-form-item>
+                </div>
+                <div style="display: flex;justify-content: space-around;">
+                    <el-form-item :label="$t('Barcode')">
+                        <el-input v-model="form2.glassId" readonly autocomplete="off" />
+                    </el-form-item>
+                    <el-form-item :label="$t('Barcode')">
+                        <el-input v-model="form4.glassId" readonly autocomplete="off" />
+                    </el-form-item>
+                    <el-form-item :label="$t('Barcode')">
+                        <el-input v-model="form3.glassId" readonly autocomplete="off" />
+                    </el-form-item>
+                    <el-form-item :label="$t('Barcode')">
+                        <el-input v-model="form5.glassId" readonly autocomplete="off" />
+                    </el-form-item>
+                </div>
+                <div style="display: flex;justify-content: space-around;">
+                    <el-form-item :label="$t('Order No')">
+                        <el-input v-model="form2.orderId" readonly autocomplete="off" />
+                    </el-form-item>
+                    <el-form-item :label="$t('Order No')">
+                        <el-input v-model="form4.orderId" readonly autocomplete="off" />
+                    </el-form-item>
+                    <el-form-item :label="$t('Order No')">
+                        <el-input v-model="form3.orderId" readonly autocomplete="off" />
+                    </el-form-item>
+                    <el-form-item :label="$t('Order No')">
+                        <el-input v-model="form5.orderId" readonly autocomplete="off" />
+                    </el-form-item>
+                </div>
+                <div style="display: flex;justify-content: space-around;">
+                    <el-form-item :label="$t('List No')">
+                        <el-input v-model="form2.listId" readonly autocomplete="off" />
+                    </el-form-item>
+                    <el-form-item :label="$t('List No')">
+                        <el-input v-model="form4.listId" readonly autocomplete="off" />
+                    </el-form-item>
+                    <el-form-item :label="$t('List No')">
+                        <el-input v-model="form3.listId" readonly autocomplete="off" />
+                    </el-form-item>
+                    <el-form-item :label="$t('List No')">
+                        <el-input v-model="form5.listId" readonly autocomplete="off" />
+                    </el-form-item>
+                </div>
+                <div style="display: flex;justify-content: space-around;">
+                    <el-form-item :label="$t('Box No')">
+                        <el-input v-model="form2.boxId" readonly autocomplete="off" />
+                    </el-form-item>
+                    <el-form-item :label="$t('Box No')">
+                        <el-input v-model="form4.boxId" readonly autocomplete="off" />
+                    </el-form-item>
+                    <el-form-item :label="$t('Box No')">
+                        <el-input v-model="form3.boxId" readonly autocomplete="off" />
+                    </el-form-item>
+                    <el-form-item :label="$t('Box No')">
+                        <el-input v-model="form5.boxId" readonly autocomplete="off" />
+                    </el-form-item>
+                </div>
+                <div style="display: flex;justify-content: space-around;">
+                    <el-form-item :label="$t('Length')">
+                        <el-input v-model="form2.glasswidthmm" readonly autocomplete="off" />
+                    </el-form-item>
+                    <el-form-item :label="$t('Length')">
+                        <el-input v-model="form4.glasswidthmm" readonly autocomplete="off" />
+                    </el-form-item>
+                    <el-form-item :label="$t('Length')">
+                        <el-input v-model="form3.glasswidthmm" readonly autocomplete="off" />
+                    </el-form-item>
+                    <el-form-item :label="$t('Length')">
+                        <el-input v-model="form5.glasswidthmm" readonly autocomplete="off" />
+                    </el-form-item>
+                </div>
+                <div style="display: flex;justify-content: space-around;">
+                    <el-form-item :label="$t('Width')">
+                        <el-input v-model="form2.glassheightmm" readonly autocomplete="off" />
+                    </el-form-item>
+                    <el-form-item :label="$t('Width')">
+                        <el-input v-model="form4.glassheightmm" readonly autocomplete="off" />
+                    </el-form-item>
+                    <el-form-item :label="$t('Width')">
+                        <el-input v-model="form3.glassheightmm" readonly autocomplete="off" />
+                    </el-form-item>
+                    <el-form-item :label="$t('Width')">
+                        <el-input v-model="form5.glassheightmm" readonly autocomplete="off" />
+                    </el-form-item>
+                </div>
+                <div style="display: flex;justify-content: space-around;">
+                    <el-button @click="DeleteQueueGlasss(2)" type="primary">{{ $t('Clear Current')
+                    }}</el-button>
+                    <el-button @click="InsertQueueGlass(2)" type="primary" :disabled="disabled">
+                        {{ $t('Confirm Modification') }}</el-button>
+                    <el-button @click="DeleteQueueGlasss(1)" type="primary">{{ $t('Clear Current')
+                    }}</el-button>
+                    <el-button @click="InsertQueueGlass(1)" type="primary" :disabled="disabled1">
+                        {{ $t('Confirm Modification') }}</el-button>
+                </div>
+            </el-form>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="cancel3()">{{ $t('cancel') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+
+        <el-dialog :visible.sync="dialogFormVisible6" :title="$t('Outing Queue')" top="5vh">
+            <el-button type="primary" @click="isAllowQueueState()" :disabled="!this.isAllowReordering">{{ this.isAllowQueue
+                == true ? $t('Start') : $t('Stop')
+            }}</el-button>
+            <el-button type="primary" @click="isAllowReorderingState()" :disabled="this.isAllowQueue">{{
+                this.isAllowReordering == true ? $t('Not Allow') : $t('Allow')
+            }}</el-button>
+            <el-table :data="this.OutSlice" :height="700" :span-method="objectSpanMethod" border :cell-style="cellStyle"
+                style="width: 100%;overflow: auto;">
+                <el-table-column :min-width="100" prop="glassId" :label="$t('Barcode')"></el-table-column>
+                <el-table-column prop="storageCage.orderId" :label="$t('Order No')"></el-table-column>
+                <el-table-column prop="storageCage.listId" :label="$t('List No')"></el-table-column>
+                <el-table-column prop="storageCage.boxId" :label="$t('Box No')"></el-table-column>
+                <el-table-column prop="storageCage.glasswidthmm" :label="$t('Length')"></el-table-column>
+                <el-table-column prop="storageCage.glassheightmm" :label="$t('Width')"></el-table-column>
+                <el-table-column 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('Completed') :scope.row.state == 3 ? $t('Absent') :$t('Deleted') }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="sequence" :label="$t('Sequence')"></el-table-column>
+                <el-table-column prop="position" :label="$t('Position')" style="font-size: 20px;">
+                    <template slot-scope='scope'>
+                        {{ scope.row.position == 1 ? "鈻勨杽鈻�" : "鈻�" }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="position" :label="$t('Flip')">
+                    <template slot-scope='scope'>
+                        {{ scope.row.flip == 1 ? $t('Yes') : $t('No') }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="barcode" :label="$t('Frame No')"></el-table-column>
+
+                <el-table-column prop="barcode" :label="$t('Complete')">
+                    <template slot-scope='scope'>
+                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="(!isAllowQueue||scope.row.state!=1)"
+                            @click="CompleteQueue(scope.row.id, scope.row.barcode, scope.row.glassId)">{{ $t('Complete')
+                            }}</el-button>
+                    </template>
+                </el-table-column>
+                <el-table-column :width="280" :label="$t('Operate')">
+                    <template slot-scope='scope'>
+                        <el-button type="text" size="small" @click="getTopMove(scope.row, scope.$index)"
+                            style="font-size: 15px;"
+                            :disabled="(scope.$index == 0 || isAllowReordering == true || scope.row.state == 1)">
+                            {{ $t('Top') }}
+                        </el-button>
+                        <el-button type="text" size="small" @click="getUpMove(scope.row, scope.$index)"
+                            style="font-size: 15px;"
+                            :disabled="(scope.$index == 0 || isAllowReordering == true || scope.row.state == 1)">
+                            {{ $t('Up') }}
+                        </el-button>
+                        <el-button type="text" size="small" @click="getDownMove(scope.row, scope.$index)"
+                            style="font-size: 15px;"
+                            :disabled="(OutSlice.length - 1 == scope.$index || isAllowReordering == true || scope.row.state == 1)">
+                            {{ $t('Down') }}
+                        </el-button>
+                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="isAllowQueue"
+                            @click="deleteproductionqueueglass(scope.row.barcode)">{{ $t('Delete') }}</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-dialog>
+
+        <el-dialog :visible.sync="dialogFormVisible7" :title="$t('Glass information corresponding to aluminum frame')"
+            top="5vh">
+            <el-input style="width:15%;" :placeholder="$t('Enter the Frame No')" v-model="framebarcode"></el-input>
+            <el-button type="primary" @click="showform7()">{{ $t('Query') }}</el-button>
+            <el-button type="primary" @click="addoutslice()">{{ $t('Increase') }}</el-button>
+            <el-table :data="this.AluminumFrame" :height="700" border style="width: 100%;overflow: auto;">
+
+                <el-table-column prop="barcode" :label="$t('Barcode')"></el-table-column>
+                <el-table-column prop="ordernumber" :label="$t('Order No')"></el-table-column>
+                <el-table-column prop="listnumber" :label="$t('List No')"></el-table-column>
+                <el-table-column prop="boxnumber" :label="$t('Box No')"></el-table-column>
+                <el-table-column prop="glasslength" :label="$t('Length')"></el-table-column>
+                <el-table-column prop="glassheight" :label="$t('Width')"></el-table-column>
+                <el-table-column prop="storageCage.cage" :label="$t('Cage No')"></el-table-column>
+                <el-table-column prop="storageCage.cell" :label="$t('Slot No')"></el-table-column>
+                <el-table-column prop="storageCage.tier" :label="$t('The Side')"></el-table-column>
+                <el-table-column prop="FrameNo" :label="$t('Frame No')"></el-table-column>
+                <el-table-column prop="Flip" :label="$t('Flip')"></el-table-column>
+                <el-table-column prop="out_slice.state" :label="$t('In the queue')">
+                    <template slot-scope='scope'>
+                        {{ scope.row.out_slice != null ? $t('Yes') : $t('No') }}
+                    </template>
+                </el-table-column>
+
+                <el-table-column prop="storageCage.tier" :label="$t('In the cage')">
+                    <template slot-scope='scope'>
+                        {{ scope.row.storageCage != null ? $t('Yes') : $t('No') }}
+                    </template>
+                </el-table-column>
+                <el-table-column :width="80" :label="$t('Operate')">
+                    <template slot-scope='scope'>
+                        <el-checkbox label="" :disabled="!(scope.row.storageCage != null && scope.row.out_slice == null)"
+                            :checked="scope.row.isCheck" @change="CheckBoxchange(scope.row.barcode, $event)"></el-checkbox>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-dialog>
     </el-container>
 </template>
-  
 <script>
 
-import { home, home2, loadtask, InsertOrder } from "../../api/home";
+import {
+    home, home2, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist,
+    SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId, UpdateQueueState, DeleteQueueGlass, SelectGlassNo,
+    SelectAluminumFrameInfoById, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues, isConfirmStates, SelectPermissionByUserName, currentUsername, CompleteQueue
+} from "../../api/home";
 
 
+import LanguageMixin from '../../lang/LanguageMixin'
+let socket;
 export default {
+    name: "Home",
     data() {
         return {
-            
+            confirm1: false,
+            confirm2: false,
+            insertcage: 0,
+            insertcell: 0,
+            inserttier: 0,
+            name: 'Confirm',
+            mixins: [LanguageMixin],
+            dialogFormVisible: false,
+            dialogFormVisible1: false,
+            dialogFormVisible2: false,
+            dialogFormVisible3: false,
+            dialogFormVisible4: false,
+            dialogFormVisible5: false,
+            dialogFormVisible6: false,
+            dialogFormVisible7: false,
+            form: {
+                orderId: "",
+                glassId: "",
+                height: "",
+                width: ""
+            },
+            form1: {},
+            form2: {},
+            form3: {},
+            form4: {},
+            form5: {},
+            alarm: [],
             tableData: [],
             cagelist1: [],
             cagelist2: [],
             cagelist3: [],
             cagelist4: [],
             task1: 3,
-            task2: 4,
+            task2: 2,
             tasklist1: [],
             tasklist2: [],
-            src: "./img/xmjc.png",
-            order: ""
+            order: "",
+            glassid: "",
+            glassid1: "",
+            glassid2: "",
+            cageglassid: "",
+            url: "../../img/bigcar01.png",
+            car1: 145,
+            car2: 210,
+            // car1: 210,
+            // car2: 300,
+            cageinfo: [],
+            cage: 0,
+            carlist: [],
+            loadglassheight1: 0,
+            loadglassheight2: 0,
+            password: 1,
+            text: "",
+            zhuangtai: "",
+            orderid: "",
+            GlassInfo: [],
+            disabled: false,
+            disabled1: false,
+            currentPage: 1,  //榛樿鍒濆椤�
+            pagesize: 15,    //姣忛〉榛樿鏄剧ず鐨勬暟鎹�
+            pageCount: 0,
+            currentPages: 1,  //榛樿鍒濆椤�
+            pagesizes: 21,    //姣忛〉榛樿鏄剧ず鐨勬暟鎹�
+            pageCounts: 0,
+            OutSlice: [],
+            AluminumFrame: [],
+            framebarcode: "",
+            isAllowQueue: true,
+            isAllowReordering: true,
+            FrameNoFlag: "",
+            isConfirm: true,
+            ManuallyInfeedGlass: true,
+            OutingQueue: true,
+            OrderInfo: true,
+            CageDetails: true,
+
         };
     },
     created() {
         this.load();
-    },
+        this.init();
+    }
+    ,
     methods: {
+
+
+        init() {
+            let viewname = "Home";
+            if (typeof (WebSocket) == "undefined") {
+                console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
+            } else {
+                //console.log("鎮ㄧ殑娴忚鍣ㄦ敮鎸乄ebSocket");
+                let socketUrl = "ws://" + this.$t('ip') + ":8888" + "/springboot-vue3/api/talk/" + viewname;
+                if (socket != null) {
+                    socket.close();
+                    socket = null;
+                }
+                // 寮�鍚竴涓獁ebsocket鏈嶅姟
+                socket = new WebSocket(socketUrl);
+                //鎵撳紑浜嬩欢
+                socket.onopen = function () {
+                    console.log("websocket宸叉墦寮�");
+                };
+                //  娴忚鍣ㄧ鏀舵秷鎭紝鑾峰緱浠庢湇鍔$鍙戦�佽繃鏉ョ殑鏂囨湰娑堟伅
+                socket.onmessage = function (msg) {
+                    //console.log("鏀跺埌鏁版嵁====" + msg.data);
+                    let obj = JSON.parse(msg.data);
+                    if (obj.params != null) {
+                        this.car1 = 145 + 8.15 * Math.abs(obj.params[0][0] - this.carlist[0]['start']) / Math.abs(this.carlist[0]['end'] - this.carlist[0]['start']) * 100;
+                        this.car2 = 210 + 8.15 * Math.abs(obj.params[0][1] - this.carlist[1]['start']) / Math.abs(this.carlist[1]['end'] - this.carlist[1]['start']) * 100;
+                        // this.car1 = 210 + 11.25 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;
+                        // this.car2 = 300 + 11.25 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;
+                    }
+                    this.tableData = obj.tableData[0];
+                    this.cagelist1 = obj.cagelist1[0];
+                    this.cagelist2 = obj.cagelist2[0];
+                    this.cagelist3 = obj.cagelist3[0];
+                    this.cagelist4 = obj.cagelist4[0];
+                    this.tasklist1 = obj.tasklist1[0];
+                    this.tasklist2 = obj.tasklist2[0];
+                    this.alarm = obj.alarmmg[0];
+                    //閾濇id鎻愮ず
+
+
+                    //鏄惁鍏佽鍑虹墖
+                    this.isAllowQueue = obj.isAllowQueue[0];
+                    //鍑虹墖闃熷垪
+                    if (this.isAllowReordering == true) {
+                        this.OutSlice = obj.listoutslice[0];
+                    }
+                    //鑾峰彇涓婄墖浣嶇幓鐠冧俊鎭�
+
+                    if (obj.zhuangtai != null) {
+                        this.zhuangtai = obj.zhuangtai[0];
+                    }
+                    //涓婄墖浣嶇幓鐠冧俊鎭�
+                    if (obj.form2 != null && obj.form2 != "") {
+                        this.form2 = obj.form2[0];
+                        this.loadglassheight2 = 70;
+                    } else {
+                        this.form2 = {};
+                    }
+
+                    //鏄惁闇�瑕佹墜鍔ㄧ‘璁や笂鐗�
+                    this.isConfirm = obj.isConfirm[0];
+                    //鎵爜浣嶇幓鐠冧俊鎭�
+                    if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {
+                        this.form3 = obj.form3[0];
+                        this.loadglassheight1 = 70;
+                    } else {
+                        this.form3 = {};
+                    }
+                    if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {
+                        this.loadglassheight1 = 70;
+                        this.form5 = obj.form3[0];
+                        this.showform3();
+                        this.Sizerange(this.form5, 3);
+                        this.glassid1 = "";
+                    } else {
+                        if (this.glassid1 == "") {
+                            this.DeleteBarcodeGlass();
+                        }
+                    }
+                    //鏁版嵁搴撹繛鎺ユ槸鍚︽甯�
+                    if (obj.dbconnected == "false") {
+                        this.text = this.$t('DataBase Connection failed');
+                    }
+                    //鐞嗙墖绗肩幓鐠冧俊鎭�
+                    if (this.dialogFormVisible3 == true) {
+                        SelectCageInfo(this.cageglassid).then(res => {
+                            this.cageinfo = res.data.cageinfo;
+                        });
+                    }
+
+
+                    this.$forceUpdate();
+
+                }.bind(this);
+                //鍏抽棴浜嬩欢
+                socket.onclose = function () {
+                    console.log("websocket宸插叧闂�");
+                };
+                //鍙戠敓浜嗛敊璇簨浠�
+                socket.onerror = function () {
+                    console.log("websocket鍙戠敓浜嗛敊璇�");
+                }
+            }
+        },
         load() {
+            //鍔犺浇鐢ㄦ埛鏉冮檺
+            currentUsername().then(res => {
+                SelectPermissionByUserName(res.data).then(res => {
+                    res.data.permission.forEach(item => {
+                        if (item.permissionId == "32" && item.state == 1) {
+                            this.ManuallyInfeedGlass = false;
+                        }
+                        if (item.permissionId == "33" && item.state == 1) {
+                            this.OutingQueue = false;
+                        }
+                        if (item.permissionId == "34" && item.state == 1) {
+                            this.OrderInfo = false;
+                        }
+                        if (item.permissionId == "35" && item.state == 1) {
+                            this.CageDetails = false;
+                        }
+                    });
+                });
+
+            });
+            //鍔犺浇绗煎瓙浣跨敤鎯呭喌鏁版嵁
             home().then(res => {
                 this.tableData = res.data.list;
             });
+            //鍔犺浇鐞嗙墖绗肩幓鐠冧俊鎭�
+            SelectCageInfo("").then(res => {
+                this.cageinfo = res.data.cageinfo;
+                this.currentPages = 1;
+            });
+            //鍔犺浇鐞嗙墖绗肩幓鐠冩暟鎹�
             home2().then(res => {
                 this.cagelist1 = res.data.list1;
                 this.cagelist2 = res.data.list2;
                 this.cagelist3 = res.data.list3;
                 this.cagelist4 = res.data.list4;
             });
-            loadtask(this.task1).then(res => {
-                this.tasklist1 = res.data.list;
+            // //鍔犺浇杩涚墖浠诲姟鏁版嵁
+            // loadtask(this.task1).then(res => {
+            //     this.tasklist1 = res.data.list;
+            // });
+            // //鍔犺浇杩涘嚭鐗囦换鍔℃暟鎹�
+            // loadtask(this.task2).then(res => {
+            //     this.tasklist2 = res.data.list;
+            // });
+            //鍔犺浇鎶ヨ淇℃伅
+            SelectAlarmmgInfo().then(res => {
+                this.alarm = res.data.alarmmg;
             });
-            loadtask(this.task2).then(res => {
-                this.tasklist2 = res.data.list;
+            //鍔犺浇灏忚溅浣嶇疆淇℃伅
+            Loadcarlist().then(res => {
+                this.carlist = res.data.carlist;
+            });
+            //鍔犺浇纭瀵嗙爜
+            SelectPassword().then(res => {
+                this.password = res.data.password;
             });
         },
+        //鏍规嵁鏍煎瓙鐘舵�佷慨鏀归鑹�
         getStatusClass(state) {
-            //姣忓悇鏍煎瓙涓嶅悓鐘舵�佷笉鍚岄鑹�
             if (state == 0) {
-                return "green gezi";
+                return "gezi";
             } else if (state == 1) {
                 return "blue gezi";
             } else if (state == 2) {
@@ -203,21 +1005,692 @@
                 return "black gezi";
             }
         },
+        //鎸夎鍗曞嚭鐗�
         getOrder() {
-            if (this.order != "") {
+            if (this.form1.order != "") {
                 InsertOrder(this.order).then(res => {
                     if (res.data.message == 200) {
-                        this.$message.success("Operation successful");
+                        this.dialogFormVisible1 = false;
+                        this.$message.success(this.$t('Operation successful'));
                     } else {
-                        this.$message.success("operation failed");
+                        this.$message.error(this.$t('There is no glass for this order'));
                     }
                     this.load();
                 });
             }
 
+        },
+        //鎵嬪姩涓婄墖
+        sbumitglassid() {
+            if (this.form.order != "") {
+                if (this.form.height < 380 || this.form.width < 390 || this.form.height > 1810 || this.form.width > 2760) {
+                    this.$message.error(this.$t('The glass size is not within the range'));
+                } else {
+                    if (this.zhuangtai == true) {
+                        Addglassid(this.glassid).then(res => {
+                            if (res.data.message2 == 200) {
+                                this.$message.success(this.$t('Operation successful'));
+                                this.cancel();
+                            } else if (res.data.message2 == 500) {
+                                this.$message.error(this.$t('There are currently tasks'));
+                            }
+                            else if (res.data.message2 == 300) {
+                                this.$message.error(this.$t('There is no such glass'));
+                            }
+                            else if (res.data.message2 == 400) {
+                                this.$message.error(this.$t('There is no such grid'));
+                            }
+                        });
+                    } else {
+                        this.$message.error(this.$t('There are currently tasks'));
+                    }
+                }
+            }
+        },
+        //鏄剧ず纭鐜荤拑淇℃伅涔熸病
+        showform(buttons) {
+            if (buttons == 1) {
+                this.confirm1 = true;
+                this.confirm2 = false;
+            } else if (buttons == 2) {
+                this.confirm1 = false;
+                this.confirm2 = true;
+            }
+            //鏍规嵁杈撳叆鐨勭幓鐠僫d鑾峰彇鐜荤拑淇℃伅
+            SelectGlassByGlassID(this.glassid).then(res => {
+                if (res.data.form != null) {
+                    this.form = res.data.form;
+                    this.dialogFormVisible = true;
+                    this.$message.success(this.$t('query was successful'));
+                } else {
+                    this.dialogFormVisible = true;
+                    this.$message.error(this.$t('There is no such glass'));
+                }
+            });
+        },
+        //鏄剧ず璁㈠崟淇℃伅椤甸潰
+        showform1() {
+            if (this.order != "") {
+                SelectGlassNo(this.order).then(res => {
+                    this.form1.order = this.order;
+                    this.form1.number = res.data.count;
+                });
+                this.dialogFormVisible1 = true;
+            }
+        },
+        //鏄剧ず鎵爜浣嶅拰涓婄墖浣�
+        showform3() {
+            this.dialogFormVisible5 = true;
+        },
+        //鑾峰彇鎵爜浣嶅拰涓婄墖浣嶆暟鎹�
+        SelectGlassByGlassIDs(parameter) {
+            this.showform3();
+            if (parameter == 1) {
+                SelectGlassByGlassID(this.glassid2).then(res => {
+                    if (res.data.form != null) {
+                        if (res.data.form.glassId != null) {
+                            this.form4 = res.data.form;
+                            this.$message.success(this.$t('query was successful'));
+                            this.Sizerange(this.form4, 2);
+                        } else {
+                            this.$message.error(this.$t('There is no such glass'));
+                        }
+
+                    } else {
+                        this.$message.error(this.$t('There is no such glass'));
+                    }
+                });
+            } else {
+                SelectGlassByGlassID(this.glassid1).then(res => {
+                    if (res.data.form != null) {
+                        if (res.data.form.glassId != null) {
+                            this.form5 = res.data.form;
+                            this.$message.success(this.$t('query was successful'));
+                            this.Sizerange(this.form5, 1);
+                        } else {
+                            this.$message.error(this.$t('There is no such glass'));
+                        }
+                    } else {
+                        this.$message.error(this.$t('There is no such glass'));
+                    }
+                });
+            }
+
+        },
+        //鏌ヨ瀹㈡埛鐜荤拑淇℃伅
+        selectglassinfo() {
+            SelectGlass(this.orderid).then(res => {
+                this.currentPage = 1;
+                this.GlassInfo = res.data.glass;
+            });
+        },
+        //鏄剧ず瀹㈡埛鐜荤拑淇℃伅
+        showform2() {
+            SelectGlass(this.orderid).then(res => {
+                this.GlassInfo = res.data.glass;
+            });
+            this.dialogFormVisible4 = true;
+        },
+        //鏄剧ず鍑虹墖闃熷垪
+        showform6() {
+            this.dialogFormVisible6 = true;
+        },
+        //鏄剧ず閾濇瀵瑰簲鐜荤拑淇℃伅
+        showform7() {
+            //鏌ヨ閾濇id瀵瑰簲鐜荤拑淇℃伅
+            SelectAluminumFrameInfoById(this.framebarcode).then(res => {
+                this.AluminumFrame = res.data.listAluminumFrame;
+                this.AluminumFrame.sort(function (x, y) {
+                    if (x['storageCage'] != null && y['storageCage'] != null) {
+                        return y['storageCage']['tier'] - x['storageCage']['tier'];
+                    }
+                });
+                this.AluminumFrame.forEach(item => {
+                    if (item.storageCage != null && item.out_slice == null) {
+                        item.isCheck = true;
+                    } else {
+                        item.isCheck = false;
+                    }
+                    item.Flip = res.data.flip;
+                    item.FrameNo = this.framebarcode;
+                });
+            });
+            // this.dialogFormVisible7 = true;
+        },
+        //鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
+        cancel() {
+            this.dialogFormVisible = false;
+            this.form = {
+                orderId: "",
+                glassId: "",
+                height: "",
+                width: ""
+            };
+        },
+        //鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
+        cancel1() {
+            this.dialogFormVisible1 = false;
+            this.form1 = {};
+        },
+        //鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
+        cancel3() {
+            this.dialogFormVisible5 = false;
+            this.form1 = {};
+        },
+        //缁撴潫杩�/鍑虹墖浠诲姟
+        endtask(type, glassid, cell) {
+            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) {
+                    UpdateTask(type, glassid, cell).then(res => {
+                        if (res.data.message3 == 200) {
+                            this.$message.success(this.$t('Operation successful'));
+                        }
+                    });
+                } else {
+                    this.$message.error(this.$t('Password error'));//瀵嗙爜閿欒
+                }
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: this.$t('Operation canceled')
+                });
+            });
+        },
+        //鏄剧ず鐞嗙墖绗艰鎯呬俊鎭�
+        showcageinfo(cage) {
+            if (this.CageDetails == false) {
+                cage = this.cageglassid;
+                SelectCageInfo(cage).then(res => {
+                    this.cageinfo = res.data.cageinfo;
+                    this.currentPages = 1;
+                    this.dialogFormVisible3 = true;
+                });
+            } else {
+                this.$message.error(this.$t('You do not have this permission'));
+            }
+
+        },
+        //鍒犻櫎鐞嗙墖绗肩幓鐠�
+        deleteglass(glassid, state) {
+            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) {
+                    if (state == 1) {
+                        DeleteByGlassID(glassid).then(res => {
+                            if (res.data.message3 == 200) {
+                                this.$message.success(this.$t('Operation successful'));
+                            }
+                        });
+                    } else {
+                        this.$message.error(this.$t('No delete allowed'));
+                    }
+                } else {
+                    this.$message.error(this.$t('Password error'));//瀵嗙爜閿欒
+                }
+
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: this.$t('Operation canceled')
+                });
+            });
+        },
+        //鎵嬪姩鍑虹墖
+        outglass(glassid, state) {
+            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) {
+                    if (state == 1) {
+                        OutByGlassID(glassid).then(res => {
+                            if (res.data.message2 == 200) {
+                                this.$message.success(this.$t('Operation successful'));
+                            }
+                            else if (res.data.message2 == 300) {
+                                this.$message.error(this.$t('Unable to find the placement method of the aluminum frame'));
+                            }
+                            else if (res.data.message2 == 400) {
+                                this.$message.error(this.$t('Unable to find whether the aluminum frame is flipped or not'));
+                            }
+                            else if (res.data.message2 == 500) {
+                                this.$message.error(this.$t('This glass is already in the Queue'));
+                            }
+                        });
+                    } else {
+                        this.$message.error(this.$t('No out allowed'));
+                    }
+                } else {
+                    this.$message.error(this.$t('Password error'));//瀵嗙爜閿欒
+                }
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: this.$t('Operation canceled')
+                });
+            });
+        },
+        //鎵嬪姩寰�鐞嗙墖绗兼坊鍔犵幓鐠�
+        insertglass(cage, cell, tier) {
+            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) {
+                    this.insertcage = cage;
+                    this.insertcell = cell;
+                    this.inserttier = tier;
+                    this.showform(2);
+                } else {
+                    this.$message.error(this.$t('Password error'));//瀵嗙爜閿欒
+                }
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: this.$t('Operation canceled')
+                });
+            });
+        },
+        //鎵嬪姩涓婄墖
+        FeedInglassid() {
+            if (this.form.glassId != ""&&this.form.glassId != null) {
+                Inglassid(this.insertcage, this.insertcell, this.inserttier, this.form).then(res => {
+                    if (res.data.message == 200) {
+                        this.$message.success(this.$t('Operation successful'));
+                        this.dialogFormVisible = false;
+                    }
+                    else if (res.data.message == 400) {
+                        this.$message.error(this.$t('The glass size is not within the range'));
+                    }
+                    else if (res.data.message == 300) {
+                        this.$message.error(this.$t('This glass is already in the cage'));
+                    }
+                });
+            } else {
+                this.$message.error(this.$t('There is no such glass'));
+            }
+
+
+        },
+        //鍚敤//鐞嗙墖绗肩鐢�
+        UpdateDisabled(cage, cell, disabled) {
+            Disabled(cage, cell, disabled).then(res => {
+                if (res.data.message == 200) {
+                    this.$message.success(this.$t('Operation successful'));
+                }
+            });
+        },
+        //鍒犻櫎鍑虹墖闃熷垪鐜荤拑
+        deleteproductionqueueglass(id) {
+            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) {
+                    DeleteProductionQueueGlass(id).then(res => {
+                        if (res.data.message == 200) {
+                            this.$message.success(this.$t('Operation successful'));
+                        }
+                    });
+                }
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: this.$t('Operation canceled')
+                });
+            });
+        },
+        //琛ㄦ牸鍒犻櫎
+        handleDelete(index, row) {
+            console.log(index, row);
+        },
+        //鏀瑰彉姣忛〉瀹圭撼鐨勬暟鎹噺
+        handleSizeChange: function (size) {
+            this.pagesize = size;
+        },
+        //鍒囨崲椤电爜
+        handleCurrentChange: function (currentPage) {
+            this.currentPage = currentPage;
+        },
+        //鏀瑰彉姣忛〉瀹圭撼鐨勬暟鎹噺
+        handleSizeChanges: function (size) {
+            this.pagesizes = size;
+        },
+        //鍒囨崲椤电爜
+        handleCurrentChanges: function (currentPage) {
+            this.currentPages = currentPage;
+        },
+        //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
+        InsertQueueGlass(parameter) {
+            if (parameter == 1 && this.form5.glassId != "") {
+                if (this.form5.glassId != this.form2.glassId && this.form5.glassId != this.form3.glassId) {
+                    InsertQueueGlassId(1, this.form5).then(res => {
+                        if (res.data.message == 200) {
+                            this.form5 = {};
+                            this.$message.success(this.$t('Operation successful'));
+                        } else {
+                            this.$message.error(this.$t('This glass ID already exists in the sorting cage'));
+                        }
+                    });
+                } else {
+                    this.$message.error(this.$t('The glass ID already exists in the loading queue'));
+                }
+            } else if (parameter == 2 && this.form4.glassId != "") {
+                if (this.form4.glassId != this.form3.glassId && this.form4.glassId != this.form2.glassId) {
+                    InsertQueueGlassId(2, this.form4).then(res => {
+                        if (res.data.message == 200) {
+                            this.form4 = {};
+                            this.$message.success(this.$t('Operation successful'));
+                        } else {
+                            this.$message.error(this.$t('This glass ID already exists in the sorting cage'));
+                        }
+                    });
+                } else {
+                    this.$message.error(this.$t('The glass ID already exists in the loading queue'));
+                }
+
+
+            }
+        },
+        //娓呴櫎涓婄墖闃熷垪鐜荤拑
+        DeleteQueueGlasss(parameter) {
+            if (parameter == 1) {
+                DeleteQueueGlass(1).then(res => {
+                    if (res.data.message == 200) {
+                        this.form3 = {};
+                        this.$message.success(this.$t('Operation successful'));
+                    }
+                });
+            } else {
+                DeleteQueueGlass(2).then(res => {
+                    if (res.data.message == 200) {
+                        this.form2 = {};
+                        this.$message.success(this.$t('Operation successful'));
+                    }
+                });
+            }
+        },
+        //淇敼鎵爜浣嶇幓鐠冪姸鎬�
+        UpdateQueueStates() {
+            UpdateQueueState().then(res => {
+                if (res.data.message == 200) {
+                    this.$message.success(this.$t('Operation successful'));
+                }
+            });
+        },
+        //閾濇瀵瑰簲鐜荤拑淇℃伅娣诲姞閾濇id鍜屾槸鍚︽坊鍔犲埌闃熷垪
+        CheckBoxchange(glassid, isChecked) {
+            this.AluminumFrame.forEach(item => { item.barcode = glassid; item.isCheck = isChecked })
+        },
+        //娣诲姞鍒板嚭鐗囬槦鍒�
+        addoutslice() {
+            var dats_ = new Array();
+            this.AluminumFrame.forEach(item => {
+                var dats2_ = new Array();
+                dats2_[0] = item.barcode;
+                dats2_[1] = item.isCheck;
+                dats2_[2] = item.Flip;
+                dats2_[3] = item.FrameNo;
+                dats2_[4] = item.glasslengthmm;
+                dats2_[5] = item.glassheightmm;
+                dats_[dats_.length] = dats2_;
+            });
+            AddOutSliceS(dats_).then(res => {
+                if (res.data.message == 200) {
+                    this.$message.success(this.$t('Operation successful'));
+                }
+            });
+        },
+        //缃《
+        getTopMove(row, index) {
+            let Sequence = [];
+            this.OutSlice.forEach(item => {
+                Sequence.push(item.sequence);
+            });
+            let OutSliceArr = [];
+            OutSliceArr.push(row);
+            let belowstop = 1;
+            let hereframeno = this.OutSlice[index].barcode;
+            let upperstop = 0;
+            for (let i = index + 1; i < this.OutSlice.length; i++) {
+                if (this.OutSlice[i].barcode == hereframeno) {
+                    OutSliceArr.push(this.OutSlice[i]);
+                    belowstop += 1;
+                } else {
+                    break;
+                }
+            }
+            this.OutSlice.splice(index, belowstop);
+            for (let i = 0; i < OutSliceArr.length; i++) {
+                this.OutSlice.splice(upperstop, 0, OutSliceArr[i]);
+                upperstop += 1;
+            }
+            this.UpdateSequence(Sequence);
+        },
+        //涓婄Щ
+        getUpMove(row, index) {
+            let Sequence = [];
+            this.OutSlice.forEach(item => {
+                Sequence.push(item.sequence);
+            });
+            let OutSliceArr = [];
+            OutSliceArr.push(row);
+            let belowstop = 1;
+            let upperstop = 0;
+            let index_x = index - 1;
+            let hereframeno = this.OutSlice[index].barcode;
+            let upperframeno = this.OutSlice[index_x].barcode;
+            for (let i = index + 1; i < this.OutSlice.length; i++) {
+                if (this.OutSlice[i].barcode == hereframeno) {
+                    OutSliceArr.push(this.OutSlice[i]);
+                    belowstop += 1;
+                } else {
+                    break;
+                }
+            }
+            this.OutSlice.splice(index, belowstop);
+            for (let i = index_x; i >= 0; i--) {
+                if (this.OutSlice[i].barcode != upperframeno) {
+                    upperstop = i + 1;
+                    break;
+                }
+            }
+            for (let i = 0; i < OutSliceArr.length; i++) {
+                this.OutSlice.splice(upperstop, 0, OutSliceArr[i]);
+                upperstop += 1;
+            }
+            this.UpdateSequence(Sequence);
+        },
+        //涓嬬Щ
+        getDownMove(row, index) {
+            let Sequence = [];
+            this.OutSlice.forEach(item => {
+                Sequence.push(item.sequence);
+            });
+            let OutSliceArr = [];
+            OutSliceArr.push(row);
+
+            let belowstop = 1;
+            let upperstop = this.OutSlice.length - 1;
+            let flag = 0;
+            let hereframeno = this.OutSlice[index].barcode;
+            let upperframeno;
+            for (let i = index + 1; i < this.OutSlice.length; i++) {
+                if (this.OutSlice[i].barcode == hereframeno) {
+                    OutSliceArr.push(this.OutSlice[i]);
+                    belowstop += 1;
+                } else {
+                    break;
+                }
+            }
+            this.OutSlice.splice(index, belowstop);
+            for (let i = index; i < this.OutSlice.length; i++) {
+                if (this.OutSlice[i].barcode != hereframeno && this.OutSlice[i].barcode != upperframeno) {
+                    upperframeno = this.OutSlice[i].barcode;
+                    flag += 1;
+                    upperstop = i;
+                }
+                if (i == this.OutSlice.length - 1 && flag == 1) {
+                    flag += 1;
+                    upperstop = i + 1;
+                }
+                if (flag == 2) {
+                    break;
+                }
+            }
+            for (let i = 0; i < OutSliceArr.length; i++) {
+                this.OutSlice.splice(upperstop, 0, OutSliceArr[i]);
+                upperstop += 1;
+            }
+            this.UpdateSequence(Sequence);
+        },
+        //淇敼椤哄簭
+        UpdateSequence(Sequence) {
+            let i = 0;
+            this.OutSlice.forEach(item => {
+                item.sequence = Sequence[i];
+                i++;
+            });
+        },
+        //鍒囨崲鍑虹墖闃熷垪鐘舵��
+        isAllowQueueState() {
+            isAllowQueues(!this.isAllowQueue, this.OutSlice).then(res => {
+                if (res.data.message == 200) {
+                    this.$message.success(this.$t('Operation successful'));
+                }
+            })
+        },
+        //
+        isAllowReorderingState() {
+            this.isAllowReordering = !this.isAllowReordering;
+        },
+        //鍒囨崲涓婄墖鏄惁闇�瑕佺‘璁ょ幓鐠冧俊鎭�
+        isConfirmState() {
+            isConfirmStates(!this.isConfirm).then(res => {
+                if (res.data.message == 200) {
+                    this.$message.success(this.$t('Operation successful'));
+                }
+            });
+        }
+        ,
+        cellStyle({ row, column, rowIndex, columnIndex }) {
+            // console.log(row, column, "ss");
+            column = rowIndex;
+            rowIndex = column;
+            let style = "";
+            if (columnIndex === 8 ) {
+                style = "font-size:25px;";
+            }
+            if (columnIndex === 9 && row.flip == 1) {
+                style = "background-Color:yellow;";
+            }
+            style
+            return style;
+        }
+        ,
+        //鍚堝苟琛�
+        objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+            // console.log(row, column, "ss");
+            row = column;
+            column = row
+            let arrOutSlice = this.OutSlice;
+            let rowspans = 0;
+            let colspans = 1;
+            let barcode = arrOutSlice[rowIndex].barcode;
+
+            let barcode2;
+            if (rowIndex != 0) {
+                barcode2 = arrOutSlice[rowIndex - 1].barcode;
+            }
+            if (columnIndex === 12) {
+                if (barcode != barcode2) {
+                    // this.FrameNoFlag = barcode;
+                    for (let i = rowIndex; i < this.OutSlice.length; i++) {
+                        if (barcode == arrOutSlice[i].barcode) {
+                            barcode = arrOutSlice[i].barcode;
+                            rowspans += 1;
+                        } else {
+
+                            break;
+                        }
+                    }
+                    return {
+                        rowspan: rowspans,
+                        colspan: colspans
+                    };
+                } else {
+                    return {
+                        rowspan: 0,
+                        colspan: 0
+                    };
+                }
+            }
+        },
+        //鍒ゆ柇鐜荤拑鏄惁瓒呭嚭鑼冨洿
+        Sizerange(Glass, position) {
+            if (this.ManuallyInfeedGlass == true) {
+                if ((Glass.glassheight < 380 || Glass.glasswidth < 390 || Glass.glassheight > 1810 || Glass.glasswidth > 2760) || (Glass.glassheight < 390 || Glass.glasswidth < 380 || Glass.glassheight > 2760 || Glass.glasswidth > 1810)) {
+                    this.$alert(this.$t('The glass size is not within the range'), this.$t('confirm'), {
+                        confirmButtonText: this.$t('Yes'),
+                        type: 'info',
+                        callback: (action) => {
+                            this.$message({
+                                type: 'info',
+                                message: `action: ${action}`
+                            }).then(
+                                this.DeleteBarcodeGlass()
+                            );
+                        }
+                    });
+                    if (position == 1 || position == 3) {
+                        this.disabled1 = true;
+                    } else {
+                        this.disabled = true;
+                    }
+                } else {
+                    if (position == 1 || position == 3) {
+                        this.disabled1 = false;
+                    } else {
+                        this.disabled = false;
+                    }
+                    if (position == 3 && this.isConfirmState == true) {
+                        this.InsertQueueGlass(1);
+                    }
+                }
+            }
+        },
+        //娓呯┖寰呯‘璁ょ幓鐠冧俊鎭�
+        DeleteBarcodeGlass() {
+            this.form5 = {};
+        },
+        //鎵嬪姩瀹屾垚鍑虹墖浠诲姟
+        CompleteQueue(id, frameid, glassid) {
+            CompleteQueue(id, frameid, glassid).then(res => {
+                if (res.data.message == 200) {
+                    this.$message.success(this.$t('Operation successful'));
+                }
+            });
         }
     }
-};
-
-
+}
 </script>
\ No newline at end of file

--
Gitblit v1.8.0