From da5297a654ba3a5bf61e8de383bcc723b03ddb58 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 19 十二月 2024 14:50:06 +0800
Subject: [PATCH] 更改选择工程的显示条件
---
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 78 ++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 41 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index f81a1eb..f48eb79 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -1,18 +1,15 @@
<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 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)
@@ -21,15 +18,15 @@
const Edit = ref(false)
const timeRange = ref(["2022-01-01 00:00:00", "2025-01-01 00:00:00"])
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 = [
{
@@ -58,9 +55,6 @@
}
});
onMounted(() => {
- // closeWebSocket();
- debugger
- // console.log("--------------webSocket")
socket = initializeWebSocket(socketUrl, handleMessage);
});
let socket = null;
@@ -100,7 +94,6 @@
}
);
if (confirmResult === 'confirm') {
-
var url="/glassStorage/rawGlassStorageDetails/deleteWarehousing?slotId="+row.slotId;
const response = await request.post(url)
// const response = await request.post("/glassStorage/rawGlassStorageDetails/deleteWarehousing",[row.slotId])
@@ -314,27 +307,31 @@
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>
@@ -383,8 +380,9 @@
</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>
+ <img src="../../assets/ypcc.png" alt=""
+ style="width: 100%;height: 120%;margin-left: -10px;position: relative;margin-top: -20px;">
+ </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'}">
@@ -552,9 +550,7 @@
</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{
--
Gitblit v1.8.0