From bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 10:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/hollow/hollowequipment.vue | 716 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 578 insertions(+), 138 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 6546cf7..4a192a7 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -28,33 +28,38 @@
</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="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">
+ </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">
+ </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' }">
@@ -130,10 +135,10 @@
</el-table>
</el-dialog>
<!-- 涓┖閰嶆柟娣诲姞 -->
-<el-dialog v-model="add" top="13vh" width="55%" :title="$t('hellow.hollowformula')" >
+<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-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;">
@@ -203,7 +208,7 @@
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.casTwob')" :required="true" style="width: 16vw;">
+ <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>
@@ -216,7 +221,7 @@
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.casThreeb')" :required="true" style="width: 16vw;">
+ <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>
@@ -226,7 +231,7 @@
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.casFourb')" :required="true" style="width: 16vw;">
+ <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>
@@ -246,7 +251,7 @@
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.frameTwob')" :required="true" style="width: 16vw;">
+ <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>
@@ -256,14 +261,14 @@
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.frameThreeb')" :required="true" style="width: 16vw;">
+ <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')" :required="true" style="width: 16vw;">
+ <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>
@@ -273,17 +278,116 @@
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.intervalFrameHeightb')" :required="true" style="width: 16vw;">
- <el-input :placeholder="$t('hellow.intervalFrameHeightb')" v-model="intervalFrameHeight" autocomplete="off" />
+ <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.intervalFrameWidthb')" :required="true" style="width: 16vw;">
- <el-input :placeholder="$t('hellow.intervalFrameWidtha')" v-model="intervalFrameWidth" autocomplete="off" />
+ <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;">
@@ -294,20 +398,8 @@
<el-input :placeholder="$t('hellow.sealInserta')" v-model="sealInsert" 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.intervalFrameTyped')" :required="true" style="width: 16vw;">
- <el-select v-model="intervalFrameType" clearable style="width: 220px" :placeholder="$t('hellow.intervalFrameTypec')">
- <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-form>
+ <!-- </el-form> -->
</el-form>
</div>
<template #footer>
@@ -320,7 +412,7 @@
</template>
</el-dialog>
<!-- 涓┖閰嶆柟淇敼 -->
-<el-dialog v-model="adda" top="13vh" width="55%" :title="$t('hellow.edithollowformula')" >
+<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">
@@ -393,7 +485,7 @@
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.casTwob')" :required="true" style="width: 16vw;">
+ <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>
@@ -406,7 +498,7 @@
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.casThreeb')" :required="true" style="width: 16vw;">
+ <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>
@@ -416,7 +508,7 @@
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.casFourb')" :required="true" style="width: 16vw;">
+ <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>
@@ -436,7 +528,7 @@
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.frameTwob')" :required="true" style="width: 16vw;">
+ <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>
@@ -446,14 +538,14 @@
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.frameThreeb')" :required="true" style="width: 16vw;">
+ <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')" :required="true" style="width: 16vw;">
+ <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>
@@ -463,17 +555,116 @@
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.intervalFrameHeightb')" :required="true" style="width: 16vw;">
- <el-input :placeholder="$t('hellow.intervalFrameHeightb')" v-model="intervalFrameHeight" autocomplete="off" />
+ <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.intervalFrameWidthb')" :required="true" style="width: 16vw;">
- <el-input :placeholder="$t('hellow.intervalFrameWidtha')" v-model="intervalFrameWidth" autocomplete="off" />
+ <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;">
@@ -483,18 +674,6 @@
<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-col :span="9">
- <div id="dta" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('hellow.intervalFrameTyped')" :required="true" style="width: 16vw;">
- <el-select v-model="intervalFrameType" clearable style="width: 220px" :placeholder="$t('hellow.intervalFrameTypec')">
- <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-form>
@@ -725,55 +904,81 @@
: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')">
- <template #default="scope">
- <el-tag
- :type="scope.row.casOne === 1 ? 'success' : 'danger'"
- >
- {{ scope.row.casOne === 1 ? $t('hellow.Y') : $t('hellow.F') }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="casTwo" align="center" :label="$t('hellow.casTwo')">
- <template #default="scope">
- <el-tag
- :type="scope.row.casTwo === 1 ? 'success' : 'danger'"
- >
- {{ scope.row.casTwo === 1 ? $t('hellow.Y') : $t('hellow.F') }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="casThree" align="center" :label="$t('hellow.casThree')">
- <template #default="scope">
- <el-tag
- :type="scope.row.casThree === 1 ? 'success' : 'danger'"
- >
- {{ scope.row.casThree === 1 ? $t('hellow.Y') : $t('hellow.F') }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="casFour" align="center" :label="$t('hellow.casFour')">
- <template #default="scope">
- <el-tag
- :type="scope.row.casFour === 1 ? 'success' : 'danger'"
- >
- {{ scope.row.casFour === 1 ? $t('hellow.Y') : $t('hellow.F') }}
- </el-tag>
- </template>
- </el-table-column>
+ <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="intervalFrameHeight" align="center" :label="$t('hellow.intervalFrameHeight')" min-width="95"/>
- <el-table-column prop="intervalFrameType" align="center" :label="$t('hellow.intervalFrameType')" min-width="95">
+ <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="getStatusType(scope.row.intervalFrameType)">
- {{ getStatusText(scope.row.intervalFrameType) }}
+ <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="intervalFrameWidth" align="center" :label="$t('hellow.intervalFrameWidth')" min-width="95"/>
+ <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>
@@ -832,17 +1037,27 @@
const frameOne = ref('')
const frameThree = ref('')
const frameTwo = ref('')
-const intervalFrameHeight = ref('')
-const intervalFrameType = ref('')
-const intervalFrameWidth = 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 adda = ref(false)
const currentPage2 = ref(1)
const currentRow = reactive({});
const formattedProcessType = ref([]);
@@ -870,19 +1085,20 @@
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;
+ tableDataa.value = data[930][0];
+ const allPageData = data;
const currentPageKeyValue = currentPageKey.value;
const currentPageData = allPageData[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 {
@@ -930,6 +1146,7 @@
}
// 澶勭悊缂栬緫鎸夐挳鐐瑰嚮
function handleEdit(row) {
+ window.localStorage.setItem('id', row.id)
formulaName.value = row.formulaName;
filmRemove.value = removalMethodMap[row.filmRemove];
bottomRemove.value = row.bottomRemove;
@@ -944,9 +1161,18 @@
frameOne.value = row.frameOne;
frameThree.value = row.frameThree;
frameTwo.value = row.frameTwo;
- intervalFrameHeight.value = row.intervalFrameHeight;
- intervalFrameType.value = removalinterval[row.intervalFrameType];
- intervalFrameWidth.value = row.intervalFrameWidth;
+ 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;
}
@@ -965,9 +1191,18 @@
frameOne.value = '';
frameThree.value = '';
frameTwo.value = '';
- intervalFrameHeight.value = '';
- intervalFrameType.value = '';
- intervalFrameWidth.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;
}
@@ -979,21 +1214,165 @@
mulan.value = true;
fetchmulan();
};
-
-function getStatusType(intervalFrameType) {
- switch (intervalFrameType) {
- case 1:
+function getcasOnea(casOne) {
+ switch (casOne) {
+ case "1":
return 'success';
- case 5:
+ case "0":
return 'warning';
+ default:
+ return 'info';
}
}
-function getStatusText(intervalFrameType) {
- switch (intervalFrameType) {
- case 1:
+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:
+ 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 '';
}
}
// 棰勮
@@ -1081,9 +1460,31 @@
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,
@@ -1099,14 +1500,24 @@
frameOne: frameOne.value,
frameThree: frameThree.value,
frameTwo: frameTwo.value,
- intervalFrameHeight: intervalFrameHeight.value,
- intervalFrameType: intervalFrameType.value,
- intervalFrameWidth: intervalFrameWidth.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;
+ // tableDatax.value = response.data;
+ fetchmulan()
add.value = false
formulaName.value = '';
filmRemove.value = '';
@@ -1122,9 +1533,18 @@
frameOne.value = '';
frameThree.value = '';
frameTwo.value = '';
- intervalFrameHeight.value = '';
- intervalFrameType.value = '';
- intervalFrameWidth.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');
@@ -1147,9 +1567,11 @@
[t('hellow.intervalFrameTypea')]: 5,
}
// 涓┖閰嶆柟淇敼
-const handledit = async () => {
+ 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,
@@ -1164,9 +1586,18 @@
frameOne: frameOne.value,
frameThree: frameThree.value,
frameTwo: frameTwo.value,
- intervalFrameHeight: intervalFrameHeight.value,
- intervalFrameType: removalintervala[intervalFrameType.value],
- intervalFrameWidth: intervalFrameWidth.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) {
@@ -1197,7 +1628,8 @@
const response = await request.post(url)
if (response.code === 200) {
ElMessage.success(response.message);
- } else {
+ fetchmulan()
+ } else {
ElMessage.error(response.msg);
}
}
@@ -1423,4 +1855,12 @@
#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