From 04b841aa1661693e68f5dea1a80e7c97a209cbeb Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 19 四月 2024 13:31:48 +0800
Subject: [PATCH] 命名以及 注解修改
---
UI-Project/src/views/Returns/returns.vue | 212 ++++++++++++++++++++++++++++-------------------------
1 files changed, 112 insertions(+), 100 deletions(-)
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index d757769..97d7b27 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -5,34 +5,110 @@
const router = useRouter()
import type { TableColumnCtx } from 'element-plus'
-import { ref } from 'vue'
+// import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
const dialogFormVisible = ref(false)
const add = ref(false)
const adda = ref(false)
-const value = ref('')
+// const value = ref('')
import request from "@/utils/request"
-request.post(`/LoadGlass/SelectAll`).then((res) => {
- console.log(555555555555);
- if (res.code == 200) {
- console.log(1111);
- // console.log(res.data);
- } else {
- ElMessage.warning(res.msg)
- router.push("/login")
- }
-});
-
-// request.get("/LoadGlass/SelectAll").then((res) => {
+import { ref, onMounted } from "vue";
+// import http from "@/http/index";
+// const tableData = ref([])
+// let app = ref({
+// data(){
+// return {
+// enableState:'',
+// }
+// },
+// })
+// const tableData = ref({
+// workstationId:'',
+// patternWidth :'',
+// patternHeigth :'',
+// filmsId :'',
+// number :'',
+// patternThickness :'',
+// enableState:'',
+// })
+// request.post(`/LoadGlass/list`).then((res) => {
+// if (res.code == 200) {
+// console.log(res.data);
+// } else {
+// ElMessage.warning(res.msg)
+// router.push("/login")
+// }
+// });
+// request.get("/LoadGlass/list").then((res) => {
// if (res.code == 200) {
// console.log(res.data);
+// tableData.value = res
// } else {
// ElMessage.warning(res.msg)
// router.push("/login")
// }
// });
+ // request
+ // const requestData = {
+ // projectNo:"P24030805",
+ // state:0
+ // };
+
+
+ const requestData = {
+ // projectNo:"P24030805",
+ state:100
+ };
+
+ const tableData = reactive([]);
+
+// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰
+const fetchTableData = async () => {
+ try {
+ // 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰锛屽苟绛夊緟鍝嶅簲
+ // const response = await request.post("/loadGlass/optimizeProject/listByState", requestData);
+ const response = await request.get("/loadGlass/LoadGlass/list");
+
+ // 妫�鏌ュ搷搴旂姸鎬�
+ if (response.code === 200) {
+ // 鏇存柊琛ㄦ牸鏁版嵁
+ console.log('鎴愬姛鑾峰彇琛ㄦ牸鏁版嵁:', response.data);
+ tableData.splice(0, tableData.length, ...response.data);
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ // 澶勭悊璇锋眰澶辫触鐨勬儏鍐�
+ ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
+ }
+};
+const user = ref('');
+const remoteMethod = () => {
+ request.post("/loadGlass/optimizeProject/listByState", requestData)
+ .then((res: any) => {
+ // if (res.code == 200) {
+ tableData.value = res.data;
+ // let self = this
+ // }
+ })
+ .catch((err: any) => {});
+}
+
+
+onMounted(fetchTableData);
+
+
+// onMounted(() => {
+// request
+// .post("/loadGlass/LoadGlass/selectPriority")
+// .then((res: any) => {
+// tableData.value = res.data;
+// })
+// .catch((err: any) => {});
+// });
interface User {
id: string
name: string
@@ -67,59 +143,7 @@
}
}
}
-}
-
-const options = [
- {
- value: 'Option1',
- label: 'P202561456',
- },
- {
- value: 'Option2',
- label: 'P202561456',
- },
- {
- value: 'Option3',
- label: 'P202561456',
- },
- {
- value: 'Option4',
- label: 'P202561456',
- },
- {
- value: 'Option5',
- label: 'P202561456',
- },
-]
-const tableData: User[] = [
-
- {
- id: 'P202561456',
- long: '1005',
- wide: '183.6',
- thick: '1991',
- },
- {
- id: 'P202561456',
- long: '105',
- wide: '183',
- thick: '191',
- }
-]
-const tableDataa = [
- {
- long: '1005',
- wide: '183.6',
- thick: '1991',
- station: '1'
- },
- {
- long: '105',
- wide: '183',
- thick: '191',
- station: '1'
- }
-]
+}
const open = () => {
ElMessageBox.confirm(
'鏄惁鍒犻櫎璇ユ潯淇℃伅?',
@@ -214,20 +238,6 @@
<el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" >鍋滄浠诲姟</el-button>
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto">
- <!-- <el-table height="100%" ref="table" :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="id" align="center" label="宸ョ▼鍙�" min-width="80" />
- <el-table-column prop="long" align="center" label="鍘熺墖瀹�" min-width="120" />
- <el-table-column prop="wide" align="center" label="鍘熺墖闀�" min-width="120" />
- <el-table-column prop="thick" align="center" label="鑶滅郴" min-width="120" />
- <el-table-column prop="thick" align="center" label="鏁伴噺" min-width="120" />
- <el-table-column
- align="center"
- label="鐘舵��"
- min-width="80"
- >
- <el-tag type="success">灏辩华</el-tag>
- </el-table-column>
- </el-table> -->
<el-table
height="100%"
ref="table"
@@ -235,19 +245,20 @@
:data="tableData"
:span-method="objectSpanMethod"
>
- <el-table-column prop="id" label="宸ョ▼鍙�" width="200" align="center"/>
- <el-table-column prop="long" label="鍘熺墖瀹�" align="center"/>
- <el-table-column prop="wide" label="鍘熺墖闀�" align="center"/>
- <el-table-column prop="thick" label="鑶滅郴" align="center"/>
- <el-table-column prop="thick" label="鏁伴噺" align="center"/>
- <el-table-column prop="wide" label="鍘氬害" align="center"/>
+ <el-table-column prop="workstationId" label="宸ョ▼鍙�" width="200" align="center"/>
+ <el-table-column prop="patternWidth" label="鍘熺墖瀹�" align="center"/>
+ <el-table-column prop="patternHeigth" label="鍘熺墖闀�" align="center"/>
+ <el-table-column prop="filmsId" label="鑶滅郴" align="center"/>
+ <el-table-column prop="number" label="鏁伴噺" align="center"/>
+ <el-table-column prop="patternThickness" label="鍘氬害" align="center"/>
<el-table-column
align="center"
label="鐘舵��"
min-width="80"
+ prop="enableState"
>
<el-tag type="success">灏辩华</el-tag>
- <!-- <el-tag type="danger">鏈氨缁�</el-tag> -->
+ <!-- <el-tag type="danger" v-if="row.enableState==2">鏈氨缁�</el-tag> -->
</el-table-column>
</el-table>
</div>
@@ -266,18 +277,19 @@
<div style="margin-left: 50px;margin-bottom: 10px;">
<el-form-item label="宸ョ▼鍙凤細" :required="true">
<el-select
- v-model="value"
- clearable
- placeholder="璇烽�夋嫨宸ョ▼"
- style="width: 300px"
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
+ clearable
+ placeholder="璇烽�夋嫨宸ョ▼"
+ style="width: 300px"
+ filterable
+ :remote-method="remoteMethod"
+ >
+ <el-option
+ v-for="item in remoteMethod"
+ :key="item.projectNo"
+ :label="item.projectNo"
+ :value="item.projectNo"
+ />
+ </el-select>
</el-form-item>
</div>
<template #footer>
--
Gitblit v1.8.0