From 309f33161c47a2c3db4cc1535eee8bc335c0c664 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期一, 22 四月 2024 20:07:37 +0800
Subject: [PATCH] 上片机、掰片/识别
---
UI-Project/src/views/Returns/returns.vue | 193 ++++++++++++++++++++++++++----------------------
UI-Project/src/views/Identify/identify.vue | 27 +++++-
2 files changed, 124 insertions(+), 96 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index d8d5d79..13a7185 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -6,8 +6,9 @@
</div>
<el-scrollbar height="650px">
<div id="home-card">
- <div id="home-item" v-for="n in 20" :key="n">
- <svg width="100%" height="400" xmlns="http://www.w3.org/2000/svg" style="margin-top: -100px;margin-left: -80px;">
+ <div id="home-item">
+ <svg width="100%" height="400" xmlns="http://www.w3.org/2000/svg" style="margin-top: -100px;margin-left: -80px;" :data="tableData">
+ <!-- 绠ご -->
<defs>
<marker id="arrow" markerUnits="strokeWidth" markerWidth="12" markerHeight="12" viewBox="0 0 12 12" refX="6"
refY="6" orient="auto">
@@ -26,6 +27,7 @@
style="stroke:#c8c9cc;stroke-width:3;"
@click="showRectInfo(rack)"
/>
+ <!-- 绠ご -->
<line x1='510' y1='309' x2='260' y2='310' stroke='#911005' stroke-width='2' marker-end='url(#arrow)'>
</line>
<text x="370" y="240" dominant-baseline="middle" text-anchor="middle">NG2024030501A-01</text>
@@ -51,16 +53,27 @@
<script>
import Swal from 'sweetalert2'
import request from "@/utils/request";
+// const tableData = ref([])
-request.get("/TidyUpGlassModule/CurrentCutTerritory").then((res) => {
+request.post("/cacheGlass/taskCache/currentCutTerritory").then((res) => {
if (res.code == 200) {
console.log(res.data);
+ tableData.value = res.data
} else {
ElMessage.warning(res.msg)
- router.push("/login")
+
}
});
+
+// request.get("/TidyUpGlassModule/CurrentCutTerritory").then((res) => {
+// if (res.code == 200) {
+// console.log(res.data);
+// } else {
+// ElMessage.warning(res.msg)
+// router.push("/login")
+// }
+// });
export default {
data() {
@@ -158,9 +171,9 @@
display: flex;
flex-wrap: wrap;
#home-item {
- border-style: solid;
- border-width: 1px;
- border-color: #E4E4E4;
+ /* border-style: solid; */
+ /* border-width: 1px;
+ border-color: red; */
width: calc(34% - 20px);
padding: 20px 0px 20px 20px;
margin-right: 20px;
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index 12cd2dd..8fafce3 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -4,7 +4,7 @@
import {useRouter} from "vue-router"
const router = useRouter()
import type { TableColumnCtx } from 'element-plus'
-
+
// import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
const dialogFormVisible = ref(false)
@@ -12,10 +12,10 @@
const adda = ref(false)
// const value = ref('')
import request from "@/utils/request"
-
+
import { ref, onMounted } from "vue";
// import http from "@/http/index";
-
+
let ruleForm = ref({
workstationId: '',
patternHeigth: '',
@@ -23,7 +23,7 @@
filmsId: '',
patternThickness: '',
number: '',
-
+
})
const tableDataa = ref([])
@@ -37,7 +37,7 @@
// damageDetails: {
// state: '',
// },
-
+
// })
// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰
const fetchTableData = async () => {
@@ -45,7 +45,7 @@
// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰锛屽苟绛夊緟鍝嶅簲
// const response = await request.post("/loadGlass/optimizeProject/listByState", requestData);
const response = await request.get("/loadGlass/up-patten-usage/prioritylist");
-
+
// 妫�鏌ュ搷搴旂姸鎬�
if (response.code === 200) {
// 鏇存柊琛ㄦ牸鏁版嵁
@@ -73,7 +73,7 @@
//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
const titleSelectJson = ref({
processType: [],
-
+
})
const getBasicData = ref({
id: '',
@@ -115,7 +115,7 @@
// }
// },
// methods:{
-
+
// }
// }
const workstationId = ref('');
@@ -124,7 +124,7 @@
const filmsId = ref('');
const patternThickness = ref('');
const number = ref('');
-
+
// 娣诲姞
const handleConfirm = async () => {
try {
@@ -136,7 +136,7 @@
patternThickness: patternThickness.value,
number: number.value
});
-
+
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
@@ -161,7 +161,7 @@
patternThickness: 0,
number: 0
});
-
+
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
@@ -183,59 +183,70 @@
amount2: string
amount3: number
}
-
+
interface SpanMethodProps {
row: User
column: TableColumnCtx<User>
rowIndex: number
columnIndex: number
}
+
+// const objectSpanMethod = ({
+// row,
+// column,
+// rowIndex,
+// columnIndex,
+// }: SpanMethodProps) => {
+// if (columnIndex === 0) {
+// if (rowIndex % 2 === 0) {
+// return {
+// rowspan: 2,
+// colspan: 1,
+// }
+// } else {
+// return {
+// rowspan: 0,
+// colspan: 0,
+// }
+// }
+// }
+// }
+
+// const open = () => {
+// ElMessageBox.confirm(
+// '鏄惁鍒犻櫎璇ユ潯淇℃伅?',
+// '鎻愮ず',
+// {
+// confirmButtonText: '鏄�',
+// cancelButtonText: '鍙栨秷',
+// type: 'warning',
+// }
+// )
+// .then(() => {
+// ElMessage({
+// type: 'success',
+// message: '鍒犻櫎鎴愬姛锛�',
+// })
+// })
+// .catch(() => {
+// ElMessage({
+// type: 'info',
+// message: '鍒犻櫎澶辫触',
+// })
+// })
+// }
-const objectSpanMethod = ({
- row,
- column,
- rowIndex,
- columnIndex,
-}: SpanMethodProps) => {
- if (columnIndex === 0) {
- if (rowIndex % 2 === 0) {
- return {
- rowspan: 2,
- colspan: 1,
- }
- } else {
- return {
- rowspan: 0,
- colspan: 0,
- }
- }
- }
-}
-const open = () => {
- ElMessageBox.confirm(
- '鏄惁鍒犻櫎璇ユ潯淇℃伅?',
- '鎻愮ず',
- {
- confirmButtonText: '鏄�',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- }
- )
- .then(() => {
- ElMessage({
- type: 'success',
- message: '鍒犻櫎鎴愬姛锛�',
- })
- })
- .catch(() => {
- ElMessage({
- type: 'info',
- message: '鍒犻櫎澶辫触',
- })
- })
-}
+const handleBindRack = (row) => {
+ workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
+ add.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+};
+const handleBindRacka = (row) => {
+ workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
+
+ adda.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+};
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
@@ -274,7 +285,7 @@
],
})
</script>
-
+
<template>
<div>
<div id="dotClass">
@@ -310,7 +321,10 @@
min-width="80"
prop="state"
>
- <!-- <el-tag type="success" v-if="damageDetails.state === 1">灏辩华</el-tag> -->
+ <template #default="scope">
+ <el-tag type="success" >{{ scope.row.state==1?"灏辩华":"鏈氨缁�" }}</el-tag>
+ </template>
+
<!-- <el-tag type="danger" v-if="row.enableState==2">鏈氨缁�</el-tag> -->
</el-table-column>
</el-table>
@@ -328,39 +342,14 @@
<el-table-column prop="filmsId" align="center" label="鑶滅郴" min-width="80" />
<el-table-column prop="number" align="center" label="鏁伴噺" min-width="80" />
<el-table-column fixed="right" label="鎿嶄綔" align="center" width="150">
- <template #default>
- <el-button size="mini" type="text" plain @click="add = true">娣诲姞</el-button>
- <el-button size="mini" type="text" plain @click="adda = true">鍒犻櫎</el-button>
+ <template #default="scope">
+ <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">娣诲姞</el-button>
+ <el-button size="mini" type="text" plain @click="handleBindRacka(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
</div>
- </div>
-
-
- <el-dialog v-model="dialogFormVisible" top="24vh" width="30%" title="宸ョ▼" >
- <div style="margin-left: 50px;margin-bottom: 10px;">
- <el-form-item label="宸ョ▼鍙凤細" :required="true">
- <el-select v-model="getBasicData.projectNo" clearable placeholder="璇烽�夋嫨宸ョ▼" style="width: 220px"
- >
- <el-option
- v-for="item in titleSelectJson['processType']"
- :key="item.id"
- :label="item.projectNo"
- :value="item.projectNo"
- />
- </el-select>
- </el-form-item>
- </div>
- <template #footer>
- <div id="dialog-footer">
- <el-button type="primary" @click="dialogFormVisible = false">
- 纭
- </el-button>
- <el-button @click="dialogFormVisible = false">鍙栨秷</el-button>
- </div>
- </template>
- </el-dialog>
+
<el-dialog v-model="add" top="23vh" width="45%" title="娣诲姞鍘熺墖" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
<el-form size="mini" label-width="150px">
@@ -429,10 +418,36 @@
</div>
</template>
</el-dialog>
+ </div>
+
+
+ <el-dialog v-model="dialogFormVisible" top="24vh" width="30%" title="宸ョ▼" >
+ <div style="margin-left: 50px;margin-bottom: 10px;">
+ <el-form-item label="宸ョ▼鍙凤細" :required="true">
+ <el-select v-model="getBasicData.projectNo" clearable placeholder="璇烽�夋嫨宸ョ▼" style="width: 220px"
+ >
+ <el-option
+ v-for="item in titleSelectJson['processType']"
+ :key="item.id"
+ :label="item.projectNo"
+ :value="item.projectNo"
+ />
+ </el-select>
+ </el-form-item>
+ </div>
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button type="primary" @click="dialogFormVisible = false">
+ 纭
+ </el-button>
+ <el-button @click="dialogFormVisible = false">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog>
</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%;}
#dialog-footer{
@@ -469,5 +484,5 @@
margin-top: -40px;
margin-left: 167px;
}
-
+
</style>
\ No newline at end of file
--
Gitblit v1.8.0