From 2e81d145301fcd7082217c088acea50fbdc5b13e Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 14 三月 2025 11:30:17 +0800
Subject: [PATCH] 卧理一线二线新增页面显示接口，中空一线、二线新增历史任务，磨边时间戳转换
---
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 59 +++++++++++++++++------------------------------------------
1 files changed, 17 insertions(+), 42 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index e41e3d5..4b863dd 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>
@@ -20,10 +21,6 @@
</el-button>
<el-button style="margin-left: 10px;" id="searchButton" type="warning" @click="handleBindc">{{
$t('hellow.stopproject')
- }}
- </el-button>
- <el-button style="margin-left: 10px;" id="searchButton" type="danger" @click="handleBindb">{{
- $t('hellow.stoptask')
}}
</el-button>
<el-switch style="margin-top: 7px;margin-left: 10px;" v-model="ganghua" class="mb-2" :inactive-text="$t('hellow.schedulingswitch')" @change="handleChange" />
@@ -398,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>
@@ -493,6 +479,17 @@
</div>
</template>
</el-dialog>
+ <!-- 鍘嗗彶浠诲姟 -->
+ <el-dialog v-model="blindb" top="10vh" width="90%">
+ <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'
@@ -542,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,
@@ -618,10 +620,6 @@
// 寮�濮嬩换鍔�
const handleBinda = (row) => {
blinda.value = true;
-};
-// 鍋滄浠诲姟
-const handleBindb = (row) => {
- blindb.value = true;
};
// 鏆傚仠浠诲姟
const handleBindc = (row) => {
@@ -897,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