From cd7f3fa89aed4e7a4b87c0ee4164cd606103b318 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 15 四月 2025 09:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 363 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 333 insertions(+), 30 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index 4e5b56b..f875465 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -20,6 +20,37 @@
const dialogFormVisiblee = ref(false)
const blindb = ref(false)
const Edit = ref(false)
+const card1 = ref(false)
+const card2 = ref(false)
+const card3 = ref(false)
+const card4 = ref(false)
+const card5 = ref(false)
+const card6 = ref(false)
+const card7 = ref(false)
+const card8 = ref(false)
+const card9 = ref(false)
+const card10 = ref(false)
+const card11 = ref(false)
+const card12 = ref(false)
+const card13 = ref(false)
+const card14 = ref(false)
+const card15 = ref(false)
+const card16 = ref(false)
+const card17 = ref(false)
+const card18 = ref(false)
+const card19 = ref(false)
+const card20 = ref(false)
+const card21 = ref(false)
+const card22 = ref(false)
+const card23 = ref(false)
+const card24 = ref(false)
+const card25 = ref(false)
+const card98 = ref(false)
+const card99 = ref(false)
+const card101 = ref(false)
+const card102 = ref(false)
+const card103 = ref(false)
+const card104 = ref(false)
const timeRange = ref([])
const timeRangea = ref([])
const selectValuesa = reactive([]);
@@ -64,8 +95,7 @@
function parseAndSetTime() {
const backendTime = new Date(globalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
- console.log(formatTimestamp(oneWeekAgo));
- console.log(oneWeekAgo);
+ oneWeekAgo.setHours(0, 0, 0, 0);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
timeRangea.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
@@ -86,6 +116,99 @@
tableDataa.value = formattedTasks;
if(data.rawStationDetailsList !=null){
tableDatab.value = data.rawStationDetailsList[0]
+ if (data.rawStationDetailsList[0][0].patternThickness !=null) {
+ card1.value = true
+ }
+ if (data.rawStationDetailsList[0][1].patternThickness !=null) {
+ card2.value = true
+ }
+ if (data.rawStationDetailsList[0][2].patternThickness !=null) {
+ card3.value = true
+ }
+ if (data.rawStationDetailsList[0][3].patternThickness !=null) {
+ card4.value = true
+ }
+ if (data.rawStationDetailsList[0][4].patternThickness !=null) {
+ card5.value = true
+ }
+ if (data.rawStationDetailsList[0][5].patternThickness !=null) {
+ card6.value = true
+ }
+ if (data.rawStationDetailsList[0][6].patternThickness !=null) {
+ card7.value = true
+ }
+ if (data.rawStationDetailsList[0][7].patternThickness !=null) {
+ card8.value = true
+ }
+ if (data.rawStationDetailsList[0][8].patternThickness !=null) {
+ card9.value = true
+ }
+ if (data.rawStationDetailsList[0][9].patternThickness !=null) {
+ card10.value = true
+ }
+ if (data.rawStationDetailsList[0][10].patternThickness !=null) {
+ card11.value = true
+ }
+ if (data.rawStationDetailsList[0][11].patternThickness !=null) {
+ card12.value = true
+ }
+ if (data.rawStationDetailsList[0][12].patternThickness !=null) {
+ card13.value = true
+ }
+ if (data.rawStationDetailsList[0][13].patternThickness !=null) {
+ card14.value = true
+ }
+ if (data.rawStationDetailsList[0][14].patternThickness !=null) {
+ card15.value = true
+ }
+ if (data.rawStationDetailsList[0][15].patternThickness !=null) {
+ card16.value = true
+ }
+ if (data.rawStationDetailsList[0][16].patternThickness !=null) {
+ card17.value = true
+ }
+ if (data.rawStationDetailsList[0][17].patternThickness !=null) {
+ card18.value = true
+ }
+ if (data.rawStationDetailsList[0][18].patternThickness !=null) {
+ card19.value = true
+ }
+ if (data.rawStationDetailsList[0][19].patternThickness !=null) {
+ card20.value = true
+ }
+ if (data.rawStationDetailsList[0][20].patternThickness !=null) {
+ card21.value = true
+ }
+ if (data.rawStationDetailsList[0][21].patternThickness !=null) {
+ card22.value = true
+ }
+ if (data.rawStationDetailsList[0][22].patternThickness !=null) {
+ card23.value = true
+ }
+ if (data.rawStationDetailsList[0][23].patternThickness !=null) {
+ card24.value = true
+ }
+ if (data.rawStationDetailsList[0][24].patternThickness !=null) {
+ card25.value = true
+ }
+ if (data.rawStationDetailsList[0][25].patternThickness !=null) {
+ card98.value = true
+ }
+ if (data.rawStationDetailsList[0][26].patternThickness !=null) {
+ card99.value = true
+ }
+ if (data.rawStationDetailsList[0][27].patternThickness !=null) {
+ card101.value = true
+ }
+ if (data.rawStationDetailsList[0][28].patternThickness !=null) {
+ card102.value = true
+ }
+ if (data.rawStationDetailsList[0][29].patternThickness !=null) {
+ card103.value = true
+ }
+ if (data.rawStationDetailsList[0][30].patternThickness !=null) {
+ card104.value = true
+ }
}
};
const handleEdit = (row) => {
@@ -125,7 +248,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 鍘熺墖鍏ュ簱
@@ -152,7 +274,6 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
};
// 鍏ュ簱璇锋眰
@@ -170,8 +291,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
// 鍑哄簱璇锋眰
@@ -189,8 +308,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
// 鍑哄簱
@@ -216,7 +333,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 鏌ヨ鏁版嵁
@@ -296,7 +412,6 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
};
// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
@@ -335,11 +450,10 @@
// }
// }
// catch (error) {
-// console.error(error);
// }
// }
// 浠诲姟鎴愬姛澶勭悊
-const successfull = async(row) => {
+const successfull = async(row) => {
try {
const confirmResult = await ElMessageBox.confirm(
t('searchOrder.psuccessfullyprocessed'),
@@ -359,12 +473,11 @@
ElMessage.error(response.msg);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 浠诲姟澶辫触澶勭悊
-const handleptask = async(row) => {
+const handleptask = async(row) => {
try {
const confirmResult = await ElMessageBox.confirm(
t('searchOrder.ptaskfailure'),
@@ -384,8 +497,7 @@
ElMessage.error(response.msg);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
function getStatusType1(taskType) {
@@ -480,15 +592,15 @@
</el-select>
<el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('film.inquire') }}</el-button>
</div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="300" ref="table"
:data="tableDataa" :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="endSlot" align="center" :label="$t('film.endoriginateslot')"/>
<el-table-column prop="patternQuantity" align="center" :label="$t('film.patternquantity')"/>
- <el-table-column
+ <el-table-column width="100"
align="center"
:label="$t('film.enabletype')"
prop="taskType"
@@ -511,13 +623,49 @@
</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 :disabled="(scope.row.taskState !== 0)" type="text" plain @click="successfull(scope.row)">{{ $t('searchOrder.successfullyprocessed') }}</el-button>
+ <el-button :disabled="(scope.row.taskState !== 0)" type="text" plain @click="handleptask(scope.row)">{{ $t('searchOrder.taskfailure') }}</el-button>
+ </template>
+ </el-table-column>
</el-table>
</div>
</el-card>
<div class="img-dlpl">
- <div class="img-car1" :style="'z-index:999;top:250px;left:' + 20 + 'px;position:absolute;'">
- </div>
+ <div class="img-car1" style="z-index:999;top:250px;left:20px;position:absolute;"></div>
+ <!-- <div class="img-car1" :style="'z-index:999;top:250px;left:' + 20 + 'px;position:absolute;'"></div> -->
+ <div class="card1" v-show="card1" style="z-index:999;top:430px;left:53px;position:absolute;"></div>
+ <div class="card2" v-show="card2" style="z-index:999;top:430px;left:80px;position:absolute;"></div>
+ <div class="card3" v-show="card3" style="z-index:999;top:430px;left:108px;position:absolute;"></div>
+ <div class="card98" v-show="card98" style="z-index:999;top:430px;left:143px;position:absolute;"></div>
+ <div class="card4" v-show="card4" style="z-index:999;top:430px;left:202px;position:absolute;"></div>
+ <div class="card5" v-show="card5" style="z-index:999;top:430px;left:227px;position:absolute;"></div>
+ <div class="card6" v-show="card6" style="z-index:999;top:430px;left:253px;position:absolute;"></div>
+ <div class="card7" v-show="card7" style="z-index:999;top:430px;left:280px;position:absolute;"></div>
+ <div class="card8" v-show="card8" style="z-index:999;top:430px;left:308px;position:absolute;"></div>
+ <div class="card9" v-show="card9" style="z-index:999;top:430px;left:337px;position:absolute;"></div>
+ <div class="card10" v-show="card10" style="z-index:999;top:430px;left:364px;position:absolute;"></div>
+ <div class="card11" v-show="card11" style="z-index:999;top:430px;left:391px;position:absolute;"></div>
+ <div class="card99" v-show="card99" style="z-index:999;top:430px;left:426px;position:absolute;"></div>
+ <div class="card12" v-show="card12" style="z-index:999;top:430px;left:489px;position:absolute;"></div>
+ <div class="card13" v-show="card13" style="z-index:999;top:430px;left:514px;position:absolute;"></div>
+ <div class="card14" v-show="card14" style="z-index:999;top:430px;left:540px;position:absolute;"></div>
+ <div class="card15" v-show="card15" style="z-index:999;top:430px;left:566px;position:absolute;"></div>
+ <div class="card16" v-show="card16" style="z-index:999;top:430px;left:595px;position:absolute;"></div>
+ <div class="card17" v-show="card17" style="z-index:999;top:430px;left:624px;position:absolute;"></div>
+ <div class="card18" v-show="card18" style="z-index:999;top:430px;left:654px;position:absolute;"></div>
+ <div class="card19" v-show="card19" style="z-index:999;top:430px;left:682px;position:absolute;"></div>
+ <div class="card20" v-show="card20" style="z-index:999;top:430px;left:707px;position:absolute;"></div>
+ <div class="card25" v-show="card25" style="z-index:999;top:109px;left:664px;position:absolute;"></div>
+ <div class="card24" v-show="card24" style="z-index:999;top:109px;left:639px;position:absolute;"></div>
+ <div class="card23" v-show="card23" style="z-index:999;top:109px;left:616px;position:absolute;"></div>
+ <div class="card22" v-show="card22" style="z-index:999;top:109px;left:592px;position:absolute;"></div>
+ <div class="card21" v-show="card21" style="z-index:999;top:109px;left:564px;position:absolute;"></div>
+ <div class="card101" v-show="card101" style="z-index:999;top:109px;left:364px;position:absolute;"></div>
+ <div class="card102" v-show="card102" style="z-index:999;top:109px;left:334px;position:absolute;"></div>
+ <div class="card103" v-show="card103" style="z-index:999;top:109px;left:96px;position:absolute;"></div>
+ <div class="card104" v-show="card104" style="z-index:999;top:109px;left:70px;position:absolute;"></div>
</div>
<el-dialog v-model="dialogFormVisiblea" top="5vh" width="85%" >
<el-table ref="table" style="margin-top: 20px;height: 700px;"
@@ -546,27 +694,27 @@
</el-table-column>
<el-table-column fixed="right" :label="$t('film.operate')" align="center" width="270">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleEdit(scope.row)">{{ $t('film.exit') }}</el-button>
- <el-button :disabled="!scope.row.remainQuantity" size="mini" type="text" plain @click="deleteWarehousing(scope.row)">{{ $t('film.delete') }}</el-button>
- <el-button :disabled="!scope.row.remainQuantity || scope.row.remainQuantity === 0" size="mini" type="text" plain @click="openc(scope.row)">{{ $t('film.outbound') }}</el-button>
+ <el-button type="text" plain @click="handleEdit(scope.row)">{{ $t('film.exit') }}</el-button>
+ <el-button :disabled="!scope.row.remainQuantity" type="text" plain @click="deleteWarehousing(scope.row)">{{ $t('film.delete') }}</el-button>
+ <el-button :disabled="!scope.row.remainQuantity || scope.row.remainQuantity === 0" type="text" plain @click="openc(scope.row)">{{ $t('film.outbound') }}</el-button>
</template>
</el-table-column>
</el-table>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="10vh" width="90%">
+<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
marginheight="2000px"
width="100%"
- height="700px"
+ height="750px"
frameborder="0"
></iframe>
</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">
+ <el-form label-width="150px">
<el-form label-width="100px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
@@ -678,7 +826,7 @@
</el-dialog>
<el-dialog v-model="Edit" 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">
+ <el-form label-width="150px">
<el-form label-width="100px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
@@ -778,4 +926,159 @@
overflow: hidden;
position:relative
}
+.card1{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card2{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card3{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card4{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card5{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card6{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card7{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card8{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card9{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card10{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card11{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card12{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card13{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card14{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card15{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card16{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card17{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card18{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card19{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card20{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card21{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card22{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card23{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card24{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card25{
+ width: 14px;
+ height: 110px;
+ background-color: #911005
+}
+.card101{
+ width: 10px;
+ height: 110px;
+ background-color: #911005
+}
+.card102{
+ width: 10px;
+ height: 110px;
+ background-color: #911005
+}
+.card103{
+ width: 10px;
+ height: 110px;
+ background-color: #911005
+}
+.card104{
+ width: 10px;
+ height: 110px;
+ background-color: #911005
+}
+.card98{
+ width: 25px;
+ height: 110px;
+ background-color: #911005
+}
+.card99{
+ width: 25px;
+ height: 110px;
+ background-color: #911005
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0