From 5aa99c119f387d6f32a58dfc7190351f6f92ecf6 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 18 九月 2023 21:07:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 390 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 269 insertions(+), 121 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 4fcd763..d1c95f8 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -60,42 +60,81 @@
.gezi {
height: 35px;
- width: 4.22px;
+
+ position: absolute;
+ width: 3.08px;
+ /* width: 4.22px; */
}
-.gezi:nth-child(22),
+/* .gezi:nth-child(22),
.gezi:nth-child(43),
.gezi:nth-child(64),
.gezi:nth-child(85) {
+ margin-left: 7px;
margin-left: 10px;
-}
+} */
.blocks {
- min-height: 55vh;
- max-width: 100vw;
+
+
background-image: url('../../img/xmjc.png');
margin: 0 auto;
background-repeat: no-repeat;
- /* background-size: 100% 100%; */
- background-size: 1660px 560px;
background-attachment: local;
width: 1660px;
+ min-height: 55vh;
+ max-width: 94vw;
+ background-size: 1200px 510px;
+ /* max-width: 100vw;
+ background-size: 1660px 560px; */
+
+
}
.blocks-img {
height: 100px;
max-width: 100vw;
background-repeat: no-repeat;
- background-size: 46px 94px;
background-attachment: local;
width: 32px;
-
position: absolute;
- /* left: 116px; */
- /* left:1060px;18.88px */
background-image: url('../../img/bigcar01.png');
+ background-size: 40px 87px;
+ /* background-size: 46px 94px; */
+}
+
+.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: 654px;
+ top: 333px;
+ /* background-size: 85px 100px;
+ left: 912px;
+ top: 366px; */
+}
+
+.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: 630px;
+ top: 420px;
+ /* background-size: 160px 40px;
+ left: 875px;
+ top: 455px; */
}
.el-table td,
@@ -137,6 +176,10 @@
transform: translateX(-150%);
}
}
+
+.el-dialog {
+ width: 80%;
+}
</style>
<template>
<el-container>
@@ -144,39 +187,46 @@
<el-main>
<div class="box" @click="dialogFormVisible2 = true">
<div class="text">
- Alarm:
+ <!-- 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: 95%;margin: 0 auto;">
- <el-input style="width:15%;" placeholder="Enter the glass lD" v-model="glassid"></el-input>
- <el-button type="primary" @click="showform()">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="showform1();">Exit the glass by order number</el-button>
+ <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-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="Coming out glass ID"></el-table-column>
- <el-table-column :width="250" prop="cell" label="The Grille number being used"></el-table-column>
- <el-table-column prop="orderId" label="Order Nmuber"></el-table-column>
- <el-table-column prop="lengthWidth" label="Length and width"></el-table-column>
- <el-table-column prop="coating" label="coating"></el-table-column>
- <el-table-column label="Operate">
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" @click="endtask(0)">end
- task</el-button>
+ <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 :label="$t('Operate')">
+ <template slot-scope='scope'>
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ @click="endtask(0, scope.row.glassId, scope.row.cell)">{{ $t('end task') }}</el-button>
+ </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 :width="250" prop="cell" label="The Grille number being used"></el-table-column>
- <el-table-column prop="orderId" label="Order Nmuber"></el-table-column>
- <el-table-column prop="lengthWidth" label="Length and width"></el-table-column>
- <el-table-column prop="coating" label="coating"></el-table-column>
- <el-table-column label="Operate">
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" @click="endtask(1)">end
- task</el-button>
+ <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 :label="$t('Operate')">
+ <template slot-scope='scope'>
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ @click="endtask(1, scope.row.glassId, scope.row.cell)">{{ $t('end task') }}</el-button>
+ </template>
</el-table-column>
</el-table>
</div>
@@ -195,88 +245,123 @@
</el-main>
<el-footer>
<div class="blocks" style="position: relative;">
- <div style="display:flex;position: absolute;float:left;z-index: 999;top:112px;left:328px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist1" :key="item['date']"
+ <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>
+ <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: 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>
+ <!-- <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 in cagelist2" :key="item['date']"
+ <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 in cagelist3" :key="item['date']"
+ <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 in cagelist4" :key="item['date']"
+ <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="Please confirm the information">
+ <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="order">
+ <el-form-item :label="$t('order')">
<el-input v-model="form.orderno" autocomplete="off" />
</el-form-item>
- <el-form-item label="length">
+ <el-form-item :label="$t('length')">
<el-input v-model="form.length" autocomplete="off" />
</el-form-item>
- <el-form-item label="width">
+ <el-form-item :label="$t('width')">
<el-input v-model="form.width" autocomplete="off" />
</el-form-item>
- <el-form-item label="coating">
+ <el-form-item :label="$t('coating')">
<el-input v-model="form.coating" autocomplete="off" />
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
- <el-button @click="cancal()">cancal</el-button>
- <el-button @click="sbumitglassid()" type="primary">confirm</el-button>
+ <el-button @click="cancal()">{{ $t('cancal') }}</el-button>
+ <el-button @click="sbumitglassid()" type="primary">{{ $t('confirm') }}</el-button>
</span>
</template>
</el-dialog>
- <el-dialog :visible.sync="dialogFormVisible1" title="Ordering Information">
+ <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="order">
+ <el-form-item :label="$t('order')">
<el-input v-model="form1.order" autocomplete="off" />
</el-form-item>
- <el-form-item label="number">
+ <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="cancal1()">cancal</el-button>
- <el-button @click="getOrder();" type="primary">confirm</el-button>
+ <el-button @click="cancal1()">{{ $t('cancal') }}</el-button>
+ <el-button @click="getOrder();" type="primary">{{ $t('confirm') }}</el-button>
</span>
</template>
</el-dialog>
- <el-dialog :visible.sync="dialogFormVisible2" title="Ordering Information">
+ <el-dialog :visible.sync="dialogFormVisible2" :title="$t('Alarm Information')">
<el-table :data="this.alarm" border style="width: 100%;">
- <el-table-column prop="id" label="id"></el-table-column>
- <el-table-column prop="content" label="content"></el-table-column>
- <el-table-column prop="timeons" label="timeon"></el-table-column>
-
- <el-table-column prop="endTime" label="endTime"></el-table-column>
+ <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="Ordering Information">
- <el-table :data="this.cageinfo" border style="width: 100%;height: 700px;overflow: auto;">
- <el-table-column :width="150" prop="cage" label="the grille number"></el-table-column>
- <el-table-column prop="cell" label="cell"></el-table-column>
- <el-table-column prop="tier" label="tier"></el-table-column>
- <el-table-column prop="glassId" label="glassid"></el-table-column>
- <el-table-column :width="130" prop="orderId" label="order number"></el-table-column>
- <el-table-column :width="150" prop="lengthWidth" label="length and width"></el-table-column>
- <el-table-column prop="coating" label="coating"></el-table-column>
- <el-table-column :width="150" label="operate">
+ <el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')">
+ <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')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="deleteglass(scope.row.glassId, scope.row.state)">delete</el-button>
+ @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)">out</el-button>
+ @click="outglass(scope.row.glassId, scope.row.state)">{{ $t('out') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -285,7 +370,7 @@
</template>
<script>
-import { home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID } from "../../api/home";
+import { home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist, SelectPassword } from "../../api/home";
import LanguageMixin from '../../lang/LanguageMixin'
@@ -294,6 +379,7 @@
name: "Home",
data() {
return {
+ name: 'Confirm',
mixins: [LanguageMixin],
dialogFormVisible: false,
dialogFormVisible1: false,
@@ -322,12 +408,16 @@
order: "",
glassid: "",
url: "../../img/bigcar01.png",
- car1: 150,
- car2: 242,
- incell: "",
- outcell: "",
+ car1: 145,
+ car2: 210,
+ // car1: 210,
+ // car2: 300,
cageinfo: [],
- cage: 0
+ cage: 0,
+ carlist: [],
+ loadglassheight: 0,
+ password: 1,
+ text: ""
};
},
created() {
@@ -359,10 +449,12 @@
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
if (obj.params != null) {
- this.car1 = 150 + 24.6 * obj.params[0][0];
- this.car2 = 242 + 24.6 * obj.params[0][1];
+ this.car1 = 145 + 8.1 * 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.25 * 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']);
}
-
this.tableData = obj.tableData[0];
this.cagelist1 = obj.cagelist1[0];
this.cagelist2 = obj.cagelist2[0];
@@ -370,14 +462,12 @@
this.cagelist4 = obj.cagelist4[0];
this.tasklist1 = obj.tasklist1[0];
this.tasklist2 = obj.tasklist2[0];
- if (this.tasklist1.length > 0) {
- this.incell = this.tasklist1[0]['cell'];
- }
- if (this.tasklist1.length > 0) {
- this.outcell = this.tasklist2[0]['cell'];
- }
this.alarm = obj.alarmmg[0];
+ this.loadglassheight = obj.loadglassheight;
+ if (obj.dbconnected == "false") {
+ this.text = this.$t('DataBase Connection failed');
+ }
SelectCageInfo(this.cage).then(res => {
this.cageinfo = res.data.cageinfo;
});
@@ -416,14 +506,19 @@
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;
});
},
//鏍规嵁鏍煎瓙鐘舵�佷慨鏀归鑹�
@@ -445,9 +540,11 @@
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("There is no such order");
+ this.$message.success(this.$t('There is no glass for this order'));
}
this.load();
});
@@ -459,10 +556,16 @@
if (this.form.order != "") {
Addglassid(this.glassid).then(res => {
if (res.data.message2 == 200) {
- this.$message.success("Operation successful");
+ this.$message.success(this.$t('Operation successful'));
this.cancal();
- } else {
- this.$message.success("There are currently tasks");
+ } else if (res.data.message2 == 500) {
+ this.$message.success(this.$t('There are currently tasks'));
+ }
+ else if (res.data.message2 == 300) {
+ this.$message.success(this.$t('There is no such glass'));
+ }
+ else if (res.data.message2 == 400) {
+ this.$message.success(this.$t('There is no such grid'));
}
});
}
@@ -499,21 +602,29 @@
this.dialogFormVisible1 = false;
this.form1 = {};
},
- endtask(type) {
- if (type == 0) {
- UpdateTask(type, this.incell).then(res => {
- if (res.data.message3 == 200) {
- this.$message.success("Operation successful");
- }
+ 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.success(this.$t('Password error'));//瀵嗙爜閿欒
+ }
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: this.$t('Operation canceled')
});
- } else {
- UpdateTask(type, this.outcell).then(res => {
- if (res.data.message3 == 200) {
- this.$message.success("Operation successful");
- }
- });
- }
-
+ });
},
showcageinfo(cage) {
this.cage = cage;
@@ -523,31 +634,68 @@
});
},
deleteglass(glassid, state) {
- if (state == 1) {
- DeleteByGlassID(glassid).then(res=>{
- if (res.data.message3 == 200) {
- this.$message.success("Operation successful");
+ this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
+ inputType: 'password',
+ inputPlaceholder: this.$t('Please enter the password'),
+ confirmButtonText: this.$t('Yes'),
+ cancelButtonText: this.$t('No'),
+ type: 'warning'
+ }).then(({ value }) => {
+ if (this.password == value) {
+ if (state == 1) {
+ DeleteByGlassID(glassid).then(res => {
+ if (res.data.message3 == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ } else {
+ this.$message.success(this.$t('No delete allowed'));
}
+ } else {
+ this.$message.success(this.$t('Password error'));//瀵嗙爜閿欒
+ }
+
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: this.$t('Operation canceled')
});
- } else {
- this.$message.success("No out allowed");
- }
+ });
},
- outglass(glassid,state){
- if (state == 1) {
- OutByGlassID(glassid).then(res=>{
- if (res.data.message3 == 200) {
- this.$message.success("Operation successful");
+ 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.message3 == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ else if (res.data.message2 == 300) {
+ this.$message.success(this.$t('There is no such grid'));
+ }
+ });
+ } else {
+ this.$message.success(this.$t('No out allowed'));
}
+ } else {
+ this.$message.success(this.$t('Password error'));//瀵嗙爜閿欒
+ }
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: this.$t('Operation canceled')
});
- } else {
- this.$message.success("No out allowed");
- }
+ });
+
}
-
}
+
}
-
-
</script>
\ No newline at end of file
--
Gitblit v1.8.0