From 839957125186876493ceb3b96c553384cb1a76fe Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 19 三月 2025 16:50:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 128 ++++++++++++++++++------------------------
1 files changed, 55 insertions(+), 73 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index 167a2c2..b9e0689 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -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,48 +23,18 @@
$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-col :span="4">
- <div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.currenttask')" style="width: 14vw">
- {{ temperingtotal }}
- </el-form-item>
- </div>
- </el-col> -->
- <!-- <el-col :span="5">
- <div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.claimednumber')" style="width: 14vw">
- {{ glasstotal }}
- </el-form-item>
- </div>
- </el-col> -->
- <!-- <el-col :span="4">
- <div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.linenumber')" style="width: 14vw">
- {{ fulltotals }}
- </el-form-item>
- </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' }">
<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"/>
@@ -95,6 +66,7 @@
<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="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>
@@ -423,17 +395,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>
@@ -494,7 +455,13 @@
<el-table ref="table" style="margin-top: 20px;height: 400px;"
:data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="formulaName" fixed align="center" :label="$t('hellow.formulaNamep')"/>
- <el-table-column prop="filmRemove" fixed align="center" :label="$t('Mounting.removalmethodp')"/>
+ <el-table-column prop="filmRemove" align="center" :label="$t('Mounting.removalmethodp')" min-width="110">
+ <template #default="scope">
+ <el-tag :type="getcasOnea(scope.row.filmRemove)">
+ {{ getStatuscasOnea(scope.row.filmRemove) }}
+ </el-tag>
+ </template>
+ </el-table-column>
<el-table-column prop="topRemove" align="center" :label="$t('hellow.topRemovep')"> </el-table-column>
<el-table-column prop="bottomRemove" align="center" :label="$t('hellow.bottomRemovep')"> </el-table-column>
<el-table-column prop="leftRemove" align="center" :label="$t('hellow.leftRemovep')"> </el-table-column>
@@ -512,6 +479,17 @@
</div>
</template>
</el-dialog>
+ <!-- 鍘嗗彶浠诲姟 -->
+ <el-dialog v-model="blindb" top="5vh" width="95%">
+ <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'
@@ -540,6 +518,7 @@
const filmRemove = ref('')
const formulaName = ref('')
const leftRemove = ref('')
+const thickness = ref('')
const rightRemove = ref('')
const topRemove = ref('')
const filmsId = ref('')
@@ -560,6 +539,11 @@
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/hellowquiptwohistory`;
+};
const options = [
{
value: 930,
@@ -592,8 +576,8 @@
const allPageData = data;
const currentPageKeyValue = currentPageKey.value;
const currentPageData = allPageData[currentPageKeyValue];
- if (data.freeTwoReqvestEntity != null) {
- freetwo.value = data.freetwo[0] == true ? 'green' : '#911005';
+ if (data.freeTwoRequestEntity != null) {
+ freetwo.value = data.freeTwoRequestEntity[0] == true ? 'green' : '#911005';
}
// if (currentPageData && Array.isArray(currentPageData) && currentPageData.length > 0) {
// tableDataa.value = currentPageData[0];
@@ -606,19 +590,36 @@
};
onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
+ window.localStorage.setItem('flowCardId', '')
});
onUnmounted(() => {
if (socket) {
closeWebSocket(socket);
}
});
+function getcasOnea(filmRemove) {
+ switch (filmRemove) {
+ case 1:
+ return 'success';
+ case 0:
+ return 'warning';
+ default:
+ return 'info';
+ }
+}
+function getStatuscasOnea(filmRemove) {
+ switch (filmRemove) {
+ case 1:
+ return t('Mounting.removal');
+ case 0:
+ return t('Mounting.noremoval');
+ default:
+ return '';
+ }
+}
// 寮�濮嬩换鍔�
const handleBinda = (row) => {
blinda.value = true;
-};
-// 鍋滄浠诲姟
-const handleBindb = (row) => {
- blindb.value = true;
};
// 鏆傚仠浠诲姟
const handleBindc = (row) => {
@@ -690,6 +691,7 @@
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
filmsId: '',
flowCardId: '',
+ thickness: '',
});
if (response.code == 200) {
ElMessage.success(response.message);
@@ -707,6 +709,7 @@
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
filmsId: filmsId.value,
flowCardId: flowCardId.value,
+ thickness: thickness.value
});
if (response.code == 200) {
ElMessage.success(response.message);
@@ -765,6 +768,7 @@
leftRemove.value = '';
rightRemove.value = '';
topRemove.value = '';
+ fetchmulan()
} else {
ElMessage.error('Failed to fetch data');
}
@@ -815,7 +819,8 @@
const response = await request.post(url)
if (response.code === 200) {
ElMessage.success(response.message);
- } else {
+ fetchmulan()
+ } else {
ElMessage.error(response.msg);
}
}
@@ -890,29 +895,6 @@
if (response.code == 200) {
ElMessage.success(response.message);
blinda.value = false;
- } else {
- ElMessage.error(response.message);
- }
- } else {
- ElMessage({
- type: 'info',
- message: t('basicData.infonull'),
- })
- }
- } 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=" + 931;
- const response = await request.post(url)
- if (response.code == 200) {
- ElMessage.success(response.message);
- blindb.value = false;
} else {
ElMessage.error(response.message);
}
--
Gitblit v1.8.0