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

---
 CanadaMes-ui/src/views/home/index.vue |  340 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 229 insertions(+), 111 deletions(-)

diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index cc2c24d..ec6e292 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -66,16 +66,6 @@
     /* width: 4.22px; */
 }
 
-/* .gezi:nth-child(22),
-.gezi:nth-child(43),
-.gezi:nth-child(64),
-.gezi:nth-child(85) {
-    margin-left: 7px;
-    margin-left: 10px;
-} */
-
-
-
 .blocks {
 
 
@@ -121,6 +111,12 @@
     top: 366px; */
 }
 
+.orderbutton {
+    position: absolute;
+    left: 1070px;
+    top: 70px;
+}
+
 .blocks-img3 {
     height: 90px;
     max-width: 100vw;
@@ -139,7 +135,7 @@
 
 .el-table td,
 .el-table th {
-    padding: 8px 0;
+    padding: 5px 0;
 }
 
 .el-table__empty-block {
@@ -153,18 +149,21 @@
 .box {
     width: 90%;
     margin-left: 5%;
-    height: 35px;
     color: red;
     font-size: 12px;
     overflow: hidden;
+    height: 20px;
+    /* height: 35px; */
 }
 
 .text {
     width: auto;
-    line-height: 35px;
+
     white-space: nowrap;
     animation: textScroll 20s linear infinite;
     margin: 0 auto;
+    line-height: 20px;
+    /* line-height: 35px; */
 }
 
 @keyframes textScroll {
@@ -178,7 +177,7 @@
 }
 
 .el-dialog {
-    width: 80%;
+    width: 90%;
 }
 </style>
 <template>
@@ -196,18 +195,19 @@
             </div>
             <div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;">
                 <el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid"></el-input>
-                <el-button type="primary" @click="showform()">{{ $t('Manually feed the glass') }}</el-button>
+                <el-button type="primary" @click="showform(1)">{{ $t('Infeed barcodid') }}</el-button>
                 <el-input style="width:15%;" :placeholder="$t('Enter the order number')" 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="$t('Coming out glass ID')"></el-table-column>
-                    <el-table-column :width="250" prop="cage" :label="$t('The Cage number being used')"></el-table-column>
-                    <el-table-column :width="250" prop="cell" :label="$t('The Grille number being used')"></el-table-column>
-                    <el-table-column prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
-                    <el-table-column prop="lengthWidth" :label="$t('Length and width')"></el-table-column>
-                    <el-table-column prop="coating" :label="$t('coating')"></el-table-column>
+                    <el-table-column :width="130" prop="cage" :label="$t('The Cage number being used')"></el-table-column>
+                    <el-table-column :width="130" prop="cell" :label="$t('The Slot number being used')"></el-table-column>
+                    <el-table-column :width="150" prop="glassId" :label="$t('Outfeed Barcodid')"></el-table-column>
+                    <el-table-column :width="130" prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
+                    <el-table-column prop="list" :label="$t('List Number')"></el-table-column>
+                    <el-table-column prop="box" :label="$t('Box Number')"></el-table-column>
+                    <el-table-column prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
                     <el-table-column :label="$t('Operate')">
                         <template slot-scope='scope'>
                             <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@@ -216,12 +216,13 @@
                     </el-table-column>
                 </el-table>
                 <el-table :data="this.tasklist2" border style="width: 100%">
-                    <el-table-column prop="glassId" :label="$t('Incoming glass ID')"></el-table-column>
-                    <el-table-column :width="250" prop="cage" :label="$t('The Cage number being used')"></el-table-column>
-                    <el-table-column :width="250" prop="cell" :label="$t('The Grille number being used')"></el-table-column>
-                    <el-table-column prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
-                    <el-table-column prop="lengthWidth" :label="$t('Length and width')"></el-table-column>
-                    <el-table-column prop="coating" :label="$t('coating')"></el-table-column>
+                    <el-table-column :width="130" prop="cage" :label="$t('The Cage number being used')"></el-table-column>
+                    <el-table-column :width="130" prop="cell" :label="$t('The Slot number being used')"></el-table-column>
+                    <el-table-column :width="150" prop="glassId" :label="$t('Infeed Barcodid')"></el-table-column>
+                    <el-table-column :width="130" prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
+                    <el-table-column prop="list" :label="$t('List Number')"></el-table-column>
+                    <el-table-column prop="box" :label="$t('Box Number')"></el-table-column>
+                    <el-table-column prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
                     <el-table-column :label="$t('Operate')">
                         <template slot-scope='scope'>
                             <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@@ -234,11 +235,11 @@
                 <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>
@@ -267,12 +268,14 @@
                         @click="showcageinfo(item['cage'])"></div>
                 </div>
                 <div class="blue gezi"
-                    :style="{ display: flex, position: absolute, float: left, top: 105 + 'px', left: 1050 + 'px', height: loadglassheight + 'px', width: 5 + 'px' }">
+                    :style="{ display: 'flex', position: 'absolute', float: 'left', top: 105 + 'px', left: 1050 + 'px', height: loadglassheight + 'px', width: 5 + '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="orderbutton" type="primary" @click="showform2()">{{ $t('OrderInfo') }}</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' }"
@@ -301,23 +304,33 @@
         </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('Barcodid')">
+                    <el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid"></el-input>
+                    <el-button type="primary" @click="showform(3)">{{ $t('Query') }}</el-button>
+                </el-form-item>
                 <el-form-item :label="$t('order')">
-                    <el-input v-model="form.orderno" autocomplete="off" />
+                    <el-input v-model="form.orderId" readonly autocomplete="off" />
                 </el-form-item>
                 <el-form-item :label="$t('length')">
-                    <el-input v-model="form.length" autocomplete="off" />
+                    <el-input v-model="form.height" readonly autocomplete="off" />
                 </el-form-item>
                 <el-form-item :label="$t('width')">
-                    <el-input v-model="form.width" autocomplete="off" />
+                    <el-input v-model="form.width" readonly autocomplete="off" />
                 </el-form-item>
-                <el-form-item :label="$t('coating')">
-                    <el-input v-model="form.coating" autocomplete="off" />
+                <el-form-item :label="$t('Barcodid')">
+                    <el-input v-model="form.glassId" readonly autocomplete="off" />
                 </el-form-item>
             </el-form>
             <template #footer>
                 <span class="dialog-footer">
-                    <el-button @click="cancal()">{{ $t('cancal') }}</el-button>
-                    <el-button @click="sbumitglassid()" type="primary">{{ $t('confirm') }}</el-button>
+                    <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>
@@ -332,8 +345,8 @@
             </el-form>
             <template #footer>
                 <span class="dialog-footer">
-                    <el-button @click="cancal1()">{{ $t('cancal') }}</el-button>
                     <el-button @click="getOrder();" type="primary">{{ $t('confirm') }}</el-button>
+                    <el-button @click="cancel1()">{{ $t('cancel') }}</el-button>
                 </span>
             </template>
         </el-dialog>
@@ -345,32 +358,51 @@
                 <el-table-column prop="endTime" :label="$t('endTime')"></el-table-column>
             </el-table>
         </el-dialog>
-        <el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')">
+        <el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')" top="5vh">
             <el-table :data="this.cageinfo" :height="700" border style="width: 100%;overflow: auto;">
-                <el-table-column prop="cage" :label="$t('The Cage number')"></el-table-column>
-                <el-table-column prop="cell" :label="$t('cell')"></el-table-column>
-                <el-table-column prop="tier" :label="$t('tier')"></el-table-column>
-                <el-table-column prop="glassId" :label="$t('glassid')"></el-table-column>
-                <el-table-column prop="orderId" :label="$t('order number')"></el-table-column>
-                <el-table-column prop="lengthWidth" :label="$t('Length and width')"></el-table-column>
-                <el-table-column prop="coating" :label="$t('coating')"></el-table-column>
-                <el-table-column :label="$t('Operate')">
+                <el-table-column :width="90" prop="cage" :label="$t('The Cage number')"></el-table-column>
+                <el-table-column :width="90" prop="cell" :label="$t('The Slot Number')"></el-table-column>
+                <el-table-column :width="55" prop="tier" :label="$t('The Side')"></el-table-column>
+                <el-table-column :width="100" prop="glassId" :label="$t('Barcodid')"></el-table-column>
+                <el-table-column :width="100" prop="orderId" :label="$t('Order Number')"></el-table-column>
+                <el-table-column :width="100" prop="list" :label="$t('List Number')"></el-table-column>
+                <el-table-column :width="100" prop="box" :label="$t('Box Number')"></el-table-column>
+                <el-table-column :width="170" prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
+                <el-table-column :width="280" :label="$t('Operate')">
                     <template slot-scope='scope'>
                         <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
                             @click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('delete') }}</el-button>
-                        <!-- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" @click="open">{{ $t('delete')
-                        }}</el-button> -->
                         <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
                             @click="outglass(scope.row.glassId, scope.row.state)">{{ $t('out') }}</el-button>
+                        <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;"
+                            @click="insertglass(scope.row.cage, scope.row.cell, scope.row.tier)">{{ $t('increase')
+                            }}</el-button>
                     </template>
                 </el-table-column>
+            </el-table>
+        </el-dialog>
+        <el-dialog :visible.sync="dialogFormVisible4" :title="$t('OrderInfo')" top="5vh">
+            <el-input style="width:15%;" :placeholder="$t('Enter the Order lD')" v-model="orderid"></el-input>
+            <el-button type="primary" @click="selectglassinfo()">{{ $t('Query') }}</el-button>
+            <el-table :data="this.GlassInfo" :height="700" border style="width: 100%;overflow: auto;">
+
+                <el-table-column prop="glassId" :label="$t('Barcodid')"></el-table-column>
+                <el-table-column prop="orderId" :label="$t('Order Number')"></el-table-column>
+                <el-table-column prop="width" :label="$t('length')"></el-table-column>
+                <el-table-column prop="height" :label="$t('width')"></el-table-column>
             </el-table>
         </el-dialog>
     </el-container>
 </template>
 <script>
-
-import { home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist, SelectPassword } from "../../api/home";
+//:disabled="scope.row.glassId > 0 || scope.row.disabled == 1 ? true : false"
+import {
+    home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo,
+    SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist, SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass
+} from "../../api/home";
 
 
 import LanguageMixin from '../../lang/LanguageMixin'
@@ -379,17 +411,23 @@
     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,
             form: {
-                orderno: "NG2210210",
-                length: 800,
-                width: 1000,
-                coating: "red",
+                orderId: "",
+                glassId: "",
+                height: "",
+                width: ""
             },
             form1: {
                 order: "NG2210210",
@@ -417,8 +455,10 @@
             carlist: [],
             loadglassheight: 0,
             password: 1,
-            text: "DataBase Connection failed",
-            zhuangtai: ""
+            text: "",
+            zhuangtai: "",
+            orderid: "",
+            GlassInfo: []
         };
     },
     created() {
@@ -454,8 +494,6 @@
                         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;
-                        console.log(obj.params[0][1], this.carlist[1]['start']);
-                        console.log(obj.params[0][0], this.carlist[0]['start']);
                     }
                     this.tableData = obj.tableData[0];
                     this.cagelist1 = obj.cagelist1[0];
@@ -464,7 +502,6 @@
                     this.cagelist4 = obj.cagelist4[0];
                     this.tasklist1 = obj.tasklist1[0];
                     this.tasklist2 = obj.tasklist2[0];
-                    console.log(this.cagelist4);
                     this.alarm = obj.alarmmg[0];
                     this.loadglassheight = obj.loadglassheight;
                     this.zhuangtai = obj.zhuangtai[0];
@@ -473,6 +510,9 @@
                     // }
                     SelectCageInfo(this.cage).then(res => {
                         this.cageinfo = res.data.cageinfo;
+                    });
+                    SelectGlass(this.orderid).then(res => {
+                        this.GlassInfo = res.data.glass;
                     });
 
                     this.$forceUpdate();
@@ -489,37 +529,34 @@
             }
         },
         load() {
+            //鍔犺浇绗煎瓙浣跨敤鎯呭喌鏁版嵁
             home().then(res => {
                 this.tableData = res.data.list;
             });
+            //鍔犺浇鐞嗙墖绗肩幓鐠冩暟鎹�
             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;
-                if (res.data.list.length > 0) {
-                    this.incell = this.tasklist1[0]['cell'];
-                }
             });
-            loadtask(this.task2).then(res => {
-                this.tasklist2 = res.data.list;
-                if (res.data.list.length > 0) {
-                    this.outcell = this.tasklist2[0]['cell'];
-                }
-            });
+            //鍔犺浇杩涘嚭鐗囦换鍔℃暟鎹�
             loadtask(this.task2).then(res => {
                 this.tasklist2 = res.data.list;
             });
+            //鍔犺浇鎶ヨ淇℃伅
             SelectAlarmmgInfo().then(res => {
                 this.alarm = res.data.alarmmg;
             });
+            //鍔犺浇灏忚溅浣嶇疆淇℃伅
             Loadcarlist().then(res => {
                 this.carlist = res.data.carlist;
-                console.log(this.carlist);
             });
+            //鍔犺浇纭瀵嗙爜
             SelectPassword().then(res => {
                 this.password = res.data.password;
             });
@@ -547,7 +584,7 @@
                         this.$message.success(this.$t('Operation successful'));
 
                     } else {
-                        this.$message.success(this.$t('There is no glass for this order'));
+                        this.$message.error(this.$t('There is no glass for this order'));
                     }
                     this.load();
                 });
@@ -557,39 +594,52 @@
         //鎵嬪姩涓婄墖
         sbumitglassid() {
             if (this.form.order != "") {
-                if (this.zhuangtai == true) {
-                    Addglassid(this.glassid).then(res => {
-                        if (res.data.message2 == 200) {
-                            this.$message.success(this.$t('Operation successful'));
-                            this.cancal();
-                        } else if (res.data.message2 == 500) {
-                            this.$message.success(this.$t('There are currently tasks'));
-                        }
-                        else if (res.data.message2 == 300) {
-                            this.$message.success(this.$t('There is no such glass'));
-                        }
-                        else if (res.data.message2 == 400) {
-                            this.$message.success(this.$t('There is no such grid'));
-                        }
-                    });
+                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 {
-                    this.$message.success(this.$t('There are currently tasks'));
+                    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() {
-            if (this.glassid != "") {
-                this.form =
-                {
-                    orderno: "NG2210210",
-                    length: 800,
-                    width: 1000,
-                    coating: "red",
-                };
-                this.dialogFormVisible = true;
+        //鏄剧ず纭鐜荤拑淇℃伅涔熸病
+        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('query was successful');
+                } else {
+                    this.dialogFormVisible = true;
+                    this.$message.error(this.$t('There is no such glass'));
+                }
+            });
         },
+        //鏄剧ず璁㈠崟淇℃伅椤甸潰
         showform1() {
             if (this.order != "") {
                 this.form1 =
@@ -599,17 +649,34 @@
                 };
                 this.dialogFormVisible1 = true;
             }
-
-
         },
-        cancal() {
+        selectglassinfo() {
+            SelectGlass(this.orderid).then(res => {
+                this.GlassInfo = res.data.glass;
+            });
+        },
+        showform2() {
+            SelectGlass(this.orderid).then(res => {
+                this.GlassInfo = res.data.glass;
+            });
+            this.dialogFormVisible4 = true;
+        },
+        //鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
+        cancel() {
             this.dialogFormVisible = false;
-            this.form = {};
+            this.form = {
+                orderId: "",
+                glassId: "",
+                height: "",
+                width: ""
+            };
         },
-        cancal1() {
+        //鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
+        cancel1() {
             this.dialogFormVisible1 = false;
             this.form1 = {};
         },
+        //缁撴潫杩�/鍑虹墖浠诲姟
         endtask(type, glassid, cell) {
             this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
                 inputType: 'password',
@@ -625,7 +692,7 @@
                         }
                     });
                 } else {
-                    this.$message.success(this.$t('Password error'));//瀵嗙爜閿欒
+                    this.$message.error(this.$t('Password error'));//瀵嗙爜閿欒
                 }
             }).catch(() => {
                 this.$message({
@@ -634,6 +701,7 @@
                 });
             });
         },
+        //鏄剧ず鐞嗙墖绗艰鎯呬俊鎭�
         showcageinfo(cage) {
             this.cage = cage;
             SelectCageInfo(cage).then(res => {
@@ -641,6 +709,7 @@
                 this.dialogFormVisible3 = true;
             });
         },
+        //鍒犻櫎鐞嗙墖绗肩幓鐠�
         deleteglass(glassid, state) {
             this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
                 inputType: 'password',
@@ -657,10 +726,10 @@
                             }
                         });
                     } else {
-                        this.$message.success(this.$t('No delete allowed'));
+                        this.$message.error(this.$t('No delete allowed'));
                     }
                 } else {
-                    this.$message.success(this.$t('Password error'));//瀵嗙爜閿欒
+                    this.$message.error(this.$t('Password error'));//瀵嗙爜閿欒
                 }
 
             }).catch(() => {
@@ -670,6 +739,7 @@
                 });
             });
         },
+        //鎵嬪姩鍑虹墖
         outglass(glassid, state) {
             this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
                 inputType: 'password',
@@ -685,14 +755,17 @@
                                 this.$message.success(this.$t('Operation successful'));
                             }
                             else if (res.data.message2 == 300) {
-                                this.$message.success(this.$t('There is no such grid'));
+                                this.$message.error(this.$t('There is no such grid'));
+                            }
+                            else if (res.data.message2 == 500) {
+                                this.$message.error(this.$t('This glass is already in the cage'));
                             }
                         });
                     } else {
-                        this.$message.success(this.$t('No out allowed'));
+                        this.$message.error(this.$t('No out allowed'));
                     }
                 } else {
-                    this.$message.success(this.$t('Password error'));//瀵嗙爜閿欒
+                    this.$message.error(this.$t('Password error'));//瀵嗙爜閿欒
                 }
             }).catch(() => {
                 this.$message({
@@ -700,10 +773,55 @@
                     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() {
+            Inglassid(this.insertcage, this.insertcell, this.inserttier, this.form).then(res => {
+                if (this.form.glassId != "") {
+                    if (res.data.message == 200) {
+                        this.$message.success(this.$t('Operation successful'));
+                        this.dialogFormVisible = false;
+                    } else {
+                        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'));
+                }
+            });
         }
     }
-
 }
-
 </script>
\ No newline at end of file

--
Gitblit v1.8.0