From a6627e41a42e323a3d1e9e019de1b90587b63804 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 21 三月 2025 16:01:00 +0800
Subject: [PATCH] 上片表格显示，中空理片笼、钢化理片笼表格显示，Switch显示，中空一线。二线新增任务的配方信息及队列信息
---
UI-Project/src/views/hollow/hellowquiptwohistory.vue | 198 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 197 insertions(+), 1 deletions(-)
diff --git a/UI-Project/src/views/hollow/hellowquiptwohistory.vue b/UI-Project/src/views/hollow/hellowquiptwohistory.vue
index b112750..7a86fff 100644
--- a/UI-Project/src/views/hollow/hellowquiptwohistory.vue
+++ b/UI-Project/src/views/hollow/hellowquiptwohistory.vue
@@ -49,6 +49,12 @@
</el-table-column>
<el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.starttime')" min-width="100" />
<el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center">
+ <template #default="scope">
+ <el-button size="mini" type="text" plain @click="handleptask(scope.row)">{{ $t('hellow.listFormula') }}</el-button>
+ <el-button size="mini" type="text" plain @click="handlecagedetails(scope.row)">{{ $t('hellow.HollowGlass') }}</el-button>
+ </template>
+ </el-table-column>
</el-table>
<div style="margin-top: 20px;margin-left: 40%;">
<el-pagination
@@ -62,6 +68,88 @@
style="margin-top: 10px;"
/>
</div>
+
+ <el-dialog v-model="dialogFormVisiblef" top="5vh" width="65%" :title="$t('hellow.HollowGlass')">
+ <el-table ref="table" style="margin-top: 20px;height: 450px;"
+ :data="tableDatacagedetails" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="flowCardId" :label="$t('hellow.flowCardId')" align="center" width="140"/>
+ <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" width="140"/>
+ <el-table-column prop="hollowSequence" :label="$t('hellow.order')" align="center"/>
+ <el-table-column prop="thickness" :label="$t('hellow.thickness')" align="center"/>
+ <el-table-column prop="layer" :label="$t('hellow.layer')" align="center"/>
+ <el-table-column prop="filmsId" :label="$t('hellow.coatingtypes')" align="center"/>
+ <el-table-column prop="height" :label="$t('hellow.height')" align="center"/>
+ <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 ? $t('hellow.waitingout') : $t('hellow.finishout') }}
+ </template>
+ </el-table-column>
+ </el-table>
+</el-dialog>
+<el-dialog v-model="dialogFormVisiblea" top="23vh" width="55%" :title="$t('hellow.listFormula')" >
+ <div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
+ <el-form size="mini" label-width="150px">
+ <el-form label-width="150px" label-position="right">
+ <el-row style="margin-top: 10px;">
+ <el-col :span="8">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.formulaName')" style="width: 16vw;">
+ <el-input disabled v-model="formulaName" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="10">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('Mounting.removalmethoda')" style="width: 16vw;">
+ <el-select v-model="filmRemove" clearable style="width: 220px" disabled>
+ <el-option :label="$t('Mounting.removal')" value="1"></el-option>
+ <el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="8">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.bottomRemove')" style="width: 16vw;">
+ <el-input disabled v-model="bottomRemove" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="10">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.topRemove')" style="width: 16vw;">
+ <el-input disabled v-model="topRemove" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="8">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.leftRemove')" style="width: 16vw;">
+ <el-input disabled v-model="leftRemove" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="10">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.rightRemove')" style="width: 16vw;">
+ <el-input disabled v-model="rightRemove" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-form>
+ </div>
+ </el-dialog>
</div>
</template>
<script lang="ts" setup>
@@ -86,7 +174,37 @@
const rawGlassThickness = ref('');
const flowCardId = ref('');
const rawGlassfilmsId = ref('');
-const slot = ref('');
+const formattedCreate = ref('')
+const formulaName = ref('')
+const filmRemove = ref('')
+const topRemove = ref('')
+const bottomRemove = ref('')
+const leftRemove = ref('')
+const rightRemove = ref('')
+const frameOne = ref('')
+const frameTwo = ref('')
+const frameThree = ref('')
+const frameFour = ref('')
+const sealInsert = ref('')
+const casOne = ref('')
+const casTwo = ref('')
+const casThree = ref('')
+const casFour = ref('')
+const intervalFrameTypeOne = ref('')
+const intervalFrameWidthOne = ref('')
+const intervalFrameHeightOne = ref('')
+const intervalFrameTypeTwo = ref('')
+const intervalFrameWidthTwo = ref('')
+const intervalFrameHeightTwo = ref('')
+const intervalFrameTypeThree = ref('')
+const intervalFrameWidthThree = ref('')
+const intervalFrameHeightThre = ref('')
+const intervalFrameTypeFour = ref('')
+const intervalFrameWidthFour = ref('')
+const intervalFrameHeightFour = ref('')
+const tableDatacagedetails = ref([])
+const dialogFormVisiblea = ref(false)
+const dialogFormVisiblef = ref(false)
let getglobalDate = window.localStorage.getItem('getglobalDate')
const historical = async () => {
try {
@@ -168,6 +286,84 @@
console.error(error);
}
}
+// 閰嶆柟淇℃伅
+const handleptask = (row) => {
+ fetchcagedl(row);
+ dialogFormVisiblea.value = true;
+};
+const removalMethodMap = {
+ 1: t('Mounting.removal'),
+ 0: t('Mounting.noremoval')
+};
+const fetchcagedl = async (row) => {
+ try {
+ var url="/hollowGlass/hollowFormulaDetails/getFormulaDetailsById?id="+ row.formulaId;
+ const response = await request.get(url)
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ formulaName.value = response.data.formulaName
+ filmRemove.value = removalMethodMap[response.data.filmRemove];
+ topRemove.value = response.data.topRemove
+ bottomRemove.value = response.data.bottomRemove
+ leftRemove.value = response.data.leftRemove
+ rightRemove.value = response.data.rightRemove
+ frameOne.value = response.data.frameOne
+ frameTwo.value = response.data.frameTwo
+ frameThree.value = response.data.frameThree
+ frameFour.value = response.data.frameFour
+ sealInsert.value = response.data.sealInsert
+ casOne.value = response.data.casOne
+ casTwo.value = response.data.casTwo
+ casThree.value = response.data.casThree
+ casFour.value = response.data.casFour
+ intervalFrameTypeOne.value = response.data.intervalFrameTypeOne
+ intervalFrameWidthOne.value = response.data.intervalFrameWidthOne
+ intervalFrameHeightOne.value = response.data.intervalFrameHeightOne
+ intervalFrameTypeTwo.value = response.data.intervalFrameTypeTwo
+ intervalFrameWidthTwo.value = response.data.intervalFrameWidthTwo
+ intervalFrameHeightTwo.value = response.data.intervalFrameHeightTwo
+ intervalFrameTypeThree.value = response.data.intervalFrameTypeThree
+ intervalFrameWidthThree.value = response.data.intervalFrameWidthThree
+ intervalFrameHeightThre.value = response.data.intervalFrameHeightThre
+ intervalFrameTypeFour.value = response.data.intervalFrameTypeFour
+ intervalFrameWidthFour.value = response.data.intervalFrameWidthFour
+ intervalFrameHeightFour.value = response.data.intervalFrameHeightFour
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
+// 闃熷垪淇℃伅
+const handlecagedetails = (row) => {
+ const { id } = row;
+ fetchcagedetails(id);
+ dialogFormVisiblef.value = true;
+};
+const fetchcagedetails = async (id) => {
+ try {
+ var url="/hollowGlass/hollowGlassQueueInfo/queryHollowGlassQueueInfoByTask?taskId="+ id;
+ const response = await request.post(url)
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ const formattedData = response.data.map(record => ({
+ ...record,
+ formaCreateTime: formatTimestamp(record.createTime),
+ formaUpdateTime: formatTimestamp(record.updateTime),
+ }));
+ tableDatacagedetails.value = formattedData;
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
// 鍘嗗彶鏌ヨ鐐瑰嚮
const sethistorical = async () => {
try {
--
Gitblit v1.8.0