From 3c4b340b58d0d0bdbc3db74b5721586dd964f86c Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 08 十一月 2024 14:49:29 +0800
Subject: [PATCH] 义乌上片后端接口及前端页面样式与调用
---
UI-Project/src/views/StockBasicData/stockBasicData.vue | 55 +++++++++++++++++++++++++++----------------------------
1 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index 2ba2936..f83f2e4 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -14,18 +14,17 @@
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
-
+
const tableData = ref([])
const slot = ref('')
const requestData = {
line: 2001
};
-const now = new Date();
-const timeRange = ref([new Date(now.setHours(0, 0, 0, 0)), new Date(now.setHours(23, 59, 59, 999))])
+const timeRange = ref([])
const selectValuesa = reactive([]);
// request.post("/cacheGlass/taskCache/selectEdgTask",{
// ...requestData,
-
+
// }).then((res) => {
// if (res.code == 200) {
@@ -37,7 +36,7 @@
// }
// });
-
+
// 纾ㄨ竟浠诲姟鏌ヨ
const setEdgGlassInfoRequest = async () => {
let celllist=[]
@@ -52,8 +51,7 @@
stateList=[selectValuesa[1]];
}
}
-
-
+console.log(timeRange.value[0],timeRange.value[1]);
const response = await request.post("/cacheGlass/edgGlassTaskInfo/setEdgGlassInfoRequest", {
cellList: celllist,
stateList: stateList,
@@ -65,9 +63,9 @@
} else {
ElMessage.error(response.message);
}
-
+
}
-
+
// 鐮存崯
const open = async(row) => {
try {
@@ -86,7 +84,7 @@
glassId: row.glassId,
state: 8,
line: row.line,
- workingProcedure: '鍐峰姞宸�',
+ workingProcedure: '纾ㄨ竟',
})
if (response.code === 200) {
ElMessage.success(response.message);
@@ -119,7 +117,7 @@
glassId: row.glassId,
state: 9,
line: row.line,
- workingProcedure: '鍐峰姞宸�',
+ workingProcedure: '纾ㄨ竟',
})
if (response.code === 200) {
ElMessage.success(response.message);
@@ -135,7 +133,7 @@
}
};
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlass`;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/edgTasks`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
@@ -157,24 +155,25 @@
<template>
<div>
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
- <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('璇烽�夋嫨绾胯矾')" clearable style="margin-left: 20px;">
- <el-option label="纾ㄨ竟涓�绾�" value="2001"></el-option>
- <el-option label="纾ㄨ竟浜岀嚎" value="2002"></el-option>
+ <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('璇烽�夋嫨鐘舵��')" clearable style="margin-left: 20px;" >
- <el-option label="鏈（杈�" value="0"></el-option>
- <el-option label="纾ㄨ竟涓�" value="1"></el-option>
- <el-option label="宸茬（杈�" value="2"></el-option>
+
+ <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;">鏃堕棿娈�</span>
- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" style="margin-left: 20px;"
- end-placeholder="缁撴潫鏃ユ湡">
+ <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"
+
+ :end-placeholder="$t('reportmanage.endtime')">
</el-date-picker>
- <el-button type="primary" style="margin-left: 10px;" @click="setEdgGlassInfoRequest()">{{
+ <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="setEdgGlassInfoRequest()">{{
$t('reportmanage.inquire')
}}</el-button>
-
+
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="750" ref="table"
@selection-change="handleSelectionChange"
@@ -190,8 +189,8 @@
{{ 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)">{{ $t('workOrder.breakage') }}</el-button>
@@ -203,7 +202,7 @@
</el-card>
</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