From 870b2e410af104ce9a551cd7f3f462b77800266a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 26 六月 2025 09:47:15 +0800
Subject: [PATCH] 解决中空一线、二线、三线前端返回空数据时报错问题
---
UI-Project/src/views/hollow/hollowequipment.vue | 1279 +++++++++++++++++++++++++++------------------------------
1 files changed, 613 insertions(+), 666 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 4a192a7..4a6d0cd 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -1,6 +1,6 @@
<template>
<div style="height: 600px;">
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" >
<div style="display: flex; flex-direction: row; align-items: center; margin-bottom: 10px;">
<el-button id="searchButton" type="primary" @click="handleormulan">
{{ $t('hellow.hollowformula') }}
@@ -11,6 +11,7 @@
<el-button type="primary" @click="selectproject">
{{ $t('hellow.reviewproject') }}
</el-button>
+ <el-button style="margin-left: 10px;" id="searchButton" type="primary" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
<el-button style="margin-left: 10px;" id="searchButton" type="success" @click="handleBinda">
{{ $t('hellow.starttask') }}
</el-button>
@@ -22,16 +23,11 @@
$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 id="dotClass">
<!-- <div style="margin-bottom: -5px;margin-left: 5px;"> -->
<!-- <el-form> -->
- <!-- <el-row> -->
+ <!-- <el-row> -->
<!-- <el-col :span="4">
<div style="font-size: 15px;">
<el-form-item :label="$t('hellow.currenttask')" style="width: 14vw">
@@ -64,6 +60,7 @@
<el-table height="650" ref="table" :data="tableDataa"
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }">
<el-table-column prop="flowCardId" :label="$t('hellow.flowCardId')" align="center"/>
+ <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center"/>
<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"/>
@@ -72,7 +69,7 @@
<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 ? "绛夊緟鍑虹墖" : "鍑虹墖瀹屾垚" }}
+ {{ scope.row.state == -1 ? $t('hellow.waitingout') : $t('hellow.finishout') }}
</template>
</el-table-column>
</el-table>
@@ -95,38 +92,47 @@
<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="productName" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('large.inproductname')"/>
+ <el-input v-model="customerName" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('large.incustomerName')"/>
+ <el-input v-model="thickness" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.inthickness')"/>
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="fetchFlowCardsearch">
{{$t('reportmanage.inquire')}}</el-button>
</div>
+ <div style="margin-left: 87%;">{{$t('hellow.pairsnumbertotal')}}{{ pairTotal }}</div>
<el-table
ref="table"
style="margin-top: 20px; height: 700px;"
:data="tableDatab"
+ :row-class-name="tableRowClassName"
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
row-key="projectNumber"
>
<el-table-column>
<template #default="props">
- <el-table :data="props.row.records" style="width: 100%">
+ <el-table :data="props.row.flowCardGlassInfoDTOList" style="width: 100%"
+ :row-class-name="(row) => nestedTableRowClassName(props.row, row)"
+ >
<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="pairCount" align="center" :label="$t('hellow.pairsnumber')" min-width="80"/>
<el-table-column prop="damageCount" align="center" :label="$t('hellow.damagenumber')" min-width="80"/>
+ <el-table-column prop="pairCount" align="center" :label="$t('hellow.pairsnumber')" min-width="80"/>
</el-table>
</template>
</el-table-column>
- <el-table-column prop="projectNumber" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
+ <el-table-column prop="flowCardId" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
+ <el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="20"/>
+ <el-table-column prop="customerName" fixed align="center" :label="$t('large.customerName')" min-width="20"/>
<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
- <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">{{
+ <el-button type="text" :disabled="scope.row.isThroughSlot" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
+ <el-button type="text" plain @click="handleBindRack(scope.row)">{{
$t('hellow.missingfilms')
}}
</el-button>
- <el-button size="mini" type="text" plain @click="handleout(scope.row)">{{
+ <el-button type="text" plain @click="handleout(scope.row)">{{
$t('hellow.forcedfilming')
}}
</el-button>
@@ -135,274 +141,255 @@
</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>
+<el-dialog v-model="add" top="15vh" width="90%" :title="$t('hellow.hollowformula')" >
+ <div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
+ <el-form label-width="150px" label-position="right">
+ <!-- 绗竴琛岋細3涓厓绱� -->
+ <el-row style="margin-top: 10px;">
+ <el-col :span="8">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.formulaName')" style="width: 90%;">
+ <el-input v-model="formulaName" autocomplete="off" />
+ </el-form-item>
</div>
- <template #footer>
+ </el-col>
+ <el-col :span="8">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('Mounting.removalmethoda')" style="width: 90%;">
+ <el-select v-model="filmRemove" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
+ <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>
+ </el-col>
+ <el-col :span="8">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.sealInsertb')" style="width: 90%;">
+ <el-input v-model="sealInsert" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ </el-row>
+
+ <!-- 绗簩琛岋細4涓厓绱� -->
+ <el-row style="margin-top: 20px;">
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.topRemove')" style="width: 90%;">
+ <el-input v-model="topRemove" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.bottomRemove')" style="width: 90%;">
+ <el-input v-model="bottomRemove" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.leftRemove')" style="width: 90%;">
+ <el-input v-model="leftRemove" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.rightRemove')" style="width: 90%;">
+ <el-input v-model="rightRemove" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ </el-row>
+
+ <!-- 绗笁琛岋細4涓厓绱� -->
+ <el-row style="margin-top: 20px;">
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.casOneb')" style="width: 90%;">
+ <el-select v-model="casOne" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
+ <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>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.casTwob')" style="width: 90%;">
+ <el-select v-model="casTwo" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
+ <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>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.casThreeb')" style="width: 90%;">
+ <el-select v-model="casThree" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
+ <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>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.casFourb')" style="width: 90%;">
+ <el-select v-model="casFour" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
+ <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>
+ </el-col>
+ </el-row>
+
+ <!-- 绗洓琛岋細4涓厓绱� -->
+ <el-row style="margin-top: 20px;">
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.frameOneb')" style="width: 90%;">
+ <el-input v-model="frameOne" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.frameTwob')" style="width: 90%;">
+ <el-input v-model="frameTwo" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.frameThreeb')" style="width: 90%;">
+ <el-input v-model="frameThree" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.frameFourb')" style="width: 90%;">
+ <el-input v-model="frameFour" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ </el-row>
+
+ <!-- 绗簲琛岋細4涓厓绱� -->
+ <el-row style="margin-top: 20px;">
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbOne')" style="width: 90%;">
+ <el-input v-model="intervalFrameHeightOne" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbTwo')" style="width: 90%;">
+ <el-input v-model="intervalFrameHeightTwo" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbThree')" style="width: 90%;">
+ <el-input v-model="intervalFrameHeightThree" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbFour')" style="width: 90%;">
+ <el-input v-model="intervalFrameHeightFour" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ </el-row>
+
+ <!-- 绗叚琛岋細4涓厓绱� -->
+ <el-row style="margin-top: 20px;">
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbOne')" style="width: 90%;">
+ <el-input v-model="intervalFrameWidthOne" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbTwo')" style="width: 90%;">
+ <el-input v-model="intervalFrameWidthTwo" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbThree')" style="width: 90%;">
+ <el-input v-model="intervalFrameWidthThree" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbFour')" style="width: 90%;">
+ <el-input v-model="intervalFrameWidthFour" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ </el-row>
+
+ <!-- 绗竷琛岋細4涓厓绱� -->
+ <el-row style="margin-top: 20px;">
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameTypedOne')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeOne" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
+ <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>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameTypedTwo')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeTwo" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
+ <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>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameTypedThree')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeThree" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
+ <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>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameTypedFour')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeFour" style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
+ <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>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+ <template #footer>
<div id="dialog-footer">
<el-button type="primary" @click="handleConfirm">
{{ $t('basicData.confirm') }}
@@ -412,274 +399,255 @@
</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>
+<el-dialog v-model="adda" top="15vh" width="85%" :title="$t('hellow.edithollowformula')" >
+ <div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
+ <el-form label-width="150px" label-position="right">
+ <!-- 绗竴琛岋細3涓厓绱� -->
+ <el-row style="margin-top: 20px;">
+ <el-col :span="8">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.formulaName')" style="width: 90%;">
+ <el-input v-model="formulaName" autocomplete="off" />
+ </el-form-item>
</div>
- <template #footer>
+ </el-col>
+ <el-col :span="8">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('Mounting.removalmethoda')" style="width: 90%;">
+ <el-select v-model="filmRemove" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
+ <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>
+ </el-col>
+ <el-col :span="8">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.sealInsertb')" style="width: 90%;">
+ <el-input v-model="sealInsert" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ </el-row>
+
+ <!-- 绗簩琛岋細4涓厓绱� -->
+ <el-row style="margin-top: 20px;">
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.topRemove')" style="width: 90%;">
+ <el-input v-model="topRemove" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.bottomRemove')" style="width: 90%;">
+ <el-input v-model="bottomRemove" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.leftRemove')" style="width: 90%;">
+ <el-input v-model="leftRemove" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.rightRemove')" style="width: 90%;">
+ <el-input v-model="rightRemove" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ </el-row>
+
+ <!-- 绗笁琛岋細4涓厓绱� -->
+ <el-row style="margin-top: 20px;">
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.casOneb')" style="width: 90%;">
+ <el-select v-model="casOne" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
+ <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>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.casTwob')" style="width: 90%;">
+ <el-select v-model="casTwo" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
+ <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>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.casThreeb')" style="width: 90%;">
+ <el-select v-model="casThree" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
+ <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>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.casFourb')" style="width: 90%;">
+ <el-select v-model="casFour" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
+ <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>
+ </el-col>
+ </el-row>
+
+ <!-- 绗洓琛岋細4涓厓绱� -->
+ <el-row style="margin-top: 20px;">
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.frameOneb')" style="width: 90%;">
+ <el-input v-model="frameOne" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.frameTwob')" style="width: 90%;">
+ <el-input v-model="frameTwo" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.frameThreeb')" style="width: 90%;">
+ <el-input v-model="frameThree" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.frameFourb')" style="width: 90%;">
+ <el-input v-model="frameFour" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ </el-row>
+
+ <!-- 绗簲琛岋細4涓厓绱� -->
+ <el-row style="margin-top: 20px;">
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbOne')" style="width: 90%;">
+ <el-input v-model="intervalFrameHeightOne" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbTwo')" style="width: 90%;">
+ <el-input v-model="intervalFrameHeightTwo" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbThree')" style="width: 90%;">
+ <el-input v-model="intervalFrameHeightThree" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbFour')" style="width: 90%;">
+ <el-input v-model="intervalFrameHeightFour" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ </el-row>
+
+ <!-- 绗叚琛岋細4涓厓绱� -->
+ <el-row style="margin-top: 20px;">
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbOne')" style="width: 90%;">
+ <el-input v-model="intervalFrameWidthOne" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbTwo')" style="width: 90%;">
+ <el-input v-model="intervalFrameWidthTwo" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbThree')" style="width: 90%;">
+ <el-input v-model="intervalFrameWidthThree" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbFour')" style="width: 90%;">
+ <el-input v-model="intervalFrameWidthFour" autocomplete="off" />
+ </el-form-item>
+ </div>
+ </el-col>
+ </el-row>
+
+ <!-- 绗竷琛岋細4涓厓绱� -->
+ <el-row style="margin-top: 20px;">
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameTypedOne')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeOne" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
+ <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>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameTypedTwo')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeTwo" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
+ <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>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameTypedThree')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeThree" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
+ <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>
+ </el-col>
+ <el-col :span="6">
+ <div style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.intervalFrameTypedFour')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeFour" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
+ <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>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+ <template #footer>
<div id="dialog-footer">
<el-button type="primary" @click="handledit">
{{ $t('basicData.confirm') }}
@@ -691,9 +659,9 @@
<!-- 棰嗗彇浠诲姟 -->
<el-dialog v-model="dialogFormVisiblec" top="21vh" width="40%" :title="$t('hellow.claimquest')">
<div style="margin-left: 20px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="100px">
+ <el-form label-width="100px">
<el-form label-width="210px" label-position="right">
- <el-form-item :label="$t('hellow.pairQuantity')" :required="true" style="width: 25vw">
+ <el-form-item :label="$t('hellow.ptotalpairQuantity')" :required="true" style="width: 25vw">
<el-input :placeholder="$t('hellow.cpairQuantity')" v-model="totalPairQuantity" autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('hellow.route')" :required="true" style="width: 25vw;">
@@ -742,9 +710,9 @@
<!-- 寮哄埗鍑虹墖 -->
<el-dialog v-model="dialogFormVisibled" top="21vh" width="40%" :title="$t('hellow.forcedfilming')">
<div style="margin-left: 20px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="100px">
+ <el-form label-width="100px">
<el-form label-width="210px" label-position="right">
- <el-form-item :label="$t('hellow.pairQuantity')" :required="true" style="width: 25vw">
+ <el-form-item :label="$t('hellow.ptotalpairQuantity')" :required="true" style="width: 25vw">
<el-input :placeholder="$t('hellow.cpairQuantity')" v-model="totalPairQuantitya" autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('hellow.route')" :required="true" style="width: 25vw;">
@@ -794,7 +762,7 @@
<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">
- {{ currentRow.projectNumber }}
+ {{ currentRow.flowCardId }}
</el-form-item>
</div>
<el-table ref="table" style="margin-top: 20px;height: 400px;"
@@ -832,17 +800,6 @@
</div>
</template>
</el-dialog>
- <!-- 鍋滄浠诲姟 -->
- <el-dialog v-model="blindb" top="30vh" width="25%" :title="$t('hellow.pstoptask')">
- <template #footer>
- <div id="dialog-footer">
- <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>
@@ -875,7 +832,6 @@
clearable
:placeholder="$t('basicData.plselectproject')"
style="width: 260px"
- @input="handleInputChange"
>
<el-option
v-for="item in titleSelectJson.processType"
@@ -986,8 +942,8 @@
<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>
+ <el-button type="text" plain @click="handleEdit(scope.row)">{{ $t('productStock.exit') }}</el-button>
+ <el-button type="text" plain @click="opena(scope.row)">{{ $t('productStock.delete') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -997,6 +953,17 @@
</div>
</template>
</el-dialog>
+ <!-- 鍘嗗彶浠诲姟 -->
+ <el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
+ <iframe
+ :src="iframeUrl"
+ marginwidth="2000px"
+ marginheight="2000px"
+ width="100%"
+ height="750px"
+ frameborder="0"
+ ></iframe>
+ </el-dialog>
</template>
<script setup>
import { ElMessage, ElMessageBox } from 'element-plus'
@@ -1018,7 +985,6 @@
const cell = ref('')
const cella = ref('')
const selectedProjectNo = ref('');
-const ganghua = ref(true)
const totalPairQuantity = ref('')
const totalPairQuantitya = ref('')
const bottomRemove = ref('')
@@ -1028,6 +994,9 @@
const rightRemove = ref('')
const topRemove = ref('')
const filmsId = ref('')
+const thickness = ref('')
+const productName = ref('')
+const customerName = ref('')
const flowCardId = ref('')
const casFour = ref('')
const casOne = ref('')
@@ -1057,15 +1026,21 @@
const dialogFormVisibled = ref(false)
const dialogFormVisiblee = ref(false)
const add = ref(false)
-const adda = ref(false)
+const adda = ref(false)
const currentPage2 = ref(1)
const currentRow = reactive({});
const formattedProcessType = ref([]);
const selectedFormulaName = ref('');
+const pairTotal = ref();
let selectedFormulaId = ref(null);
const formulaNameid = ref({ id: null });
const titleformulaName = ref({ formulaName: [] ,formulaId: []});
const titleSelectJson = ref({ processType: [] });
+const iframeUrl = ref('');
+const handlehistorical = (row) => {
+ blindb.value = true;
+ iframeUrl.value = `${window.location.origin}/#/hollow/hellowquiphistory`;
+};
const options = [
{
value: 930,
@@ -1077,7 +1052,7 @@
}
]
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/HollowGlass`;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/HollowGlassone`;
const currentPage = ref(parseInt(window.localStorage.getItem('currentPage')) || 1);
watch(() => currentPage.value, (newVal) => {
window.localStorage.setItem('currentPage', newVal);
@@ -1088,16 +1063,16 @@
};
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- fetchFlowBind(currentRow.projectNumber, currentRow.layer, currentPage2.value);
+ fetchFlowBind(currentRow.flowCardId, currentPage2.value);
};
const handleMessage = (data) => {
try {
- tableDataa.value = data[930][0];
+ tableDataa.value = data.queueInfo[0];
const allPageData = data;
const currentPageKeyValue = currentPageKey.value;
const currentPageData = allPageData[currentPageKeyValue];
- if (data.freeOneRequestEntity != null) {
- freeone.value = data.freeOneRequestEntity == 1 ? 'green' : '#911005';
+ if (data.freeRequest != null) {
+ freeone.value = data.freeRequest[0] == true ? 'green' : '#911005';
}
// if (currentPageData && Array.isArray(currentPageData) && currentPageData.length > 0) {
// tableDataa.value = currentPageData[0];
@@ -1105,11 +1080,11 @@
// console.warn('No data for the current page key:', currentPageKeyValue);
// }
} catch (error) {
- console.error('Error parsing WebSocket message:', error);
}
};
onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
+ window.localStorage.setItem('flowCardId', '')
});
onUnmounted(() => {
if (socket) {
@@ -1119,10 +1094,6 @@
// 寮�濮嬩换鍔�
const handleBinda = (row) => {
blinda.value = true;
-};
-// 鍋滄浠诲姟
-const handleBindb = (row) => {
- blindb.value = true;
};
// 鏆傚仠浠诲姟
const handleBindc = (row) => {
@@ -1145,7 +1116,7 @@
5: t('hellow.intervalFrameTypea')
}
// 澶勭悊缂栬緫鎸夐挳鐐瑰嚮
-function handleEdit(row) {
+function handleEdit(row) {
window.localStorage.setItem('id', row.id)
formulaName.value = row.formulaName;
filmRemove.value = removalMethodMap[row.filmRemove];
@@ -1383,20 +1354,20 @@
// 缂虹墖璇︽儏
const handleBindRack = (row) => {
currentPage2.value = 1;
- const { projectNumber, layer } = row;
- currentRow.projectNumber = row.projectNumber;
+ const { flowCardId } = row;
+ currentRow.flowCardId = row.flowCardId;
dialogFormVisibleb.value = true;
- fetchFlowBind(projectNumber, layer,currentPage2.value);
+ fetchFlowBind(flowCardId,currentPage2.value);
};
// 棰嗗彇浠诲姟
const handletake = (row) => {
- window.localStorage.setItem('flowCardId', row.projectNumber)
+ window.localStorage.setItem('flowCardId', row.flowCardId)
dialogFormVisiblec.value = true;
fetchmulan()
};
// 寮哄埗鍑虹墖
const handleout = (row) => {
- window.localStorage.setItem('flowCardId', row.projectNumber)
+ window.localStorage.setItem('flowCardId', row.flowCardId)
dialogFormVisibled.value = true;
fetchmulan()
};
@@ -1404,35 +1375,48 @@
const fetchFlowCardId = async () => {
try {
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
+ deviceId: 0,
filmsId: '',
flowCardId: '',
+ thickness: 0,
});
if (response.code == 200) {
ElMessage.success(response.message);
- const newData = parseData(response.data);
- tableDatab.value = newData;
+ tableDatab.value = response.data;
+ pairTotal.value = response.data[0].pairTotalCount;
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
+function tableRowClassName({ row }) {
+ if (row.isThroughSlot == true) {
+ return 'row-red-background';
+ }
+ return '';
+}
+function nestedTableRowClassName(parentRow, row) {
+ if (parentRow.isThroughSlot == true) {
+ return 'row-red-background';
+ }
+ return '';
+}
const fetchFlowCardsearch = async () => {
try {
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
filmsId: filmsId.value,
flowCardId: flowCardId.value,
+ productName: productName.value,
+ customerName: customerName.value,
+ thickness: thickness.value
});
if (response.code == 200) {
ElMessage.success(response.message);
- const newData = parseData(response.data);
- tableDatab.value = newData;
+ tableDatab.value = response.data;
+ pairTotal.value = response.data[0].pairTotalCount;
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
// 涓┖閰嶆柟
@@ -1445,10 +1429,8 @@
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) => {
@@ -1547,10 +1529,8 @@
intervalFrameWidthFour.value = '';
sealInsert.value = '';
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
@@ -1605,10 +1585,8 @@
adda.value = false
fetchmulan()
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
// 涓┖閰嶆柟鍒犻櫎
@@ -1630,11 +1608,9 @@
ElMessage.success(response.message);
fetchmulan()
} else {
- ElMessage.error(response.msg);
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 宸ョ▼鍙�
@@ -1649,14 +1625,16 @@
}));
titleSelectJson.value.processType = processTypes;
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
// 棰勮
const handleup = async () => {
+ if (!selectedProjectNo.value) {
+ ElMessage.error(t('basicData.plselectproject'))
+ return
+ }
try {
var url="/hollowGlass/hollowGlassOutRelationInfo/appointHollowTaskDetails?cell="+ 930 + "&flowCardId=" + selectedProjectNo.value;
window.localStorage.setItem('flowCardId', selectedProjectNo.value)
@@ -1668,30 +1646,32 @@
selectedProjectNo.value = ''
closeWebSocket(socket);
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
const parseData = (rawData) => {
- return Object.keys(rawData).map(projectNumber => ({
- projectNumber,
- records: rawData[projectNumber]
- }));
+ return Object.entries(rawData).map(([compositeKey, records]) => {
+ const [projectNumber, productName] = compositeKey.split(':');
+ return {
+ projectNumber,
+ productname: productName,
+ records: records.map(record => ({
+ ...record,
+ }))
+ };
+ });
};
-const fetchFlowBind = async (flowCardId, layer, page) => {
+const fetchFlowBind = async (flowCardId, page) => {
try {
- var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + layer;
+ var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + 1;
const response = await request.post(url)
if (response.code == 200) {
tableDatac.value = response.data[page];
ElMessage.success(response.message);
} else {
- ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
}
// 寮�濮嬩换鍔�
@@ -1705,7 +1685,6 @@
ElMessage.success(response.message);
blinda.value = false;
} else {
- ElMessage.error(response.message);
}
} else {
ElMessage({
@@ -1714,30 +1693,6 @@
})
}
} catch (error) {
- 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);
}
}
// 鏆傚仠浠诲姟
@@ -1751,7 +1706,6 @@
ElMessage.success(response.message);
blindc.value = false;
} else {
- ElMessage.error(response.message);
}
} else {
ElMessage({
@@ -1760,7 +1714,6 @@
})
}
} catch (error) {
- console.error(error);
}
}
// 鍒犻櫎浠诲姟
@@ -1774,7 +1727,6 @@
ElMessage.success(response.message);
blindd.value = false;
} else {
- ElMessage.error(response.message);
}
} else {
ElMessage({
@@ -1783,11 +1735,18 @@
})
}
} catch (error) {
- console.error(error);
}
}
// 棰嗗彇浠诲姟
const finisha = async () => {
+ if (!totalPairQuantity.value) {
+ ElMessage.error(t('hellow.cpairQuantity'))
+ return
+ }
+ if (!selectedFormulaName.value) {
+ ElMessage.error(t('hellow.phollowformula'))
+ return
+ }
let flowCardId = window.localStorage.getItem('flowCardId')
let id = window.localStorage.getItem('id')
try {
@@ -1800,16 +1759,22 @@
formulaName.value = '';
totalPairQuantity.value = '';
} else {
- ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
}
// 寮哄埗鍑虹墖
const finishb = async () => {
let flowCardId = window.localStorage.getItem('flowCardId')
let id = window.localStorage.getItem('id')
+ if (!totalPairQuantity.value) {
+ ElMessage.error(t('hellow.cpairQuantity'))
+ return
+ }
+ if (!selectedFormulaName.value) {
+ ElMessage.error(t('hellow.phollowformula'))
+ return
+ }
try {
var url="/hollowGlass/hollowGlassOutRelationInfo/forceOutGlass?cell="+ 930 + "&flowCardId=" + flowCardId + "&totalPairQuantity=" + totalPairQuantitya.value+ "&formulaId=" + id;
const response = await request.post(url)
@@ -1819,33 +1784,12 @@
cella.value = '';
totalPairQuantitya.value = '';
} else {
- ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
}
-// 璋冨害
-const handleChange = async () => {
- try {
- const body = {
- flag: ganghua.value,
- };
- var url="/hollowGlass/hollowGlassOutRelationInfo/dispatchHollowSwitch?flag="+ganghua.value;
- const response = await request.post(url)
- if (response.code == 200) {
- ElMessage.success(response.message);
- ganghua.value = response.data
- }else {
- ElMessage.error(response.message);
- }
-}
-catch (error) {
- console.error(error);
- }
-}
+
onBeforeUnmount(() => {
- console.log("鍏抽棴浜�")
closeWebSocket();
});
</script>
@@ -1863,4 +1807,7 @@
margin-top: 20px;
margin-bottom: 10px;
}
+::v-deep(.row-red-background) {
+ background-color: rgb(224.6, 242.8, 215.6) !important;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0