From 5e4b0e1e71c9a5bd46d191af56b9517881d12475 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 13 三月 2025 08:43:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Caching/cachingun.vue | 100 +++++---------------------------------------------
1 files changed, 10 insertions(+), 90 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index ead7ee8..dd57e4a 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -54,27 +54,11 @@
parseAndSetTime();
});
// 鍘嗗彶浠诲姟
+const iframeUrl = ref('');
const handlehistorical = (row) => {
blindb.value = true;
- historical()
+ iframeUrl.value = `${window.location.origin}/#/Caching/cachingunhistory`;
};
-// 鍘嗗彶浠诲姟
-const historical = async () => {
- try {
- let startTime = window.localStorage.getItem('startTime')
- var url="/cacheGlass/edgStorageDeviceTaskHistory?deviceId="+2 + "&startTime=" + startTime + "&endTime=" + globalDate + "&glassId=" + '' + "&taskState=" + '' + "&taskType=" + '';
- const response = await request.get(url)
- if (response.code == 200) {
- ElMessage.success(response.message);
- tableDatad.value = response.data;
- } else {
- ElMessage.error(response.message);
- }
-}
-catch (error) {
- console.error(error);
- }
-}
const sethistorical = async () => {
try {
const params = {
@@ -445,78 +429,14 @@
</div>
<!-- 鍘嗗彶浠诲姟 -->
<el-dialog v-model="blindb" top="10vh" width="90%">
- <div style="display: flex;">
- <el-input v-model="glassId" style="margin-left: 10px;margin-bottom: 10px;width: 270px;" :placeholder="$t('searchOrder.inglassID')" />
- <el-select
- :placeholder="$t('searchOrder.taskstatus')"
- clearable
- style="width: 270px;margin-left: 10px;"
- v-model="taskState">
- <el-option
- v-for="item in optionsa"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- <el-select
- :placeholder="$t('film.enabletype')"
- clearable
- style="width: 270px;margin-left: 10px;"
- v-model="taskType">
- <el-option
- v-for="item in optionsb"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- <span class="demonstration" style="margin-left: 20px;margin-top: 3px;">{{ $t('workOrder.time') }}</span>
- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" :start-placeholder="$t('reportmanage.starttime')"
- style="margin-left: 15px;" value-format = "YYYY-MM-DD hh:mm:ss"
- :end-placeholder="$t('reportmanage.endtime')">
- </el-date-picker>
- <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{
- $t('reportmanage.inquire')
- }}</el-button>
- </div>
- <el-table ref="table" style="margin-top: 20px;height: 650px;" :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="glassIdIn" align="center" :label="$t('searchOrder.intoglassid')" min-width="80" />
- <el-table-column prop="glassIdOut" align="center" :label="$t('searchOrder.outputglassID')" min-width="80" />
- <el-table-column prop="currentCell" align="center" :label="$t('sorter.layernow')" min-width="80" />
- <el-table-column prop="startCell" align="center" :label="$t('processCard.layer')" min-width="120" />
- <el-table-column
- align="center"
- :label="$t('film.taskstatus')"
- min-width="80"
- prop="taskState"
- >
- <template #default="scope">
- <el-tag :type="getStatusTypeb(scope.row.taskState)">
- {{ getStatusTextb(scope.row.taskState) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column
- align="center"
- :label="$t('film.enabletype')"
- min-width="80"
- prop="taskType"
- >
- <template #default="scope">
- <el-tag :type="getStatusTypea(scope.row.taskType)">
- {{ getStatusTexta(scope.row.taskType) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="createTime" align="center" :label="$t('film.createtime')" min-width="120" />
- <el-table-column prop="updateTime" align="center" :label="$t('sorter.updateTime')" min-width="120" />
- </el-table>
- <template #footer>
- <div id="dialog-footer">
- <el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
- </div>
- </template>
+ <iframe
+ :src="iframeUrl"
+ marginwidth="2000px"
+ marginheight="2000px"
+ width="100%"
+ height="700px"
+ frameborder="0"
+ ></iframe>
</el-dialog>
</template>
<style scoped>
--
Gitblit v1.8.0