From ec07571bee22583e40138a3bf665a3eb8cf850ef Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期三, 17 四月 2024 10:16:59 +0800
Subject: [PATCH] 大理片笼更改图片
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 349 ++++++------------------
UI-Project/src/views/Slicecage/slicecage.vue | 285 +++++---------------
UI-Project/src/assets/lpl.jpg | 0
UI-Project/src/views/Returns/returns.vue | 67 ++--
UI-Project/src/views/Identify/identify.vue | 84 +++--
UI-Project/src/assets/cp.png | 0
UI-Project/src/assets/dlpl.png | 0
UI-Project/src/assets/dlpla.png | 0
8 files changed, 239 insertions(+), 546 deletions(-)
diff --git a/UI-Project/src/assets/cp.png b/UI-Project/src/assets/cp.png
new file mode 100644
index 0000000..e3272b2
--- /dev/null
+++ b/UI-Project/src/assets/cp.png
Binary files differ
diff --git a/UI-Project/src/assets/dlpl.png b/UI-Project/src/assets/dlpl.png
new file mode 100644
index 0000000..818a0a2
--- /dev/null
+++ b/UI-Project/src/assets/dlpl.png
Binary files differ
diff --git a/UI-Project/src/assets/dlpla.png b/UI-Project/src/assets/dlpla.png
new file mode 100644
index 0000000..9aa315e
--- /dev/null
+++ b/UI-Project/src/assets/dlpla.png
Binary files differ
diff --git a/UI-Project/src/assets/lpl.jpg b/UI-Project/src/assets/lpl.jpg
new file mode 100644
index 0000000..d66b84d
--- /dev/null
+++ b/UI-Project/src/assets/lpl.jpg
Binary files differ
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index be0e99f..0dfc7b9 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -4,6 +4,9 @@
<div style="margin-left: 400px; font-size: 20px;">宸ョ▼鍙凤細P20240305001 </div>
<div style="margin-left: 150px; font-size: 20px;">鐗堝浘缂栧彿锛�1</div>
</div>
+ <el-scrollbar height="650px">
+ <div id="home-card">
+ <div id="home-item" v-for="n in 20" :key="n">
<svg width="100%" height="690" xmlns="http://www.w3.org/2000/svg" style="margin-top: -40px;">
<defs>
<marker id="arrow" markerUnits="strokeWidth" markerWidth="12" markerHeight="12" viewBox="0 0 12 12" refX="6"
@@ -25,24 +28,9 @@
/>
<line x1='510' y1='309' x2='260' y2='310' stroke='#911005' stroke-width='2' marker-end='url(#arrow)'>
</line>
- <line x1='850' y1='309' x2='1100' y2='310' stroke='#911005' stroke-width='2' marker-end='url(#arrow)'>
- </line>
- <line x1='510' y1='409' x2='260' y2='410' stroke='#911005' stroke-width='2' marker-end='url(#arrow)'>
- </line>
- <line x1='1200' y1='650' x2='1200' y2='470' stroke='#911005' stroke-width='2' marker-end='url(#arrow)'>
- </line>
<text x="370" y="240" dominant-baseline="middle" text-anchor="middle">NG2024030501A-01</text>
<text x="370" y="260" dominant-baseline="middle" text-anchor="middle">500*300</text>
- <text x="970" y="240" dominant-baseline="middle" text-anchor="middle">NG2024030501A-02</text>
- <text x="970" y="260" dominant-baseline="middle" text-anchor="middle">500*300</text>
-
- <text x="600" y="500" dominant-baseline="middle" text-anchor="middle">NG2024030501A-03</text>
- <text x="600" y="520" dominant-baseline="middle" text-anchor="middle">800*450</text>
-
-
- <text x="1280" y="520" dominant-baseline="middle" text-anchor="middle">NG2024030501A-04</text>
- <text x="1280" y="540" dominant-baseline="middle" text-anchor="middle">400*300</text>
<g v-for="(item, itemIndex) in rack.items" :key="itemIndex">
<rect
:x="calculateItemXPosition(rack, item, itemIndex)"
@@ -54,6 +42,9 @@
</g>
</g>
</svg>
+ </div>
+ </div>
+ </el-scrollbar>
</el-card>
</template>
@@ -84,30 +75,6 @@
{ position: 'bottom-right', width: 40, height: 30, fillColor: '#ffffff', content: 'NG12345678' }
]
},
- {
- x: 685, y: 126, width: 600, height: 240, fillColor: '#93d2f3',
- items: [
- { position: 'bottom-left', width: 40, height: 30, fillColor: '#ffffff', content: 'NG123456' },
- { position: 'bottom-right', width: 40, height: 30, fillColor: '#ffffff', content: 'NG123456' },
- { position: 'top-right', width: 40, height: 30, fillColor: '#ffffff', content: 'NG1234567' }
- ]
- },
- {
- x: 70, y: 380, width: 1100, height: 260, fillColor: '#81b337',
- items: [
- { position: 'top-left', width: 40, height: 30, fillColor: '#ffffff', content: 'NG123456' },
- { position: 'bottom-right', width: 40, height: 30, fillColor: '#ffffff', content: 'NG123456' },
- { position: 'top-right', width: 40, height: 30, fillColor: '#ffffff', content: 'NG1234567' }
- ]
- },
- {
- x: 1185, y: 380, width: 200, height: 300,fillColor: '#81b337',
- items: [
- { position: 'bottom-right', width: 40, height: 30, fillColor: '#ffffff', content: 'NG123456' },
- { position: 'top-right',width: 40, height: 30, fillColor: '#ffffff', content: 'NG123456' },
- { position: 'top-left', width: 40, height: 30, fillColor: '#ffffff', content: 'NG1234567' },
- ]
- }
// Add more racks and items here as needed
],
@@ -183,4 +150,43 @@
color: black;
border: 1px solid black;
}
+
+#home-card {
+ width: 100%;
+ overflow: hidden;
+ padding: 10px 0px;
+ display: flex;
+ flex-wrap: wrap;
+ #home-item {
+ border-style: solid;
+ border-width: 1px;
+ border-color: #E4E4E4;
+ width: calc(34% - 20px);
+ padding: 20px 0px 20px 20px;
+ margin-right: 10px;
+ margin-bottom: 10px;
+ display: flex;
+ justify-content: center;
+ /* align-items: center; */
+ background: #fff;
+ #home-img {
+ display: inline-block;
+ width: 160px;
+ height: 60px;
+ margin: 0;
+ padding: 0;
+ }
+ #home-right {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: flex-start;
+ margin-left: 10px;
+ #home-num {
+ font-size: 40px;
+ margin: 5px 0;
+ }
+ }
+ }
+ }
</style>
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index a8e0996..1a07941 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -16,6 +16,22 @@
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);
@@ -37,7 +53,10 @@
request
.get("/LoadGlass/list")
.then((res: any) => {
+ if (res.code == 200) {
tableData.value = res.data;
+ // let self = this
+ }
})
.catch((err: any) => {});
});
@@ -84,7 +103,6 @@
}
}
}
-
const options = [
{
value: 'Option1',
@@ -122,20 +140,20 @@
// thick: '191',
// }
// ]
-const tableDataa = [
- {
- long: '1005',
- wide: '183.6',
- thick: '1991',
- station: '1'
- },
- {
- long: '105',
- wide: '183',
- thick: '191',
- station: '1'
- }
-]
+// const tableDataa = [
+// {
+// long: '1005',
+// wide: '183.6',
+// thick: '1991',
+// station: '1'
+// },
+// {
+// long: '105',
+// wide: '183',
+// thick: '191',
+// station: '1'
+// }
+// ]
const open = () => {
ElMessageBox.confirm(
'鏄惁鍒犻櫎璇ユ潯淇℃伅?',
@@ -230,20 +248,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"
@@ -263,8 +267,8 @@
min-width="80"
prop="enableState"
>
- <el-tag type="success">灏辩华</el-tag>
- <!-- <el-tag type="danger" v-if="row.enableState==2">鏈氨缁�</el-tag> -->
+ <el-tag type="success" v-if=" tableData.enableState == '1'">灏辩华</el-tag>
+ <!-- <el-tag type="danger" v-if="this.enableState === '2'">鏈氨缁�</el-tag> -->
</el-table-column>
</el-table>
</div>
@@ -283,7 +287,6 @@
<div style="margin-left: 50px;margin-bottom: 10px;">
<el-form-item label="宸ョ▼鍙凤細" :required="true">
<el-select
- v-model="form.workstationId"
clearable
placeholder="璇烽�夋嫨宸ョ▼"
style="width: 300px"
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index ea231b5..9c7b9f9 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -12,203 +12,30 @@
const currentPage4 = ref(4)
const pageSize4 = ref(100)
-// const tableData = [
-// {
-// id: '1',
-// long: '1005',
-// wide: '183.6',
-// thick: '1991',
-// type: '1234567',
-// typea: '1',
-// },
-// ]
-// const tableDatab = [
-// {
-// idb: '2',
-// longb: '105',
-// wideb: '183',
-// typeb: '123456',
-// }
-// ]
-const tableDataa = [
+const tableData = [
{
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
- },
- {
- ida: '3',
- typea: '1991',
+ id: '1',
+ a: '1',
+ b: '1',
+ c: '123456789',
+ d: '1568251',
+ e: '1',
+ f: '100',
+ g: '',
},
]
-
+const tableDatab = [
+ {
+ id: '2',
+ a: '2',
+ b: '2',
+ c: '123456789',
+ d: '1568251',
+ e: '1',
+ f: '100',
+ g: '',
+ }
+]
const dialogForm = () => {
ElMessageBox.confirm(
'纭畾瑕佹�ュ仠鍚�?',
@@ -300,13 +127,13 @@
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="id" align="center" label="鍑虹墖鐜荤拑ID" 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="type" align="center" label="宸ョ▼鍙�" min-width="120" />
- <el-table-column prop="type" align="center" label="娴佺▼鍗″彿" min-width="120" />
- <el-table-column prop="type" align="center" label="閽㈠寲鐗堝浘鍙�" min-width="120" />
- <el-table-column prop="type" align="center" label="灏哄" min-width="120" />
- <el-table-column prop="type" align="center" label="缁撴潫浠诲姟" min-width="120" />
+ <el-table-column prop="a" align="center" label="绗煎瓙" min-width="120" />
+ <el-table-column prop="b" align="center" label="鏍煎瓙" min-width="120" />
+ <el-table-column prop="c" align="center" label="宸ョ▼鍙�" min-width="120" />
+ <el-table-column prop="d" align="center" label="娴佺▼鍗″彿" min-width="120" />
+ <el-table-column prop="e" align="center" label="閽㈠寲鐗堝浘鍙�" min-width="157" />
+ <el-table-column prop="f" align="center" label="灏哄" min-width="120" />
+ <el-table-column prop="g" align="center" label="缁撴潫浠诲姟" min-width="120" />
</el-table>
</div>
</el-card>
@@ -315,14 +142,14 @@
<el-table height="100%" ref="table"
@selection-change="handleSelectionChange"
:data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="idb" align="center" label="杩涚墖鐜荤拑ID" min-width="80" />
- <el-table-column prop="longb" align="center" label="绗煎瓙" min-width="120" />
- <el-table-column prop="wideb" align="center" label="鏍煎瓙" min-width="120" />
- <el-table-column prop="typeb" align="center" label="宸ョ▼鍙�" min-width="120" />
- <el-table-column prop="typeb" align="center" label="娴佺▼鍗″彿" min-width="120" />
- <el-table-column prop="typeb" align="center" label="閽㈠寲鐗堝浘鍙�" min-width="120" />
- <el-table-column prop="typeb" align="center" label="灏哄" min-width="120" />
- <el-table-column prop="typeb" align="center" label="缁撴潫浠诲姟" min-width="120" />
+ <el-table-column prop="id" align="center" label="杩涚墖鐜荤拑ID" min-width="80" />
+ <el-table-column prop="a" align="center" label="绗煎瓙" min-width="120" />
+ <el-table-column prop="b" align="center" label="鏍煎瓙" min-width="120" />
+ <el-table-column prop="c" align="center" label="宸ョ▼鍙�" min-width="120" />
+ <el-table-column prop="d" align="center" label="娴佺▼鍗″彿" min-width="120" />
+ <el-table-column prop="e" align="center" label="閽㈠寲鐗堝浘鍙�" min-width="157" />
+ <el-table-column prop="f" align="center" label="灏哄" min-width="120" />
+ <el-table-column prop="g" align="center" label="缁撴潫浠诲姟" min-width="120" />
</el-table>
</div>
</el-card>
@@ -338,8 +165,13 @@
</el-col>
</div>
</div>
+ <!-- <div id="awatch">
+ <img src="../../assets/lpl.jpg" alt="" style="width: 10%;height: 10%;margin-left: 160px;">
+</div> -->
+
+
<div id="awatch">
- <img src="../../assets/xmjc.png" alt="" style="width: 70%;height: 100%;margin-left: 160px;">
+ <img src="../../assets/cp.png" alt="" style="width: 1305px;height: 400px;margin-left: 240px;margin-top: 50px;">
</div>
</div>
<el-dialog v-model="dialogFormVisible" top="12vh" width="85%" title="璇风‘璁ょ幓鐠冧俊鎭�" >
@@ -565,4 +397,37 @@
::-webkit-scrollbar {
width: 0 !important;height: 0;
}
+ .img-list{
+
+ position:relative;
+}
+.data-img{
+ @apply float-none ;
+
+ width:100%;
+ height:16rem;
+ background: rgba(0, 0, 0, 0);
+ opacity: 1;
+ border-radius: 0.5rem 0.5rem 0px 0px;
+
+}
+.check-img{
+ position: absolute;
+ width: 3.3125rem;
+ height: 2.9375rem;
+ top:20rem;
+ right: 52rem;
+ z-index: 10;
+
+}
+.check-imga{
+ position: absolute;
+ width: 3.3125rem;
+ height: 2.9375rem;
+ top:15rem;
+ right: 37rem;
+ z-index: 10;
+
+}
+
</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 04dc378..0666da4 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -1,209 +1,52 @@
<script setup>
import {Search} from "@element-plus/icons-vue";
-import {reactive, onMounted} from "vue";
+import {reactive} from "vue";
import {useRouter} from "vue-router"
const router = useRouter()
+const dialogFormVisiblea = ref(false)
import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import Landingindication from "./Landingindication.vue";
-import Landingindicationtwo from "./Landingindicationtwo.vue";
-import unloadrequest from "@/utils/unloadrequest";
-const dialogFormVisiblea = ref(false)
+// import Landingindicationtwo from "./Landingindicationtwo.vue";
-
-
-const dialogFormVisiblea2 = ref(false)
-
-
-const tableData = reactive([]);
-
-
-let socket;
-
-
-const initWebSocket = (token) =>{ //鍒濆鍖杦e
-
-let viewname = "unloadglass";
-
-if (typeof WebSocket === "undefined") {
- console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
-} else {
- let socketUrl = "ws://" + "localhost"+":88" + "/api/unLoadGlass/api/talk/" + viewname;
- if (socket != null) {
- socket.close();
- socket = null;
- }
-
- // 寮�鍚竴涓獁ebsocket鏈嶅姟
- socket = new WebSocket(socketUrl);
-
- // 鎵撳紑浜嬩欢
- socket.onopen = function () {
- console.log("websocket宸叉墦寮�");
- };
-
-
-
-socket.onmessage = (msg) => {
-if (!msg.data) {
-return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
-}
-
-
-
- let obj = JSON.parse(msg.data);
-
-
- console.log('鏀跺埌娑堟伅锛�', obj.data);
-
- }
-
- }
- }
-
-
-
-
-// 鏁版嵁
-const loading = ref(false);
-
-
-// 寮规鏄剧ず鎺у埗
-
-const dialogFormVisible = ref(false);
-
-// 琛ㄥ崟鏁版嵁
-const workstationId = ref('');
-const flowCardId = ref('');
-const flowCardOptions = ref([]);
-
-
-// 鏂规硶
-const handleSelectionChange = () => {
- // 澶勭悊琛ㄦ牸琛岄�夋嫨浜嬩欢
-};
-
-const handleBindRack = (row) => {
- workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
-
- // 鍙戣捣鎺ュ彛璇锋眰鑾峰彇娴佺▼鍗″彿
- fetchFlowCardId();
-
-
- dialogFormVisiblea.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
-};
-
-
-
-//鑾峰彇娴佺▼鍗″彿
-const fetchFlowCardId = async () => {
- try {
- const response = await unloadrequest.get('/api/downWorkstation/getflowCardId');
- console.log(response)
- if (response.code === 200) {
- flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flowcard_id }));
- } else {
- ElMessage.error(response.msg);
- }
- } catch (error) {
- console.error(error);
- }
-};
-//纭
-const handleConfirm = async () => {
- try {
- const response = await unloadrequest.post('/api/downWorkstation/updateFlowCardId', {
- workstationId: workstationId.value,
- flowCardId: flowCardId.value
- });
-
- console.log(response)
- if (response.code == 200) {
- // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
- console.log('缁戝畾鎴愬姛');
- ElMessage.success(response.message);
- dialogFormVisiblea.value = false;
- } else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.msg);
- }
- } catch (error) {
- // 澶勭悊閿欒
- console.error(error);
- }
-};
-
-
-
-const handleBindRack2 = (row) => {
- workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
-
-
-
-
- dialogFormVisiblea2.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
-};
-//娓呴櫎鍐呭
-const handleclear = async () => {
- try {
- const response = await unloadrequest.post('/api/downWorkstation/clear', {
- workstationId: workstationId.value,
- });
-
- console.log(response);
-
- if (response.code === 200) {
- // 娓呴櫎鎴愬姛鐨勯�昏緫
- console.log('娓呴櫎鎴愬姛');
- ElMessage.success(response.message);
- dialogFormVisiblea2.value = false;
- } else if (response.code === 400) {
- // 娓呴櫎澶辫触鐨勯�昏緫
- console.log('娓呴櫎澶辫触');
- console.log(response.message); // 鎵撳嵃鏈嶅姟鍣ㄨ繑鍥炵殑閿欒淇℃伅
- ElMessage.error(response.message);
- dialogFormVisiblea2.value = false;
- }
- } catch (error) {
- // console.log(error);
- ElMessage.error("娓呴櫎澶辫触");
- dialogFormVisiblea2.value = false;
- }
-};
-
-
-
-
-
-// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰
-const fetchTableData = async () => {
- try {
- // 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰锛屽苟绛夊緟鍝嶅簲
- const response = await unloadrequest.get('/api/downWorkstation/getone');
-
- // 妫�鏌ュ搷搴旂姸鎬�
- if (response.code === 200) {
- // 鏇存柊琛ㄦ牸鏁版嵁
- console.log('鎴愬姛鑾峰彇琛ㄦ牸鏁版嵁:', response.data);
- tableData.splice(0, tableData.length, ...response.data);
- } else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.msg);
- }
- } catch (error) {
- // 澶勭悊璇锋眰澶辫触鐨勬儏鍐�
- ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
- }
-};
-
-
-
-
-initWebSocket();
-onMounted(fetchTableData);
-//setInterval(fetchTableData, 2000)
-
+const tableData = [
+ {
+ id: '1',
+ long: '1005',
+ wide: '183.6',
+ thick: '1991',
+ state: '鏈惎鐢�',
+ },
+ {
+ id: '2',
+ long: '105',
+ wide: '183',
+ thick: '191',
+ state: '鏈惎鐢�'
+ },
+ {
+ id: '3',
+ long: '105',
+ wide: '183',
+ thick: '191',
+ state: '鏈惎鐢�'
+ },
+ {
+ id: '4',
+ long: '105',
+ wide: '183',
+ thick: '191',
+ state: '鏈惎鐢�'
+ },
+ {
+ id: '5',
+ long: '105',
+ wide: '183',
+ thick: '191',
+ state: '鏈惎鐢�'
+ },
+]
const open = () => {
ElMessageBox.confirm(
'鏄惁鍒犻櫎璇ユ潯淇℃伅?',
@@ -241,6 +84,17 @@
}
}
+const dialogForm = () => {
+ ElMessageBox.confirm(
+ '鏄惁娓呯┖璇ユ潯淇℃伅?',
+ '鎻愮ず',
+ {
+ confirmButtonText: '鏄�',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }
+ )
+}
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
@@ -279,10 +133,6 @@
],
})
-
-
-
-
</script>
<template>
@@ -292,80 +142,53 @@
<el-table height="100%" ref="table"
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="workstationId" align="center" label="涓嬬墖浣�" min-width="80" />
- <el-table-column prop="workstationId" align="center" label="鏋跺彿" min-width="120" />
- <el-table-column prop="flowCardId" align="center" label="娴佺▼鍗″彿" min-width="120" />
- <el-table-column prop="totalquantity" align="center" label="鎬绘暟閲�" min-width="120" />
- <el-table-column prop="racksnumber" align="center" label="宸茶惤鏋舵暟閲�" min-width="120" />
- <el-table-column prop="work_state" align="center" label="鐘舵��" min-width="120" />
- <el-table-column prop="deviceId" align="center" label="璁惧鍙�" min-width="120" />
- <el-table-column prop="enableState" align="center" label="鍚敤鐘舵��" min-width="120" />
+ <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="wide" align="center" label="鎬绘暟閲�" min-width="120" />
+ <el-table-column prop="wide" align="center" label="宸茶惤鏋舵暟閲�" min-width="120" />
+ <el-table-column prop="state" align="center" label="鍚敤鐘舵��" min-width="120" />
<el-table-column fixed="right" label="鎿嶄綔" align="center" width="200">
- <template #default="scope">
- <el-button size="mini" type="text" plain v-show="scope.row.enableState !== '宸插惎鐢�' " @click="handleBindRack(scope.row)">缁戝畾鏋跺瓙</el-button>
- <el-button size="mini" type="text" plain @click="handleBindRack2(scope.row)">娓呯┖</el-button>
- </template>
+ <template #default>
+ <el-button size="mini" type="text" plain v-show="state !== '宸插惎鐢�' " @click="dialogFormVisiblea = true">缁戝畾鏋跺瓙</el-button>
+ <el-button size="mini" type="text" plain @click="dialogForm">娓呯┖</el-button>
+ </template>
</el-table-column>
</el-table>
</div>
</el-card>
-
-
+
+ </div>
+ <div style="display: flex;">
+ <div id="main-body">
+ <Landingindication></Landingindication>
+ </div>
+ <!-- <div id="main-body">
+ <Landingindicationtwo></Landingindicationtwo>
+ </div> -->
+ </div>
<el-dialog v-model="dialogFormVisiblea" top="21vh" width="30%" title="缁戝畾鏋跺瓙" >
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
- <el-form label-width="100px" label-position="right">
- <el-form-item label="鏋跺彿锛�" :required="true" style="width: 18vw">
- <el-input v-model="workstationId" autocomplete="off"/>
- </el-form-item>
- <el-form-item label="娴佺▼鍗″彿锛�" :required="true" style="width: 18vw;">
- <el-select v-model="flowCardId" placeholder="璇烽�夋嫨娴佺▼鍗″彿">
- <el-option v-for="item in flowCardOptions" :key="item.flowcard_id" :label="item.flowcard_id" :value="item.flowcard_id" />
- </el-select>
- </el-form-item>
- </el-form>
- </el-form>
- </div>
+ <el-form size="mini" label-width="150px">
+ <el-form label-width="100px" label-position="right">
+ <el-form-item label="鏋跺彿锛�" :required="true" style="width: 18vw">
+ <el-input autocomplete="off"/>
+ </el-form-item>
+ <el-form-item label="娴佺▼鍗″彿锛�" :required="true" style="width: 18vw;">
+ <el-input autocomplete="off" />
+ </el-form-item>
+ </el-form>
+ </el-form>
+ </div>
<template #footer>
<div id="dialog-footer">
- <el-button type="primary" @click="handleConfirm">
+ <el-button type="primary" @click="dialogFormVisiblea = false">
纭
</el-button>
<el-button @click="dialogFormVisiblea = false">鍙栨秷</el-button>
</div>
</template>
</el-dialog>
-
-
-
-
- <el-dialog v-model="dialogFormVisiblea2" top="21vh" width="30%" title="娓呴櫎鏋跺瓙鐜荤拑" >
-
- <template #footer>
- <div id="dialog-footer">
- <el-button type="primary" @click="handleclear">
- 纭
- </el-button>
- <el-button @click="dialogFormVisiblea2 = false">鍙栨秷</el-button>
- </div>
- </template>
- </el-dialog>
-
-
- <!-- workstationId: '1',
- workstationId: '1005',
- flowCardId: '183.6',
- totalquantity: '1991',
- racksnumber:"1",
- work_state: '寰呰瘑鍒�', -->
- </div>
- <div style="display: flex;">
- <div id="main-body">
- <Landingindication></Landingindication>
- </div>
- <div id="main-bodya">
- <Landingindicationtwo></Landingindicationtwo>
- </div></div>
</template>
<style scoped>
@@ -389,11 +212,7 @@
height: 450px;
}
#main-body{
- margin-top: -20px;
- margin-left: 300px;
-}
-#main-bodya{
margin-top: -10px;
- margin-left: 100px;
+ margin-left: 450px;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0