From 2659d91f6f796731441ba6f372a52692142705b1 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 05 十二月 2024 09:20:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/config.js | 2
UI-Project/src/views/Slicecage/slicecage.vue | 43 +++++++++-----
UI-Project/src/lang/zh.js | 3 +
UI-Project/src/views/hollow/hollowequipment.vue | 93 +++++++++++++++++++++---------
4 files changed, 96 insertions(+), 45 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index e752fc6..19eeb5a 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,7 +1,7 @@
export default {
// serverUrl: "10.153.19.150:88/api",
// serverUrl: "192.168.1.199:88/api",
- serverUrl: "127.0.0.1:88/api",
+ serverUrl: "127.0.0.1:88",
// serverUrl2: "10.153.19.150:88"
// serverUrl2: "192.168.1.199:88"
serverUrl2: "127.0.0.1:88"
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 113d83b..87e0e5a 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -234,6 +234,8 @@
cancel:'鍙栨秷',
temperingtotal:'閽㈠寲鐐夋暟锛�',
glasstotal:'鐜荤拑鎬绘暟锛�',
+ Labelprinting:'鏍囩鎵撳嵃',
+ Schedulingswitch:'璋冨害寮�鍏�',
},
workOrder:{
glassID:'鐜荤拑ID',
@@ -668,5 +670,6 @@
forcedfilming: '寮哄埗鍑虹墖',
pforcedfilming: '鏄惁寮哄埗鍑虹墖锛�',
brokenpieces: '鐮存崯鐗囨暟',
+ realpieces: '瀹為檯鐗囨暟',
}
}
\ No newline at end of file
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 06b7e10..8fffb96 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -951,18 +951,20 @@
<template>
<div style="height: 600px;">
- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="primary" @click="dialogFormVisiblea = true">{{ $t('searchOrder.cageinformation') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="success" @click="dialogFormVisibleb = true">{{ $t('searchOrder.productionqueue') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="warning" @click="handleganghua">{{ $t('searchOrder.temperingqueries') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="info" @click="handlezhiban">{{ $t('searchOrder.dutyinformation') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="info" @click="dialogFormVisibles=true;fetchFlows()">{{ $t('searchOrder.searchlayout') }}</el-button>
- <el-switch style="margin-top: 5px;margin-left: 10px;" v-model="ganghua" class="mb-2" :inactive-text="$t('searchOrder.temperedswitch')" @change="handleChange" />
- <el-button style="margin-top: 10px;margin-left: 10px;margin-bottom: 10px;" id="searchButton" type="primary"
- @click="dialogFormVisibleaDownGlasss = true">鏍囩鎵撳嵃
+ <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="primary" @click="dialogFormVisiblea = true">{{ $t('searchOrder.cageinformation') }}</el-button>
+ <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="success" @click="dialogFormVisibleb = true">{{ $t('searchOrder.productionqueue') }}</el-button>
+ <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="warning" @click="handleganghua">{{ $t('searchOrder.temperingqueries') }}</el-button>
+ <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="info" @click="handlezhiban">{{ $t('searchOrder.dutyinformation') }}</el-button>
+ <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="info" @click="dialogFormVisibles=true;fetchFlows()">{{ $t('searchOrder.searchlayout') }}</el-button>
+ <el-switch style="margin-top: 7px;margin-left: 10px;" v-model="ganghua" class="mb-2" :inactive-text="$t('searchOrder.temperedswitch')" @change="handleChange" />
+ <el-switch style="margin-top: 7px;margin-left: 10px;" v-model="ganghua" class="mb-2" :inactive-text="$t('searchOrder.Schedulingswitch')" @change="handleChange" />
+ <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="primary"
+ @click="dialogFormVisibleaDownGlasss = true">{{ $t('searchOrder.Labelprinting') }}
</el-button>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 5px;" v-loading="loading">
- <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 100px;">
- <el-table height="100px" ref="table"
+ <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: 200px;">
+ <el-table height="200px" ref="table"
:data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="bigStorageCageOutTask.glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="140" />
<el-table-column prop="bigStorageCageOutTask.startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
@@ -995,9 +997,9 @@
</el-table>
</div>
</el-card>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 3px;" v-loading="loading">
- <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 100px;">
- <el-table height="100px" ref="table"
+ <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: 200px;">
+ <el-table height="200px" ref="table"
@selection-change="handleSelectionChange"
:data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="bigStorageCageFeedTask.glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="140" />
@@ -1030,6 +1032,7 @@
</el-table>
</div>
</el-card>
+ </div>
<div style="padding: 10px;display: flex;height:130px;">
<div v-for="(item, index) in tableDatae" :key="index" id="occupy">
<el-col style="text-align:left;font-weight: bold;">#{{ item.device_id }}</el-col>
@@ -1808,7 +1811,7 @@
.img-dlpl{
margin-left: 20px;
- margin-top: 20px;
+ margin-top: 0px;
background-image:url('../../assets/dlpl9.png');
background-repeat: no-repeat;
background-attachment: local;
@@ -1845,4 +1848,14 @@
overflow: hidden;
position:relative
}
+.table-container {
+ display: flex;
+ flex-wrap: nowrap; /* 闃叉鎹㈣ */
+ justify-content: space-between; /* 鏍规嵁闇�瑕佽皟鏁村瓙鍏冪礌涔嬮棿鐨勯棿璺� */
+}
+
+.table-container > el-card {
+ flex: 1; /* 浣夸袱涓崱鐗囧钩鍒嗗彲鐢ㄧ┖闂� */
+ margin-bottom: 10px; /* 鍙�夛紝鏍规嵁闇�瑕佹坊鍔犲簳閮ㄩ棿璺� */
+}
</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 7437db2..429e3f5 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -2,7 +2,7 @@
<div style="height: 600px;">
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
<div style="display: flex; flex-direction: row; align-items: center; margin-bottom: 10px;">
- <el-button id="searchButton" type="success" @click="dialogFormVisiblea = true">
+ <el-button id="searchButton" type="success" @click="handlezhiban">
{{ $t('hellow.createtask') }}
</el-button>
<el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handleBinda">
@@ -59,17 +59,19 @@
<el-dialog v-model="dialogFormVisiblea" top="5vh" width="85%">
<el-table ref="table" style="margin-top: 20px;height: 500px;"
:data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="deviceId" fixed align="center" :label="$t('hellow.cardnumber')" min-width="80"/>
- <el-table-column prop="slot" fixed align="center" :label="$t('hellow.layernumber')" min-width="80"/>
- <el-table-column prop="patternWidth" align="center" :label="$t('hellow.thickness')" min-width="80"/>
- <el-table-column prop="patternHeight" align="center" :label="$t('hellow.coatingtypes')" min-width="80"/>
- <el-table-column prop="patternHeight" align="center" :label="$t('hellow.totalnumber')" min-width="80"/>
+ <el-table-column prop="flowCardId" fixed align="center" :label="$t('hellow.cardnumber')" min-width="80"/>
+ <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="patternHeight" align="center" :label="$t('hellow.pairsnumber')" min-width="80"/>
- <el-table-column prop="patternHeight" align="center" :label="$t('hellow.missingnumber')" min-width="80"/>
+ <!-- <el-table-column prop="damageCount" align="center" :label="$t('hellow.brokenpieces')" min-width="80"/> -->
+ <!-- <el-table-column prop="lackCount" align="center" :label="$t('hellow.missingnumber')" min-width="80"/> -->
<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
<template #default="scope">
<el-button size="mini" type="text" plain @click="finisha(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
- <el-button size="mini" type="text" plain @click="dialogFormVisibleb = true">{{
+ <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">{{
$t('hellow.missingfilms')
}}
</el-button>
@@ -84,18 +86,18 @@
<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">
- {{ temperingtotal }}
+ {{ currentRow.flowCardId }}
</el-form-item>
</div>
<el-table ref="table" style="margin-top: 20px;height: 400px;"
- :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="patternWidth" align="center" :label="$t('hellow.thickness')" min-width="80"/>
- <el-table-column prop="patternHeight" align="center" :label="$t('hellow.coatingtypes')" min-width="80"/>
- <el-table-column prop="patternHeight" align="center" :label="$t('hellow.height')" min-width="80"/>
- <el-table-column prop="patternHeight" align="center" :label="$t('hellow.width')" min-width="80"/>
- <el-table-column prop="patternHeight" align="center" :label="$t('hellow.totalnumber')" min-width="80"/>
- <el-table-column prop="patternHeight" align="center" :label="$t('hellow.missingnumber')" min-width="80"/>
- <el-table-column prop="patternHeight" align="center" :label="$t('hellow.brokenpieces')" min-width="80"/>
+ :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <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="totalCount" align="center" :label="$t('hellow.totalnumber')" 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('hellow.brokenpieces')" min-width="80"/>
<div style="float: right;margin-bottom: 5px;">
<el-pagination layout="prev, pager, next" :total="50"/>
</div>
@@ -124,29 +126,21 @@
</template>
<script setup>
import {ElMessage, ElMessageBox} from 'element-plus'
-import {onBeforeUnmount, onMounted, onUnmounted, ref} from "vue";
+import {onBeforeUnmount, onMounted, onUnmounted, ref, reactive} from "vue";
import request from "@/utils/request"
import {closeWebSocket} from '@/utils/WebSocketService';
import {useI18n} from 'vue-i18n'
-
const {t} = useI18n()
const blinda = ref(false)
const blindb = ref(false)
const tableDataa = ref([])
+const tableDatab = ref([])
const tableDatac = ref([])
+const flowCard = ref('')
const dialogFormVisiblea = ref(false)
const dialogFormVisibleb = ref(false)
+const currentRow = reactive({}); // 褰撳墠琛岀殑鏁版嵁
-const tableDatab = [
- {
- layoutSequence: 'Tom',
- },
- {
- layoutSequence: '2016-05-02',
- name: 'Tom',
- address: 'No. 189, Grove St, Los Angeles',
- },
-]
let socket = null;
// const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/screen`;
// const handleMessage = (data) => {
@@ -175,6 +169,47 @@
const handleBindb = (row) => {
blindb.value = true;
};
+const handlezhiban = () => {
+ dialogFormVisiblea.value = true;
+ fetchFlowCardId();
+};
+const handleBindRack = (row) => {
+ const { flowCardId, layer } = row;
+ currentRow.flowCardId = row.flowCardId; // 鐩存帴璁剧疆鍝嶅簲寮忓睘鎬�
+ dialogFormVisibleb.value = true;
+ fetchFlowBind(flowCardId, layer);
+};
+// 鍒涘缓浠诲姟
+const fetchFlowCardId = async () => {
+ try {
+ const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard')
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ console.log(response.data.NG24111426A001);
+
+ tableDatab.value = response.data.NG24111426A001;
+} else {
+ ElMessage.error(response.message);
+ }
+ } catch (error) {
+ console.error(error);
+ }
+}
+// 缂虹墖璇︽儏
+const fetchFlowBind = async (flowCardId, layer) => {
+ try {
+ var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + layer;
+ const response = await request.post(url)
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ tableDatac.value = response.data;
+ } else {
+ ElMessage.error(response.message);
+ }
+ } catch (error) {
+ console.error(error);
+ }
+}
// 寮�濮嬩换鍔�
const handlea = async () => {
try {
--
Gitblit v1.8.0