From 88903b37521e91e5bcc2e6ef6d8e3b1a1f00599c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 19 十二月 2024 11:07:24 +0800
Subject: [PATCH] 1、卧式理片前端数据推送 分1、2号线，新增任务栏
---
UI-Project/src/views/hollow/hollowequipment.vue | 98 +++++++++++++++++++++++-------------------------
1 files changed, 47 insertions(+), 51 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index e5a67e0..9756ed2 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -42,25 +42,24 @@
</el-form>
</div>
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
- <el-table height="480" ref="table" :data="tableDataa"
- :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }">
- <el-table-column prop="sequence" :label="$t('hellow.order')" align="center"/>
+ <el-table height="650" ref="table" :data="tableDataa" :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }">
+ <el-table-column prop="flowCardId" :label="$t('hellow.flowCardId')" align="center"/>
+ <el-table-column prop="hollowSequence" :label="$t('hellow.order')" align="center"/>
<el-table-column prop="thickness" :label="$t('hellow.thickness')" align="center"/>
<el-table-column prop="layer" :label="$t('hellow.coatingtypes')" align="center"/>
<el-table-column prop="height" :label="$t('hellow.height')" align="center"/>
<el-table-column prop="width" :label="$t('hellow.width')" align="center"/>
<el-table-column prop="state" :label="$t('hellow.state')" align="center"/>
</el-table>
- <div style="display: flex;margin-left: 500px;margin-top: 10px;">
- <!-- <div style="float: center;"> -->
- <div style="margin-top: 5px;margin-right: 5px;">绾胯矾</div>
- <el-pagination
- background
- size="large"
+ <div style="display: flex;margin-left: 40%;margin-top: 10px;">
+ <div style="margin-top: 5px;margin-right: 5px;">{{ $t('hellow.line') }}</div>
+ <el-pagination
+ background
+ size="large"
layout="prev, pager, next"
:total="30"
:current-page.sync="currentPage"
- @current-change="handlePageChange"
+ @current-change="handlePageChange1"
/>
</div>
</div>
@@ -70,22 +69,22 @@
<el-dialog v-model="dialogFormVisiblea" top="5vh" width="85%">
<el-table
ref="table"
- style="margin-top: 20px; height: 500px;"
+ style="margin-top: 20px; height: 700px;"
:data="tableDatab"
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
row-key="projectNumber"
>
<!-- <el-table-column type="expand"> -->
- <el-table-column >
- <template #default="props">
- <el-table :data="props.row.records" style="width: 100%">
- <el-table-column prop="layer" fixed align="center" :label="$t('hellow.layernumber')" min-width="80"/>
+ <el-table-column>
+ <template #default="props">
+ <el-table :data="props.row.records" style="width: 100%">
+ <el-table-column prop="layer" fixed align="center" :label="$t('hellow.layernumber')" min-width="80"/>
<el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="80"/>
<el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="80"/>
<el-table-column prop="sumCount" align="center" :label="$t('hellow.totalnumber')" min-width="80"/>
<el-table-column prop="realCount" align="center" :label="$t('hellow.realpieces')" min-width="80"/>
<el-table-column prop="pairCount" align="center" :label="$t('hellow.pairsnumber')" min-width="80"/>
- </el-table>
+ </el-table>
</template>
</el-table-column>
<el-table-column prop="projectNumber" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
@@ -137,7 +136,6 @@
</div>
</template>
</el-dialog>
-
<!-- 寮哄埗鍑虹墖 -->
<el-dialog v-model="dialogFormVisibled" top="21vh" width="40%" :title="$t('hellow.forcedfilming')">
<div style="margin-left: 20px;margin-top: 10px;margin-bottom: 10px;">
@@ -171,6 +169,7 @@
</div>
</template>
</el-dialog>
+ <!-- 缂虹墖璇︽儏 -->
<el-dialog v-model="dialogFormVisibleb" top="7vh" width="70%" height="500">
<div style="margin-top: -20px;text-align: center;margin-left: 400px;">
<el-form-item :label="$t('hellow.cardnumbera')" style="width: 14vw">
@@ -190,6 +189,16 @@
<el-pagination layout="prev, pager, next" :total="50"/>
</div>
</el-table>
+ <div style="display: flex;margin-left: 40%;margin-top: 10px;">
+ <el-pagination
+ background
+ size="large"
+ layout="prev, pager, next"
+ :total="30"
+ :current-page.sync="currentPage2"
+ @current-change="handlePageChange2"
+ />
+ </div>
</el-dialog>
<!-- 寮�濮嬩换鍔� -->
<el-dialog v-model="blinda" top="30vh" width="25%" :title="$t('hellow.pstarttask')">
@@ -231,38 +240,44 @@
const flowCard = ref('')
const cell = ref('')
const cella = ref('')
-const ganghua = ref('')
+const ganghua = ref(true)
const totalPairQuantity = ref('')
const totalPairQuantitya = ref('')
const dialogFormVisiblea = ref(false)
const dialogFormVisibleb = ref(false)
const dialogFormVisiblec = ref(false)
const dialogFormVisibled = ref(false)
+const currentPage2 = ref(1)
const currentRow = reactive({});
const options = [
{
value: 930,
- label: '绾胯矾涓�',
+ label: t('hellow.line1'),
},
{
value: 931,
- label: '绾胯矾浜�',
+ label: t('hellow.line2'),
},
{
value: 932,
- label: '绾胯矾涓�',
+ label: t('hellow.line3'),
}
]
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/HollowGlass`;
const currentPage = ref(parseInt(window.localStorage.getItem('currentPage')) || 1);
- console.log(currentPage.value);
watch(() => currentPage.value, (newVal) => {
window.localStorage.setItem('currentPage', newVal);
});
const currentPageKey = computed(() => `93${currentPage.value - 1}`);
-const handlePageChange = (newPage) => {
+const handlePageChange1 = (newPage) => {
currentPage.value = newPage;
+ console.log(currentPage.value);
+};
+const handlePageChange2 = (newPage) => {
+ currentPage2.value = newPage;
+ console.log(currentPage2.value);
+ fetchFlowBind(currentRow.projectNumber, currentRow.layer, currentPage2.value);
};
const handleMessage = (data) => {
try {
@@ -298,11 +313,13 @@
dialogFormVisiblea.value = true;
fetchFlowCardId();
};
+// 缂虹墖璇︽儏
const handleBindRack = (row) => {
+ currentPage2.value = 1;
const { projectNumber, layer } = row;
currentRow.projectNumber = row.projectNumber;
dialogFormVisibleb.value = true;
- fetchFlowBind(projectNumber, layer);
+ fetchFlowBind(projectNumber, layer,currentPage2.value);
};
// 棰嗗彇浠诲姟
const handletake = (row) => {
@@ -321,8 +338,6 @@
if (response.code == 200) {
ElMessage.success(response.message);
const newData = parseData(response.data);
- console.log(newData);
-
tableDatab.value = newData;
} else {
ElMessage.error('Failed to fetch data');
@@ -331,34 +346,18 @@
ElMessage.error('Error fetching data');
}
};
-
const parseData = (rawData) => {
return Object.keys(rawData).map(projectNumber => ({
projectNumber,
records: rawData[projectNumber]
}));
};
-// const fetchFlowCardId = async () => {
-// try {
-// const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard')
-// if (response.code == 200) {
-// ElMessage.success(response.message);
-// console.log(response.data);
-// tableDatab.value = response.data;
-// } else {
-// ElMessage.error(response.message);
-// }
-// } catch (error) {
-// console.error(error);
-// }
-// }
-// 缂虹墖璇︽儏
-const fetchFlowBind = async (flowCardId, layer) => {
+const fetchFlowBind = async (flowCardId, layer, page) => {
try {
var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + layer;
const response = await request.post(url)
if (response.code == 200) {
- tableDatac.value = response.data[1];
+ tableDatac.value = response.data[page];
ElMessage.success(response.message);
} else {
ElMessage.error(response.message);
@@ -429,17 +428,16 @@
console.error(error);
}
}
- // 璋冨害
- const handleChange = async () => {
+// 璋冨害
+const handleChange = async () => {
try {
const body = {
- flag: ganghua.value, // 浣跨敤 ganghua.value 鑾峰彇褰撳墠寮�鍏崇殑鐘舵��
+ flag: ganghua.value,
};
- var url="/hollowGlass/hollowGlassOutRelationInfo/dispatchHollowSwitch?flag="+ganghua.value;
+ var url="/hollowGlass/hollowGlassOutRelationInfo/dispatchHollowSwitch?flag="+ganghua.value;
const response = await request.post(url)
if (response.code == 200) {
- // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
ganghua.value = response.data
}else {
@@ -447,7 +445,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -456,7 +453,6 @@
closeWebSocket();
});
</script>
-
<style scoped>
#dialog-footer {
text-align: center;
--
Gitblit v1.8.0