From bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 10:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 263 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 182 insertions(+), 81 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index f81a1eb..f3c75a8 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -1,35 +1,33 @@
<script lang="ts" setup>
-import {Search} from "@element-plus/icons-vue";
-import {reactive} from "vue";
+import {onBeforeUnmount, onMounted, reactive, ref} from "vue";
import {useRouter} from "vue-router"
-const router = useRouter()
-import type { TableColumnCtx } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { useI18n } from 'vue-i18n'
-import { WebSocketHost ,host} from '@/utils/constants'
+import {ElMessage, ElMessageBox} from 'element-plus'
+import {useI18n} from 'vue-i18n'
+import {host, WebSocketHost} from '@/utils/constants'
+import dayjs from 'dayjs';
import request from "@/utils/request"
-import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
-import { ref, onMounted, onUnmounted, onBeforeUnmount } from "vue";
+import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
+const router = useRouter()
const tableDataa = ref([])
const tableDatab = ref([])
-const { t } = useI18n()
+const {t} = useI18n()
const add = ref(false)
const dialogFormVisiblea = ref(false)
const dialogFormVisibleb = ref(false)
const dialogFormVisiblec = ref(false)
const dialogFormVisiblee = ref(false)
const Edit = ref(false)
-const timeRange = ref(["2022-01-01 00:00:00", "2025-01-01 00:00:00"])
+const timeRange = ref([])
const selectValuesa = reactive([]);
- const patternWidth = ref('');
- const patternHeight = ref('');
- const patternThickness = ref('');
- const filmsId = ref('');
- const remainQuantity = ref('');
- const slot = ref('');
- const leftingStation = ref('');
+const patternWidth = ref('');
+const patternHeight = ref('');
+const patternThickness = ref('');
+const filmsId = ref('');
+const remainQuantity = ref('');
+const slot = ref('');
+const leftingStation = ref('');
const loadingline = ref('');
- let webSocket: WebSocket | null = null;
+let webSocket: WebSocket | null = null;
const value = ref('')
const options = [
{
@@ -45,9 +43,11 @@
taskType: '',
taskState: '',
});
-request.post("/glassStorage/rawGlassStorageTask/setRawGlassTaskRequest",{
- beginDate: "2022-01-01 00:00:00",
- endDate: "2025-01-01 00:00:00",
+ let startTime = window.localStorage.getItem('startTime')
+ let endTime = window.localStorage.getItem('endTime')
+ request.post("/glassStorage/rawGlassStorageTask/setRawGlassTaskRequest",{
+ beginDate: startTime,
+ endDate: endTime,
}).then((response) => {
if (response.code == 200) {
tableDataa.value = response.data
@@ -57,25 +57,32 @@
}
});
-onMounted(() => {
- // closeWebSocket();
- debugger
- // console.log("--------------webSocket")
- socket = initializeWebSocket(socketUrl, handleMessage);
+ onMounted(() => {
+ socket = initializeWebSocket(socketUrl, handleMessage);
+ const endTime = dayjs().startOf('minute'); // 褰撳墠鏃堕棿锛岀簿纭埌鍒嗛挓
+ const startTime = endTime.subtract(7, 'day').startOf('minute'); // 褰撳墠鏃堕棿鐨勫墠涓�澶╋紝绮剧‘鍒板垎閽�
+ // 璁剧疆鏃堕棿鑼冨洿涓� [寮�濮嬫椂闂�, 缁撴潫鏃堕棿]
+ timeRange.value = [startTime.format('YYYY-MM-DD HH:mm:ss'), endTime.format('YYYY-MM-DD HH:mm:ss')];
+ window.localStorage.setItem('startTime', startTime.format('YYYY-MM-DD HH:mm:ss'))
+ window.localStorage.setItem('endTime', endTime.format('YYYY-MM-DD HH:mm:ss'))
});
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/glassStorage/api/talk/rawGlass`;
const handleMessage = (data) => {
- if(data.tasks !=null){
- tableDataa.value = data.tasks[0]
- }
+ const formattedTasks = data.tasks[0].map(task => {
+ if (task && task.createTime) {
+ return { ...task, createTime: formatTimestamp(task.createTime) };
+ }
+ return task;
+ });
+ tableDataa.value = formattedTasks;
if(data.rawStationDetailsList !=null){
tableDatab.value = data.rawStationDetailsList[0]
- console.log(tableDatab.value);
}
};
const handleEdit = (row) => {
- window.localStorage.setItem('slotId', row.slotId)
+ window.localStorage.setItem('deviceId', row.deviceId)
+ window.localStorage.setItem('slot', row.slot)
Edit.value = true;
};
const handleBinda = (row) => {
@@ -100,8 +107,7 @@
}
);
if (confirmResult === 'confirm') {
-
- var url="/glassStorage/rawGlassStorageDetails/deleteWarehousing?slotId="+row.slotId;
+ var url="/glassStorage/rawGlassStorageDetails/deleteWarehousing?slot="+row.slot;
const response = await request.post(url)
// const response = await request.post("/glassStorage/rawGlassStorageDetails/deleteWarehousing",[row.slotId])
if (response.code === 200) {
@@ -192,7 +198,7 @@
}
);
if (confirmResult === 'confirm') {
- var url="/glassStorage/rawGlassStorageDetails/outWarehousing?slotId="+row.slotId;
+ var url="/glassStorage/rawGlassStorageDetails/outWarehousing?slotId="+row.slot;
const response = await request.post(url)
// const response = await request.post("/glassStorage/rawGlassStorageDetails/outWarehousing",[row.slotId])
if (response.code === 200) {
@@ -220,10 +226,10 @@
}
}
const response = await request.post("/glassStorage/rawGlassStorageTask/setRawGlassTaskRequest", {
- beginDate: timeRange.value[0],
- endDate: timeRange.value[1],
- taskState: stateList,
- taskType: celllist
+ beginDate: (timeRange.value && timeRange.value[0]) || '',
+ endDate: (timeRange.value && timeRange.value[1]) || '',
+ taskState: celllist,
+ taskType: stateList
})
if (response.code === 200) {
// tableDataa.value = response.data;
@@ -241,7 +247,7 @@
}
const newState = row.state === 1 ? 0 : 1;
try {
- var url="/glassStorage/rawGlassStorageStation/updateSlotState?slot="+row.deviceId + "&state=" + newState;
+ var url="/glassStorage/rawGlassStorageStation/updateSlotState?slot="+row.slot + "&state=" + newState;
const response = await request.post(url)
if (response.code === 200) {
ElMessage.success(response.message);
@@ -256,17 +262,28 @@
};
// 淇敼鏁伴噺
const Editclick = async () => {
- let slotId = window.localStorage.getItem('slotId')
+ let slot = window.localStorage.getItem('slot')
+ let deviceId = window.localStorage.getItem('deviceId')
try {
const response = await request.post('/glassStorage/rawGlassStorageDetails/updateQuantity', {
- slotId: slotId,
+ deviceId: deviceId,
+ slot: slot,
remainQuantity: remainQuantity.value,
+ filmsId: filmsId.value,
+ patternThickness: patternThickness.value,
+ patternHeight: patternHeight.value,
+ patternWidth: patternWidth.value,
}
);
if (response.code === 200) {
ElMessage.success(response.message);
Edit.value = false;
tableDatab.value = response.data;
+ patternWidth.value = '';
+ patternHeight.value = '';
+ patternThickness.value = '';
+ filmsId.value = '';
+ remainQuantity.value = '';
} else {
ElMessage.error(response.message);
}
@@ -274,6 +291,17 @@
console.error(error);
}
};
+// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
+function formatTimestamp(timestamp) {
+ const date = new Date(timestamp);
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮嬶紝闇�瑕佸姞1锛屽苟琛ラ浂
+ const day = String(date.getDate()).padStart(2, '0'); // 琛ラ浂
+ const hours = String(date.getHours()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+ const minutes = String(date.getMinutes()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+ const seconds = String(date.getSeconds()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
function getStatusType1(taskType) {
switch (taskType) {
case 1:
@@ -296,50 +324,54 @@
}
function getStatusType2(taskState) {
switch (taskState) {
- case 1:
+ case 0:
return 'info';
case 2:
return 'warning';
- case 3:
+ case 1:
return 'success';
}
}
function getStatusText2(taskState) {
switch (taskState) {
- case 1:
+ case 0:
return t('film.built');//鏂板缓
case 2:
- return t('film.execution');//鎵ц涓�
- case 3:
+ return t('film.fail');//澶辫触
+ case 1:
return t('film.finish');//瀹屾垚
}
}
-// onUnmounted(() => {
-// if (socket) {
-// closeWebSocket(socket);
-// }
-// });
onBeforeUnmount(() => {
closeWebSocket();
});
</script>
<template>
- <div>
- <div style="display: flex; flex-direction: row; align-items: center; margin-top: 20px;">
- <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="dialogFormVisiblea = true">{{ $t('film.mes') }}</el-button>
- <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handleBinda">{{ $t('film.warehousing') }}</el-button>
- <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handleBindc">{{ $t('film.pwarehousing') }}</el-button>
- <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handleBinde">{{ $t('film.pwareout') }}</el-button>
- <el-date-picker style="margin-left: 10px;" v-model="timeRange" type="datetimerange"
- format="YYYY/MM/DD HH:mm:ss"
+ <div style="height: 500px;">
+ <div style="display: flex; flex-direction: row; align-items: center; margin-top: 20px;">
+ <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="dialogFormVisiblea = true">
+ {{ $t('film.mes') }}
+ </el-button>
+ <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handleBinda">
+ {{ $t('film.warehousing') }}
+ </el-button>
+ <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handleBindc">
+ {{ $t('film.pwarehousing') }}
+ </el-button>
+ <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handleBinde">{{
+ $t('film.pwareout')
+ }}
+ </el-button>
+ <el-date-picker style="margin-left: 10px;" v-model="timeRange" 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')"
+ :start-placeholder="$t('film.starttime')"
+ :end-placeholder="$t('film.endtime')"
:default-time="defaultTime" />
<el-select v-model="selectValuesa[0]" clearable :placeholder="$t('film.taskstatus')" style="margin-left: 10px;" >
- <el-option :label="$t('film.built')" value="1"></el-option>
- <el-option :label="$t('film.execution')" value="2"></el-option>
- <el-option :label="$t('film.finish')" value="3"></el-option>
+ <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="selectValuesa[1]" clearable :placeholder="$t('film.tasktype')" style="margin-left: 10px;" >
<el-option :label="$t('film.stocke')" value="1"></el-option>
@@ -379,12 +411,14 @@
</template>
</el-table-column>
<el-table-column prop="createTime" align="center" :label="$t('film.createtime')" />
+
</el-table>
</div>
</el-card>
- <div class="awatch">
- <img src="../../assets/ypcc.png" alt="" style="width: 100%;height: 120%;margin-left: 10px;position: relative;margin-top: -20px;">
-</div>
+ <div class="img-dlpl">
+ <div class="img-car1" :style="'z-index:999;top:250px;left:' + 20 + 'px;position:absolute;'">
+ </div>
+ </div>
<el-dialog v-model="dialogFormVisiblea" top="5vh" width="85%" >
<el-table ref="table" style="margin-top: 20px;height: 700px;"
:data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
@@ -412,7 +446,7 @@
</el-table-column>
<el-table-column fixed="right" :label="$t('film.operate')" align="center" width="270">
<template #default="scope">
- <el-button :disabled="!scope.row.remainQuantity" size="mini" type="text" plain @click="handleEdit(scope.row)">{{ $t('film.exit') }}</el-button>
+ <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>
</template>
@@ -531,30 +565,71 @@
</div>
</template>
</el-dialog>
- <el-dialog v-model="Edit" top="21vh" width="40%">
- <div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="100px">
- <el-form label-width="210px" label-position="right">
- <el-form-item :label="$t('film.thickremainquantity')" :required="true" style="width: 25vw">
- <el-input v-model="remainQuantity" autocomplete="off" />
+ <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="100px" label-position="right">
+ <el-row style="margin-top: -15px;margin-bottom: -2px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('film.widtha')" :required="true" style="width: 17vw;">
+ <el-input :placeholder="$t('film.inwidth')" v-model="patternWidth" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('film.heighta')" :required="true" style="width: 17vw;">
+ <el-input :placeholder="$t('film.inheight')" v-model="patternHeight" autocomplete="off" />
+ </el-form-item></div>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('film.thicknessa')" :required="true" style="width: 17vw;">
+ <el-input :placeholder="$t('film.inthickness')" v-model="patternThickness" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('film.filmsa')" :required="true" style="width: 17vw;">
+ <el-input :placeholder="$t('film.infilms')" v-model="filmsId" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form label-width="210px">
+ <el-form-item :label="$t('film.thickremainquantity')" :required="true" style="width: 44.5vw;margin-left: -40px;">
+ <el-input v-model="remainQuantity" autocomplete="off" :placeholder="$t('film.inquantity')"/>
</el-form-item>
</el-form>
- </el-form>
- </div>
+ </div></div>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-form>
+ </div>
<template #footer>
<div id="dialog-footer">
<el-button type="primary" @click="Editclick">
- {{ $t('reportWork.sure') }}
+ {{ $t('basicData.confirm') }}
</el-button>
- <el-button @click="Edit = false">{{ $t('reportWork.cancel') }}</el-button>
+ <el-button @click="Edit = false">{{ $t('basicData.cancel') }}</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
-
<style scoped>
-
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
.awatch{
@@ -566,4 +641,30 @@
text-align: center;
margin-top: -15px;
}
+.img-dlpl{
+ margin-left: 330px;
+ margin-top: 10px;
+ background-image:url('../../assets/ypcc.png');
+ background-repeat: no-repeat;
+ background-attachment: local;
+ min-height: 700px;
+ width: 800px;
+ max-width: 100%;
+ background-size: 800px 700px;
+ overflow: hidden;
+ position:relative
+}
+.img-car1{
+ display: flex;
+ background-image:url('../../assets/C1.png');
+ position: absolute;
+ background-repeat: no-repeat;
+ background-attachment: local;
+ min-height: 150px;
+ width: 70px;
+ max-width: 100%;
+ background-size: 70px 150px;
+ overflow: hidden;
+ position:relative
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0