From e875c70fea51ffafd689fd0d5f8b51bd3df40de0 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 07 一月 2025 15:26:13 +0800
Subject: [PATCH] 中空模块新增空闲状态，中空配方新增字段，掰片模块调整文字样式
---
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index 7c705d5..167a2c2 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.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.freetwo') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: freetwo, 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' }">
@@ -539,6 +544,7 @@
const topRemove = ref('')
const filmsId = ref('')
const flowCardId = ref('')
+const freetwo = ref('#911005');
const dialogFormVisiblea = ref(false)
const dialogFormVisibleb = ref(false)
const dialogFormVisiblec = ref(false)
@@ -582,10 +588,13 @@
};
const handleMessage = (data) => {
try {
- tableDataa.value = data[931][0];
- const allPageData = data;
+ tableDataa.value = data[931][0];
+ const allPageData = data;
const currentPageKeyValue = currentPageKey.value;
const currentPageData = allPageData[currentPageKeyValue];
+ if (data.freeTwoReqvestEntity != null) {
+ freetwo.value = data.freetwo[0] == true ? 'green' : '#911005';
+ }
// if (currentPageData && Array.isArray(currentPageData) && currentPageData.length > 0) {
// tableDataa.value = currentPageData[0];
// } else {
@@ -1033,4 +1042,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