| UI-Project/src/views/hollow/hollowequipment.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI-Project/src/views/hollow/hollowequipmenthree.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI-Project/src/views/hollow/hollowequipmenttwo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI-Project/src/views/hollow/hollowslicecage.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
UI-Project/src/views/hollow/hollowequipment.vue
@@ -16,10 +16,10 @@ <el-button style="margin-left: 10px;" id="searchButton" type="success" @click="handleBinda"> {{ $t('hellow.starttask') }} </el-button> <el-button style="margin-left: 10px;" id="searchButton" type="info" @click="handleBindd">{{ <!-- <el-button style="margin-left: 10px;" id="searchButton" type="info" @click="handleBindd">{{ $t('hellow.taskdet') }} </el-button> </el-button> --> <el-button style="margin-left: 10px;" id="searchButton" type="warning" @click="handleBindc">{{ $t('hellow.stopproject') }} @@ -64,8 +64,25 @@ <!-- </div> --> </div> <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;"> <el-table height="650" ref="table" :data="tableDataa" :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"> <el-tabs v-model="activeTab" type="card"> <el-tab-pane v-for="tab in tabList" :key="tab.title" :label="tab.title" :name="tab.title" > <div style="margin-bottom: 10px;"> <el-button style="margin-left: 10px;" type="info" @click="handleDelete(tab.title)">{{ $t('hellow.taskdet') }} </el-button> </div> <!-- 动态表格 --> <el-table :data="tab.tableDataa" :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }" > <el-table-column prop="flowCardId" :label="$t('hellow.flowCardId')" align="center" /> <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" /> <el-table-column prop="hollowSequence" :label="$t('hellow.order')" align="center" /> @@ -80,6 +97,8 @@ </template> </el-table-column> </el-table> </el-tab-pane> </el-tabs> <!-- <div style="display: flex;margin-left: 40%;margin-top: 10px;"> <div style="margin-top: 5px;margin-right: 5px;">{{ $t('hellow.line') }}</div> <el-pagination @@ -808,17 +827,6 @@ <print-custom-label-x-j id="childLabel" :faceOrientation="stateValue" :lableType="1" :list="listFlow" :lastList='lastList' :type="tag.name" style="width: 100%;height: 100%" /> </el-dialog> <!-- 删除任务 --> <el-dialog v-model="blindd" top="30vh" width="25%" :title="$t('hellow.hollowtaskdet')"> <template #footer> <div id="dialog-footer"> <el-button type="primary" @click="handled"> {{ $t('basicData.confirm') }} </el-button> <el-button @click="blindd = false">{{ $t('basicData.cancel') }}</el-button> </div> </template> </el-dialog> <!-- 预览 --> <el-dialog v-model="dialogFormVisiblee" top="24vh" width="25%" :title="$t('hellow.reviewproject')"> <div style="margin-left: 50px;margin-bottom: 10px;"> @@ -965,7 +973,7 @@ </template> <script setup> import { ElMessage, ElMessageBox } from 'element-plus' import { onBeforeUnmount, onMounted, onUnmounted, ref, reactive, watch, computed } from "vue"; import { onBeforeUnmount, onMounted, onUnmounted, ref, reactive, watch, computed, getCurrentInstance } from "vue"; import request from "@/utils/request" import { host, WebSocketHost } from '@/utils/constants' import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService'; @@ -974,8 +982,10 @@ const blinda = ref(false) const blindb = ref(false) const blindc = ref(false) const blindd = ref(false) const mulan = ref(false) const activeTab = ref('') const tabList = ref([]) const internalInstance = getCurrentInstance() const tableDataa = ref([]) const tableDatab = ref([]) const tableDatac = ref([]) @@ -1050,7 +1060,7 @@ } ] let socket = null; const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/HollowGlassone`; const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/HollowGlassOne`; const currentPage = ref(parseInt(window.localStorage.getItem('currentPage')) || 1); watch(() => currentPage.value, (newVal) => { window.localStorage.setItem('currentPage', newVal); @@ -1064,19 +1074,24 @@ fetchFlowBind(currentRow.flowCardId, currentPage2.value); }; const handleMessage = (data) => { const rawData = data.queueInfo[0] const formattedData = Object.entries(rawData).map(([key, data]) => ({ title: key, tableDataa: Array.isArray(data) ? data : [data] })); tabList.value = formattedData; if (tabList.value.length > 0) { activeTab.value = tabList.value[0].title; } internalInstance.ctx.$forceUpdate(); try { tableDataa.value = data.queueInfo[0]; const allPageData = data; const currentPageKeyValue = currentPageKey.value; const currentPageData = allPageData[currentPageKeyValue]; if (data.freeRequest != null) { freeone.value = data.freeRequest[0] == true ? 'green' : '#911005'; } // if (currentPageData && Array.isArray(currentPageData) && currentPageData.length > 0) { // tableDataa.value = currentPageData[0]; // } else { // console.warn('No data for the current page key:', currentPageKeyValue); // } } catch (error) { } }; @@ -1096,10 +1111,6 @@ // 暂停任务 const handleBindc = (row) => { blindc.value = true; }; // 删除任务 const handleBindd = (row) => { blindd.value = true; }; const removalMethodMap = { 1: t('Mounting.removal'), @@ -1688,20 +1699,12 @@ // 开始任务 const handlea = async () => { try { let flowCardId = window.localStorage.getItem('flowCardId') if (flowCardId !== '') { var url = "/hollowGlass/hollowGlassOutRelationInfo/startTask?flowCardId=" + flowCardId + "&cell=" + 930; var url = "/hollowGlass/hollowGlassOutRelationInfo/startTask?cell=" + 930 ; const response = await request.post(url) if (response.code == 200) { ElMessage.success(response.message); blinda.value = false; } else { } } else { ElMessage({ type: 'info', message: t('basicData.infonull'), }) } } catch (error) { } @@ -1709,45 +1712,40 @@ // 暂停任务 const handlec = async () => { try { let flowCardId = window.localStorage.getItem('flowCardId') if (flowCardId !== '') { var url = "/hollowGlass/hollowGlassOutRelationInfo/pauseTask?flowCardId=" + flowCardId + "&cell=" + 930; var url = "/hollowGlass/hollowGlassOutRelationInfo/pauseTask?cell=" + 930; const response = await request.post(url) if (response.code == 200) { ElMessage.success(response.message); blindc.value = false; } else { } } else { ElMessage({ type: 'info', message: t('basicData.infonull'), }) } } catch (error) { } } // 删除任务 const handled = async () => { const handleDelete = async (flowCardId) => { try { let flowCardId = window.localStorage.getItem('flowCardId') if (flowCardId !== '') { const confirmResult = await ElMessageBox.confirm( t('hellow.hollowtaskdet'), t('workOrder.prompt'), { confirmButtonText: t('workOrder.yes'), cancelButtonText: t('workOrder.cancel'), type: 'warning', } ); if (confirmResult === 'confirm') { var url = "/hollowGlass/hollowGlassOutRelationInfo/deleteHollowTaskDetails?flowCardId=" + flowCardId + "&cell=" + 930; const response = await request.post(url) if (response.code == 200) { if (response.code === 200) { ElMessage.success(response.message); blindd.value = false; } else { ElMessage.error(response.msg); } } else { ElMessage({ type: 'info', message: t('basicData.infonull'), }) } } catch (error) { } } }; // 领取任务 const finisha = async () => { if (!totalPairQuantity.value) { UI-Project/src/views/hollow/hollowequipmenthree.vue
@@ -15,10 +15,6 @@ <el-button style="margin-left: 10px;" id="searchButton" type="success" @click="handleBinda"> {{ $t('hellow.starttask') }} </el-button> <el-button style="margin-left: 10px;" id="searchButton" type="info" @click="handleBindd">{{ $t('hellow.taskdet') }} </el-button> <el-button style="margin-left: 10px;" id="searchButton" type="warning" @click="handleBindc">{{ $t('hellow.stopproject') }} @@ -34,8 +30,24 @@ <i :style="{ marginTop: '2px', backgroundColor: freethree, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i> </div> <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;"> <el-table height="650" ref="table" :data="tableDataa" :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"> <el-tabs v-model="activeTab" type="card"> <el-tab-pane v-for="tab in tabList" :key="tab.title" :label="tab.title" :name="tab.title" > <div style="margin-bottom: 10px;"> <el-button style="margin-left: 10px;" type="info" @click="handleDelete(tab.title)">{{ $t('hellow.taskdet') }} </el-button> </div> <!-- 动态表格 --> <el-table :data="tab.tableDataa" :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }" > <el-table-column prop="flowCardId" :label="$t('hellow.flowCardId')" align="center"/> <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center"/> <el-table-column prop="hollowSequence" :label="$t('hellow.order')" align="center"/> @@ -46,10 +58,12 @@ <el-table-column prop="width" :label="$t('hellow.width')" align="center"/> <el-table-column prop="state" :label="$t('hellow.state')" align="center"> <template #default="scope"> {{ scope.row.state == -1 ? "等待出片" : "出片完成" }} {{ scope.row.state == -1 ? $t('hellow.waitingout') : $t('hellow.finishout') }} </template> </el-table-column> </el-table> </el-tab-pane> </el-tabs> <!-- <div style="display: flex;margin-left: 40%;margin-top: 10px;"> <div style="margin-top: 5px;margin-right: 5px;">{{ $t('hellow.line') }}</div> <el-pagination @@ -441,17 +455,6 @@ <print-custom-label-x-j id="childLabel" :faceOrientation="stateValue" :lableType="1" :list="listFlow" :lastList='lastList' :type="tag.name" style="width: 100%;height: 100%" /> </el-dialog> <!-- 删除任务 --> <el-dialog v-model="blindd" top="30vh" width="25%" :title="$t('hellow.hollowtaskdet')"> <template #footer> <div id="dialog-footer"> <el-button type="primary" @click="handled"> {{ $t('basicData.confirm') }} </el-button> <el-button @click="blindd = false">{{ $t('basicData.cancel') }}</el-button> </div> </template> </el-dialog> <!-- 预览 --> <el-dialog v-model="dialogFormVisiblee" top="24vh" width="25%" :title="$t('hellow.reviewproject')" > <div style="margin-left: 50px;margin-bottom: 10px;"> @@ -536,8 +539,10 @@ const blinda = ref(false) const blindb = ref(false) const blindc = ref(false) const blindd = ref(false) const mulan = ref(false) const activeTab = ref('') const tabList = ref([]) const internalInstance = getCurrentInstance() const tableDataa = ref([]) const tableDatab = ref([]) const tableDatac = ref([]) @@ -608,8 +613,17 @@ fetchFlowBind(currentRow.flowCardId, currentPage2.value); }; const handleMessage = (data) => { const rawData = data.queueInfo[0] const formattedData = Object.entries(rawData).map(([key, data]) => ({ title: key, tableDataa: Array.isArray(data) ? data : [data] })); tabList.value = formattedData; if (tabList.value.length > 0) { activeTab.value = tabList.value[0].title; } internalInstance.ctx.$forceUpdate(); try { tableDataa.value = data.queueInfo[0]; const allPageData = data; const currentPageKeyValue = currentPageKey.value; const currentPageData = allPageData[currentPageKeyValue]; @@ -657,8 +671,28 @@ blindc.value = true; }; // 删除任务 const handleBindd = (row) => { blindd.value = true; const handleDelete = async (flowCardId) => { try { const confirmResult = await ElMessageBox.confirm( t('hellow.hollowtaskdet'), t('workOrder.prompt'), { confirmButtonText: t('workOrder.yes'), cancelButtonText: t('workOrder.cancel'), type: 'warning', } ); if (confirmResult === 'confirm') { var url = "/hollowGlass/hollowGlassOutRelationInfo/deleteHollowTaskDetails?flowCardId=" + flowCardId + "&cell=" + 930; const response = await request.post(url) if (response.code === 200) { ElMessage.success(response.message); } else { ElMessage.error(response.msg); } } } catch (error) { } }; const removalMethodMap = { 1: t('Mounting.removal'), @@ -939,7 +973,7 @@ try { let flowCardId = window.localStorage.getItem('flowCardId') if (flowCardId !== '') { var url="/hollowGlass/hollowGlassOutRelationInfo/startTask?flowCardId="+flowCardId + "&cell=" + 932; var url = "/hollowGlass/hollowGlassOutRelationInfo/startTask?cell=" + 932 ; const response = await request.post(url) if (response.code == 200) { ElMessage.success(response.message); @@ -960,7 +994,7 @@ try { let flowCardId = window.localStorage.getItem('flowCardId') if (flowCardId !== '') { var url="/hollowGlass/hollowGlassOutRelationInfo/pauseTask?flowCardId="+flowCardId + "&cell=" + 932; var url = "/hollowGlass/hollowGlassOutRelationInfo/pauseTask?cell=" + 932; const response = await request.post(url) if (response.code == 200) { ElMessage.success(response.message); UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -16,10 +16,6 @@ <el-button style="margin-left: 10px;" id="searchButton" type="success" @click="handleBinda"> {{ $t('hellow.starttask') }} </el-button> <el-button style="margin-left: 10px;" id="searchButton" type="info" @click="handleBindd">{{ $t('hellow.taskdet') }} </el-button> <el-button style="margin-left: 10px;" id="searchButton" type="warning" @click="handleBindc">{{ $t('hellow.stopproject') }} @@ -36,8 +32,24 @@ :style="{ marginTop: '2px', backgroundColor: freetwo, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i> </div> <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;"> <el-table height="650" ref="table" :data="tableDataa" :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"> <el-tabs v-model="activeTab" type="card"> <el-tab-pane v-for="tab in tabList" :key="tab.title" :label="tab.title" :name="tab.title" > <div style="margin-bottom: 10px;"> <el-button style="margin-left: 10px;" type="info" @click="handleDelete(tab.title)">{{ $t('hellow.taskdet') }} </el-button> </div> <!-- 动态表格 --> <el-table :data="tab.tableDataa" :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }" > <el-table-column prop="flowCardId" :label="$t('hellow.flowCardId')" align="center" /> <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" /> <el-table-column prop="hollowSequence" :label="$t('hellow.order')" align="center" /> @@ -48,10 +60,12 @@ <el-table-column prop="width" :label="$t('hellow.width')" align="center" /> <el-table-column prop="state" :label="$t('hellow.state')" align="center"> <template #default="scope"> {{ scope.row.state == -1 ? "等待出片" : "出片完成" }} {{ scope.row.state == -1 ? $t('hellow.waitingout') : $t('hellow.finishout') }} </template> </el-table-column> </el-table> </el-tab-pane> </el-tabs> <!-- <div style="display: flex;margin-left: 40%;margin-top: 10px;"> <div style="margin-top: 5px;margin-right: 5px;">{{ $t('hellow.line') }}</div> <el-pagination @@ -417,17 +431,6 @@ <print-custom-label-x-j id="childLabel" :faceOrientation="stateValue" :lableType="1" :list="listFlow" :lastList='lastList' :type="tag.name" style="width: 100%;height: 100%" /> </el-dialog> <!-- 删除任务 --> <el-dialog v-model="blindd" top="30vh" width="25%" :title="$t('hellow.hollowtaskdet')"> <template #footer> <div id="dialog-footer"> <el-button type="primary" @click="handled"> {{ $t('basicData.confirm') }} </el-button> <el-button @click="blindd = false">{{ $t('basicData.cancel') }}</el-button> </div> </template> </el-dialog> <!-- 预览 --> <el-dialog v-model="dialogFormVisiblee" top="24vh" width="25%" :title="$t('hellow.reviewproject')"> <div style="margin-left: 50px;margin-bottom: 10px;"> @@ -500,9 +503,10 @@ const blinda = ref(false) const blindb = ref(false) const blindc = ref(false) const blindd = ref(false) const mulan = ref(false) const activeTab = ref('') const tabList = ref([]) const internalInstance = getCurrentInstance() const tableDataa = ref([]) const tableDatab = ref([]) const tableDatac = ref([]) @@ -594,19 +598,23 @@ fetchFlowBind(currentRow.flowCardId, currentPage2.value); }; const handleMessage = (data) => { const rawData = data.queueInfo[0] const formattedData = Object.entries(rawData).map(([key, data]) => ({ title: key, tableDataa: Array.isArray(data) ? data : [data] })); tabList.value = formattedData; if (tabList.value.length > 0) { activeTab.value = tabList.value[0].title; } internalInstance.ctx.$forceUpdate(); try { tableDataa.value = data.queueInfo[0]; const allPageData = data; const currentPageKeyValue = currentPageKey.value; const currentPageData = allPageData[currentPageKeyValue]; if (data.freeRequest != null) { freetwo.value = data.freeRequest[0] == true ? 'green' : '#911005'; } // if (currentPageData && Array.isArray(currentPageData) && currentPageData.length > 0) { // tableDataa.value = currentPageData[0]; // } else { // console.warn('No data for the current page key:', currentPageKeyValue); // } } catch (error) { } }; @@ -646,10 +654,6 @@ // 暂停任务 const handleBindc = (row) => { blindc.value = true; }; // 删除任务 const handleBindd = (row) => { blindd.value = true; }; const handleBinde = (row) => { blinde.value = true; @@ -985,7 +989,7 @@ try { let flowCardId = window.localStorage.getItem('flowCardId') if (flowCardId !== '') { var url = "/hollowGlass/hollowGlassOutRelationInfo/startTask?flowCardId=" + flowCardId + "&cell=" + 931; var url = "/hollowGlass/hollowGlassOutRelationInfo/startTask?cell=" + 931 ; const response = await request.post(url) if (response.code == 200) { ElMessage.success(response.message); @@ -1006,7 +1010,7 @@ try { let flowCardId = window.localStorage.getItem('flowCardId') if (flowCardId !== '') { var url = "/hollowGlass/hollowGlassOutRelationInfo/pauseTask?flowCardId=" + flowCardId + "&cell=" + 931; var url = "/hollowGlass/hollowGlassOutRelationInfo/pauseTask?cell=" + 931; const response = await request.post(url) if (response.code == 200) { ElMessage.success(response.message); @@ -1023,26 +1027,29 @@ } } // 删除任务 const handled = async () => { const handleDelete = async (flowCardId) => { try { let flowCardId = window.localStorage.getItem('flowCardId') if (flowCardId !== '') { var url = "/hollowGlass/hollowGlassOutRelationInfo/deleteHollowTaskDetails?flowCardId=" + flowCardId + "&cell=" + 931; const response = await request.post(url) if (response.code == 200) { ElMessage.success(response.message); blindd.value = false; } else { const confirmResult = await ElMessageBox.confirm( t('hellow.hollowtaskdet'), t('workOrder.prompt'), { confirmButtonText: t('workOrder.yes'), cancelButtonText: t('workOrder.cancel'), type: 'warning', } ); if (confirmResult === 'confirm') { var url = "/hollowGlass/hollowGlassOutRelationInfo/deleteHollowTaskDetails?flowCardId=" + flowCardId + "&cell=" + 930; const response = await request.post(url) if (response.code === 200) { ElMessage.success(response.message); } else { ElMessage({ type: 'info', message: t('basicData.infonull'), }) ElMessage.error(response.msg); } } } catch (error) { } } }; // 领取任务 const finisha = async () => { let flowCardId = window.localStorage.getItem('flowCardId') UI-Project/src/views/hollow/hollowslicecage.vue
@@ -75,13 +75,13 @@ add.value = true; }; // 缺片详情 const handleMissingFilms = (row) => { currentPage2.value = 1; const { flowCardId } = row; currentLack.flowCardId = row.flowCardId; dialogFormVisibleb.value = true; fetchFlowBind(flowCardId, currentPage2.value); }; // const handleMissingFilms = (row) => { // currentPage2.value = 1; // const { flowCardId } = row; // currentLack.flowCardId = row.flowCardId; // dialogFormVisibleb.value = true; // fetchFlowBind(flowCardId, currentPage2.value); // }; const handlePageChange2 = (newPage) => { currentPage2.value = newPage; fetchFlowBind(currentLack.flowCardId, currentPage2.value); @@ -425,8 +425,8 @@ let socket = null; const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/hollowGlassMessage`; const handleMessage = (data) => { if(data.bigStorageCageUsageSummary!=null){ const summaries = data.bigStorageCageUsageSummary[0]; if(data.lackDetailsList!=null){ const summaries = data.lackDetailsList[0]; const updatedData = summaries.map(summary => ({ ...summary, totalNumber: summary.layer * summary.sumCount, @@ -886,26 +886,20 @@ <div style="width: 100%; height: 100%; overflow: hidden;"> <el-table ref="table" border :data="tableDatass" :header-cell-style="{background:'#F2F3F5', color:'#1D2129'}" show-summary :summary-method="getSummaries" max-height="calc(500px - 35px)" style="width: 100%;" > <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140" /> <el-table-column prop="sumCount" align="center" :label="$t('searchOrder.totallogarithms')" min-width="120" /> <el-table-column prop="pairCount" align="center" :label="$t('searchOrder.numberpairs')" min-width="120" /> <el-table-column prop="totalNumber" align="center" :label="$t('hellow.totalnumber')" min-width="100" /> <el-table-column prop="realCount" align="center" :label="$t('hellow.realpieces')" min-width="120" /> <el-table-column fixed="right" :label="$t('hellow.operate')" align="center"> <template #default="scope"> <el-button type="text" plain @click="handleMissingFilms(scope.row)"> {{ $t('hellow.missingfilms') }} </el-button> </template> </el-table-column> <el-table-column prop="layer" align="center" :label="$t('reportmanage.layer')" min-width="40" /> <el-table-column prop="glassType" align="center" :label="$t('large.serialnumber')" 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="height" align="center" :label="$t('hellow.height')" min-width="80" /> <el-table-column prop="width" align="center" :label="$t('hellow.width')" min-width="80" /> <el-table-column prop="lackCount" align="center" :label="$t('hellow.missingnumber')" min-width="80" /> <el-table-column prop="damageCount" align="center" :label="$t('large.brokenNum')"/> </el-table> </div> </el-card>