From add613567296124356cf870be07d7e105f48afb6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 26 二月 2025 14:45:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/StockBasicData/stockBasicData.vue | 53 +++++++++--------------------------------------------
1 files changed, 9 insertions(+), 44 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index a3a214d..ec5af28 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -4,16 +4,12 @@
import {host, WebSocketHost} from '@/utils/constants'
import request from "@/utils/request"
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
-// import { ref } from 'vue'
import {ElMessage, ElMessageBox} from 'element-plus'
-// import LanguageMixin from './lang/LanguageMixin'
import {useI18n} from 'vue-i18n'
-
const router = useRouter()
const adda = ref(false)
const {t} = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
-
const tableData = ref([])
const slot = ref('')
const requestData = {
@@ -21,21 +17,6 @@
};
const timeRange = ref([])
const selectValuesa = reactive([]);
-// request.post("/cacheGlass/taskCache/selectEdgTask",{
-// ...requestData,
-
-// }).then((res) => {
-// if (res.code == 200) {
-
-// console.log(res.data);
-// tableData.value = res.data
-// console.log(res.data[0].slot);
-// } else {
-// ElMessage.warning(res.msg)
-
-// }
-// });
-
// 纾ㄨ竟浠诲姟鏌ヨ
const setEdgGlassInfoRequest = async () => {
let celllist=[]
@@ -62,9 +43,7 @@
} else {
ElMessage.error(response.message);
}
-
}
-
// 鐮存崯
const open = async(row) => {
try {
@@ -77,8 +56,7 @@
type: 'warning',
}
);
- if (confirmResult === 'confirm') {
- // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
+ if (confirmResult === 'confirm') {
const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
glassId: row.glassId,
state: 8,
@@ -87,14 +65,11 @@
})
if (response.code === 200) {
ElMessage.success(response.message);
- } else {
- // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
+ } else {
ElMessage.error(response.msg);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
}
};
@@ -110,8 +85,7 @@
type: 'warning',
}
);
- if (confirmResult === 'confirm') {
- // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
+ if (confirmResult === 'confirm') {
const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
glassId: row.glassId,
state: 9,
@@ -120,22 +94,17 @@
})
if (response.code === 200) {
ElMessage.success(response.message);
- } else {
- // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
+ } else {
ElMessage.error(response.msg);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
- } catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
+ } catch (error) {
console.error('鍙戠敓閿欒:', error);
}
};
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/edgTasks`;
-// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
- // 鏇存柊 tableData 鐨勬暟鎹�
tableData.value = data.edgTasks[0]
};
onMounted(() => {
@@ -155,27 +124,26 @@
<div style="height: 500px;">
<div>
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <div style="display: flex;">
<el-select v-model="selectValuesa[0]" filterable :placeholder="$t('workOrder.cway')" clearable
style="margin-left: 20px;margin-bottom: 10px;">
<el-option :label="$t('workOrder.edgingone')" value="2001"></el-option>
<el-option :label="$t('workOrder.edgingtwo')" value="2002"></el-option>
</el-select>
-
<el-select v-model="selectValuesa[1]" filterable :placeholder="$t('workOrder.cstate')" clearable
style="margin-left: 20px;margin-bottom: 10px;">
<el-option :label="$t('workOrder.nedging')" value="0"></el-option>
<el-option :label="$t('workOrder.edging')" value="1"></el-option>
<el-option :label="$t('workOrder.finedging')" value="2"></el-option>
</el-select>
- <span class="demonstration" style="margin-left: 20px;margin-bottom: 10px;">{{ $t('workOrder.time') }}</span>
- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" :start-placeholder="$t('reportmanage.starttime')" style="margin-left: 20px;margin-bottom: 10px;" value-format = "YYYY-MM-DD hh:mm:ss"
-
+ <span class="demonstration" style="margin-left: 20px;margin-top: 3px;">{{ $t('workOrder.time') }}</span>
+ <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="setEdgGlassInfoRequest()">{{
$t('reportmanage.inquire')
}}</el-button>
-
+ </div>
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="750" ref="table"
@selection-change="handleSelectionChange"
@@ -191,8 +159,6 @@
{{ scope.row.status==0?"鏈（杈�":scope.row.status==1?"纾ㄨ竟涓�":"宸茬（杈�" }}
</template>
</el-table-column>
-
-
<el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200">
<template #default="scope">
<el-button size="mini" type="text" plain @click="open(scope.row)">{{
@@ -211,7 +177,6 @@
</div>
</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%;}
--
Gitblit v1.8.0