From c0505074f5149b7f0c7fe26822e793eac18319f3 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 13 五月 2024 11:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Caching/cachingbefore.vue | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingbefore.vue b/UI-Project/src/views/Caching/cachingbefore.vue
index 5cf4a38..5d9d157 100644
--- a/UI-Project/src/views/Caching/cachingbefore.vue
+++ b/UI-Project/src/views/Caching/cachingbefore.vue
@@ -55,7 +55,7 @@
const open = async(row) => {
try {
const confirmResult = await ElMessageBox.confirm(
- '鏄惁鍒犻櫎璇ユ潯淇℃伅?',
+ '鏄惁鎶ョ己璇ユ潯淇℃伅?',
'鎻愮ず',
{
confirmButtonText: '鏄�',
@@ -66,15 +66,15 @@
if (confirmResult === 'confirm') {
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const deleteResponse = await request.post("/cacheGlass/edgStorageCage/edgStorageCageGlass", {
- id:0,
- slot: row.slot
+ id: row.id,
+ esdId: row.esdId
})
if (response.code == 200) {
// 鍒犻櫎鎴愬姛锛屾偍鍙互鏍规嵁闇�瑕佸鐞嗘垚鍔熺殑鎯呭喌
alert('鍒犻櫎鎴愬姛锛�');
} else {
// 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
- alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
+ alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
@@ -171,9 +171,6 @@
]
})
-
-
-
</script>
<template>
@@ -206,16 +203,6 @@
</el-table>
</div>
</el-card>
- <!-- <el-dialog v-model="adda" top="30vh" width="25%" title="鏄惁鍒犻櫎璇ユ潯淇℃伅?" >
- <template #footer>
- <div id="dialog-footer">
- <el-button type="primary" @click="handleConfirma">
- 纭
- </el-button>
- <el-button @click="adda = false">鍙栨秷</el-button>
- </div>
- </template>
- </el-dialog> -->
</div>
<div id="awatch">
<img src="../../assets/woshihuancun.png" alt="" style="width: 60%;height: 90%;margin-left: 260px;margin-top: 20px;">
--
Gitblit v1.8.0