From 0f54cac3125f4b20e042b52cd43d8792133b7b96 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 31 十二月 2024 14:20:40 +0800
Subject: [PATCH] 中理片笼状态显示更改逻辑
---
UI-Project/src/views/Slicecage/slicecage.vue | 229 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 197 insertions(+), 32 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 267a699..e2422ac 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -18,7 +18,14 @@
const dialogFormVisibleb = ref(false)
const dialogFormVisiblec = ref(false)
const dialogFormVisibled = ref(false)
+const dialogFormVisiblee = ref(false)
+const dialogFormVisiblef = ref(false)
const dialogFormVisibles = ref(false)
+const inkageEntity = ref('#911005');
+const requestEntity = ref('#911005');
+const mesReplyEntity = ref('#911005');
+const outInkageEntity = ref('#911005');
+const outRequestEntity = ref('#911005');
const tableDataa = ref([])
const tableDatagh = ref([])
const tableDatab = ref([])
@@ -29,6 +36,8 @@
const tableDatax = ref([])
const tableDatas = ref([])
const tableDatalack = ref([])
+const tableDataspecify = ref([])
+const tableDatacagedetails = ref([])
const carPosition = ref([])
const ganghua = ref('')
const diaodu = ref('')
@@ -69,6 +78,7 @@
const cell7=ref(true);
const cell8=ref(true);
const cell9=ref(true);
+const canEdit = ref(true);
const selectedRow = ref(null);
const temperingtotal = ref(0);
const glasstotal = ref(0);
@@ -186,16 +196,21 @@
row.enableState = newState;
};
// 鏄惁鐮存崯
-const toggleEnableisDamage = async (row) => {
+const broken = async (row) => {
+ try {
const newState = row.isDamage === 1 ? 0 : 1;
- const response = await request.post('/cacheGlass/edgStorageCage/updateEdgStorageCage', { id: row.id, enableState: newState });
- if (response.code === 200) {
+ const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/bigStorageGlassDamageByGlassId', { glassId: row.glassId });
+ if (response.code == 200) {
ElMessage.success(response.message);
- } else {
+ } else {
ElMessage.error(response.message);
- }
+ }
row.isDamage = newState;
-};
+}
+catch (error) {
+ console.error(error);
+ }
+}
// 鍒犻櫎
const opena = async(row) => {
try {
@@ -333,8 +348,8 @@
);
if (confirmResult === 'confirm') {
const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/TemperingGlass",{
- engineerId: row.engineer_id,
- temperingLayoutId: row.tempering_layout_id,
+ engineerId: row.engineerId,
+ temperingLayoutId: row.temperingLayoutId,
temperingFeedSequence:temperingFeedSequence
});
if (response.code === 200) {
@@ -361,7 +376,7 @@
}
);
if (confirmResult === 'confirm') {
- const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/appointEngineerId",{
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/appointTemperingEngineerId",{
engineerId: row.engineer_id
});
if (response.code === 200) {
@@ -523,7 +538,7 @@
deviceId: deviceId,
slot: slot
};
- const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails", dataToSend)
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails", dataToSend)
if (response.code === 200) {
tableDataa.value = response.data;
add.value = false;
@@ -560,6 +575,12 @@
const { engineerId, temperingLayoutId } = row;
fetchlack(engineerId, temperingLayoutId);
dialogFormVisibled.value = true;
+};
+// 绗煎唴璇︽儏
+const handlecagedetails = (row) => {
+ const { engineerId, temperingLayoutId } = row;
+ fetchcagedetails(engineerId, temperingLayoutId);
+ dialogFormVisiblef.value = true;
};
// 閽㈠寲鏌ヨ
onMounted(async () => {
@@ -603,8 +624,8 @@
if (response.code === 200) {
ElMessage.success(response.message);
tableDataa.value = response.data
- filmsId.value = ''
- flowCardId.value = ''
+ // filmsId.value = ''
+ // flowCardId.value = ''
} else {
ElMessage.warning(response.msg)
}
@@ -635,6 +656,27 @@
if (response.code == 200) {
ElMessage.success(response.message);
tableDatalack.value = response.data
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
+// 绗煎唴璇︽儏
+const fetchcagedetails = async (engineerId, temperingLayoutId) => {
+ try {
+ const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/queryRealGlassInfo',{
+ engineerId: engineerId,
+ temperingLayoutId: temperingLayoutId,
+ })
+ if (response.code == 200) {
+ console.log(response.data);
+
+ ElMessage.success(response.message);
+ tableDatacagedetails.value = response.data
} else {
ElMessage.error(response.message);
}
@@ -745,7 +787,22 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
const handleMessage = (data) => {
- if (data.scanGlass != null) {
+ if (data.inkageEntity != null) {
+ inkageEntity.value = data.inkageEntity[0] == true ? 'green' : '#911005';
+ }
+ if (data.requestEntity != null) {
+ requestEntity.value = data.requestEntity == 1 ? 'green' : '#911005';
+ }
+ if (data.mesReplyEntity != null) {
+ mesReplyEntity.value = data.mesReplyEntity == 1 ? 'green' : '#911005';
+ }
+ if (data.outInkageEntity != null) {
+ outInkageEntity.value = data.outInkageEntity[0] == true ? 'green' : '#911005';
+ }
+ if (data.outRequestEntity != null) {
+ outRequestEntity.value = data.outRequestEntity == 1 ? 'green' : '#911005';
+ }
+ if (data.scanGlass != null) {
scanGlass.value = data.scanGlass[0];
let width = scanGlass.value.width;
let height = scanGlass.value.height;
@@ -763,9 +820,7 @@
}
if(data.bigStorageCageDetailsOutTask!=null){
tableDatac.value = data.bigStorageCageDetailsOutTask[0]
- console.log(data.bigStorageCageDetailsOutTask[0])
adjusta.value = data.bigStorageCageDetailsOutTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
- // console.log(data.bigStorageCageDetailsOutTask[0]);
} else {
tableDatac.value = '',
adjusta.value = ''
@@ -778,7 +833,6 @@
}
if(data.temperingGlassInfoList!=null){
tableDatab.value = data.temperingGlassInfoList[0]
- console.log(tableDatab.value)
}else{
tableDatab.value = ''
}
@@ -898,6 +952,18 @@
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="primary"
@click="dialogFormVisibleaDownGlasss = true">{{ $t('searchOrder.Labelprinting') }}
</el-button>
+ <div id="dotClass">
+ <div>{{ $t('searchOrder.inkageEntity') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: inkageEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ <div style="margin-left: 70px;">{{ $t('searchOrder.requestEntity') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: requestEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ <div style="margin-left: 70px;">{{ $t('searchOrder.mesReplyEntity') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: mesReplyEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ <div style="margin-left: 70px;">{{ $t('searchOrder.outInkageEntity') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: outInkageEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ <div style="margin-left: 70px;">{{ $t('searchOrder.outRequestEntity') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: outRequestEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ </div>
<div class="table-container">
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 300px;">
@@ -1284,8 +1350,8 @@
</el-dialog>
<el-dialog v-model="dialogFormVisiblea" top="2vh" width="97%" :title="$t('searchOrder.cageinformation')">
<div style="display: flex;">
- <el-input v-model="flowCardId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.incardnumber')" />
- <el-input v-model="filmsId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('film.infilms')"/>
+ <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-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="fetchxianga">
{{$t('reportmanage.inquire')}}</el-button>
</div>
@@ -1471,17 +1537,18 @@
<el-table-column prop="engineerId" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="150"/>
<el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')" min-width="150" />
<el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="150" />
- <el-table-column prop="temperingLayoutId" fixed align="center" :label="$t('searchOrder.layoutnumber')" min-width="120" />
+ <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutnumber')" min-width="120" />
<el-table-column prop="totalCount" align="center" :label="$t('searchOrder.allnumber')" min-width="150" />
<el-table-column prop="realCount" align="center" :label="$t('searchOrder.numbercages')" min-width="150" />
<el-table-column prop="lackCount" align="center" :label="$t('searchOrder.missingquantity')" min-width="150" />
<el-table-column prop="damageCount" align="center" :label="$t('searchOrder.breakquantity')" min-width="150" />
- <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="400">
+ <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="500">
<template #default="scope">
<el-button size="mini" type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
<el-button size="mini" type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
<el-button size="mini" type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
- <el-button size="mini" type="text" plain @click="handlelack(scope.row)">{{ $t('hellow.missingnumber') }}</el-button>
+ <el-button size="mini" type="text" plain @click="handlelack(scope.row)">{{ $t('searchOrder.lacknumber') }}</el-button>
+ <el-button size="mini" type="text" plain @click="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -1504,16 +1571,107 @@
min-width="80"
prop="isDamage"
>
- <template #default="scope">
- <el-tag
- :type="scope.row.isDamage === 1 ? 'danger' : 'success'"
- @click="toggleEnableisDamage(scope.row)"
- >
- {{ scope.row.isDamage === 1 ? $t('searchOrder.breakage') : $t('searchOrder.breakagn') }}
- </el-tag>
- </template>
+ <template #default="scope">
+ <div
+ @click="scope.row.isDamage === 1 ? null : broken(scope.row)"
+ style="position: relative; display: inline-block;"
+ >
+ <el-tag
+ :type="scope.row.isDamage === 1 ? 'danger' : 'success'"
+ style="pointer-events: {{ scope.row.isDamage === 1 ? 'none' : 'auto' }};"
+ >
+ {{ scope.row.isDamage === 1 ? $t('searchOrder.breakage') : $t('searchOrder.breakagn') }}
+ </el-tag>
+ <div
+ v-if="scope.row.isDamage === 1"
+ style="position: absolute; top: 0; left: 0; right: 0; bottom: 0; background: transparent; z-index: 1;"
+ ></div>
+ </div>
+ </template>
</el-table-column>
- <!-- <el-table-column prop="isDamage" align="center" :label="$t('searchOrder.state')" min-width="80" /> -->
+ <el-table-column prop="layer" align="center" :label="$t('processCard.layer')" min-width="80" />
+ <el-table-column prop="xcoordinate" align="center" :label="$t('searchOrder.xcoordinates')" min-width="80" />
+ <el-table-column prop="ycoordinate" align="center" :label="$t('searchOrder.ycoordinates')" min-width="80" />
+ </el-table>
+</el-dialog>
+<el-dialog v-model="dialogFormVisiblee" top="5vh" width="85%" :title="$t('searchOrder.specifyengineerid')">
+ <el-table ref="table" style="margin-top: 20px;height: 600px;"
+ :data="tableDataspecify" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="engineerId" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="150"/>
+ <el-table-column prop="flowCardId" fixed align="center" :label="$t('searchOrder.cardnumber')" min-width="150" />
+ <el-table-column prop="glassId" fixed align="center" :label="$t('searchOrder.glassID')" min-width="150" />
+ <el-table-column prop="temperingLayoutId" fixed align="center" :label="$t('searchOrder.layoutID')" min-width="100" />
+ <el-table-column prop="temperingFeedSequence" fixed align="center" :label="$t('searchOrder.picturesequence')" min-width="120" />
+ <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="filmsid" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
+ <el-table-column
+ align="center"
+ :label="$t('searchOrder.state')"
+ min-width="80"
+ prop="isDamage"
+ >
+ <template #default="scope">
+ <div
+ @click="scope.row.isDamage === 1 ? null : broken(scope.row)"
+ style="position: relative; display: inline-block;"
+ >
+ <el-tag
+ :type="scope.row.isDamage === 1 ? 'danger' : 'success'"
+ style="pointer-events: {{ scope.row.isDamage === 1 ? 'none' : 'auto' }};"
+ >
+ {{ scope.row.isDamage === 1 ? $t('searchOrder.breakage') : $t('searchOrder.breakagn') }}
+ </el-tag>
+ <div
+ v-if="scope.row.isDamage === 1"
+ style="position: absolute; top: 0; left: 0; right: 0; bottom: 0; background: transparent; z-index: 1;"
+ ></div>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="layer" align="center" :label="$t('processCard.layer')" min-width="80" />
+ <el-table-column prop="xcoordinate" align="center" :label="$t('searchOrder.xcoordinates')" min-width="80" />
+ <el-table-column prop="ycoordinate" align="center" :label="$t('searchOrder.ycoordinates')" min-width="80" />
+ </el-table>
+</el-dialog>
+<el-dialog v-model="dialogFormVisiblef" top="5vh" width="85%" :title="$t('searchOrder.cagedetails')">
+ <el-table ref="table" style="margin-top: 20px;height: 600px;"
+ :data="tableDatacagedetails" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="engineerId" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="150"/>
+ <el-table-column prop="flowCardId" fixed align="center" :label="$t('searchOrder.cardnumber')" min-width="150" />
+ <el-table-column prop="glassId" fixed align="center" :label="$t('searchOrder.glassID')" min-width="150" />
+ <el-table-column prop="slot" fixed align="center" :label="$t('film.slot')" min-width="150" />
+ <el-table-column prop="temperingLayoutId" fixed align="center" :label="$t('searchOrder.layoutID')" min-width="100" />
+ <el-table-column prop="temperingFeedSequence" fixed align="center" :label="$t('searchOrder.picturesequence')" min-width="120" />
+ <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="filmsId" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
+ <el-table-column
+ align="center"
+ :label="$t('searchOrder.state')"
+ min-width="80"
+ prop="isDamage"
+ >
+ <template #default="scope">
+ <div
+ @click="scope.row.isDamage === 1 ? null : broken(scope.row)"
+ style="position: relative; display: inline-block;"
+ >
+ <el-tag
+ :type="scope.row.isDamage === 1 ? 'danger' : 'success'"
+ style="pointer-events: {{ scope.row.isDamage === 1 ? 'none' : 'auto' }};"
+ >
+ {{ scope.row.isDamage === 1 ? $t('searchOrder.breakage') : $t('searchOrder.breakagn') }}
+ </el-tag>
+ <div
+ v-if="scope.row.isDamage === 1"
+ style="position: absolute; top: 0; left: 0; right: 0; bottom: 0; background: transparent; z-index: 1;"
+ ></div>
+ </div>
+ </template>
+ </el-table-column>
<el-table-column prop="layer" align="center" :label="$t('processCard.layer')" min-width="80" />
<el-table-column prop="xcoordinate" align="center" :label="$t('searchOrder.xcoordinates')" min-width="80" />
<el-table-column prop="ycoordinate" align="center" :label="$t('searchOrder.ycoordinates')" min-width="80" />
@@ -1548,13 +1706,13 @@
<el-table ref="table" style="margin-top: 20px;height: 500px;"
:data="tableDatas" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="engineerId" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="150"/>
+ <el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')" min-width="150" />
+ <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="150" />
<el-table-column prop="temperingLayoutId" fixed align="center" :label="$t('searchOrder.layoutnumber')" min-width="120" />
<el-table-column prop="totalCount" align="center" :label="$t('searchOrder.allnumber')" min-width="150" />
<el-table-column prop="realCount" align="center" :label="$t('searchOrder.numbercages')" min-width="150" />
<el-table-column prop="lackCount" align="center" :label="$t('searchOrder.missingquantity')" min-width="150" />
<el-table-column prop="damageCount" align="center" :label="$t('searchOrder.breakquantity')" min-width="150" />
- <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="150" />
- <el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')" min-width="150" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="250">
<template #default="scope">
<el-button size="mini" type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
@@ -1742,4 +1900,11 @@
flex: 1; /* 浣夸袱涓崱鐗囧钩鍒嗗彲鐢ㄧ┖闂� */
margin-bottom: 10px; /* 鍙�夛紝鏍规嵁闇�瑕佹坊鍔犲簳閮ㄩ棿璺� */
}
+#dotClass {
+ display: flex;
+ margin-left: 20px;
+ size: 50px;
+ margin-top: 20px;
+ margin-bottom: 10px;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0