From 24d3f1dcf658d9c06a60668338f1dac6c544ceca Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 01 七月 2024 17:56:58 +0800
Subject: [PATCH] 下片卧式缓存新增按钮，大理片笼页面刷新，分页，状态，按钮点击状态
---
UI-Project/src/views/Caching/cachingun.vue | 37 ++++++++-
UI-Project/src/views/Slicecage/slicecage.vue | 167 ++++++++++++++++++++++++++++++++---------
UI-Project/src/lang/zh.js | 8 ++
3 files changed, 170 insertions(+), 42 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 83e2f37..157fdaa 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -93,9 +93,11 @@
disable:'绂佺敤',
start:'鍚敤',
deficiencieste:'鎶ョ己',
+ updown:'浜哄伐涓嬬墖',
operate:'鎿嶄綔',
prompt:'鎻愮ず',
information:'鏄惁鎶ョ己璇ユ潯淇℃伅锛�',
+ infor:'鏄惁浜哄伐涓嬬墖璇ユ潯淇℃伅锛�',
yes:'鏄�',
cancel:'鍙栨秷',
},
@@ -198,6 +200,12 @@
fin:'鏄惁瀹屾垚浠诲姟锛�',
sureadd:'纭娣诲姞',
sureadda:'鏄惁纭娣诲姞锛�',
+ zailong:'鍦ㄧ涓�',
+ rengongxp:'浜哄伐涓嬬墖',
+ up:'涓婁竴椤�',
+ down:'涓嬩竴椤�',
+ now:'褰撳墠椤垫樉绀�',
+ tit:'鏉℃暟鎹�',
},
workOrder:{
glassID:'鐜荤拑ID',
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index 94c8b0b..cc1a97d 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -30,6 +30,7 @@
<el-table-column fixed="right" :label="$t('sorter.operate')" align="center" width="200">
<template #default="scope">
<el-button size="mini" type="text" plain @click="open(scope.row)">{{ $t('sorter.deficiencieste') }}</el-button>
+ <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('sorter.updown') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -105,7 +106,7 @@
);
if (confirmResult === 'confirm') {
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
- var url="/cacheGlass/edgStorageCage/edgStorageCageGlass?edgStorageCageId="+row.id;
+ var url="/unLoadGlass/downStorage/deleteDownStorageCage?edgStorageCageId="+row.id;
console.log(url);
const response = await request.post(url, {
esdId: row.esdId
@@ -114,13 +115,41 @@
ElMessage.success(response.message);
} else {
// 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
- ElMessage.error(response.msg);
+ ElMessage.error(response.message);
// alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
}
-
-
+ catch (error) {
+ // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
+// 浜哄伐涓嬬墖
+const opena = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('sorter.infor'),
+ t('sorter.prompt'),
+ {
+ confirmButtonText: t('sorter.yes'),
+ cancelButtonText: t('sorter.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ const response = await request.post("/unLoadGlass/downGlassTask/generateOutGlassTask", {
+ glassId: row.glass_id
+ })
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
+ ElMessage.error(response.message);
+ // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
+ }
+ }
+ }
catch (error) {
// 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index a27ce75..943558e 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -7,7 +7,7 @@
const router = useRouter()
import request from "@/utils/request"
import { WebSocketHost ,host} from '@/utils/constants'
-import { ref, onMounted , onBeforeUnmount, reactive} from "vue";
+import { ref, onMounted , onBeforeUnmount, reactive, computed } from "vue";
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
import { ElMessage, ElMessageBox } from 'element-plus'
import { tr } from "element-plus/es/locale";
@@ -70,8 +70,93 @@
const cell7=ref(true);
const cell8=ref(true);
const selectedRow = ref(null); // 瀛樺偍閫変腑鐨勮鏁版嵁
-const currentPage4 = ref(4)
-const pageSize4 = ref(100)
+
+
+ // 褰撳墠椤电爜鍜屾瘡椤垫樉绀虹殑鏉℃暟
+ const currentPage = ref(1);
+ const itemsPerPage = computed(() => {
+ if (currentPage.value === 1) {
+ return 21;
+ } else if (currentPage.value === 2) {
+ return 21;
+ } else if (currentPage.value === 3) {
+ return 21;
+ } else if (currentPage.value === 4) {
+ return 21;
+ } else if (currentPage.value === 5) {
+ return 21;
+ } else if (currentPage.value === 6) {
+ return 21;
+ } else if (currentPage.value === 7) {
+ return 21;
+ } else {
+ return 21; // 榛樿鍊硷紝鍙互鏍规嵁瀹為檯闇�姹備慨鏀�
+ }
+ });
+
+ // 璁＄畻鍒嗛〉鍚庣殑鏁版嵁
+ const paginatedUsers = computed(() => {
+ const startIndex = calculateStartIndex();
+ const endIndex = startIndex + itemsPerPage.value;
+ return tableData.value.slice(startIndex, endIndex);
+ });
+
+ // 璁＄畻褰撳墠椤电殑璧峰绱㈠紩
+ function calculateStartIndex() {
+ let index = 0;
+ for (let i = 1; i < currentPage.value; i++) {
+ if (i === 1) {
+ index += 21;
+ } else if (i === 2) {
+ index += 21;
+ } else if (i === 3) {
+ index += 21;
+ }else if (i === 4) {
+ index += 21;
+ }else if (i === 5) {
+ index += 21;
+ }else if (i === 6) {
+ index += 21;
+ }else if (i === 7) {
+ index += 21;
+ } else {
+ index += 31;
+ }
+ }
+ return index;
+ }
+
+ // 涓婁竴椤靛拰涓嬩竴椤垫柟娉�
+ const prevPage = () => {
+ if (currentPage.value > 1) {
+ currentPage.value--;
+ }
+ };
+
+ const nextPage = () => {
+ if (currentPage.value < totalPages.value) {
+ currentPage.value++;
+ }
+ };
+
+ // 鎬婚〉鏁拌绠�
+ const totalPages = computed(() => {
+ // let total = 0;
+ // for (let i = 1; i <= users.value.length; i++) {
+ // if (i === 1) {
+ // total += 1;
+ // } else if (i === 2) {
+ // total += 2;
+ // } else if (i === 3) {
+ // total += 5;
+ // } else {
+ // total += 10;
+ // }
+ // }
+ return 8;
+ });
+
+
const getTableRow = (row,type) =>{
switch (type) {
@@ -90,12 +175,9 @@
selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁
currentRow.deviceId = row.deviceId; // 鐩存帴璁剧疆鍝嶅簲寮忓睘鎬�
currentRow.slot = row.slot;
- console.log(row.deviceId);
- console.log(row.slot);
window.localStorage.setItem('deviceId', row.deviceId)
window.localStorage.setItem('slot', row.slot)
add.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
-
};
// 鎼滅储
const searchout = async () => {
@@ -148,7 +230,8 @@
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/deleteBigStorageCageDetails",row)
if (response.code === 200) {
- ElMessage.success(response.message);
+ tableData.value = response.data;
+ ElMessage.success(response.message);
} else {
// 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
ElMessage.error(response.message);
@@ -175,7 +258,8 @@
if (confirmResult === 'confirm') {
const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/damageBigStorageCageDetails?status="+0, row)
if (response.code === 200) {
- ElMessage.success(response.message);
+ tableData.value = response.data;
+ ElMessage.success(response.message);
} else {
ElMessage.error(response.message);
}
@@ -199,7 +283,8 @@
if (confirmResult === 'confirm') {
const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/damageBigStorageCageDetails?status="+1, row)
if (response.code === 200) {
- ElMessage.success(response.message);
+ tableData.value = response.data;
+ ElMessage.success(response.message);
} else {
ElMessage.error(response.message);
}
@@ -355,8 +440,12 @@
};
const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails", dataToSend)
if (response.code === 200) {
+ tableData.value = response.data;
add.value = false;
ElMessage.success(response.message);
+ glassId.value = '';
+ tableDataf.value = '';
+
} else {
ElMessage.error(response.message);
}
@@ -369,7 +458,6 @@
function handleRowClick(row) {
selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁
}
-
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
@@ -428,23 +516,23 @@
// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
onMounted(() => {
// fetchFlowCardId();
- // fetchTableData(); // 鑾峰彇鏁版嵁
initializeWebSocket(socketUrl, handleMessage);
+
});
function getStatusType(enableState: number) {
switch (enableState) {
- case 0:
- return 'warning';
- case 1:
+ case 100:
return 'success';
+ case 102:
+ return 'warning';
}
}
function getStatusText(enableState: number) {
switch (enableState) {
- case 0:
- return t('searchOrder.disable');
- case 1:
- return t('searchOrder.enable');
+ case 100:
+ return t('searchOrder.zailong');
+ case 102:
+ return t('searchOrder.rengongxp');
}
}
function getStatusTypea(ishorizontal: number) {
@@ -906,7 +994,7 @@
</el-dialog>
<el-dialog v-model="dialogFormVisiblea" top="5vh" width="97%" :title="$t('searchOrder.cageinformation')">
<el-table
- :data="tableData"
+ :data="paginatedUsers"
@row-click="handleRowClick"
height="500"
@expand-change="handleExpandChange"
@@ -925,8 +1013,8 @@
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
>
<!-- <el-table-column prop="menuName" label="浜岀骇鑿滃崟鏍�" align="center" min-width="140" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"/> -->
- <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" min-width="80"/>
- <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="100" />
+ <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" min-width="90"/>
+ <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="110" />
<el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="120" />
<el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="80" />
<el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="80" />
@@ -939,6 +1027,7 @@
:label="$t('searchOrder.startstatus')"
min-width="80"
prop="state"
+
>
<template #default="scope">
<el-tag :type="getStatusType(scope.row.state)">
@@ -952,10 +1041,14 @@
<el-button size="mini" type="text" plain @click="broke(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
<el-button size="mini" type="text" plain @click="brokec(scope.row)">{{ $t('searchOrder.takeout') }}</el-button>
<el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('searchOrder.delete') }}</el-button>
- <el-button size="mini" type="text" plain @click="outfil(scope.row)">{{ $t('searchOrder.outfilm') }}</el-button>
+ <el-button size="mini" type="text"
+ :disabled="!((props.row.bigStorageCageDetails[0].state !== 102 && scope.$index == 0 ) || (props.row.bigStorageCageDetails[(scope.$index - 1)<0?0:scope.$index-1].state==102)&&(scope.row.state!=102))"
+ plain @click="outfil(scope.row)">
+ {{ $t('searchOrder.outfilm') }}
+ </el-button>
</template>
</el-table-column>
- </el-table>
+ </el-table>
</div>
</template>
</el-table-column>
@@ -985,22 +1078,20 @@
</template>
</el-table-column>
</el-table>
- <div id="demo-pagination-block">
- <el-pagination
- style="margin-left: 850px;"
- v-model:current-page="currentPage4"
- v-model:page-size="pageSize4"
- :page-sizes="[100, 200, 300, 400]"
- :small="small"
- :disabled="disabled"
- :background="background"
- layout="total, sizes, prev, pager, next, jumper"
- :total="400"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
+ <div>
+ <div style="margin-top: 20px; text-align: center;">
+ <!-- 涓婁竴椤垫寜閽� -->
+ <el-button @click="prevPage" :disabled="currentPage === 1">{{ $t('searchOrder.up') }}</el-button>
+
+ <!-- 涓嬩竴椤垫寜閽� -->
+ <el-button @click="nextPage" :disabled="currentPage >= totalPages">{{ $t('searchOrder.down') }}</el-button>
+
+ <!-- 褰撳墠椤垫樉绀虹殑鏉℃暟 -->
+ <span style="margin-left: 10px;">{{ $t('searchOrder.now') }} {{ itemsPerPage }} {{ $t('searchOrder.tit') }}</span>
+ </div>
</div>
-</el-dialog>
+ </el-dialog>
+<!-- </el-dialog> -->
<el-dialog v-model="dialogFormVisibleb" top="5vh" width="85%" :title="$t('searchOrder.productionqueue')">
<!-- <div style="display: flex;">
<p style="margin-top: 3px;">闃熷垪鐘舵�侊細</p>
--
Gitblit v1.8.0