From a8c1dd008f9a096cb01774f17a8bceda5aafed88 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 26 二月 2025 15:04:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/hollow/hollowequipment.vue | 1501 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 1,450 insertions(+), 51 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 24392bd..4a192a7 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -2,45 +2,64 @@
<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="handlezhiban">
+ <el-button id="searchButton" type="primary" @click="handleormulan">
+ {{ $t('hellow.hollowformula') }}
+ </el-button>
+ <el-button id="searchButton" type="primary" @click="handlezhiban">
{{ $t('hellow.createtask') }}
</el-button>
- <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handleBinda">
+ <el-button type="primary" @click="selectproject">
+ {{ $t('hellow.reviewproject') }}
+ </el-button>
+ <el-button style="margin-left: 10px;" id="searchButton" type="success" @click="handleBinda">
{{ $t('hellow.starttask') }}
</el-button>
- <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handleBindb">{{
+ <el-button style="margin-left: 10px;" id="searchButton" type="info" @click="handleBindd">{{
+ $t('hellow.taskdet')
+ }}
+ </el-button>
+ <el-button style="margin-left: 10px;" id="searchButton" type="warning" @click="handleBindc">{{
+ $t('hellow.stopproject')
+ }}
+ </el-button>
+ <el-button style="margin-left: 10px;" id="searchButton" type="danger" @click="handleBindb">{{
$t('hellow.stoptask')
}}
</el-button>
<el-switch style="margin-top: 7px;margin-left: 10px;" v-model="ganghua" class="mb-2" :inactive-text="$t('hellow.schedulingswitch')" @change="handleChange" />
</div>
- <div style="margin-bottom: -5px;margin-left: 5px;">
- <el-form>
- <el-row>
- <el-col :span="4">
- <div id="dt" style="font-size: 15px;">
+ <div id="dotClass">
+ <!-- <div style="margin-bottom: -5px;margin-left: 5px;"> -->
+ <!-- <el-form> -->
+ <!-- <el-row> -->
+ <!-- <el-col :span="4">
+ <div style="font-size: 15px;">
<el-form-item :label="$t('hellow.currenttask')" style="width: 14vw">
{{ temperingtotal }}
</el-form-item>
</div>
- </el-col>
- <el-col :span="5">
- <div id="dta" style="font-size: 15px;">
+ </el-col> -->
+ <!-- <el-col :span="5">
+ <div style="font-size: 15px;">
<el-form-item :label="$t('hellow.claimednumber')" style="width: 14vw">
{{ glasstotal }}
</el-form-item>
</div>
- </el-col>
- <el-col :span="4">
- <div id="dt" style="font-size: 15px;">
+ </el-col> -->
+ <!-- <el-col :span="4">
+ <div style="font-size: 15px;">
<el-form-item :label="$t('hellow.linenumber')" style="width: 14vw">
{{ fulltotals }}
</el-form-item>
</div>
- </el-col>
- </el-row>
- </el-form>
- </div>
+ </el-col> -->
+ <div style="margin-left: 70px;">{{ $t('hellow.freeone') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: freeone, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+
+ <!-- </el-row> -->
+ <!-- </el-form> -->
+ <!-- </div> -->
+ </div>
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="650" ref="table" :data="tableDataa"
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }">
@@ -57,7 +76,7 @@
</template>
</el-table-column>
</el-table>
- <div style="display: flex;margin-left: 40%;margin-top: 10px;">
+ <!-- <div style="display: flex;margin-left: 40%;margin-top: 10px;">
<div style="margin-top: 5px;margin-right: 5px;">{{ $t('hellow.line') }}</div>
<el-pagination
background
@@ -67,12 +86,18 @@
:current-page.sync="currentPage"
@current-change="handlePageChange1"
/>
- </div>
+ </div> -->
</div>
</el-card>
</div>
<!-- 鍒涘缓浠诲姟 -->
<el-dialog v-model="dialogFormVisiblea" top="5vh" width="85%">
+ <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-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="fetchFlowCardsearch">
+ {{$t('reportmanage.inquire')}}</el-button>
+ </div>
<el-table
ref="table"
style="margin-top: 20px; height: 700px;"
@@ -80,7 +105,6 @@
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
row-key="projectNumber"
>
- <!-- <el-table-column type="expand"> -->
<el-table-column>
<template #default="props">
<el-table :data="props.row.records" style="width: 100%">
@@ -110,6 +134,560 @@
</el-table-column>
</el-table>
</el-dialog>
+<!-- 涓┖閰嶆柟娣诲姞 -->
+<el-dialog v-model="add" top="3vh" width="55%" :title="$t('hellow.hollowformula')" >
+ <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="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.formulaNamea')" v-model="formulaName" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 16vw;">
+ <el-select v-model="filmRemove" clearable style="width: 220px" :placeholder="$t('Mounting.removalmethod')">
+ <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="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.bottomRemovea')" v-model="bottomRemove" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.topRemovea')" v-model="topRemove" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.leftRemovea')" v-model="leftRemove" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.rightRemovea')" v-model="rightRemove" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.casOneb')" :required="true" style="width: 16vw;">
+ <el-select v-model="casOne" clearable :placeholder="$t('hellow.casOnea')" style="width: 220px">
+ <el-option :label="$t('hellow.F')" value="0"></el-option>
+ <el-option :label="$t('hellow.Y')" value="1"></el-option>
+ </el-select>
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.casTwob')" style="width: 16vw;">
+ <el-select v-model="casTwo" clearable :placeholder="$t('hellow.casTwoa')" style="width: 220px">
+ <el-option :label="$t('hellow.F')" value="0"></el-option>
+ <el-option :label="$t('hellow.Y')" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.casThreeb')" style="width: 16vw;">
+ <el-select v-model="casThree" clearable :placeholder="$t('hellow.casThreea')" style="width: 220px">
+ <el-option :label="$t('hellow.F')" value="0"></el-option>
+ <el-option :label="$t('hellow.Y')" value="1"></el-option>
+ </el-select>
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.casFourb')" style="width: 16vw;">
+ <el-select v-model="casFour" clearable :placeholder="$t('hellow.casFoura')" style="width: 220px">
+ <el-option :label="$t('hellow.F')" value="0"></el-option>
+ <el-option :label="$t('hellow.Y')" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.frameOneb')" :required="true" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.frameOnea')" v-model="frameOne" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.frameTwob')" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.frameTwoa')" v-model="frameTwo" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.frameThreeb')" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.frameThreea')" v-model="frameThree" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.frameFourb')" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.frameFoura')" v-model="frameFour" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameHeightbOne')" :required="true" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.intervalFrameHeightaOne')" v-model="intervalFrameHeightOne" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameHeightbTwo')" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.intervalFrameHeightaTwo')" v-model="intervalFrameHeightTwo" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameHeightbThree')" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.intervalFrameHeightaThree')" v-model="intervalFrameHeightThree" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameHeightbFour')" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.intervalFrameHeightaFour')" v-model="intervalFrameHeightFour" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameWidthbOne')" :required="true" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.intervalFrameWidthaOne')" v-model="intervalFrameWidthOne" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameWidthbTwo')" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.intervalFrameWidthaTwo')" v-model="intervalFrameWidthTwo" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameWidthbThree')" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.intervalFrameWidthaThree')" v-model="intervalFrameWidthThree" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameWidthbFour')" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.intervalFrameWidthaFour')" v-model="intervalFrameWidthFour" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameTypedOne')" :required="true" style="width: 16vw;">
+ <el-select v-model="intervalFrameTypeOne" clearable style="width: 220px" :placeholder="$t('hellow.intervalFrameTypecOne')">
+ <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
+ <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
+ </el-select>
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameTypedTwo')" style="width: 16vw;">
+ <el-select v-model="intervalFrameTypeTwo" clearable style="width: 220px" :placeholder="$t('hellow.intervalFrameTypecTwo')">
+ <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
+ <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameTypedThree')" style="width: 16vw;">
+ <el-select v-model="intervalFrameTypeThree" clearable style="width: 220px" :placeholder="$t('hellow.intervalFrameTypecThree')">
+ <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
+ <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
+ </el-select>
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameTypedFour')" style="width: 16vw;">
+ <el-select v-model="intervalFrameTypeFour" clearable style="width: 220px" :placeholder="$t('hellow.intervalFrameTypecFour')">
+ <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
+ <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.sealInsertb')" :required="true" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.sealInserta')" v-model="sealInsert" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ </el-row>
+ <!-- </el-form> -->
+ </el-form>
+ </div>
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button type="primary" @click="handleConfirm">
+ {{ $t('basicData.confirm') }}
+ </el-button>
+ <el-button @click="add = false">{{ $t('basicData.cancel') }}</el-button>
+ </div>
+ </template>
+ </el-dialog>
+<!-- 涓┖閰嶆柟淇敼 -->
+<el-dialog v-model="adda" top="3vh" width="55%" :title="$t('hellow.edithollowformula')" >
+ <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="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.formulaNamea')" v-model="formulaName" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 16vw;">
+ <el-select v-model="filmRemove" clearable style="width: 220px" :placeholder="$t('Mounting.removalmethod')">
+ <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="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.bottomRemovea')" v-model="bottomRemove" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.topRemovea')" v-model="topRemove" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.leftRemovea')" v-model="leftRemove" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.rightRemovea')" v-model="rightRemove" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.casOneb')" :required="true" style="width: 16vw;">
+ <el-select v-model="casOne" clearable :placeholder="$t('hellow.casOnea')" style="width: 220px">
+ <el-option :label="$t('hellow.F')" value="0"></el-option>
+ <el-option :label="$t('hellow.Y')" value="1"></el-option>
+ </el-select>
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.casTwob')" style="width: 16vw;">
+ <el-select v-model="casTwo" clearable :placeholder="$t('hellow.casTwoa')" style="width: 220px">
+ <el-option :label="$t('hellow.F')" value="0"></el-option>
+ <el-option :label="$t('hellow.Y')" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.casThreeb')" style="width: 16vw;">
+ <el-select v-model="casThree" clearable :placeholder="$t('hellow.casThreea')" style="width: 220px">
+ <el-option :label="$t('hellow.F')" value="0"></el-option>
+ <el-option :label="$t('hellow.Y')" value="1"></el-option>
+ </el-select>
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.casFourb')" style="width: 16vw;">
+ <el-select v-model="casFour" clearable :placeholder="$t('hellow.casFoura')" style="width: 220px">
+ <el-option :label="$t('hellow.F')" value="0"></el-option>
+ <el-option :label="$t('hellow.Y')" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.frameOneb')" :required="true" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.frameOnea')" v-model="frameOne" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.frameTwob')" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.frameTwoa')" v-model="frameTwo" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.frameThreeb')" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.frameThreea')" v-model="frameThree" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.frameFourb')" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.frameFoura')" v-model="frameFour" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameHeightbOne')" :required="true" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.intervalFrameHeightaOne')" v-model="intervalFrameHeightOne" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameHeightbTwo')" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.intervalFrameHeightaTwo')" v-model="intervalFrameHeightTwo" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameHeightbThree')" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.intervalFrameHeightaThree')" v-model="intervalFrameHeightThree" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameHeightbFour')" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.intervalFrameHeightaFour')" v-model="intervalFrameHeightFour" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameWidthbOne')" :required="true" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.intervalFrameWidthaOne')" v-model="intervalFrameWidthOne" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameWidthbTwo')" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.intervalFrameWidthaTwo')" v-model="intervalFrameWidthTwo" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameWidthbThree')" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.intervalFrameWidthaThree')" v-model="intervalFrameWidthThree" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameWidthbFour')" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.intervalFrameWidthaFour')" v-model="intervalFrameWidthFour" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameTypedOne')" :required="true" style="width: 16vw;">
+ <el-select v-model="intervalFrameTypeOne" clearable style="width: 220px" :placeholder="$t('hellow.intervalFrameTypecOne')">
+ <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
+ <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
+ </el-select>
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameTypedTwo')" style="width: 16vw;">
+ <el-select v-model="intervalFrameTypeTwo" clearable style="width: 220px" :placeholder="$t('hellow.intervalFrameTypecTwo')">
+ <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
+ <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameTypedThree')" style="width: 16vw;">
+ <el-select v-model="intervalFrameTypeThree" clearable style="width: 220px" :placeholder="$t('hellow.intervalFrameTypecThree')">
+ <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
+ <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
+ </el-select>
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameTypedFour')" style="width: 16vw;">
+ <el-select v-model="intervalFrameTypeFour" clearable style="width: 220px" :placeholder="$t('hellow.intervalFrameTypecFour')">
+ <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
+ <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.sealInsertb')" :required="true" style="width: 16vw;">
+ <el-input :placeholder="$t('hellow.sealInserta')" v-model="sealInsert" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-form>
+ </div>
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button type="primary" @click="handledit">
+ {{ $t('basicData.confirm') }}
+ </el-button>
+ <el-button @click="adda = false">{{ $t('basicData.cancel') }}</el-button>
+ </div>
+ </template>
+ </el-dialog>
<!-- 棰嗗彇浠诲姟 -->
<el-dialog v-model="dialogFormVisiblec" top="21vh" width="40%" :title="$t('hellow.claimquest')">
<div style="margin-left: 20px;margin-top: 10px;margin-bottom: 10px;">
@@ -120,7 +698,8 @@
</el-form-item>
<el-form-item :label="$t('hellow.route')" :required="true" style="width: 25vw;">
<el-select
- :placeholder="$t('hellow.croute')"
+ :placeholder="$t('hellow.line1')"
+ disabled
style="width: 270px"
v-model="cell">
<el-option
@@ -131,6 +710,23 @@
/>
</el-select>
</el-form-item>
+ <el-form-item :label="$t('hellow.hollowformulp')" :required="true" style="width: 25vw;">
+ <el-select
+ v-model="selectedFormulaName"
+ filterable
+ clearable
+ :placeholder="$t('hellow.phollowformula')"
+ style="width: 270px"
+ @change="handleFormulaChange"
+ >
+ <el-option
+ v-for="item in titleformulaName"
+ :key="item.id"
+ :label="item.formulaName"
+ :value="item.formulaName"
+ />
+ </el-select>
+ </el-form-item>
</el-form>
</el-form>
</div>
@@ -153,7 +749,8 @@
</el-form-item>
<el-form-item :label="$t('hellow.route')" :required="true" style="width: 25vw;">
<el-select
- :placeholder="$t('hellow.croute')"
+ :placeholder="$t('hellow.line1')"
+ disabled
style="width: 270px"
v-model="cella">
<el-option
@@ -164,6 +761,23 @@
/>
</el-select>
</el-form-item>
+ <el-form-item :label="$t('hellow.hollowformulp')" :required="true" style="width: 25vw;">
+ <el-select
+ v-model="selectedFormulaName"
+ filterable
+ clearable
+ :placeholder="$t('hellow.phollowformula')"
+ style="width: 270px"
+ @change="handleFormulaChange"
+ >
+ <el-option
+ v-for="item in titleformulaName"
+ :key="item.id"
+ :label="item.formulaName"
+ :value="item.formulaName"
+ />
+ </el-select>
+ </el-form-item>
</el-form>
</el-form>
</div>
@@ -222,16 +836,170 @@
<el-dialog v-model="blindb" top="30vh" width="25%" :title="$t('hellow.pstoptask')">
<template #footer>
<div id="dialog-footer">
- <el-button type="primary" @click="handlea">
+ <el-button type="primary" @click="handleb">
{{ $t('basicData.confirm') }}
</el-button>
<el-button @click="blindb = false">{{ $t('basicData.cancel') }}</el-button>
</div>
</template>
</el-dialog>
+ <!-- 鏆傚仠浠诲姟 -->
+ <el-dialog v-model="blindc" top="30vh" width="25%" :title="$t('hellow.pstopproject')">
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button type="primary" @click="handlec">
+ {{ $t('basicData.confirm') }}
+ </el-button>
+ <el-button @click="blindc = false">{{ $t('basicData.cancel') }}</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ <!-- 鍒犻櫎浠诲姟 -->
+ <el-dialog v-model="blindd" top="30vh" width="25%" :title="$t('hellow.hollowtaskdet')">
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button type="primary" @click="handled">
+ {{ $t('basicData.confirm') }}
+ </el-button>
+ <el-button @click="blindd = false">{{ $t('basicData.cancel') }}</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ <!-- 棰勮 -->
+ <el-dialog v-model="dialogFormVisiblee" top="24vh" width="25%" :title="$t('hellow.reviewproject')" >
+ <div style="margin-left: 50px;margin-bottom: 10px;">
+ <el-form-item :label="$t('basicData.projectnumber')" :required="true">
+ <el-select
+ v-model="selectedProjectNo"
+ filterable
+ clearable
+ :placeholder="$t('basicData.plselectproject')"
+ style="width: 260px"
+ @input="handleInputChange"
+ >
+ <el-option
+ v-for="item in titleSelectJson.processType"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </div>
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button type="primary" @click="handleup">
+ {{ $t('basicData.confirm') }}
+ </el-button>
+ <el-button @click="dialogFormVisiblee = false">{{ $t('basicData.cancel') }}</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ <!-- 涓┖閰嶆柟 -->
+ <el-dialog v-model="mulan" top="15vh" width="80%" :title="$t('hellow.hollowformula')">
+ <el-button id="searchButton" type="primary" @click="openAddDialog">
+ {{ $t('basicData.add') }}
+ </el-button>
+ <el-table ref="table" style="margin-top: 20px;height: 400px;"
+ :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="formulaName" fixed align="center" :label="$t('hellow.formulaNamep')" min-width="120"/>
+ <el-table-column prop="filmRemove" align="center" :label="$t('Mounting.removalmethodp')"/>
+ <el-table-column prop="casOne" align="center" :label="$t('hellow.casOne')" min-width="110">
+ <template #default="scope">
+ <el-tag :type="getcasOnea(scope.row.casOne)">
+ {{ getStatuscasOnea(scope.row.casOne) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="casTwo" align="center" :label="$t('hellow.casTwo')" min-width="110">
+ <template #default="scope">
+ <el-tag :type="getcasOneb(scope.row.casTwo)">
+ {{ getStatuscasOneb(scope.row.casTwo) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="casThree" align="center" :label="$t('hellow.casThree')" min-width="110">
+ <template #default="scope">
+ <el-tag :type="getcasOnec(scope.row.casThree)">
+ {{ getStatuscasOnec(scope.row.casThree) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="casFour" align="center" :label="$t('hellow.casFour')" min-width="110">
+ <template #default="scope">
+ <el-tag :type="getcasOned(scope.row.casFour)">
+ {{ getStatuscasOned(scope.row.casFour) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="frameOne" align="center" :label="$t('hellow.frameOne')"/>
+ <el-table-column prop="frameTwo" align="center" :label="$t('hellow.frameTwo')"/>
+ <el-table-column prop="frameThree" align="center" :label="$t('hellow.frameThree')"/>
+ <el-table-column prop="frameFour" align="center" :label="$t('hellow.frameFour')"/>
+ <el-table-column prop="intervalFrameHeightOne" align="center" :label="$t('hellow.intervalFrameHeightOne')" min-width="110"/>
+ <el-table-column prop="intervalFrameHeightTwo" align="center" :label="$t('hellow.intervalFrameHeightTwo')" min-width="110"/>
+ <el-table-column prop="intervalFrameHeightThree" align="center" :label="$t('hellow.intervalFrameHeightThree')" min-width="110"/>
+ <el-table-column prop="intervalFrameHeightFour" align="center" :label="$t('hellow.intervalFrameHeightFour')" min-width="110"/>
+ <!-- <el-table-column prop="intervalFrameTypeOne" align="center" :label="$t('hellow.intervalFrameTypeOne')" min-width="110">
+ <template #default="scope">
+ <el-tag :type="getStatusTypea(scope.row.intervalFrameTypeOne)">
+ {{ getStatusTexta(scope.row.intervalFrameTypeOne) }}
+ </el-tag>
+ </template>
+ </el-table-column> -->
+ <el-table-column prop="intervalFrameTypeOne" align="center" :label="$t('hellow.intervalFrameTypeOne')" min-width="110">
+ <template #default="scope">
+ <el-tag :type="getStatusTypea(scope.row.intervalFrameTypeOne)">
+ {{ getStatusTexta(scope.row.intervalFrameTypeOne) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="intervalFrameTypeTwo" align="center" :label="$t('hellow.intervalFrameTypeTwo')" min-width="110">
+ <template #default="scope">
+ <el-tag :type="getStatusTypeb(scope.row.intervalFrameTypeTwo)">
+ {{ getStatusTextb(scope.row.intervalFrameTypeTwo) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="intervalFrameTypeThree" align="center" :label="$t('hellow.intervalFrameTypeThree')" min-width="110">
+ <template #default="scope">
+ <el-tag :type="getStatusTypec(scope.row.intervalFrameTypeThree)">
+ {{ getStatusTextc(scope.row.intervalFrameTypeThree) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="intervalFrameTypeFour" align="center" :label="$t('hellow.intervalFrameTypeFour')" min-width="110">
+ <template #default="scope">
+ <el-tag :type="getStatusTyped(scope.row.intervalFrameTypeFour)">
+ {{ getStatusTextd(scope.row.intervalFrameTypeFour) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="intervalFrameWidthOne" align="center" :label="$t('hellow.intervalFrameWidthOne')" min-width="110"/>
+ <el-table-column prop="intervalFrameWidthTwo" align="center" :label="$t('hellow.intervalFrameWidthTwo')" min-width="110"/>
+ <el-table-column prop="intervalFrameWidthThree" align="center" :label="$t('hellow.intervalFrameWidthThree')" min-width="110"/>
+ <el-table-column prop="intervalFrameWidthFour" align="center" :label="$t('hellow.intervalFrameWidthFour')" min-width="110"/>
+ <el-table-column prop="sealInsert" align="center" :label="$t('hellow.sealInsert')"/>
+ <el-table-column prop="topRemove" align="center" :label="$t('hellow.topRemovep')" min-width="95"> </el-table-column>
+ <el-table-column prop="bottomRemove" align="center" :label="$t('hellow.bottomRemovep')" min-width="95"> </el-table-column>
+ <el-table-column prop="leftRemove" align="center" :label="$t('hellow.leftRemovep')" min-width="95"> </el-table-column>
+ <el-table-column prop="rightRemove" align="center" :label="$t('hellow.rightRemovep')" min-width="95"> </el-table-column>
+ <el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="270">
+ <template #default="scope">
+ <el-button size="mini" type="text" plain @click="handleEdit(scope.row)">{{ $t('productStock.exit') }}</el-button>
+ <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('productStock.delete') }}</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button @click="mulan = false">{{ $t('large.close') }}</el-button>
+ </div>
+ </template>
+</el-dialog>
</template>
<script setup>
-import {ElMessage} from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
import {onBeforeUnmount, onMounted, onUnmounted, ref, reactive, watch, computed} from "vue";
import request from "@/utils/request"
import {host, WebSocketHost} from '@/utils/constants'
@@ -240,22 +1008,64 @@
const {t} = useI18n()
const blinda = ref(false)
const blindb = ref(false)
+const blindc = ref(false)
+const blindd = ref(false)
+const mulan = ref(false)
const tableDataa = ref([])
const tableDatab = ref([])
const tableDatac = ref([])
-const allData = ref({})
-const flowCard = ref('')
+const tableDatax = ref([])
const cell = ref('')
const cella = ref('')
+const selectedProjectNo = ref('');
const ganghua = ref(true)
const totalPairQuantity = ref('')
const totalPairQuantitya = ref('')
+const bottomRemove = ref('')
+const filmRemove = ref('')
+const formulaName = ref('')
+const leftRemove = ref('')
+const rightRemove = ref('')
+const topRemove = ref('')
+const filmsId = ref('')
+const flowCardId = ref('')
+const casFour = ref('')
+const casOne = ref('')
+const casThree = ref('')
+const casTwo = ref('')
+const frameFour = ref('')
+const frameOne = ref('')
+const frameThree = ref('')
+const frameTwo = ref('')
+const intervalFrameHeightOne = ref('')
+const intervalFrameHeightTwo = ref('')
+const intervalFrameHeightThree = ref('')
+const intervalFrameHeightFour = ref('')
+const intervalFrameTypeOne = ref('')
+const intervalFrameTypeTwo = ref('')
+const intervalFrameTypeThree = ref('')
+const intervalFrameTypeFour = ref('')
+const intervalFrameWidthOne = ref('')
+const intervalFrameWidthTwo = ref('')
+const intervalFrameWidthThree = ref('')
+const intervalFrameWidthFour = ref('')
+const sealInsert = ref('')
+const freeone = ref('#911005');
const dialogFormVisiblea = ref(false)
const dialogFormVisibleb = ref(false)
const dialogFormVisiblec = ref(false)
const dialogFormVisibled = ref(false)
+const dialogFormVisiblee = ref(false)
+const add = ref(false)
+const adda = ref(false)
const currentPage2 = ref(1)
const currentRow = reactive({});
+const formattedProcessType = ref([]);
+const selectedFormulaName = ref('');
+let selectedFormulaId = ref(null);
+const formulaNameid = ref({ id: null });
+const titleformulaName = ref({ formulaName: [] ,formulaId: []});
+const titleSelectJson = ref({ processType: [] });
const options = [
{
value: 930,
@@ -264,10 +1074,6 @@
{
value: 931,
label: t('hellow.line2'),
- },
- {
- value: 932,
- label: t('hellow.line3'),
}
]
let socket = null;
@@ -279,23 +1085,25 @@
const currentPageKey = computed(() => `93${currentPage.value - 1}`);
const handlePageChange1 = (newPage) => {
currentPage.value = newPage;
- console.log(currentPage.value);
};
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- console.log(currentPage2.value);
fetchFlowBind(currentRow.projectNumber, currentRow.layer, currentPage2.value);
};
const handleMessage = (data) => {
try {
+ tableDataa.value = data[930][0];
const allPageData = data;
const currentPageKeyValue = currentPageKey.value;
const currentPageData = allPageData[currentPageKeyValue];
- if (currentPageData && Array.isArray(currentPageData) && currentPageData.length > 0) {
- tableDataa.value = currentPageData[0];
- } else {
- console.warn('No data for the current page key:', currentPageKeyValue);
- }
+ if (data.freeOneRequestEntity != null) {
+ freeone.value = data.freeOneRequestEntity == 1 ? 'green' : '#911005';
+ }
+ // if (currentPageData && Array.isArray(currentPageData) && currentPageData.length > 0) {
+ // tableDataa.value = currentPageData[0];
+ // } else {
+ // console.warn('No data for the current page key:', currentPageKeyValue);
+ // }
} catch (error) {
console.error('Error parsing WebSocket message:', error);
}
@@ -316,9 +1124,261 @@
const handleBindb = (row) => {
blindb.value = true;
};
+// 鏆傚仠浠诲姟
+const handleBindc = (row) => {
+ blindc.value = true;
+};
+// 鍒犻櫎浠诲姟
+const handleBindd = (row) => {
+ blindd.value = true;
+};
+const removalMethodMap = {
+ 1: t('Mounting.removal'),
+ 0: t('Mounting.noremoval')
+};
+const removalcas = {
+ 1: t('hellow.Y'),
+ 0: t('hellow.F')
+}
+const removalinterval = {
+ 1: t('hellow.intervalFrameTypeb'),
+ 5: t('hellow.intervalFrameTypea')
+}
+// 澶勭悊缂栬緫鎸夐挳鐐瑰嚮
+function handleEdit(row) {
+ window.localStorage.setItem('id', row.id)
+ formulaName.value = row.formulaName;
+ filmRemove.value = removalMethodMap[row.filmRemove];
+ bottomRemove.value = row.bottomRemove;
+ leftRemove.value = row.leftRemove;
+ rightRemove.value = row.rightRemove;
+ topRemove.value = row.topRemove;
+ casFour.value = removalcas[row.casFour];
+ casOne.value = removalcas[row.casOne];
+ casThree.value = removalcas[row.casThree];
+ casTwo.value = removalcas[row.casTwo];
+ frameFour.value = row.frameFour;
+ frameOne.value = row.frameOne;
+ frameThree.value = row.frameThree;
+ frameTwo.value = row.frameTwo;
+ intervalFrameHeightOne.value = row.intervalFrameHeightOne;
+ intervalFrameHeightTwo.value = row.intervalFrameHeightTwo;
+ intervalFrameHeightThree.value = row.intervalFrameHeightThree;
+ intervalFrameHeightFour.value = row.intervalFrameHeightFour;
+ intervalFrameTypeOne.value = removalinterval[row.intervalFrameTypeOne];
+ intervalFrameTypeTwo.value = removalinterval[row.intervalFrameTypeTwo];
+ intervalFrameTypeThree.value = removalinterval[row.intervalFrameTypeThree];
+ intervalFrameTypeFour.value = removalinterval[row.intervalFrameTypeFour];
+ intervalFrameWidthOne.value = row.intervalFrameWidthOne;
+ intervalFrameWidthTwo.value = row.intervalFrameWidthTwo;
+ intervalFrameWidthThree.value = row.intervalFrameWidthThree;
+ intervalFrameWidthFour.value = row.intervalFrameWidthFour;
+ sealInsert.value = row.sealInsert;
+ adda.value = true;
+}
+function openAddDialog() {
+ formulaName.value = '';
+ filmRemove.value = '';
+ bottomRemove.value = '';
+ leftRemove.value = '';
+ rightRemove.value = '';
+ topRemove.value = '';
+ casFour.value = '';
+ casOne.value = '';
+ casThree.value = '';
+ casTwo.value = '';
+ frameFour.value = '';
+ frameOne.value = '';
+ frameThree.value = '';
+ frameTwo.value = '';
+ intervalFrameHeightOne.value = '';
+ intervalFrameHeightTwo.value = '';
+ intervalFrameHeightThree.value = '';
+ intervalFrameHeightFour.value = '';
+ intervalFrameTypeOne.value = '';
+ intervalFrameTypeTwo.value = '';
+ intervalFrameTypeThree.value = '';
+ intervalFrameTypeFour.value = '';
+ intervalFrameWidthOne.value = '';
+ intervalFrameWidthTwo.value = '';
+ intervalFrameWidthThree.value = '';
+ intervalFrameWidthFour.value = '';
+ sealInsert.value = '';
+ add.value = true;
+}
const handlezhiban = () => {
dialogFormVisiblea.value = true;
fetchFlowCardId();
+};
+const handleormulan = () => {
+ mulan.value = true;
+ fetchmulan();
+};
+function getcasOnea(casOne) {
+ switch (casOne) {
+ case "1":
+ return 'success';
+ case "0":
+ return 'warning';
+ default:
+ return 'info';
+ }
+}
+function getStatuscasOnea(casOne) {
+ switch (casOne) {
+ case "1":
+ return t('hellow.Y');
+ case "0":
+ return t('hellow.F');
+ default:
+ return '';
+ }
+}
+function getcasOneb(casOne) {
+ switch (casOne) {
+ case "1":
+ return 'success';
+ case "0":
+ return 'warning';
+ default:
+ return 'info';
+ }
+}
+function getStatuscasOneb(casOne) {
+ switch (casOne) {
+ case "1":
+ return t('hellow.Y');
+ case "0":
+ return t('hellow.F');
+ default:
+ return '';
+ }
+}
+function getcasOnec(casOne) {
+ switch (casOne) {
+ case "1":
+ return 'success';
+ case "0":
+ return 'warning';
+ default:
+ return 'info';
+ }
+}
+function getStatuscasOnec(casOne) {
+ switch (casOne) {
+ case "1":
+ return t('hellow.Y');
+ case "0":
+ return t('hellow.F');
+ default:
+ return '';
+ }
+}
+
+function getcasOned(casOne) {
+ switch (casOne) {
+ case "1":
+ return 'success';
+ case "0":
+ return 'warning';
+ default:
+ return 'info';
+ }
+}
+function getStatuscasOned(casOne) {
+ switch (casOne) {
+ case "1":
+ return t('hellow.Y');
+ case "0":
+ return t('hellow.F');
+ default:
+ return '';
+ }
+}
+function getStatusTypea(intervalFrameTypeOne) {
+ switch (intervalFrameTypeOne) {
+ case "1":
+ return 'success';
+ case "5":
+ return 'warning';
+ default:
+ return 'info';
+ }
+}
+function getStatusTexta(intervalFrameTypeOne) {
+ switch (intervalFrameTypeOne) {
+ case "1":
+ return t('hellow.intervalFrameTypeb');
+ case "5":
+ return t('hellow.intervalFrameTypea');
+ default:
+ return '';
+ }
+}
+function getStatusTypeb(intervalFrameTypeTwo) {
+ switch (intervalFrameTypeTwo) {
+ case "1":
+ return 'success';
+ case "5":
+ return 'warning';
+ default:
+ return 'info';
+ }
+}
+function getStatusTextb(intervalFrameTypeTwo) {
+ switch (intervalFrameTypeTwo) {
+ case "1":
+ return t('hellow.intervalFrameTypeb');
+ case "5":
+ return t('hellow.intervalFrameTypea');
+ default:
+ return '';
+ }
+}
+function getStatusTypec(intervalFrameTypeThree) {
+ switch (intervalFrameTypeThree) {
+ case "1":
+ return 'success';
+ case "5":
+ return 'warning';
+ default:
+ return 'info';
+ }
+}
+function getStatusTextc(intervalFrameTypeThree) {
+ switch (intervalFrameTypeThree) {
+ case "1":
+ return t('hellow.intervalFrameTypeb');
+ case "5":
+ return t('hellow.intervalFrameTypea');
+ default:
+ return '';
+ }
+}
+function getStatusTyped(intervalFrameTypeFour) {
+ switch (intervalFrameTypeFour) {
+ case "1":
+ return 'success';
+ case "5":
+ return 'warning';
+ default:
+ return 'info';
+ }
+}
+function getStatusTextd(intervalFrameTypeFour) {
+ switch (intervalFrameTypeFour) {
+ case "1":
+ return t('hellow.intervalFrameTypeb');
+ case "5":
+ return t('hellow.intervalFrameTypea');
+ default:
+ return '';
+ }
+}
+// 棰勮
+const selectproject = () => {
+ dialogFormVisiblee.value = true;
+ selectgong();
};
// 缂虹墖璇︽儏
const handleBindRack = (row) => {
@@ -332,21 +1392,282 @@
const handletake = (row) => {
window.localStorage.setItem('flowCardId', row.projectNumber)
dialogFormVisiblec.value = true;
+ fetchmulan()
};
// 寮哄埗鍑虹墖
const handleout = (row) => {
window.localStorage.setItem('flowCardId', row.projectNumber)
dialogFormVisibled.value = true;
+ fetchmulan()
};
// 鍒涘缓浠诲姟
const fetchFlowCardId = async () => {
try {
- const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard');
+ const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
+ filmsId: '',
+ flowCardId: '',
+ });
if (response.code == 200) {
ElMessage.success(response.message);
const newData = parseData(response.data);
tableDatab.value = newData;
} else {
+ ElMessage.error('Failed to fetch data');
+ }
+ } catch (error) {
+ ElMessage.error('Error fetching data');
+ }
+};
+const fetchFlowCardsearch = async () => {
+ try {
+ const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
+ filmsId: filmsId.value,
+ flowCardId: flowCardId.value,
+ });
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ const newData = parseData(response.data);
+ tableDatab.value = newData;
+ } else {
+ ElMessage.error('Failed to fetch data');
+ }
+ } catch (error) {
+ ElMessage.error('Error fetching data');
+ }
+};
+// 涓┖閰嶆柟
+const fetchmulan = async () => {
+ try {
+ var url="/hollowGlass/hollowFormulaDetails/listFormulaDetails?keyword="+'';
+ const response = await request.post(url)
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ tableDatax.value = response.data;
+ titleformulaName.value = response.data.map(item => ({ formulaId: item.id, formulaName: item.formulaName }));
+ } else {
+ ElMessage.error('Failed to fetch data');
+ }
+ } catch (error) {
+ ElMessage.error('Error fetching data');
+ }
+};
+const handleFormulaChange = (value) => {
+ const selectedItem = titleformulaName.value.find(item => item.formulaName === value);
+ if (selectedItem) {
+ formulaNameid.value = { id: selectedItem.formulaId };
+ window.localStorage.setItem('id', formulaNameid.value.id)
+ } else {
+ formulaNameid.value = { id: null };
+ }
+};
+// 楠岃瘉鍑芥暟
+function validateForm() {
+ const errors = [];
+ if (!formulaName.value) errors.push('蹇呭～锛�');
+ if (filmRemove.value === null) errors.push('蹇呭～锛�');
+ if (!bottomRemove.value) errors.push('蹇呭～锛�');
+ if (!topRemove.value) errors.push('蹇呭～锛�');
+ if (!leftRemove.value) errors.push('蹇呭～锛�');
+ if (!rightRemove.value) errors.push('蹇呭～锛�');
+ if (casOne.value === null) errors.push('蹇呭～锛�');
+ if (!frameOne.value) errors.push('蹇呭～锛�');
+ if (!intervalFrameHeightOne.value) errors.push('蹇呭～锛�');
+ if (!intervalFrameWidthOne.value) errors.push('蹇呭～锛�');
+ if (intervalFrameTypeOne.value === null) errors.push('蹇呭～锛�');
+ if (!sealInsert.value) errors.push('蹇呭～锛�');
+ if (errors.length > 0) {
+ ElMessage.error(errors.join(''));
+ return false;
+ }
+ return true;
+}
+// 涓┖閰嶆柟娣诲姞
+const handleConfirm = async () => {
+ try {
+ if (!validateForm()) return;
+ const response = await request.post('/hollowGlass/hollowFormulaDetails/saveFormulaDetails',{
+ formulaName: formulaName.value,
+ filmRemove: filmRemove.value,
+ bottomRemove: bottomRemove.value,
+ leftRemove: leftRemove.value,
+ rightRemove: rightRemove.value,
+ topRemove: topRemove.value,
+ casFour: casFour.value,
+ casOne: casOne.value,
+ casThree: casThree.value,
+ casTwo: casTwo.value,
+ frameFour: frameFour.value,
+ frameOne: frameOne.value,
+ frameThree: frameThree.value,
+ frameTwo: frameTwo.value,
+ intervalFrameHeightOne: intervalFrameHeightOne.value,
+ intervalFrameHeightTwo: intervalFrameHeightTwo.value,
+ intervalFrameHeightThree: intervalFrameHeightThree.value,
+ intervalFrameHeightFour: intervalFrameHeightFour.value,
+ intervalFrameTypeOne: intervalFrameTypeOne.value,
+ intervalFrameTypeTwo: intervalFrameTypeTwo.value,
+ intervalFrameTypeThree: intervalFrameTypeThree.value,
+ intervalFrameTypeFour: intervalFrameTypeFour.value,
+ intervalFrameWidthOne: intervalFrameWidthOne.value,
+ intervalFrameWidthTwo: intervalFrameWidthTwo.value,
+ intervalFrameWidthThree: intervalFrameWidthThree.value,
+ intervalFrameWidthFour: intervalFrameWidthFour.value,
+ sealInsert: sealInsert.value,
+ });
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ // tableDatax.value = response.data;
+ fetchmulan()
+ add.value = false
+ formulaName.value = '';
+ filmRemove.value = '';
+ bottomRemove.value = '';
+ leftRemove.value = '';
+ rightRemove.value = '';
+ topRemove.value = '';
+ casFour.value = '';
+ casOne.value = '';
+ casThree.value = '';
+ casTwo.value = '';
+ frameFour.value = '';
+ frameOne.value = '';
+ frameThree.value = '';
+ frameTwo.value = '';
+ intervalFrameHeightOne.value = '';
+ intervalFrameHeightTwo.value = '';
+ intervalFrameHeightThree.value = '';
+ intervalFrameHeightFour.value = '';
+ intervalFrameTypeOne.value = '';
+ intervalFrameTypeTwo.value = '';
+ intervalFrameTypeThree.value = '';
+ intervalFrameTypeFour.value = '';
+ intervalFrameWidthOne.value = '';
+ intervalFrameWidthTwo.value = '';
+ intervalFrameWidthThree.value = '';
+ intervalFrameWidthFour.value = '';
+ sealInsert.value = '';
+ } else {
+ ElMessage.error('Failed to fetch data');
+ }
+ } catch (error) {
+ ElMessage.error('Error fetching data');
+ }
+};
+
+const removalMethodMapa = {
+ [t('Mounting.removal')]: 1,
+ [t('Mounting.noremoval')]: 0,
+};
+const removalcasa = {
+ [t('hellow.Y')]: 1,
+ [t('hellow.F')]: 0,
+}
+const removalintervala = {
+ [t('hellow.intervalFrameTypeb')]: 1,
+ [t('hellow.intervalFrameTypea')]: 5,
+}
+// 涓┖閰嶆柟淇敼
+ const handledit = async() => {
+ let id = window.localStorage.getItem('id')
+ try {
+ const response = await request.post('/hollowGlass/hollowFormulaDetails/updateFormulaDetails',{
+ id: id,
+ formulaName: formulaName.value,
+ filmRemove: removalMethodMapa[filmRemove.value],
+ bottomRemove: bottomRemove.value,
+ leftRemove: leftRemove.value,
+ rightRemove: rightRemove.value,
+ topRemove: topRemove.value,
+ casFour: removalcasa[casFour.value],
+ casOne: removalcasa[casOne.value],
+ casThree: removalcasa[casThree.value],
+ casTwo: removalcasa[casTwo.value],
+ frameFour: frameFour.value,
+ frameOne: frameOne.value,
+ frameThree: frameThree.value,
+ frameTwo: frameTwo.value,
+ intervalFrameHeightOne: intervalFrameHeightOne.value,
+ intervalFrameHeightTwo: intervalFrameHeightTwo.value,
+ intervalFrameHeightThree: intervalFrameHeightThree.value,
+ intervalFrameHeightFour: intervalFrameHeightFour.value,
+ intervalFrameTypeOne: removalintervala[intervalFrameTypeOne.value],
+ intervalFrameTypeTwo: removalintervala[intervalFrameTypeTwo.value],
+ intervalFrameTypeThree: removalintervala[intervalFrameTypeThree.value],
+ intervalFrameTypeFour: removalintervala[intervalFrameTypeFour.value],
+ intervalFrameWidthOne: intervalFrameWidthOne.value,
+ intervalFrameWidthTwo: intervalFrameWidthTwo.value,
+ intervalFrameWidthThree: intervalFrameWidthThree.value,
+ intervalFrameWidthFour: intervalFrameWidthFour.value,
+ sealInsert: sealInsert.value,
+ });
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ adda.value = false
+ fetchmulan()
+ } else {
+ ElMessage.error('Failed to fetch data');
+ }
+ } catch (error) {
+ ElMessage.error('Error fetching data');
+ }
+};
+// 涓┖閰嶆柟鍒犻櫎
+ const opena = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('hellow.hollowformuldet'),
+ t('productStock.prompt'),
+ {
+ confirmButtonText: t('productStock.yes'),
+ cancelButtonText: t('productStock.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ var url="/hollowGlass/hollowFormulaDetails/deleteFormulaDetails?idList="+row.id;
+ const response = await request.post(url)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ fetchmulan()
+ } else {
+ ElMessage.error(response.msg);
+ }
+ }
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
+// 宸ョ▼鍙�
+const selectgong = async () => {
+ try {
+ var url="/hollowGlass/hollowGlassOutRelationInfo/hollowTaskList?cell="+ 930;
+ const response = await request.post(url)
+ if (response.code == 200) {
+ const processTypes = response.data.map((projectNo, index) => ({
+ value: projectNo,
+ label: projectNo
+ }));
+ titleSelectJson.value.processType = processTypes;
+ } else {
+ ElMessage.error('Failed to fetch data');
+ }
+ } catch (error) {
+ ElMessage.error('Error fetching data');
+ }
+};
+// 棰勮
+const handleup = async () => {
+ try {
+ var url="/hollowGlass/hollowGlassOutRelationInfo/appointHollowTaskDetails?cell="+ 930 + "&flowCardId=" + selectedProjectNo.value;
+ window.localStorage.setItem('flowCardId', selectedProjectNo.value)
+ const response = await request.post(url)
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ tableDataa.value = response.data;
+ dialogFormVisiblee.value = false
+ selectedProjectNo.value = ''
+ closeWebSocket(socket);
+ } else {
ElMessage.error('Failed to fetch data');
}
} catch (error) {
@@ -376,13 +1697,10 @@
// 寮�濮嬩换鍔�
const handlea = async () => {
try {
- let engineeringId = window.localStorage.getItem('engineeringId')
- console.log(engineeringId);
- if (engineeringId !== '') {
- const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
- engineeringId: engineeringId,
- state: 0,
- })
+ let flowCardId = window.localStorage.getItem('flowCardId')
+ if (flowCardId !== '') {
+ var url="/hollowGlass/hollowGlassOutRelationInfo/startTask?flowCardId="+flowCardId + "&cell=" + 930;
+ const response = await request.post(url)
if (response.code == 200) {
ElMessage.success(response.message);
blinda.value = false;
@@ -399,16 +1717,87 @@
console.error(error);
}
}
+// 缁撴潫浠诲姟
+const handleb = async () => {
+ try {
+ let flowCardId = window.localStorage.getItem('flowCardId')
+ if (flowCardId !== '') {
+ var url="/hollowGlass/hollowGlassOutRelationInfo/finishTask?flowCardId="+flowCardId + "&cell=" + 930;
+ const response = await request.post(url)
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ blindb.value = false;
+ } else {
+ ElMessage.error(response.message);
+ }
+ } else {
+ ElMessage({
+ type: 'info',
+ message: t('basicData.infonull'),
+ })
+ }
+ } catch (error) {
+ console.error(error);
+ }
+}
+// 鏆傚仠浠诲姟
+const handlec = async () => {
+ try {
+ let flowCardId = window.localStorage.getItem('flowCardId')
+ if (flowCardId !== '') {
+ var url="/hollowGlass/hollowGlassOutRelationInfo/pauseTask?flowCardId="+flowCardId + "&cell=" + 930;
+ const response = await request.post(url)
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ blindc.value = false;
+ } else {
+ ElMessage.error(response.message);
+ }
+ } else {
+ ElMessage({
+ type: 'info',
+ message: t('basicData.infonull'),
+ })
+ }
+ } catch (error) {
+ console.error(error);
+ }
+}
+// 鍒犻櫎浠诲姟
+const handled = async () => {
+ try {
+ let flowCardId = window.localStorage.getItem('flowCardId')
+ if (flowCardId !== '') {
+ var url="/hollowGlass/hollowGlassOutRelationInfo/deleteHollowTaskDetails?flowCardId="+flowCardId + "&cell=" + 930;
+ const response = await request.post(url)
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ blindd.value = false;
+ } else {
+ ElMessage.error(response.message);
+ }
+ } else {
+ ElMessage({
+ type: 'info',
+ message: t('basicData.infonull'),
+ })
+ }
+ } catch (error) {
+ console.error(error);
+ }
+}
// 棰嗗彇浠诲姟
const finisha = async () => {
let flowCardId = window.localStorage.getItem('flowCardId')
- try {
- var url="/hollowGlass/hollowGlassOutRelationInfo/receiveTask?cell="+cell.value + "&flowCardId=" + flowCardId + "&totalPairQuantity=" + totalPairQuantity.value;
+ let id = window.localStorage.getItem('id')
+ try {
+ var url="/hollowGlass/hollowGlassOutRelationInfo/receiveTask?cell="+ 930 + "&flowCardId=" + flowCardId + "&totalPairQuantity=" + totalPairQuantity.value+ "&formulaId=" + id;
const response = await request.post(url)
if (response.code == 200) {
ElMessage.success(response.message);
dialogFormVisiblec.value = false;
cell.value = '';
+ formulaName.value = '';
totalPairQuantity.value = '';
} else {
ElMessage.error(response.message);
@@ -420,8 +1809,9 @@
// 寮哄埗鍑虹墖
const finishb = async () => {
let flowCardId = window.localStorage.getItem('flowCardId')
+ let id = window.localStorage.getItem('id')
try {
- var url="/hollowGlass/hollowGlassOutRelationInfo/forceOutGlass?cell="+cella.value + "&flowCardId=" + flowCardId + "&totalPairQuantity=" + totalPairQuantitya.value;
+ var url="/hollowGlass/hollowGlassOutRelationInfo/forceOutGlass?cell="+ 930 + "&flowCardId=" + flowCardId + "&totalPairQuantity=" + totalPairQuantitya.value+ "&formulaId=" + id;
const response = await request.post(url)
if (response.code == 200) {
ElMessage.success(response.message);
@@ -441,7 +1831,6 @@
const body = {
flag: ganghua.value,
};
-
var url="/hollowGlass/hollowGlassOutRelationInfo/dispatchHollowSwitch?flag="+ganghua.value;
const response = await request.post(url)
if (response.code == 200) {
@@ -461,7 +1850,17 @@
});
</script>
<style scoped>
+#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
+#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer {
text-align: center;
margin-top: -15px;
-}</style>
\ No newline at end of file
+}
+#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