From 8e981498c3192e4c05dfb0c4f5ae1b3e77740601 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 28 六月 2024 09:13:44 +0800
Subject: [PATCH] 上片机点击事件，大理片笼部分
---
UI-Project/src/views/Slicecage/slicecage.vue | 261 +++++++++++++++++++++++++++++-----------------------
1 files changed, 146 insertions(+), 115 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 2a42c23..6925842 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -23,6 +23,7 @@
const tableDatab = ref([])
const tableDatac = ref([])
const tableDatad = ref([])
+const tableDataf = ref([])
const tableDatae = ref([])
const adjustedRects = ref([]);
const adjustedRectsa = ref([]);
@@ -188,7 +189,14 @@
}
const handleBindRack = (row) => {
selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁
+ console.log(row.id);
+ console.log(row.slot);
+ window.localStorage.setItem('id', row.id)
+ window.localStorage.setItem('slot', row.slot)
add.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+ let id = window.localStorage.getItem('id')
+ let slot = window.localStorage.getItem('slot')
+
};
async function handleConfirm() {
if (!selectedRow.value) {
@@ -230,6 +238,31 @@
console.error(error);
}
}
+// 鎼滅储
+const searchout = async () => {
+ console.log(glassId.value);
+
+ try {
+ const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/selectBigStorageCageDetails',{
+ glassId:glassId.value
+ });
+
+ if (response.code == 200) {
+ // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ console.log(response.data);
+
+ tableDataf.value = response.data;
+ ElMessage.success(response.message);
+
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.message);
+ }
+ } catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+};
// 娣诲姞
// const handleConfirm = async () => {
// try {
@@ -524,7 +557,39 @@
// alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
- } catch (error) {
+ } catch (error) {
+ // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
+// 纭娣诲姞
+const finisha = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.sureadda'),
+ t('searchOrder.prompt'),
+ {
+ confirmButtonText: t('searchOrder.yes'),
+ cancelButtonText: t('searchOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
+ // const dataToSend = {
+ // ...row,
+ // status: 1
+ // };
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails", row)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
+ ElMessage.error(response.message);
+ // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
+ }
+ }
+ } catch (error) {
// 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
}
@@ -546,9 +611,8 @@
adjustedRects.value = data.bigStorageCageInfo1[0].map(rect => ({
...rect,
// width: rect.remainWidth *0.04,
- top: rect.id *2,
+ top: rect.id ,
}));
-console.log(data.bigStorageCageInfo1[0]);
adjustedRectsa.value = data.bigStorageCageInfo2[0].map(rect => ({
...rect,
// width: rect.remainWidth *0.04,
@@ -727,7 +791,8 @@
<div class="img-car4" :style="'z-index:999;left:704px;top:' + carposition4 + 'px;position:absolute;'">
<div v-show="cellshow4" style="margin-top:10px;width:200px;height:5px;background-color:#409EFF;"></div>
</div>
- <div v-show="cell1" style="width: 227px;position: relative;height: 29px;top:55px;left: 465px;background-color: #911005;">
+ <div style="position: relative;">
+ <div v-show="cell1" style="width: 227px;height: 29px;position: relative;top:55px;left: 465px;background-color: #911005;">
<div
v-for="(rect, index) in adjustedRects"
:key="rect"
@@ -740,10 +805,22 @@
top: `${rect.top}px`,
}"
>
-
+ <div
+ v-for="(rect, index) in project"
+ :key="rect"
+ :style="{
+ position: 'absolute',
+ width: '1px',
+ height: '0.8px',
+ backgroundColor: '#409EFF',
+ top: '0px',
+ left: `${rect.left}px`,
+ }"
+ >
</div>
</div>
- <div v-show="cell2" style="width: 227px;height: 29px;position: relative;top:86px;left: 465px;background-color: #911005;">
+ </div>
+ <!-- <div v-show="cell2" style="width: 227px;height: 29px;position: relative;top:56px;left: 465px;background-color: #911005;">
<div
v-for="(rect, index) in adjustedRectsa"
:key="rect"
@@ -758,7 +835,7 @@
>
</div>
- </div>
+ </div> -->
<!-- <div v-show="cell3" style="width: 227px;height: 29px;position: absolute;top:117px;left: 465px;background-color: #409EFF;">
</div>
<div v-show="cell4" style="width: 227px;height: 29px;position: absolute;top:148px;left: 465px;background-color: #409EFF;">
@@ -772,129 +849,83 @@
<div v-show="cell8" style="width: 227px;height: 29px;position: absolute;top:300px;left: 465px;background-color: #409EFF;">
</div> -->
</div>
+</div>
</div>
- <el-dialog v-model="add" top="10vh" width="65%" :title="$t('searchOrder.addcage')" >
- <div style="margin-top: -20px;margin-bottom: 40px;margin-left: 30px">
- <el-input :placeholder="$t('searchOrder.inputid')" clearable style="width: 200px;">
- </el-input>
- <el-button type="primary" plain style="margin-left: 10px;">{{ $t('searchOrder.search') }}</el-button>
-
- <!-- <span style="margin-right: 10px">绂佺敤璇�</span>
- <el-input clearable placeholder="璇疯緭鍏ョ鐢ㄨ瘝" size="mini"
- style="margin-right: 50px; width: 200px;" /> -->
- </div>
- <div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="180px">
- <el-form label-width="180px" label-position="right">
+ <el-dialog v-model="add" top="10vh" width="70%" :title="$t('searchOrder.addcage')" >
+ <div style="margin-bottom: 20px">
+ <!-- <div>鏍煎彿锛歿{ id }}</div> -->
+ <!-- <div>鏍呮牸鍙凤細{{ selectedRow.slot }}</div> -->
+
+ <el-form>
<el-row style="margin-top: -15px;margin-bottom: -2px;">
- <el-col :span="6">
+ <el-col :span="4">
<div id="dt" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.glassIDa')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.inglassID')" v-model="glassId" autocomplete="off" />
+ <el-form-item :label="$t('searchOrder.tid')" style="width: 14vw">
+ <!-- let id = window.localStorage.getItem('id') -->
+ <el-input v-model="id" autocomplete="off"></el-input>
</el-form-item>
- </div></div>
+ </div>
</el-col>
- <el-col :span="9">
+ <el-col :span="5">
<div id="dta" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.pieceingrida')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.inpieceingrid')" v-model="sequence" autocomplete="off" />
- </el-form-item></div>
+ <el-form-item :label="$t('searchOrder.gridnumber')" style="width: 14vw">
+ {{ slot }}
+ <!-- <el-input v-model="bigStorageCageDetails.slot" autocomplete="off"></el-input> -->
+ </el-form-item>
</div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
- <el-col :span="6">
- <div id="dt" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.cardnumbera')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.incardnumber')" v-model="flowCardId" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- <el-col :span="9">
- <div id="dta" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.typeglassa')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.intypeglass')" v-model="glassType" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- </el-row>
- <el-row style="margin-top: 10px;">
- <el-col :span="6">
- <div id="dt" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.widtha')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.inwidth')" v-model="width" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- <el-col :span="9">
- <div id="dta" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.heighta')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.inheight')" v-model="height" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- </el-row>
- <el-row style="margin-top: 10px;">
- <el-col :span="6">
- <div id="dt" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.thicknessa')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.inthickness')" v-model="thickness" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- <el-col :span="9">
- <div id="dta" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.layoutIDa')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.inlayoutID')" v-model="temperingLayoutId" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- </el-row>
- <el-row style="margin-top: 10px;">
- <el-col :span="6">
- <div id="dt" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.picturesequencea')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.inpicturesequence')" v-model="temperingFeedSequence" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- <el-col :span="9">
- <div id="dta" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.startstatusa')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.instartstatus')" v-model="state" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- </el-row>
- <el-row style="margin-top: 10px;">
- <el-col :span="6">
- <div id="dt" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.glassgapsa')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.inglassgaps')" v-model="gap" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- <el-col :span="9">
- <div id="dta" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.gridnumbera')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.grid')" v-model="state" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- </el-row>
- </el-form>
- </el-form>
- </div>
- <template #footer>
+ </el-form>
+ </div>
+ <div style="margin-top: -20px;margin-bottom: 40px;margin-left: 30px">
+ <el-input v-model="glassId" :placeholder="$t('searchOrder.inputid')" clearable style="width: 200px;">
+ </el-input>
+ <el-button type="primary" plain style="margin-left: 10px;" @click="searchout">{{ $t('searchOrder.search') }}</el-button>
+ </div>
+
+ <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 500px;">
+ <el-table height="100%" ref="table"
+ :data="tableDataf" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="120" />
+ <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="180" />
+ <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="150" />
+ <el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="150"/>
+ <el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="150"/>
+ <el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="150"/>
+ <el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="150"/>
+ <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutID')" min-width="150"/>
+ <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')" min-width="150"/>
+ <el-table-column
+ align="center"
+ :label="$t('searchOrder.startstatus')"
+ min-width="80"
+ prop="state"
+ >
+ <template #default="scope">
+ <el-tag
+ :type="scope.row.state === 1 ? 'success' : 'danger'"
+ >
+ {{ scope.row.state === 1 ? $t('searchOrder.enable') : $t('searchOrder.disable') }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="150"/>
+ <!-- <el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="150"/> -->
+ <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="150">
+ <template #default="scope">
+ <el-button size="mini" type="text" plain @click="finisha(scope.row)">{{ $t('searchOrder.sureadd') }}</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!-- <template #footer>
<div id="dialog-footer">
<el-button type="primary" @click="handleConfirm">
{{ $t('searchOrder.sure') }}
</el-button>
<el-button @click="add = false">{{ $t('searchOrder.cancel') }}</el-button>
</div>
- </template>
+ </template> -->
</el-dialog>
<el-dialog v-model="dialogFormVisiblea" top="5vh" width="97%" :title="$t('searchOrder.cageinformation')">
<el-table
--
Gitblit v1.8.0