From 687a49f9be36259f768bbd5344e940935782c200 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 14 三月 2025 10:36:08 +0800
Subject: [PATCH] 提交完工事添加破损数据非空判断，修改玻璃类型为膜系
---
UI-Project/src/views/Slicecage/slicecage.vue | 150 ++++---------------------------------------------
1 files changed, 13 insertions(+), 137 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index ba10a0a..a09a077 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -256,83 +256,11 @@
}
};
// 鍘嗗彶浠诲姟
-// const handlehistorical = (row) => {
-// blindb.value = true;
-// historical()
-// };
-// 鍘嗗彶浠诲姟
-const historical = async () => {
- try {
- let startTime = window.localStorage.getItem('startTime')
- const response = await request.post("/cacheVerticalGlass/bigStorageCageHistoryTask/queryBigStorageCageHistoryTask", {
- glassId: glassId.value,
- startSlot: 0,
- targetSlot: 0,
- taskStateList: [],
- taskTypeList: [],
- beginDate: startTime,
- endDate: globalDate
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- tableDatax.value = response.data;
- } else {
- ElMessage.error(response.message);
- }
-}
-catch (error) {
- console.error(error);
- }
-}
-// 鍘嗗彶鏌ヨ
-const sethistorical = async () => {
- try {
- let startTime = window.localStorage.getItem('startTime')
- let celllist=[]
- let stateList=[]
- let pstartSlot= ''
- let ptargetSlot=''
- if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
- if(selectValuesa[0]!=""){
- celllist=[selectValuesa[0]];
- }
- }
- if(selectValuesa[1]!=null&&selectValuesa[1]!='undefined'){
- if(selectValuesa[1]!=""){
- stateList=[selectValuesa[1]];
- }
- }
- if(startSlot.value != ""){
- pstartSlot = startSlot.value
- }else{
- pstartSlot = '0'
- }
- if(targetSlot.value != ""){
- ptargetSlot = targetSlot.value
- }else{
- ptargetSlot = '0'
- }
- const response = await request.post("/cacheVerticalGlass/bigStorageCageHistoryTask/queryBigStorageCageHistoryTask", {
- glassId: glassId.value,
- startSlot: pstartSlot,
- targetSlot: ptargetSlot,
- taskStateList: celllist,
- taskTypeList: stateList,
- beginDate: startTime,
- endDate: globalDate
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- tableDatax.value = response.data;
- } else {
- ElMessage.error(response.message);
- }
-}
-catch (error) {
- console.error(error);
- }
-}
-
+const iframeUrl = ref('');
+const handlehistorical = (row) => {
+ blindb.value = true;
+ iframeUrl.value = `${window.location.origin}/#/Slicecage/slicecagehistory`;
+};
// 鎷胯蛋
const brokec = async(row) => {
try {
@@ -1518,66 +1446,14 @@
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
<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-input v-model="startSlot" style="margin-left: 10px;margin-bottom: 10px;width: 270px;" :placeholder="$t('film.originateslot')" />
- <el-input v-model="targetSlot" style="margin-left: 10px;margin-bottom: 10px;width: 270px;" :placeholder="$t('film.endslot')" />
- <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('searchOrder.taskstatus')" clearable
- style="width: 270px;margin-left: 10px;">
- <el-option :label="$t('searchOrder.begin')" value="0"></el-option>
- <el-option :label="$t('searchOrder.finish')" value="2"></el-option>
- <el-option :label="$t('order.dilapidation')" value="3"></el-option>
- <el-option :label="$t('searchOrder.uncar')" value="4"></el-option>
- </el-select>
- <el-select v-model="selectValuesa[1]" filterable :placeholder="$t('film.enabletype')" clearable
- style="width: 270px;margin-left: 10px;">
- <el-option :label="$t('searchOrder.inkage')" value="1"></el-option>
- <el-option :label="$t('searchOrder.outfilm')" value="2"></el-option>
- <el-option :label="$t('film.dispatch')" value="3"></el-option>
- </el-select>
- <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>
<!-- 閽㈠寲鏌ヨ -->
<el-dialog v-model="dialogFormVisiblec" top="5vh" width="85%" :title="$t('searchOrder.temperingqueries')">
--
Gitblit v1.8.0