From b0884ede9aff94441929fcc94e52f5d540c86196 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 18 二月 2025 13:57:48 +0800
Subject: [PATCH] 新增字段
---
UI-Project/src/views/hollow/hollowslicecage.vue | 114 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 56 insertions(+), 58 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index 19edbb2..dc72f50 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -3,10 +3,10 @@
import {useRouter} from "vue-router"
import request from "@/utils/request"
import {host, WebSocketHost} from '@/utils/constants'
-import {computed, onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
+import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import {ElMessage, ElMessageBox} from 'element-plus'
-import PrintLabel from "@/views/UnLoadGlass/PrintCustomLabelSemi1.vue";
+
const dialogFormVisibleaDownGlasss = ref(false)
const scanGlass = ref([])
const {t} = useI18n()
@@ -18,6 +18,8 @@
const mesReplyEntity = ref('#911005');
const outInkageEntity = ref('#911005');
const outRequestEntity = ref('#911005');
+const freeone = ref('#911005');
+const freetwo = ref('#911005');
const tableDataa = ref([])
const tableDatab = ref([])
const tableDatac = ref([])
@@ -110,9 +112,16 @@
}
);
if (confirmResult === 'confirm') {
- const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/deleteBigStorageCageDetails",row)
+ const params = new URLSearchParams();
+ params.append('state', '8');
+ params.append('deviceId', row.deviceId);
+ params.append('glassId', row.glassId);
+ params.append('slot', row.slot);
+ var url = `/hollowGlass/hollowBigStorageCageDetails/deleteHollowBigStorageCageDetails?${params.toString()}`;
+ const response = await request.post(url)
if (response.code === 200) {
- tableDataa.value = response.data;
+ fetchxiang(1);
+ // tableDataa.value = response.data;
ElMessage.success(response.message);
} else {
ElMessage.error(response.message);
@@ -134,10 +143,16 @@
type: 'warning',
}
);
- if (confirmResult === 'confirm') {
- const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/damageBigStorageCageDetails?status="+8, row)
- if (response.code === 200) {
- tableDataa.value = response.data;
+ if (confirmResult === 'confirm') {
+ const params = new URLSearchParams();
+ params.append('state', '8');
+ params.append('deviceId', row.deviceId);
+ params.append('glassId', row.glassId);
+ params.append('slot', row.slot);
+ var url = `/hollowGlass/hollowBigStorageCageDetails/damageHollowBigStorageCageDetails?${params.toString()}`;
+ const response = await request.post(url)
+ if (response.code === 200) {
+ fetchxiang(1);
ElMessage.success(response.message);
} else {
ElMessage.error(response.message);
@@ -160,34 +175,16 @@
}
);
if (confirmResult === 'confirm') {
- const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/damageBigStorageCageDetails?status="+9, row)
- if (response.code === 200) {
- tableDataa.value = response.data;
- ElMessage.success(response.message);
- } else {
- ElMessage.error(response.message);
- }
- }
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
- }
-};
- // 鍑虹墖
- const outfil = async(row) => {
- try {
- const confirmResult = await ElMessageBox.confirm(
- t('searchOrder.outfil'),
- t('searchOrder.prompt'),
- {
- confirmButtonText: t('searchOrder.yes'),
- cancelButtonText: t('searchOrder.cancel'),
- type: 'warning',
- }
- );
- if (confirmResult === 'confirm') {
- const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/outBigStorageCageDetails", row)
- if (response.code === 200) {
- ElMessage.success(response.message);
+ const params = new URLSearchParams();
+ params.append('state', '9');
+ params.append('deviceId', row.deviceId);
+ params.append('glassId', row.glassId);
+ params.append('slot', row.slot);
+ var url = `/hollowGlass/hollowBigStorageCageDetails/damageHollowBigStorageCageDetails?${params.toString()}`;
+ const response = await request.post(url)
+ if (response.code === 200) {
+ fetchxiang(1);
+ ElMessage.success(response.message);
} else {
ElMessage.error(response.message);
}
@@ -216,14 +213,13 @@
deviceId: deviceId,
slot: slot
};
- const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails", dataToSend)
+ const response = await request.post("/cacheVerticalGlass/hollowBigStorageCageDetails/insertHollowBigStorageCageDetails", dataToSend)
if (response.code === 200) {
tableDataa.value = response.data;
add.value = false;
ElMessage.success(response.message);
glassId.value = '';
tableDataf.value = '';
-
} else {
ElMessage.error(response.message);
}
@@ -301,24 +297,27 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/hollowGlassMessage`;
const handleMessage = (data) => {
- console.log(data);
-
if (data.inkageEntity != null) {
- inkageEntity.value = data.inkageEntity == 1 ? '#911005' : 'green';
+ inkageEntity.value = data.inkageEntity[0] == true ? 'green' : '#911005';
}
if (data.requestEntity != null) {
- requestEntity.value = data.requestEntity == 1 ? '#911005' : 'green';
+ requestEntity.value = data.requestEntity == 1 ? 'green' : '#911005';
}
if (data.mesReplyEntity != null) {
- mesReplyEntity.value = data.mesReplyEntity == 1 ? '#911005' : 'green';
+ mesReplyEntity.value = data.mesReplyEntity == 1 ? 'green' : '#911005';
}
if (data.outInkageEntity != null) {
- outInkageEntity.value = data.outInkageEntity == 1 ? '#911005' : 'green';
+ outInkageEntity.value = data.outInkageEntity[0] == true ? 'green' : '#911005';
+ }
+ if (data.freeTwoReqvestEntity != null) {
+ freetwo.value = data.freeTwoReqvestEntity[0] == true ? 'green' : '#911005';
}
if (data.outRequestEntity != null) {
- outRequestEntity.value = data.outRequestEntity == 1 ? '#911005' : 'green';
+ outRequestEntity.value = data.outRequestEntity == 1 ? 'green' : '#911005';
}
-
+ if (data.free0neReguestEntity != null) {
+ freeone.value = data.free0neReguestEntity == 1 ? 'green' : '#911005';
+ }
if(data.bigStorageCageDetailsOutTask!=null){
tableDatac.value = data.bigStorageCageDetailsOutTask[0]
console.log(data.bigStorageCageDetailsOutTask[0])
@@ -435,6 +434,10 @@
<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 style="margin-left: 70px;">{{ $t('hellow.freeone') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: freeone, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ <div style="margin-left: 70px;">{{ $t('hellow.freetwo') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: freetwo, 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">
@@ -481,7 +484,7 @@
</div>
<!-- // 鐖剁骇妗� -->
<div class="img-dlpl" >
- <div class="img-car1" :style="'z-index:999;left:270px;top:' + 350*carPosition[0] + 'px;position:absolute;'">
+ <div class="img-car1" :style="'z-index:999;left:475px;top:' + 1700*carPosition[0] + 'px;position:absolute;'">
<div
v-for="(rect, index) in adjusta"
:key="rect.id"
@@ -495,7 +498,7 @@
>
</div>
</div>
- <div class="img-car4" :style="'z-index:999;left:740px;top:' + 350*carPosition[1] + 'px;position:absolute;'">
+ <div class="img-car4" :style="'z-index:999;left:890px;top:' + 600*carPosition[1] + 'px;position:absolute;'">
<div
v-for="(rect, index) in adjust"
:key="rect.id"
@@ -876,11 +879,6 @@
<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"
- :disabled="!((props.row.hollowBigStorageCageDetails[0].state !== 102 && scope.$index == 0 ) || (props.row.hollowBigStorageCageDetails[(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>
@@ -1021,19 +1019,19 @@
.img-dlpl{
margin-left: 20px;
margin-top: 0px;
- background-image:url('../../assets/dlpl9.png');
+ background-image:url('../../assets/zhongkong.png');
background-repeat: no-repeat;
background-attachment: local;
- min-height: 400px;
+ min-height: 700px;
width: 1200px;
max-width: 100%;
- background-size: 1200px 400px;
+ background-size: 1200px 700px;
overflow: hidden;
position:relative
}
.img-car1{
display: flex;
- background-image:url('../../assets/lp9.png');
+ background-image:url('../../assets/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
@@ -1046,7 +1044,7 @@
}
.img-car4{
display: flex;
- background-image:url('../../assets/lpa9.png');
+ background-image:url('../../assets/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
--
Gitblit v1.8.0