From 63100c0391d3a4f1d41ac5e580625913b2edd265 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 04 十一月 2025 13:15:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Slicecage/slicecage.vue | 153 +++++++++++++++++++-------------------------------
1 files changed, 59 insertions(+), 94 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 5d4d162..84d93f7 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -41,6 +41,7 @@
const selectValuesa = reactive([]);
const carPosition = ref([])
const ganghua = ref('')
+const engineerId = ref('')
const diaodu = ref('')
const flowCardId = ref('')
const filmsId = ref('')
@@ -540,7 +541,10 @@
const getAlertText = (alarmCode) => {
const codeMap = {
sizeSame: 'hellow.sizeSame',
- idSame: 'hellow.idSame'
+ idSame: 'hellow.idSame',
+ slotLess: 'hellow.slotLess',
+ overSize: 'hellow.overSize',
+ noGlass: 'hellow.noGlass'
};
return alarmCode in codeMap
? t(codeMap[alarmCode])
@@ -564,10 +568,13 @@
const fetchxiang = async () => {
isLoading.value = true;
try {
- const response = await request.post('/cacheVerticalGlass/bigStorageCage/querybigStorageCageDetail',{
+ const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/queryVerticalSheetCageDetailsList',{
// deviceId: page,
+ engineerId: engineerId.value,
filmsId: filmsId.value,
flowCardId: flowCardId.value,
+ glassId: glassId.value,
+ thickness: -1,
})
// 妯℃嫙鏈�灏忓姞杞芥椂闂�
await new Promise(resolve => setTimeout(resolve, 300));
@@ -586,10 +593,13 @@
const fetchxianga = async () => {
let page = window.localStorage.getItem('pagenumber')
try {
- const response = await request.post('/cacheVerticalGlass/bigStorageCage/querybigStorageCageDetail',{
+ const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/queryVerticalSheetCageDetailsList',{
deviceId: page,
+ engineerId: engineerId.value,
filmsId: filmsId.value,
flowCardId: flowCardId.value,
+ glassId: glassId.value,
+ thickness: thickness.value ? thickness.value : -1,
})
if (response.code === 200) {
ElMessage.success(response.message);
@@ -773,18 +783,27 @@
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
const handleMessage = (data) => {
// 鎶ヨ淇℃伅
- if (data.alarmInfo[0] !=null && data.alarmInfo[0].length > 0) {
- const alert = data.alarmInfo[0]
- const { id,alarmMessage, ...rest } = alert[0];
- alertMessage.value = `${alarmMessage}`;
- alertMessage.value = `${alert[0].alarmMessage}`;
- // 鍔ㄦ�佺炕璇戦�昏緫锛氭牴鎹產larmCode閫夋嫨缈昏瘧閿�
- alertText.value = alert[0].alarmCode === 'sizeSame'
- ? t('hellow.sizeSame')
- : t('hellow.idSame');
+if (data.alarmInfo[0] != null && data.alarmInfo[0].length > 0) {
+ const alert = data.alarmInfo[0];
+ const { id, alarmMessage, ...rest } = alert[0];
+ alertMessage.value = `${alarmMessage}`;
+ alertMessage.value = `${alert[0].alarmMessage}`;
+ if (alert[0].alarmCode === 'sizeSame') {
+ alertText.value = t('hellow.sizeSame');
+ } else if (alert[0].alarmCode === 'idSame') {
+ alertText.value = t('hellow.idSame');
+ } else if (alert[0].alarmCode === 'slotLess') {
+ alertText.value = t('hellow.slotLess');
+ } else if (alert[0].alarmCode === 'overSize') {
+ alertText.value = t('hellow.overSize');
+ } else if (alert[0].alarmCode === 'noGlass') {
+ alertText.value = t('hellow.noGlass');
+ } else {
+ alertText.value = t('hellow.unknownAlert');
+ }
alarmData.value = data; // 瀛樺偍瀹屾暣鏁版嵁鐢ㄤ簬寮圭獥
showAlert.value = true;
- }
+}
const formattedData = data.alarmInfo[0].map(record => ({
...record,
formattedCreateTime: formatTimestamp(record.createTime),
@@ -1055,22 +1074,6 @@
closeWebSocket(socket);
}
});
-function getStatusType(enableState: number) {
- switch (enableState) {
- case 100:
- return 'success';
- case 102:
- return 'warning';
- }
-}
-function getStatusText(enableState: number) {
- switch (enableState) {
- case 100:
- return t('searchOrder.zailong');
- case 102:
- return t('searchOrder.rengongxp');
- }
-}
function getStatusTypea(ishorizontal: number) {
switch (ishorizontal) {
case 0:
@@ -1415,71 +1418,18 @@
:title="$t('searchOrder.cageinformation')">
<div v-loading="isLoading" class="loading-container" :element-loading-text="$t('searchOrder.loadingText')" >
<div style="display: flex;">
+ <el-input v-model="engineerId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('processCard.projectnumber')"/>
+ <el-input v-model="glassId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.inglassID')"/>
<el-input v-model="flowCardId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.incardnumber')" />
<el-input v-model="filmsId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('film.infilms')"/>
+ <el-input v-model="thickness" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.inthickness')"/>
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="fetchxianga">
{{$t('reportmanage.inquire')}}</el-button>
</div>
- <el-table
- :data="tableDataa"
- @row-click="handleRowClick"
- height="700"
- @expand-change="handleExpandChange"
- row-key="id"
- default-expand-all
- :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
- >
- <el-table-column type="expand">
- <template #default="props">
- <div v-if="props.row.bigStorageCageDetails && props.row.bigStorageCageDetails.length">
- <el-table
- :data="props.row.bigStorageCageDetails"
- border
- style="width: 98%;margin-left: 20px;"
- row-key="id"
- :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="120"/>
- <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="130" />
- <el-table-column prop="filmsId" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
- <!-- <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" />
- <el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="80" />
- <el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="80" />
- <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutID')" min-width="100" />
- <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')" min-width="120" />
- <el-table-column
- align="center"
- :label="$t('searchOrder.startstatus')"
- min-width="80"
- prop="state"
- >
- <template #default="scope">
- <el-tag :type="getStatusType(scope.row.state)">
- {{ getStatusText(scope.row.state) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="80" />
- <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" min-width="220">
- <template #default="scope">
- <el-button type="text" plain @click="broke(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
- <el-button type="text" plain @click="brokec(scope.row)">{{ $t('searchOrder.takeout') }}</el-button>
- <el-button type="text" plain @click="opena(scope.row)">{{ $t('searchOrder.delete') }}</el-button>
- <el-button 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>
- </div>
- </template>
- </el-table-column>
- <el-table-column prop="id" :label="$t('searchOrder.cagetableID')" align="center" min-width="90"/>
+ <el-table ref="table" style="margin-top: 20px;height: 700px;width: 1770px;" :data="tableDataa" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="deviceId" align="center" :label="$t('searchOrder.cagenumber')" min-width="100" />
+ <el-table-column prop="engineerId" align="center" :label="$t('searchOrder.projectnumber')" min-width="100" />
+ <el-table-column prop="layer" align="center" :label="$t('processCard.layer')" min-width="50" />
<el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="150" />
<el-table-column
align="center"
@@ -1497,12 +1447,27 @@
</template>
</el-table-column>
<el-table-column prop="remainWidth" align="center" :label="$t('searchOrder.remainingwidth')" min-width="120" />
-
- <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center">
- <template #default="scope">
- <el-button type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.add') }}</el-button>
- </template>
- </el-table-column>
+ <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" min-width="120"/>
+ <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="130" />
+ <el-table-column prop="filmsId" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
+ <el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="80" />
+ <el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="80" />
+ <el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="80" />
+ <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutID')" min-width="100" />
+ <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')" min-width="120" />
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center" width="240">
+ <template #default="scope">
+ <!-- <el-button type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.add') }}</el-button> -->
+ <el-button type="text" plain @click="broke(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
+ <el-button type="text" plain @click="brokec(scope.row)">{{ $t('searchOrder.takeout') }}</el-button>
+ <el-button type="text" plain @click="opena(scope.row)">{{ $t('searchOrder.delete') }}</el-button>
+ <!-- <el-button 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>
<div>
<!-- <div style="margin-top: 20px;margin-left: 40%;">
--
Gitblit v1.8.0