From 75b98831417be414bc43e1832479d05d20cf6ac3 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 13 三月 2025 16:44:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 115 +++++++++++----------------------------------------------
1 files changed, 22 insertions(+), 93 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index 04ed981..4e5b56b 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -247,34 +247,6 @@
ElMessage.error(response.message);
}
};
-// 鍘嗗彶浠诲姟鏌ヨ
-const sethistorical = async () => {
- let celllista=[]
- let stateLista=[]
- if(selectValuesb[0]!=null&&selectValuesb[0]!='undefined'){
- if(selectValuesb[0]!=""){
- celllista=[selectValuesb[0]];
- }
- }
- if(selectValuesb[1]!=null&&selectValuesb[1]!='undefined'){
- if(selectValuesb[1]!=""){
- stateLista=[selectValuesb[1]];
- }
- }
- const response = await request.post("/glassStorage/rawGlassStorageTask/queryRawGlassHistoryTask", {
- beginDate: (timeRangea.value && timeRangea.value[0]) || '',
- endDate: (timeRangea.value && timeRangea.value[1]) || '',
- taskState: celllista,
- taskType: stateLista
- })
- if (response.code === 200) {
- tableDatad.value = response.data;
- ElMessage.success(response.message);
- }
- else {
- ElMessage.error(response.message);
- }
-};
// 鏄惁绂佺敤
const toggleEnableState = async (row: any) => {
if (!row.deviceId) {
@@ -341,9 +313,31 @@
// 鍘嗗彶浠诲姟
const iframeUrl = ref('');
const handlehistorical = (row) => {
+ // historical()
+ // window.localStorage.setItem('pagenumber', 1)
blindb.value = true;
iframeUrl.value = `${window.location.origin}/#/GlassStorage/rawhistory`;
};
+// const historical = async () => {
+// try {
+// let startTime = window.localStorage.getItem('startTime')
+// const response = await request.post("/glassStorage/rawGlassStorageTask/queryRawGlassHistoryTask", {
+// pageNo: 1,
+// pageSize: 20,
+// taskState: [],
+// taskType: [],
+// beginDate: startTime,
+// endDate: globalDate
+// })
+// if (response.code == 200) {
+// window.localStorage.setItem('pagenumber', 1)
+// } else {
+// }
+// }
+// catch (error) {
+// console.error(error);
+// }
+// }
// 浠诲姟鎴愬姛澶勭悊
const successfull = async(row) => {
try {
@@ -570,71 +564,6 @@
frameborder="0"
></iframe>
</el-dialog>
-<!-- <el-dialog v-model="blindb" top="10vh" width="90%">
- <div style="display: flex;">
- <el-date-picker style="margin-left: 10px;" v-model="timeRangea" type="datetimerange"
- format="YYYY/MM/DD HH:mm:ss"
- value-format="YYYY-MM-DD HH:mm:ss"
- :start-placeholder="$t('film.starttime')"
- :end-placeholder="$t('film.endtime')"
- :default-time="defaultTime" />
- <el-select v-model="selectValuesb[0]" clearable :placeholder="$t('film.taskstatus')" style="margin-left: 10px;" >
- <el-option :label="$t('film.built')" value="0"></el-option>
- <el-option :label="$t('film.finish')" value="1"></el-option>
- <el-option :label="$t('film.fail')" value="2"></el-option>
- </el-select>
- <el-select v-model="selectValuesb[1]" clearable :placeholder="$t('film.tasktype')" style="margin-left: 10px;" >
- <el-option :label="$t('sorter.advancetask')" value="1"></el-option>
- <el-option :label="$t('sorter.outputtasks')" value="2"></el-option>
- <el-option :label="$t('sorter.schedulingtasks')" value="3"></el-option>
- <el-option :label="$t('sorter.advancerequests')" value="4"></el-option>
- <el-option :label="$t('sorter.releaserequest')" value="5"></el-option>
- </el-select>
- <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="id" align="center" :label="$t('film.enableid')"/>
- <el-table-column prop="startSlot" align="center" :label="$t('film.originateslot')"/>
- <el-table-column prop="endSlot" align="center" :label="$t('film.endslot')"/>
- <el-table-column prop="patternQuantity" align="center" :label="$t('film.patternquantity')"/>
- <el-table-column
- align="center"
- :label="$t('film.enabletype')"
- prop="taskType"
- >
- <template #default="scope">
- <el-tag :type="getStatusType1(scope.row.taskType)">
- {{ getStatusText1(scope.row.taskType) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column
- align="center"
- :label="$t('film.taskstatus')"
- prop="taskState"
- >
- <template #default="scope">
- <el-tag :type="getStatusType2(scope.row.taskState)">
- {{ getStatusText2(scope.row.taskState) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="createTime" align="center" :label="$t('film.createtime')" />
- <el-table-column fixed="right" :label="$t('film.operate')" align="center">
- <template #default="scope">
- <el-button size="mini" :disabled="!scope.row.taskState == 0" type="text" plain @click="successfull(scope.row)">{{ $t('searchOrder.successfullyprocessed') }}</el-button>
- <el-button size="mini" :disabled="!scope.row.taskState == 0" type="text" plain @click="handleptask(scope.row)">{{ $t('searchOrder.taskfailure') }}</el-button>
- </template>
- </el-table-column>
- </el-table>
- <template #footer>
- <div id="dialog-footer">
- <el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
- </div>
- </template>
- </el-dialog> -->
<el-dialog v-model="dialogFormVisibleb" top="23vh" width="55%" :title="$t('film.addglass')" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
<el-form size="mini" label-width="150px">
--
Gitblit v1.8.0