From 452c6813b5bb90bf4f3bf4e3cc774ff4eebf30bf Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 05 七月 2024 15:45:38 +0800
Subject: [PATCH] 原片仓储静态数据
---
UI-Project/src/views/Slicecage/slicecage.vue | 759 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 415 insertions(+), 344 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 6925842..3035fa4 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1,18 +1,13 @@
<script lang="ts" setup>
-// import zhCn from 'element-plus/lib/locale/lang/zh-cn'
-// import en from 'element-plus/dist/locale/en.mjs'
-// const { locale } = useI18n()
-
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
import {Search} from "@element-plus/icons-vue";
-import {reactive} from "vue";
import {useRouter} from "vue-router"
const router = useRouter()
import request from "@/utils/request"
import { WebSocketHost ,host} from '@/utils/constants'
-import { ref, onMounted , onBeforeUnmount} 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";
@@ -26,8 +21,15 @@
const tableDataf = ref([])
const tableDatae = ref([])
const adjustedRects = ref([]);
+const project = ref([]);
const adjustedRectsa = ref([]);
-// const height = ref([]);
+const adjustedRectsb = ref([]);
+const adjustedRectsc = ref([]);
+const adjustedRectsd = ref([]);
+const adjustedRectse = ref([]);
+const adjustedRectsf = ref([]);
+const adjustedRectsg = ref([]);
+const currentRow = reactive({}); // 褰撳墠琛岀殑鏁版嵁
const add = ref(false)
const flowCardId = ref('');
const gap = ref('');
@@ -68,111 +70,97 @@
const cell7=ref(true);
const cell8=ref(true);
const selectedRow = ref(null); // 瀛樺偍閫変腑鐨勮鏁版嵁
-
-const currentPage4 = ref(4)
-const pageSize4 = ref(100)
-
- // var timer=setInterval(() => {
- // // console.log(million.value,million1.value);
- // million.value+=1;
- // if(million.value-million1.value!==12){
-
- // if(million.value-million1.value>=2){
- // if(carposition1.value==220){
- // timers1.value=false;
- // }else if(carposition1.value==60){
- // timers1.value=true;
- // }
- // if(timers1.value==true){
- // carposition1.value=carposition1.value+16;
- // }else{
- // carposition1.value=carposition1.value-16;
- // }
-
-
- // if(carposition2.value==220){
- // timers2.value=false;
- // }else if(carposition2.value==60){
- // timers2.value=true;
- // }
- // if(timers2.value==true){
- // carposition2.value+=16;
- // }else{
- // carposition2.value-=16;
- // }
- // }else{
-
- // }
- // }else{
- // million1.value=million.value;
+
+
+ // 褰撳墠椤电爜鍜屾瘡椤垫樉绀虹殑鏉℃暟
+ 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 20;
+ } else if (currentPage.value === 5) {
+ return 21;
+ } else if (currentPage.value === 6) {
+ return 25;
+ } else if (currentPage.value === 7) {
+ return 51;
+ } else if (currentPage.value === 8) {
+ return 25;
+ } else {
+ return 25; // 榛樿鍊硷紝鍙互鏍规嵁瀹為檯闇�姹備慨鏀�
+ }
+ });
+
+ // 璁＄畻鍒嗛〉鍚庣殑鏁版嵁
+ 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 += 20;
+ }else if (i === 5) {
+ index += 21;
+ }else if (i === 6) {
+ index += 25;
+ }else if (i === 7) {
+ index += 51;
+ }else if (i === 8) {
+ index += 25;
+ } else {
+ index += 25;
+ }
+ }
+ return index;
+ }
+
+ // 涓婁竴椤靛拰涓嬩竴椤垫柟娉�
+ const prevPage = () => {
+ if (currentPage.value > 1) {
+ currentPage.value--;
+ }
+ };
- // if(cellshow1.value==true){
- // cellshow1.value=false;
- // }else{
- // cellshow1.value=true;
- // }
- // if(cellshow2.value==true){
- // cellshow2.value=false;
- // }else{
- // cellshow2.value=true;
- // }
- // }
-
- // }, 1000);
-
- // var timer=setInterval(() => {
- // // console.log(million3.value,million4.value);
- // million3.value+=1;
- // if(million3.value-million4.value!==12){
-
- // if(million3.value-million4.value>=2){
- // if(carposition3.value==260){
- // timers3.value=false;
- // }else if(carposition3.value==60){
- // timers3.value=true;
- // }
- // if(timers3.value==true){
- // carposition3.value=carposition3.value+20;
- // }else{
- // carposition3.value=carposition3.value-20;
- // }
-
-
- // if(carposition4.value==260){
- // timers4.value=false;
- // }else if(carposition4.value==60){
- // timers4.value=true;
- // }
- // if(timers4.value==true){
- // carposition4.value+=20;
- // }else{
- // carposition4.value-=20;
- // }
- // }else{
-
- // }
- // }else{
- // million4.value=million3.value;
- // if(cellshow5.value==true){
- // cellshow5.value=false;
-
- // }else{
- // cellshow5.value=true;
-
- // }
- // if(cellshow3.value==true){
- // cellshow3.value=false;
- // }else{
- // cellshow3.value=true;
- // }
- // if(cellshow4.value==true){
- // cellshow4.value=false;
- // }else{
- // cellshow4.value=true;
- // }
- // }
-
- // }, 1000);
+ 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 9;
+ });
+
+
const getTableRow = (row,type) =>{
switch (type) {
@@ -189,68 +177,20 @@
}
const handleBindRack = (row) => {
selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁
- console.log(row.id);
- console.log(row.slot);
- window.localStorage.setItem('id', row.id)
+ currentRow.deviceId = row.deviceId; // 鐩存帴璁剧疆鍝嶅簲寮忓睘鎬�
+ currentRow.slot = row.slot;
+ window.localStorage.setItem('deviceId', row.deviceId)
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) {
- // 澶勭悊娌℃湁閫変腑琛岀殑鎯呭喌...
- return;
- }
-
- // 鏋勯�犱綘鐨凱OST璇锋眰鏁版嵁锛屽寘鍚�変腑鐨勮鏁版嵁鍜岃〃鍗曟暟鎹�
- const postData = {
- ...selectedRow.value, // 閫変腑琛岀殑鏁版嵁
- };
-
- try {
- const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails', {
- 'flowCardId': flowCardId.value,
- 'gap': gap.value,
- 'glassId': glassId.value,
- 'glassType': glassType.value,
- 'height': height.value,
- 'sequence': sequence.value,
- 'state': state.value,
- 'temperingFeedSequence': temperingFeedSequence.value,
- 'temperingLayoutId': temperingLayoutId.value,
- 'thickness': thickness.value,
- 'width': width.value,
- body: JSON.stringify(postData),
- });
- if (response.code == 200) {
- // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
- ElMessage.success(response.message);
- add.value = false;
- tableData.value = response.data;
- } else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.message);
- }
- } catch (error) {
- // 澶勭悊閿欒...
- 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);
@@ -263,36 +203,6 @@
console.error(error);
}
};
-// 娣诲姞
-// const handleConfirm = async () => {
-// try {
-// const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails', {
-// 'bigStorageCageOutTask.flowCardId': flowCardId.value,
-// 'bigStorageCageOutTask.gap': gap.value,
-// 'bigStorageCageOutTask.glassId': glassId.value,
-// 'bigStorageCageOutTask.glassType': glassType.value,
-// 'bigStorageCageOutTask.height': height.value,
-// 'bigStorageCageOutTask.sequence': sequence.value,
-// 'bigStorageCageOutTask.state': state.value,
-// 'bigStorageCageOutTask.temperingFeedSequence': temperingFeedSequence.value,
-// 'bigStorageCageOutTask.temperingLayoutId': temperingLayoutId.value,
-// 'bigStorageCageOutTask.thickness': thickness.value,
-// 'bigStorageCageOutTask.width': width.value,
-// });
-// if (response.code == 200) {
-// // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
-// ElMessage.success(response.message);
-// add.value = false;
-// tableData.value = response.data;
-// } else {
-// // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
-// ElMessage.error(response.msg);
-// }
-// } catch (error) {
-// // 澶勭悊閿欒
-// console.error(error);
-// }
-// };
// 鏄惁绂佺敤
const toggleEnableState = async (row) => {
const newState = row.enableState === 1 ? 0 : 1;
@@ -307,13 +217,7 @@
ElMessage.error(response.message);
}
row.enableState = newState;
-};
-// const tableData = ref([
-// // ...鎮ㄧ殑琛ㄦ牸鏁版嵁
-// id:
-// deviceId slot enableState remainWidth
-
-// ]);
+};
// 鍒犻櫎
const opena = async(row) => {
try {
@@ -330,7 +234,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);
@@ -355,22 +260,15 @@
}
);
if (confirmResult === 'confirm') {
- // const dataToSend = {
- // ...row,
- // status: 0
- // };
- // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
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);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
}
};
@@ -387,22 +285,15 @@
}
);
if (confirmResult === 'confirm') {
- // const dataToSend = {
- // ...row,
- // status: 1
- // };
- // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
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);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
}
};
@@ -424,13 +315,10 @@
if (response.code === 200) {
ElMessage.success(response.message);
} else {
- // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
ElMessage.error(response.message);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
}
};
@@ -447,22 +335,14 @@
}
);
if (confirmResult === 'confirm') {
- // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
- // const dataToSend = {
- // ...row,
- // status: 0
- // };
const response = await request.post("/cacheVerticalGlass/temperingGlassInfo/damageTemperingGlassInfo?status="+0, row)
if (response.code === 200) {
ElMessage.success(response.message);
} else {
- // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
ElMessage.error(response.message);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
}
};
@@ -479,22 +359,14 @@
}
);
if (confirmResult === 'confirm') {
- // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
- // const dataToSend = {
- // ...row,
- // status: 1
- // };
const response = await request.post("/cacheVerticalGlass/temperingGlassInfo/damageTemperingGlassInfo?status="+1, row)
if (response.code === 200) {
ElMessage.success(response.message);
} else {
- // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
ElMessage.error(response.message);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
}
};
@@ -511,7 +383,6 @@
}
);
if (confirmResult === 'confirm') {
- // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const dataToSend = {
...row,
status: 1
@@ -520,13 +391,10 @@
if (response.code === 200) {
ElMessage.success(response.message);
} else {
- // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
ElMessage.error(response.message);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
}
};
@@ -543,22 +411,14 @@
}
);
if (confirmResult === 'confirm') {
- // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
- // const dataToSend = {
- // ...row,
- // status: 1
- // };
const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/finishBigStorageCageDetails", row)
if (response.code === 200) {
ElMessage.success(response.message);
} else {
- // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
ElMessage.error(response.message);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
}
};
@@ -575,18 +435,23 @@
}
);
if (confirmResult === 'confirm') {
- // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
- // const dataToSend = {
- // ...row,
- // status: 1
- // };
- const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails", row)
+ let deviceId = window.localStorage.getItem('deviceId')
+ let slot = window.localStorage.getItem('slot')
+ const dataToSend = {
+ ...row,
+ deviceId: deviceId,
+ slot: slot
+ };
+ 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);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
@@ -597,7 +462,6 @@
function handleRowClick(row) {
selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁
}
-
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
@@ -608,43 +472,71 @@
tableDatab.value = data.temperingGlassInfoList[0]
tableDatae.value = data.bigStorageCageUsage[0]
// adjustedRects.value = data.bigStorageCageInfo1[0]
+ window.localStorage.setItem('length', data.bigStorageCageInfo1[0].length)
+ let length = window.localStorage.getItem('length')
adjustedRects.value = data.bigStorageCageInfo1[0].map(rect => ({
...rect,
- // width: rect.remainWidth *0.04,
- top: rect.id ,
+ height: 20/length,
+ top: 29/length
}));
+ let small = data.bigStorageCageInfo1[0]
+ console.log(small[0].bigStorageCageDetails);
adjustedRectsa.value = data.bigStorageCageInfo2[0].map(rect => ({
...rect,
- // width: rect.remainWidth *0.04,
- top: rect.id *2,
+ height: 20/length,
+ top: 29/length
}));
- // window.localStorage.setItem('length', data.bigStorageCageInfo1[0].length)
- // let length = window.localStorage.getItem('length')
-
+adjustedRectsb.value = data.bigStorageCageInfo3[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+adjustedRectsc.value = data.bigStorageCageInfo4[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+adjustedRectsd.value = data.bigStorageCageInfo5[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+adjustedRectse.value = data.bigStorageCageInfo6[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+adjustedRectsf.value = data.bigStorageCageInfo7[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+adjustedRectsg.value = data.bigStorageCageInfo8[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
};
-// function getRectHeight(length: number) {
-// return length > 0 ? 29 / length : 29;
-// }
// 鍒濆鍖� 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) {
@@ -773,9 +665,6 @@
</el-col>
</div>
</div>
- <!-- <div id="awatch">
- <img src="../../assets/cp.png" alt="" style="width: 70%;height: 70%;margin-left: 160px;">
-</div> -->
<!-- // 鐖剁骇妗� -->
<div class="img-dlpl" >
<div class="img-car1" :style="'z-index:999;left:247px;top:' + carposition1 + 'px;position:absolute;'">
@@ -792,85 +681,273 @@
<div v-show="cellshow4" style="margin-top:10px;width:200px;height:5px;background-color:#409EFF;"></div>
</div>
<div style="position: relative;">
- <div v-show="cell1" style="width: 227px;height: 29px;position: relative;top:55px;left: 465px;background-color: #911005;">
+ <div v-show="cell1" style="width: 227px;height: 29px;position: relative;top:55px;left: 465px;">
<div
v-for="(rect, index) in adjustedRects"
- :key="rect"
+ :key="rect.id"
:style="{
+
+ // display:'flex',
position: 'absolute',
width: '227px',
- height: '0.8px',
- backgroundColor: '#409EFF',
+ // backgroundColor: 'red',
left: '0px',
- top: `${rect.top}px`,
+ top: index*rect.top+`px`,
+ height: `${rect.height}px`,
}"
>
<div
- v-for="(rect, index) in project"
- :key="rect"
+ v-for="(rects, index) in rect.bigStorageCageDetails"
+ :key="rects"
:style="{
- position: 'absolute',
- width: '1px',
- height: '0.8px',
- backgroundColor: '#409EFF',
+ float:'left',
+ width: '18px',
+ height: `${rect.height}px`,
+ backgroundColor: '#911005',
+ // border:'1px solid black',
top: '0px',
- left: `${rect.left}px`,
+ marginRight: rects.gap/5000*227+'px'
}"
>
+ </div>
</div>
</div>
- </div>
- <!-- <div v-show="cell2" style="width: 227px;height: 29px;position: relative;top:56px;left: 465px;background-color: #911005;">
+ <div v-show="cell2" style="width: 227px;height: 29px;position: relative;top:56px;left: 465px;">
<div
v-for="(rect, index) in adjustedRectsa"
- :key="rect"
+ :key="rect.id"
:style="{
+
+ // display:'flex',
position: 'absolute',
width: '227px',
- height: '0.8px',
- backgroundColor: '#409EFF',
+ // backgroundColor: 'red',
left: '0px',
- top: `${rect.top}px`,
+ top: index*rect.top+`px`,
+ height: `${rect.height}px`,
}"
>
-
+ <div
+ v-for="(rects, index) in rect.bigStorageCageDetails"
+ :key="rects"
+ :style="{
+ float:'left',
+ width: '18px',
+ height: `${rect.height}px`,
+ backgroundColor: '#911005',
+ // border:'1px solid black',
+ top: '0px',
+ marginRight: rects.gap/5000*227+'px'
+ }"
+ >
+ </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;">
+ <div v-show="cell3" style="width: 227px;height: 29px;position: absolute;top:117px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectsb"
+ :key="rect.id"
+ :style="{
+ // display:'flex',
+ position: 'absolute',
+ width: '227px',
+ // backgroundColor: 'red',
+ left: '0px',
+ top: index*rect.top+`px`,
+ height: `${rect.height}px`,
+ }"
+ >
+ <div
+ v-for="(rects, index) in rect.bigStorageCageDetails"
+ :key="rects"
+ :style="{
+ float:'left',
+ width: '18px',
+ height: `${rect.height}px`,
+ backgroundColor: '#911005',
+ // border:'1px solid black',
+ top: '0px',
+ marginRight: rects.gap/5000*227+'px'
+ }"
+ >
+ </div>
</div>
- <div v-show="cell5" style="width: 227px;height: 29px;position: absolute;top:208px;left: 465px;background-color: #409EFF;">
</div>
- <div v-show="cell6" style="width: 227px;height: 29px;position: absolute;top:238px;left: 465px;background-color: #409EFF;">
+ <div v-show="cell4" style="width: 227px;height: 29px;position: absolute;top:148px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectsc"
+ :key="rect.id"
+ :style="{
+
+ // display:'flex',
+ position: 'absolute',
+ width: '227px',
+ // backgroundColor: 'red',
+ left: '0px',
+ top: index*rect.top+`px`,
+ height: `${rect.height}px`,
+ }"
+ >
+ <div
+ v-for="(rects, index) in rect.bigStorageCageDetails"
+ :key="rects"
+ :style="{
+ float:'left',
+ width: '18px',
+ height: `${rect.height}px`,
+ backgroundColor: '#911005',
+ // border:'1px solid black',
+ top: '0px',
+ marginRight: rects.gap/5000*227+'px'
+ }"
+ >
+ </div>
</div>
- <div v-show="cell7" style="width: 227px;height: 29px;position: absolute;top:269px;left: 465px;background-color: #409EFF;">
</div>
- <div v-show="cell8" style="width: 227px;height: 29px;position: absolute;top:300px;left: 465px;background-color: #409EFF;">
- </div> -->
+ <div v-show="cell5" style="width: 227px;height: 29px;position: absolute;top:208px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectsd"
+ :key="rect.id"
+ :style="{
+
+ // display:'flex',
+ position: 'absolute',
+ width: '227px',
+ // backgroundColor: 'red',
+ left: '0px',
+ top: index*rect.top+`px`,
+ height: `${rect.height}px`,
+ }"
+ >
+ <div
+ v-for="(rects, index) in rect.bigStorageCageDetails"
+ :key="rects"
+ :style="{
+ float:'left',
+ width: '18px',
+ height: `${rect.height}px`,
+ backgroundColor: '#911005',
+ // border:'1px solid black',
+ top: '0px',
+ marginRight: rects.gap/5000*227+'px'
+ }"
+ >
+ </div>
+ </div>
+ </div>
+ <div v-show="cell6" style="width: 227px;height: 29px;position: absolute;top:238px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectse"
+ :key="rect.id"
+ :style="{
+
+ // display:'flex',
+ position: 'absolute',
+ width: '227px',
+ // backgroundColor: 'red',
+ left: '0px',
+ top: index*rect.top+`px`,
+ height: `${rect.height}px`,
+ }"
+ >
+ <div
+ v-for="(rects, index) in rect.bigStorageCageDetails"
+ :key="rects"
+ :style="{
+ float:'left',
+ width: '18px',
+ height: `${rect.height}px`,
+ backgroundColor: '#911005',
+ // border:'1px solid black',
+ top: '0px',
+ marginRight: rects.gap/5000*227+'px'
+ }"
+ >
+ </div>
+ </div>
+ </div>
+ <div v-show="cell7" style="width: 227px;height: 29px;position: absolute;top:269px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectsf"
+ :key="rect.id"
+ :style="{
+
+ // display:'flex',
+ position: 'absolute',
+ width: '227px',
+ // backgroundColor: 'red',
+ left: '0px',
+ top: index*rect.top+`px`,
+ height: `${rect.height}px`,
+ }"
+ >
+ <div
+ v-for="(rects, index) in rect.bigStorageCageDetails"
+ :key="rects"
+ :style="{
+ float:'left',
+ width: '18px',
+ height: `${rect.height}px`,
+ backgroundColor: '#911005',
+ // border:'1px solid black',
+ top: '0px',
+ marginRight: rects.gap/5000*227+'px'
+ }"
+ >
+ </div>
+ </div>
+ </div>
+ <div v-show="cell8" style="width: 227px;height: 29px;position: absolute;top:300px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectsg"
+ :key="rect.id"
+ :style="{
+
+ // display:'flex',
+ position: 'absolute',
+ width: '227px',
+ // backgroundColor: 'red',
+ left: '0px',
+ top: index*rect.top+`px`,
+ height: `${rect.height}px`,
+ }"
+ >
+ <div
+ v-for="(rects, index) in rect.bigStorageCageDetails"
+ :key="rects"
+ :style="{
+ float:'left',
+ width: '18px',
+ height: `${rect.height}px`,
+ backgroundColor: '#911005',
+ // border:'1px solid black',
+ top: '0px',
+ marginRight: rects.gap/5000*227+'px'
+ }"
+ >
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
<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="4">
<div id="dt" style="font-size: 15px;">
- <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 :label="$t('searchOrder.tida')" style="width: 14vw">
+ {{ currentRow.deviceId }}
+ <!-- <el-input v-model="currentRow.id" autocomplete="off"></el-input> -->
</el-form-item>
</div>
</el-col>
<el-col :span="5">
<div id="dta" style="font-size: 15px;">
- <el-form-item :label="$t('searchOrder.gridnumber')" style="width: 14vw">
- {{ slot }}
- <!-- <el-input v-model="bigStorageCageDetails.slot" autocomplete="off"></el-input> -->
+ <el-form-item :label="$t('searchOrder.gridnumbera')" style="width: 14vw">
+ {{ currentRow.slot }}
+ <!-- <el-input v-model="currentRow.slot" autocomplete="off"></el-input> -->
</el-form-item>
</div>
</el-col>
@@ -918,18 +995,10 @@
</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> -->
</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"
@@ -948,8 +1017,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" />
@@ -962,6 +1031,7 @@
:label="$t('searchOrder.startstatus')"
min-width="80"
prop="state"
+
>
<template #default="scope">
<el-tag :type="getStatusType(scope.row.state)">
@@ -975,10 +1045,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>
@@ -1008,22 +1082,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>
@@ -1081,7 +1153,6 @@
</template>
<style scoped>
-
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer{
--
Gitblit v1.8.0