From f99ff750a82209b1b34b72f2ff78bfe448a1d66a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 31 十月 2024 13:52:18 +0800
Subject: [PATCH] 义乌上片功能（部分）
---
UI-Project/src/views/Returns/upreturns.vue | 109 ++++++++++++++++++++----------------------------------
1 files changed, 41 insertions(+), 68 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 1d25199..8efd86a 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -1,16 +1,14 @@
<script lang="ts" setup>
-import {Search} from "@element-plus/icons-vue";
-import {reactive} from "vue";
+import {onBeforeUnmount, onMounted, onUnmounted, 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'
-const { t } = useI18n()
-import { WebSocketHost ,host} from '@/utils/constants'
+import {ElMessage} 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 {t} = useI18n()
const selectValuesa = reactive([]);
const selectedProjectNo = ref(''); // 褰撳墠閫変腑鐨勫伐绋嬪彿
const loadingline = ref(''); // 褰撳墠閫変腑鐨勪笂鐗囩嚎
@@ -59,12 +57,16 @@
};
const selectproject = () => {
dialogFormVisible.value = true;
+ selectgong();
};
onMounted(() => {
- // socket = initializeWebSocket(socketUrl, handleMessage);
+ socket = initializeWebSocket(socketUrl, handleMessage);
});
+const handleMessage = (data) => {
+
+}
onUnmounted(() => {
if (socket) {
closeWebSocket(socket);
@@ -72,68 +74,43 @@
});
//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
const titleSelectJson = ref({
- processType: [],
-})
-const titleSelectJsona = ref({
- processTypea: [],
+ engineerId: [],
})
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/uploadGlass`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
-
-const requestData = {
- state: 100
-};
-
onBeforeUnmount(() => {
closeWebSocket();
});
+const selectgong = async () => {
+ try {
+ const response = await request.post('/loadGlass/upEngineering/selectTask')
+ if (response.code == 200) {
+ titleSelectJson.value.engineerId = response.data;
+ } else {
+ ElMessage.error(response.message);
+ }
+ } catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
// 娣诲姞
const handleBindRack = (row) => {
workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
ida.value = row.id;
add.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
};
-// 鏆傚仠
-const handlea = async () => {
- try {
- let engineeringId = window.localStorage.getItem('engineeringId')
-console.log(engineeringId);
-if (engineeringId !== '') {
- const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
- engineeringId: engineeringId,
- state: 0,
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- blinda.value = false;
- // tableData.splice([]);
- } else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.message);
- }
- }
- else {
- ElMessage({
- type: 'info',
- message: t('basicData.infonull'),
- })
- }
-}
-catch (error) {
- // 澶勭悊閿欒
- console.error(error);
- }
-}
+
function getStatusText(state: number) {
switch (state) {
- case 0:
+ case 0:
return t('basicData.waiting');
- case 1:
+ case 1:
return t('basicData.up');
- case 2:
- return t('basicData.up');
+ case 2:
+ return t('basicData.up');
case 100:
return t('basicData.finish');
}
@@ -163,11 +140,7 @@
blindb.value = true;
};
-// 鍒犻櫎
-const handleBindRacka = (row) => {
- workstationId.value = row.workstationId;
- adda.value = true;
-};
+
const toggleEnableState = async (row: any) => {
// 妫�鏌� id 鏄惁涓虹┖
if (!row.id) {
@@ -486,13 +459,13 @@
:placeholder="$t('basicData.plselectproject')"
style="width: 220px"
@input="handleInputChange"
- >
- <el-option
- v-for="item in titleSelectJson['processType']"
- :key="item.id"
- :label="item.projectNo"
- :value="item.projectNo"
- />
+ >
+ <el-option
+ v-for="item in titleSelectJson['engineerId']"
+ :key="item.id"
+ :label="item.engineerId"
+ :value="item.engineerId"
+ />
</el-select>
</el-form-item>
</div>
--
Gitblit v1.8.0