From 48be263891d34bfac0417c1e8d047fef673f0900 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 28 四月 2024 14:17:42 +0800
Subject: [PATCH] Merge branch 'security_20240424'
---
UI-Project/config.js | 7
UI-Project/src/views/Slicecage/slicecage.vue | 1330 ++++++++++++++++++++++++++++----------------------
hangzhoumesParent/common/pom.xml | 16
hangzhoumesParent/moduleService/CacheGlassModule/pom.xml | 15
hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml | 6
hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml | 1
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java | 5
UI-Project/vite.config.js | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 176 +++---
9 files changed, 867 insertions(+), 691 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index 0009876..bf51358 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,9 +1,6 @@
export default {
- // serverUrl: "127.0.0.1:88/api",
- serverUrl: "10.153.19.150:88/api",
+ serverUrl: "127.0.0.1:88/api",
//serverUrl: "localhost:88/api/",
serverUrl2: "10.153.19.150:88"
//serverUrl:"res.abeim.cn"
-}
-
-
+}
\ No newline at end of file
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 22d0adc..2538c4e 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1,37 +1,27 @@
<script lang="ts" setup>
-import {Search} from "@element-plus/icons-vue";
-import {reactive} from "vue";
-import {useRouter} from "vue-router"
+import {reactive, ref} from 'vue'
+import {useRouter} from 'vue-router'
+import {ElMessage, ElMessageBox} from 'element-plus'
+
const router = useRouter()
-
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { tr } from "element-plus/es/locale";
+
const dialogFormVisible = ref(false)
const dialogFormVisiblea = ref(false)
const dialogFormVisibleb = ref(false)
-
-const carposition1 = ref(60);
-const carposition2 = ref(220);
-const carposition3 = ref(60);
-const carposition4 = ref(260);
-const timers1 =ref(true);
-const timers2 =ref(true);
-const timers3 =ref(true);
-const timers4 =ref(true);
-const cellshow=ref(false);
-const cellshow5=ref(false);
-const c1=ref(false);
-const c2=ref(false);
-const cellshow1=ref(true);
-const cellshow2=ref(true);
-const cellshow3=ref(true);
-const cellshow4=ref(true);
-const million=ref(0);
-const million1=ref(0);
-const million3=ref(0);
-const million4=ref(0);
-
+
+const carposition1 = ref(40)
+const carposition2 = ref(200)
+const timers1 = ref(true)
+const timers2 = ref(true)
+const cellshow = ref(false)
+const cellshow1 = ref(true)
+const cellshow2 = ref(true)
+const million = ref(0)
+const million1 = ref(0)
+
+const loading = null
+const handleSelectionChange = null
+
const currentPage4 = ref(4)
const pageSize4 = ref(100)
const tableData = [
@@ -56,320 +46,338 @@
e: '1',
f: '100*100',
g: '',
- }
+ },
]
const dialogForm = () => {
- ElMessageBox.confirm(
- '纭畾瑕佹�ュ仠鍚�?',
- '鎻愮ず',
- {
- confirmButtonText: '鏄�',
- cancelButtonText: '鍚�',
- type: 'warning',
- }
- )
- .then(() => {
- ElMessage({
- type: 'success',
- message: '鎬ュ仠鎴愬姛锛�',
+ ElMessageBox.confirm('纭畾瑕佹�ュ仠鍚�?', '鎻愮ず', {
+ confirmButtonText: '鏄�',
+ cancelButtonText: '鍚�',
+ type: 'warning',
+ })
+ .then(() => {
+ ElMessage({
+ type: 'success',
+ message: '鎬ュ仠鎴愬姛锛�',
+ })
})
- })
- .catch(() => {
- ElMessage({
- type: 'info',
- message: '鎬ュ仠澶辫触',
+ .catch(() => {
+ ElMessage({
+ type: 'info',
+ message: '鎬ュ仠澶辫触',
})
})
}
-
- var timer=setInterval(() => {
- console.log(million.value,million1.value);
- million.value+=1;
- if(million.value-million1.value!==12){
-
- if(million.value-million1.value>=2){
- if(carposition1.value==220){
- timers1.value=false;
- }else if(carposition1.value==60){
- timers1.value=true;
- }
- if(timers1.value==true){
- carposition1.value=carposition1.value+16;
- }else{
- carposition1.value=carposition1.value-16;
- }
-
-
- if(carposition2.value==220){
- timers2.value=false;
- }else if(carposition2.value==60){
- timers2.value=true;
- }
- if(timers2.value==true){
- carposition2.value+=16;
- }else{
- carposition2.value-=16;
- }
- }else{
-
+
+var timer = setInterval(() => {
+ console.log(million.value, million1.value)
+ million.value += 1
+ if (million.value - million1.value !== 12) {
+ if (million.value - million1.value >= 2) {
+ if (carposition1.value == 200) {
+ timers1.value = false
+ } else if (carposition1.value == 40) {
+ timers1.value = true
}
- }else{
- million1.value=million.value;
- if(cellshow.value==true){
- cellshow.value=false;
-
- }else{
- cellshow.value=true;
-
+ if (timers1.value == true) {
+ carposition1.value = carposition1.value + 16
+ } else {
+ carposition1.value = carposition1.value - 16
}
- if(cellshow1.value==true){
- cellshow1.value=false;
- }else{
- cellshow1.value=true;
+
+ if (carposition2.value == 200) {
+ timers2.value = false
+ } else if (carposition2.value == 40) {
+ timers2.value = true
}
- if(cellshow2.value==true){
- cellshow2.value=false;
- }else{
- cellshow2.value=true;
+ if (timers2.value == true) {
+ carposition2.value += 16
+ } else {
+ carposition2.value -= 16
}
+ } else {
}
-
- }, 1000);
-
- var timer=setInterval(() => {
- console.log(million3.value,million4.value);
- million3.value+=1;
- if(million3.value-million4.value!==12){
-
- if(million3.value-million4.value>=2){
- if(carposition3.value==260){
- timers3.value=false;
- }else if(carposition3.value==60){
- timers3.value=true;
- }
- if(timers3.value==true){
- carposition3.value=carposition3.value+20;
- }else{
- carposition3.value=carposition3.value-20;
- }
-
-
- if(carposition4.value==260){
- timers4.value=false;
- }else if(carposition4.value==60){
- timers4.value=true;
- }
- if(timers4.value==true){
- carposition4.value+=20;
- }else{
- carposition4.value-=20;
- }
- }else{
-
- }
- }else{
- million4.value=million3.value;
- if(cellshow5.value==true){
- cellshow5.value=false;
-
- }else{
- cellshow5.value=true;
-
- }
- if(cellshow3.value==true){
- cellshow3.value=false;
- }else{
- cellshow3.value=true;
- }
- if(cellshow4.value==true){
- cellshow4.value=false;
- }else{
- cellshow4.value=true;
- }
+ } else {
+ million1.value = million.value
+ if (cellshow.value == true) {
+ cellshow.value = false
+ } else {
+ cellshow.value = true
}
-
- }, 1000);
-
-const getTableRow = (row,type) =>{
+ if (cellshow1.value == true) {
+ cellshow1.value = false
+ } else {
+ cellshow1.value = true
+ }
+ if (cellshow2.value == true) {
+ cellshow2.value = false
+ } else {
+ cellshow2.value = true
+ }
+ }
+}, 100000)
+
+const getTableRow = (row, type) => {
switch (type) {
- case 'edit' :{
+ case 'edit': {
//alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/returns/createReturns', query: { ReturnID: 'TH24010101' }})
+ router.push({
+ path: '/main/returns/createReturns',
+ query: {ReturnID: 'TH24010101'},
+ })
break
}
- case 'delete':{
+ case 'delete': {
alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
break
}
}
}
-
+
const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
- keepSource: true,//淇濇寔婧愭暟鎹�
- align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ border: 'full', //琛ㄦ牸鍔犺竟妗�
+ keepSource: true, //淇濇寔婧愭暟鎹�
+ align: 'center', //鏂囧瓧灞呬腑
+ stripe: true, //鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true, height: 50}, //榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'OrderList',
- showFooter: true,//鏄剧ず鑴�
+ showFooter: true, //鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
- showOverflow:true,
+ scrollY: {enabled: true}, //寮�鍚櫄鎷熸粴鍔�
+ showOverflow: true,
columnConfig: {
resizable: true,
- useKey: true
+ useKey: true,
},
- filterConfig: { //绛涢�夐厤缃」
- remote: true
+ filterConfig: {
+ //绛涢�夐厤缃」
+ remote: true,
},
customConfig: {
- storage: true
+ storage: true,
},
editConfig: {
trigger: 'click',
mode: 'row',
- showStatus: true
+ showStatus: true,
},
- data: [
+ data: [
{
- 'id': '1',
- 'long': '5',
- 'wide': '1005',
- 'thick': '183.6',
- }
+ id: '1',
+ long: '5',
+ wide: '1005',
+ thick: '183.6',
+ },
],
})
</script>
-
+
<template>
<div style="height: 700px;">
<!-- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="primary" @click="dialogFormVisible = true">鎵嬪姩杩涚墖</el-button> -->
- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="primary" @click="dialogFormVisiblea = true">璁㈠崟淇℃伅</el-button>
- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="success" @click="dialogFormVisibleb = true">鍑虹墖闃熷垪</el-button>
- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="danger">缁堟杩涚墖</el-button>
- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="danger">缁堟鍑虹墖</el-button>
- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="danger" @click="dialogForm">杞�ュ仠</el-button>
-
- <el-card style="flex: 1;margin-left: 10px;margin-top: 5px;" v-loading="loading">
+ <el-button style="margin-top: 5px;margin-left: 10px;"
+ id="searchButton"
+ type="primary"
+ @click="dialogFormVisiblea = true">璁㈠崟淇℃伅
+ </el-button>
+ <el-button style="margin-top: 5px;margin-left: 10px;"
+ id="searchButton"
+ type="success"
+ @click="dialogFormVisibleb = true">鍑虹墖闃熷垪
+ </el-button>
+ <el-button style="margin-top: 5px;margin-left: 10px;"
+ id="searchButton"
+ type="danger">缁堟杩涚墖
+ </el-button>
+ <el-button style="margin-top: 5px;margin-left: 10px;"
+ id="searchButton"
+ type="danger">缁堟鍑虹墖
+ </el-button>
+ <el-button style="margin-top: 5px;margin-left: 10px;"
+ id="searchButton"
+ type="danger"
+ @click="dialogForm">杞�ュ仠
+ </el-button>
+
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 5px;"
+ v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 100px;">
- <el-table height="100%" ref="table"
- @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="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-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="text">瀹屾垚浠诲姟</el-button>
-</el-table-column>
+ <el-table height="100%"
+ ref="table"
+ @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="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-button style="margin-top: 5px;margin-left: 10px;"
+ id="searchButton"
+ type="text">瀹屾垚浠诲姟
+ </el-button>
+ </el-table-column>
</el-table>
</div>
</el-card>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 3px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 3px;"
+ v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 100px;">
- <el-table height="100%" ref="table"
- @selection-change="handleSelectionChange"
- :data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <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-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="text">瀹屾垚浠诲姟</el-button>
-</el-table-column>
+ <el-table height="100%"
+ ref="table"
+ @selection-change="handleSelectionChange"
+ :data="tableDatab"
+ :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <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-button style="margin-top: 5px;margin-left: 10px;"
+ id="searchButton"
+ type="text">瀹屾垚浠诲姟
+ </el-button>
+ </el-table-column>
</el-table>
</div>
</el-card>
<div style="padding: 10px;display: flex;height:110px;">
- <div id="occupy">
- <el-col style="text-align:left;font-weight: bold;">#1</el-col>
- <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span id="biao">浣跨敤鐜�</span><span id="zhi">35%</span>
- </el-col>
- <hr style="width:80%;margin: 0 auto;" />
- <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span id="biao">绌洪棽锛堟牸瀛愭暟锛�</span><span id="zhi">555</span>
- </el-col>
- </div>
- <div id="occupy">
- <el-col style="text-align:left;font-weight: bold;">#2</el-col>
- <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span id="biao">浣跨敤鐜�</span><span id="zhi">35%</span>
- </el-col>
- <hr style="width:80%;margin: 0 auto;" />
- <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span id="biao">绌洪棽锛堟牸瀛愭暟锛�</span><span id="zhi">555</span>
- </el-col>
- </div>
- <div id="occupy">
- <el-col style="text-align:left;font-weight: bold;">#3</el-col>
- <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span id="biao">浣跨敤鐜�</span><span id="zhi">35%</span>
- </el-col>
- <hr style="width:80%;margin: 0 auto;" />
- <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span id="biao">绌洪棽锛堟牸瀛愭暟锛�</span><span id="zhi">555</span>
- </el-col>
- </div>
- <div id="occupy">
- <el-col style="text-align:left;font-weight: bold;">#4</el-col>
- <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span id="biao">浣跨敤鐜�</span><span id="zhi">35%</span>
- </el-col>
- <hr style="width:80%;margin: 0 auto;" />
- <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span id="biao">绌洪棽锛堟牸瀛愭暟锛�</span><span id="zhi">555</span>
- </el-col>
- </div>
- <div id="occupy">
- <el-col style="text-align:left;font-weight: bold;">#5</el-col>
- <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span id="biao">浣跨敤鐜�</span><span id="zhi">35%</span>
- </el-col>
- <hr style="width:80%;margin: 0 auto;" />
- <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span id="biao">绌洪棽锛堟牸瀛愭暟锛�</span><span id="zhi">555</span>
- </el-col>
- </div>
- <div id="occupy">
- <el-col style="text-align:left;font-weight: bold;">#6</el-col>
- <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span id="biao">浣跨敤鐜�</span><span id="zhi">35%</span>
- </el-col>
- <hr style="width:80%;margin: 0 auto;" />
- <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span id="biao">绌洪棽锛堟牸瀛愭暟锛�</span><span id="zhi">555</span>
- </el-col>
- </div>
- <div id="occupy">
- <el-col style="text-align:left;font-weight: bold;">#7</el-col>
- <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span id="biao">浣跨敤鐜�</span><span id="zhi">35%</span>
- </el-col>
- <hr style="width:80%;margin: 0 auto;" />
- <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span id="biao">绌洪棽锛堟牸瀛愭暟锛�</span><span id="zhi">555</span>
- </el-col>
- </div>
- <div id="occupy">
- <el-col style="text-align:left;font-weight: bold;">#8</el-col>
- <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span id="biao">浣跨敤鐜�</span><span id="zhi">35%</span>
- </el-col>
- <hr style="width:80%;margin: 0 auto;" />
- <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span id="biao">绌洪棽锛堟牸瀛愭暟锛�</span><span id="zhi">555</span>
- </el-col>
- </div>
- <!-- <div v-for="n in 8" :key="n" id="occupy">
+ <div id="occupy">
+ <el-col style="text-align:left;font-weight: bold;">#1</el-col>
+ <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+ <span id="biao">浣跨敤鐜�</span><span id="zhi">35%</span>
+ </el-col>
+ <hr style="width:80%;margin: 0 auto;"/>
+ <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+ <span id="biao">绌洪棽锛堟牸瀛愭暟锛�</span><span id="zhi">555</span>
+ </el-col>
+ </div>
+ <div id="occupy">
+ <el-col style="text-align:left;font-weight: bold;">#2</el-col>
+ <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+ <span id="biao">浣跨敤鐜�</span><span id="zhi">35%</span>
+ </el-col>
+ <hr style="width:80%;margin: 0 auto;"/>
+ <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+ <span id="biao">绌洪棽锛堟牸瀛愭暟锛�</span><span id="zhi">555</span>
+ </el-col>
+ </div>
+ <div id="occupy">
+ <el-col style="text-align:left;font-weight: bold;">#3</el-col>
+ <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+ <span id="biao">浣跨敤鐜�</span><span id="zhi">35%</span>
+ </el-col>
+ <hr style="width:80%;margin: 0 auto;"/>
+ <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+ <span id="biao">绌洪棽锛堟牸瀛愭暟锛�</span><span id="zhi">555</span>
+ </el-col>
+ </div>
+ <div id="occupy">
+ <el-col style="text-align:left;font-weight: bold;">#4</el-col>
+ <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+ <span id="biao">浣跨敤鐜�</span><span id="zhi">35%</span>
+ </el-col>
+ <hr style="width:80%;margin: 0 auto;"/>
+ <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+ <span id="biao">绌洪棽锛堟牸瀛愭暟锛�</span><span id="zhi">555</span>
+ </el-col>
+ </div>
+ <div id="occupy">
+ <el-col style="text-align:left;font-weight: bold;">#5</el-col>
+ <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+ <span id="biao">浣跨敤鐜�</span><span id="zhi">35%</span>
+ </el-col>
+ <hr style="width:80%;margin: 0 auto;"/>
+ <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+ <span id="biao">绌洪棽锛堟牸瀛愭暟锛�</span><span id="zhi">555</span>
+ </el-col>
+ </div>
+ <div id="occupy">
+ <el-col style="text-align:left;font-weight: bold;">#6</el-col>
+ <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+ <span id="biao">浣跨敤鐜�</span><span id="zhi">35%</span>
+ </el-col>
+ <hr style="width:80%;margin: 0 auto;"/>
+ <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+ <span id="biao">绌洪棽锛堟牸瀛愭暟锛�</span><span id="zhi">555</span>
+ </el-col>
+ </div>
+ <div id="occupy">
+ <el-col style="text-align:left;font-weight: bold;">#7</el-col>
+ <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+ <span id="biao">浣跨敤鐜�</span><span id="zhi">35%</span>
+ </el-col>
+ <hr style="width:80%;margin: 0 auto;"/>
+ <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+ <span id="biao">绌洪棽锛堟牸瀛愭暟锛�</span><span id="zhi">555</span>
+ </el-col>
+ </div>
+ <div id="occupy">
+ <el-col style="text-align:left;font-weight: bold;">#8</el-col>
+ <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+ <span id="biao">浣跨敤鐜�</span><span id="zhi">35%</span>
+ </el-col>
+ <hr style="width:80%;margin: 0 auto;"/>
+ <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+ <span id="biao">绌洪棽锛堟牸瀛愭暟锛�</span><span id="zhi">555</span>
+ </el-col>
+ </div>
+ <!-- <div v-for="n in 8" :key="n" id="occupy">
<el-col style="text-align:left;font-weight: bold;">#1</el-col>
<el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
<span id="biao">浣跨敤鐜�</span><span id="zhi">35%</span>
@@ -383,360 +391,508 @@
<!-- <div id="awatch">
<img src="../../assets/cp.png" alt="" style="width: 70%;height: 70%;margin-left: 160px;">
</div> -->
-<!-- // 鐖剁骇妗� -->
-<div class="img-dlpl" >
- <div class="img-car1" :style="'z-index:999;left:247px;top:' + carposition1 + 'px;position:absolute;'">
- <div v-show="cellshow1" style="margin-top:10px;width:200px;height:5px;background-color:#409EFF;"></div>
+ <!-- // 鐖剁骇妗� -->
+ <div class="img-dlpl">
+ <div class="img-car1"
+ :style="'z-index:999;left:247px;top:' + carposition1 + 'px;position:absolute;'">
+ <div v-show="cellshow1"
+ style="margin-top:10px;width:200px;height:5px;background-color:red;"></div>
+ </div>
+
+ <div class="img-car2"
+ :style="'z-index:999;left:704px;top:' + carposition2 + 'px;position:absolute;'">
+ <div v-show="cellshow2"
+ style="margin-top:10px;width:200px;height:5px;background-color:red;"></div>
+ </div>
+ <div v-show="cellshow"
+ style="width: 200px;height: 5px;position: absolute;top:60px;left: 490px;background-color: red;">
+
+ </div>
</div>
- <div v-show="c1" class="img-car2" :style="'z-index:999;left:704px;top:' + carposition2 + 'px;position:absolute;'">
- <div v-show="cellshow2" style="margin-top:10px;width:200px;height:5px;background-color:#409EFF;"></div>
- </div>
-
- <div v-show="c2" class="img-car3" :style="'z-index:999;left:247px;top:' + carposition3 + 'px;position:absolute;'">
- <div v-show="cellshow3" style="margin-top:10px;width:200px;height:5px;background-color:#409EFF;"></div>
- </div>
- <div class="img-car4" :style="'z-index:999;left:704px;top:' + carposition4 + 'px;position:absolute;'">
- <div v-show="cellshow4" style="margin-top:10px;width:200px;height:5px;background-color:#409EFF;"></div>
- </div>
- <div v-show="cellshow" style="width: 200px;height: 5px;position: absolute;top:70px;left: 480px;background-color: #409EFF;">
- </div>
- <div v-show="cellshow5" style="width: 200px;height: 5px;position: absolute;top:70px;left: 480px;background-color: #409EFF;">
- </div>
-</div>
-
+
</div>
-<el-dialog v-model="dialogFormVisible" top="12vh" width="85%" title="璇风‘璁ょ幓鐠冧俊鎭�" >
- <div style="margin-left: 50px;margin-bottom: 10px;">
- <div style="display: flex;">
- <p style="margin-top: 4px;">纭鐘舵��:</p>
- <el-button style="margin-left: 10px;size: mini;" type="success">鍏佽</el-button>
- <el-button style="margin-left: 10px;size: mini;" type="danger">涓嶅厑璁�</el-button>
- <p style="margin-left: 60px;margin-top: 4px;">褰撳墠鐘舵��:</p>
- <div style="margin-top: 4px; margin-left: 10px;">鎵嬪姩</div>
- <el-button style="margin-left: 10px;size: mini;" type="primary">鍒囨崲</el-button>
- <el-input placeholder="璇疯緭鍏ョ幓鐠僫d" style="width: 180px;size: mini;margin-left: 60px;"></el-input>
- <el-button style="margin-left: 10px;size: mini;" type="primary">娣诲姞</el-button>
- <p style="margin-left: 60px;margin-top: 4px;">鐜荤拑id:</p>
- <el-input style="width: 180px;size: mini;margin-left: 30px;"></el-input>
- </div>
- <div style="display: flex;">
- <p style="margin-left: 290px;margin-top: 20px;font-weight: bold;">涓婄墖浣�</p>
- <p style="margin-left: 630px;margin-top: 20px;font-weight: bold;">鎵爜浣�</p>
- </div>
- <div style="display: flex;">
- <div style="margin-top: 20px;">
- <p style="margin-top: 10px;margin-left: 100px;margin-bottom: 20px;">褰撳墠淇℃伅</p>
- <el-form label-position="right" label-width="90px">
- <el-form-item style="width: 20vw" label="鐜荤拑id锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ョ幓鐠僫d"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="璁㈠崟缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="鍒楄〃缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ュ垪琛ㄧ紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="绠卞瓙缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ョ瀛愮紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="闀匡細">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ラ暱"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="瀹斤細">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ュ"></el-input>
- </el-form-item>
- </el-form>
+ <el-dialog v-model="dialogFormVisible"
+ top="12vh"
+ width="85%"
+ title="璇风‘璁ょ幓鐠冧俊鎭�">
+ <div style="margin-left: 50px;margin-bottom: 10px;">
+ <div style="display: flex;">
+ <p style="margin-top: 4px;">纭鐘舵��:</p>
+ <el-button style="margin-left: 10px;size: mini;"
+ type="success">鍏佽
+ </el-button>
+ <el-button style="margin-left: 10px;size: mini;"
+ type="danger">涓嶅厑璁�
+ </el-button>
+ <p style="margin-left: 60px;margin-top: 4px;">褰撳墠鐘舵��:</p>
+ <div style="margin-top: 4px; margin-left: 10px;">鎵嬪姩</div>
+ <el-button style="margin-left: 10px;size: mini;"
+ type="primary">鍒囨崲
+ </el-button>
+ <el-input placeholder="璇疯緭鍏ョ幓鐠僫d"
+ style="width: 180px;size: mini;margin-left: 60px;"></el-input>
+ <el-button style="margin-left: 10px;size: mini;"
+ type="primary">娣诲姞
+ </el-button>
+ <p style="margin-left: 60px;margin-top: 4px;">鐜荤拑id:</p>
+ <el-input style="width: 180px;size: mini;margin-left: 30px;"></el-input>
</div>
- <div style="margin-top: 20px;">
- <p style="margin-top: 10px;margin-left: 100px;margin-bottom: 20px;">淇敼淇℃伅</p>
- <el-form label-position="right" label-width="90px">
- <el-form-item style="width: 20vw" label="鐜荤拑id锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ョ幓鐠僫d"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="璁㈠崟缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="鍒楄〃缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ュ垪琛ㄧ紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="绠卞瓙缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ョ瀛愮紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="闀匡細">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ラ暱"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="瀹斤細">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ュ"></el-input>
- </el-form-item>
- </el-form>
+ <div style="display: flex;">
+ <p style="margin-left: 290px;margin-top: 20px;font-weight: bold;">涓婄墖浣�</p>
+ <p style="margin-left: 630px;margin-top: 20px;font-weight: bold;">鎵爜浣�</p>
</div>
- <div style="margin-top: 20px;">
- <p style="margin-top: 10px;margin-left: 100px;margin-bottom: 20px;">淇敼淇℃伅</p>
- <el-form label-position="right" label-width="90px">
- <el-form-item style="width: 20vw" label="鐜荤拑id锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ョ幓鐠僫d"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="璁㈠崟缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="鍒楄〃缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ュ垪琛ㄧ紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="绠卞瓙缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ョ瀛愮紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="闀匡細">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ラ暱"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="瀹斤細">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ュ"></el-input>
- </el-form-item>
- </el-form>
- </div>
- <div style="margin-top: 20px;">
- <p style="margin-top: 10px;margin-left: 100px;margin-bottom: 20px;">褰撳墠淇℃伅</p>
- <el-form label-position="right" label-width="90px">
- <el-form-item style="width: 20vw" label="鐜荤拑id锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ョ幓鐠僫d"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="璁㈠崟缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="鍒楄〃缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ュ垪琛ㄧ紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="绠卞瓙缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ョ瀛愮紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="闀匡細">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ラ暱"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="瀹斤細">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ュ"></el-input>
- </el-form-item>
- </el-form>
- </div>
- </div>
+ <div style="display: flex;">
+ <div style="margin-top: 20px;">
+ <p style="margin-top: 10px;margin-left: 100px;margin-bottom: 20px;">褰撳墠淇℃伅</p>
+ <el-form label-position="right"
+ label-width="90px">
+ <el-form-item style="width: 20vw"
+ label="鐜荤拑id锛�">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ョ幓鐠僫d"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="璁㈠崟缂栧彿锛�">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="鍒楄〃缂栧彿锛�">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ュ垪琛ㄧ紪鍙�"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="绠卞瓙缂栧彿锛�">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ョ瀛愮紪鍙�"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="闀匡細">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ラ暱"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="瀹斤細">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ュ"></el-input>
+ </el-form-item>
+ </el-form>
</div>
- <template #footer>
- <div id="dialog-footer">
- <el-button type="primary" @click="dialogFormVisible = false">
- 纭
- </el-button>
- <el-button @click="dialogFormVisible = false">鍙栨秷</el-button>
+ <div style="margin-top: 20px;">
+ <p style="margin-top: 10px;margin-left: 100px;margin-bottom: 20px;">淇敼淇℃伅</p>
+ <el-form label-position="right"
+ label-width="90px">
+ <el-form-item style="width: 20vw"
+ label="鐜荤拑id锛�">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ョ幓鐠僫d"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="璁㈠崟缂栧彿锛�">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="鍒楄〃缂栧彿锛�">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ュ垪琛ㄧ紪鍙�"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="绠卞瓙缂栧彿锛�">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ョ瀛愮紪鍙�"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="闀匡細">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ラ暱"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="瀹斤細">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ュ"></el-input>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div style="margin-top: 20px;">
+ <p style="margin-top: 10px;margin-left: 100px;margin-bottom: 20px;">淇敼淇℃伅</p>
+ <el-form label-position="right"
+ label-width="90px">
+ <el-form-item style="width: 20vw"
+ label="鐜荤拑id锛�">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ョ幓鐠僫d"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="璁㈠崟缂栧彿锛�">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="鍒楄〃缂栧彿锛�">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ュ垪琛ㄧ紪鍙�"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="绠卞瓙缂栧彿锛�">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ョ瀛愮紪鍙�"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="闀匡細">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ラ暱"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="瀹斤細">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ュ"></el-input>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div style="margin-top: 20px;">
+ <p style="margin-top: 10px;margin-left: 100px;margin-bottom: 20px;">褰撳墠淇℃伅</p>
+ <el-form label-position="right"
+ label-width="90px">
+ <el-form-item style="width: 20vw"
+ label="鐜荤拑id锛�">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ョ幓鐠僫d"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="璁㈠崟缂栧彿锛�">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="鍒楄〃缂栧彿锛�">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ュ垪琛ㄧ紪鍙�"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="绠卞瓙缂栧彿锛�">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ョ瀛愮紪鍙�"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="闀匡細">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ラ暱"></el-input>
+ </el-form-item>
+ <el-form-item style="width: 20vw"
+ label="瀹斤細">
+ <el-input style="width: 180px"
+ size="mini"
+ placeholder="璇疯緭鍏ュ"></el-input>
+ </el-form-item>
+ </el-form>
+ </div>
+ </div>
</div>
- </template>
-</el-dialog>
-<el-dialog v-model="dialogFormVisiblea" top="10vh" width="85%" title="璁㈠崟淇℃伅" >
- <el-input placeholder="璇疯緭鍏ュ伐绋嬪彿" style="width: 180px;size: mini;"></el-input>
- <el-button style="margin-left: 10px;size: mini;" type="primary">鏌ヨ</el-button>
- <el-table ref="table" style="margin-top: 20px;height: 500px;"
- @selection-change="handleSelectionChange"
- :data="tableDataa" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="ida" align="center" label="鐜荤拑id" min-width="80" />
- <el-table-column prop="typea" align="center" label="宸ョ▼鍙�" min-width="120" />
- <el-table-column prop="typea" align="center" label="闀�" min-width="120" />
- <el-table-column prop="typea" align="center" label="瀹�" min-width="120" />
- <el-table-column prop="typea" align="center" label="鍘�" min-width="120" />
- </el-table>
- <div id="demo-pagination-block">
- <el-pagination
- style="margin-left: 850px;"
- v-model:current-page="currentPage4"
- v-model:page-size="pageSize4"
- :page-sizes="[100, 200, 300, 400]"
- :small="small"
- :disabled="disabled"
- :background="background"
- layout="total, sizes, prev, pager, next, jumper"
- :total="400"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
- </div>
-</el-dialog>
-<el-dialog v-model="dialogFormVisibleb" top="10vh" width="85%" title="鍑虹墖闃熷垪" >
- <div style="display: flex;">
- <p style="margin-top: 4px;">闃熷垪鐘舵�侊細</p>
- <p style="margin-top: 4px;">寮�濮�</p>
- <el-button style="margin-left: 10px;size: mini;" type="danger">鍋滄</el-button>
- <el-button style="margin-left: 10px;size: mini;" type="primary">娣诲姞</el-button>
- </div>
- <el-table ref="table" style="margin-top: 20px;height: 500px;"
- @selection-change="handleSelectionChange"
- :data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="id" align="center" label="閾濇id" min-width="80" />
- <el-table-column prop="type" align="center" label="鐜荤拑id" 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="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>
-</el-dialog>
-
+ <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="dialogFormVisiblea"
+ top="10vh"
+ width="85%"
+ title="璁㈠崟淇℃伅">
+ <el-input placeholder="璇疯緭鍏ュ伐绋嬪彿"
+ style="width: 180px;size: mini;"></el-input>
+ <el-button style="margin-left: 10px;size: mini;"
+ type="primary">鏌ヨ
+ </el-button>
+ <el-table ref="table"
+ style="margin-top: 20px;height: 500px;"
+ @selection-change="handleSelectionChange"
+ :data="tableDataa"
+ :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="ida"
+ align="center"
+ label="鐜荤拑id"
+ min-width="80"/>
+ <el-table-column prop="typea"
+ align="center"
+ label="宸ョ▼鍙�"
+ min-width="120"/>
+ <el-table-column prop="typea"
+ align="center"
+ label="闀�"
+ min-width="120"/>
+ <el-table-column prop="typea"
+ align="center"
+ label="瀹�"
+ min-width="120"/>
+ <el-table-column prop="typea"
+ align="center"
+ label="鍘�"
+ min-width="120"/>
+ </el-table>
+ <div id="demo-pagination-block">
+ <el-pagination style="margin-left: 850px;"
+ v-model:current-page="currentPage4"
+ v-model:page-size="pageSize4"
+ :page-sizes="[100, 200, 300, 400]"
+ :small="small"
+ :disabled="disabled"
+ :background="background"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="400"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"/>
+ </div>
+ </el-dialog>
+ <el-dialog v-model="dialogFormVisibleb"
+ top="10vh"
+ width="85%"
+ title="鍑虹墖闃熷垪">
+ <div style="display: flex;">
+ <p style="margin-top: 4px;">闃熷垪鐘舵�侊細</p>
+ <p style="margin-top: 4px;">寮�濮�</p>
+ <el-button style="margin-left: 10px;size: mini;"
+ type="danger">鍋滄
+ </el-button>
+ <el-button style="margin-left: 10px;size: mini;"
+ type="primary">娣诲姞
+ </el-button>
+ </div>
+ <el-table ref="table"
+ style="margin-top: 20px;height: 500px;"
+ @selection-change="handleSelectionChange"
+ :data="tableDatab"
+ :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="id"
+ align="center"
+ label="閾濇id"
+ min-width="80"/>
+ <el-table-column prop="type"
+ align="center"
+ label="鐜荤拑id"
+ 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="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>
+ </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{
+#dt {
+ display: block;
+ float: left;
+ line-height: 20px;
+ margin-left: 100px;
+}
+
+#dta {
+ display: block;
+ float: left;
+ line-height: 20px;
+ margin-left: 80%;
+}
+
+#dialog-footer {
text-align: center;
margin-top: -15px;
}
-#message{
+
+#message {
text-align: center;
align-items: center;
color: black;
- width: 200px;
- height: 100px;
- background-color: #337ecc;
- margin-left: 28%;
+ width: 200px;
+ height: 100px;
+ background-color: #337ecc;
+ margin-left: 28%;
}
-#awatch{
+
+#awatch {
height: 450px;
}
+
#occupy {
- height: 100%;
- width: 15%;
- background-color: white;
- margin: 0px 8px 0px 8px;
- border: 1px #EBEEF5 solid;
- text-align: center;
- padding: 5px;
+ height: 100%;
+ width: 15%;
+ background-color: white;
+ margin: 0px 8px 0px 8px;
+ border: 1px #ebeef5 solid;
+ text-align: center;
+ padding: 5px;
}
#biao {
- font-size: 12px;
+ font-size: 12px;
}
#zhi {
- font-size: 18px;
- font-weight: bold;
+ font-size: 18px;
+ font-weight: bold;
}
+
#demo-pagination-block + #demo-pagination-block {
margin-top: 10px;
}
+
#demo-pagination-block #demonstration {
margin-bottom: 16px;
}
+
::-webkit-scrollbar {
- width: 0 !important;
- }
- ::-webkit-scrollbar {
- width: 0 !important;height: 0;
- }
- .img-list{
-
- position:relative;
+ width: 0 !important;
}
-.data-img{
- @apply float-none ;
-
- width:100%;
- height:16rem;
+
+::-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{
+
+.check-img {
position: absolute;
width: 3.3125rem;
height: 2.9375rem;
- top:20rem;
+ top: 20rem;
right: 57rem;
z-index: 10;
-
}
-.check-imga{
+
+.check-imga {
position: absolute;
width: 3.3125rem;
height: 2.9375rem;
- top:15rem;
+ top: 15rem;
right: 28.5rem;
z-index: 10;
-
}
+
.vertical {
- width: 45px;
- height: 25px;
- background-color: #409EFF;
- top: 485px; /* 鍒濆浣嶇疆 */
- left: 899px; /* 姘村钩灞呬腑 */
- transform: translateX(-50%);
- animation: move-vertical 6s infinite; /* 浠庝笂鍒颁笅鍔ㄧ敾锛屾寔缁�6绉掞紝鏃犻檺寰幆 */
+ width: 45px;
+ height: 25px;
+ background-color: #409eff;
+ top: 485px; /* 鍒濆浣嶇疆 */
+ left: 899px; /* 姘村钩灞呬腑 */
+ transform: translateX(-50%);
+ animation: move-vertical 6s infinite; /* 浠庝笂鍒颁笅鍔ㄧ敾锛屾寔缁�6绉掞紝鏃犻檺寰幆 */
}
-
+
@keyframes move-vertical {
- 0% {
- top: 485px; /* 璧峰浣嶇疆 */
- }
- 100% {
- top: calc(100% - 210px); /* 浠庝笂鍒颁笅缁撴潫浣嶇疆 */
- }
+ 0% {
+ top: 485px; /* 璧峰浣嶇疆 */
+ }
+ 100% {
+ top: calc(100% - 210px); /* 浠庝笂鍒颁笅缁撴潫浣嶇疆 */
+ }
}
-
-.img-dlpl{
+
+.img-dlpl {
margin-left: 200px;
- background-image:url('../../assets/dlpl.png');
+ background-image: url('../../assets/dlpl.png');
background-repeat: no-repeat;
- background-attachment: local;
- min-height: 400px;
- width: 1200px;
- max-width: 100%;
- background-size: 1200px 400px;
- overflow: hidden;
- position:relative
+ background-attachment: local;
+ min-height: 400px;
+ width: 1200px;
+ max-width: 100%;
+ background-size: 1200px 400px;
+ overflow: hidden;
+ position: relative;
}
-.img-car1{
- background-image:url('../../assets/lp.png');
+
+.img-car1 {
+ background-image: url('../../assets/lpl.jpg');
position: absolute;
background-repeat: no-repeat;
- background-attachment: local;
- min-height: 200px;
- width: 200px;
- max-width: 100%;
- background-size: 200px 70px;
- overflow: hidden;
- position:relative
+ background-attachment: local;
+ min-height: 200px;
+ width: 200px;
+ max-width: 100%;
+ background-size: 200px 70px;
+ overflow: hidden;
+ position: relative;
}
-.img-car2{
- background-image:url('../../assets/lpa.png');
+
+.img-car2 {
+ background-image: url('../../assets/lpla.jpg');
position: absolute;
background-repeat: no-repeat;
- background-attachment: local;
- min-height: 200px;
- width: 200px;
- max-width: 100%;
- background-size: 200px 70px;
- overflow: hidden;
- position:relative
-}
-.img-car3{
- background-image:url('../../assets/lp.png');
- position: absolute;
- background-repeat: no-repeat;
- background-attachment: local;
- min-height: 200px;
- width: 200px;
- max-width: 100%;
- background-size: 200px 70px;
- overflow: hidden;
- position:relative
-}
-.img-car4{
- background-image:url('../../assets/lpa.png');
- position: absolute;
- background-repeat: no-repeat;
- background-attachment: local;
- min-height: 200px;
- width: 200px;
- max-width: 100%;
- background-size: 200px 70px;
- overflow: hidden;
- position:relative
+ background-attachment: local;
+ min-height: 200px;
+ width: 200px;
+ max-width: 100%;
+ background-size: 200px 70px;
+ overflow: hidden;
+ position: relative;
}
</style>
\ No newline at end of file
diff --git a/UI-Project/vite.config.js b/UI-Project/vite.config.js
index 996aec1..b93f5ee 100644
--- a/UI-Project/vite.config.js
+++ b/UI-Project/vite.config.js
@@ -22,7 +22,7 @@
https: false,
proxy: {
'/api': {
- target: '10.153.19.150:88/',
+ target: 'http://127.0.0.1:88/',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, '/'),
},
diff --git a/hangzhoumesParent/common/pom.xml b/hangzhoumesParent/common/pom.xml
index 099f637..3a8a351 100644
--- a/hangzhoumesParent/common/pom.xml
+++ b/hangzhoumesParent/common/pom.xml
@@ -48,6 +48,12 @@
</dependency>
<dependency>
+ <groupId>com.github.yulichang</groupId>
+ <artifactId>mybatis-plus-join-boot-starter</artifactId>
+ <version>1.4.8</version>
+ </dependency>
+
+ <dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>3.3.1</version>
@@ -172,16 +178,6 @@
<version>1.2.33</version>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>com.github.yulichang</groupId>-->
-<!-- <artifactId>mybatis-plus-join</artifactId>-->
-<!-- <version>1.2.4</version>-->
-<!-- </dependency>-->
- <dependency>
- <groupId>com.github.yulichang</groupId>
- <artifactId>mybatis-plus-join-boot-starter</artifactId>
- <version>1.4.12</version>
- </dependency>
</dependencies>
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml b/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
index 63b92ad..0d87b5f 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
@@ -17,11 +17,16 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>com.github.yulichang</groupId>-->
-<!-- <artifactId>mybatis-plus-join-boot-starter</artifactId>-->
-<!-- <version>1.4.12</version>-->
-<!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.github.yulichang</groupId>-->
+ <!-- <artifactId>mybatis-plus-join</artifactId>-->
+ <!-- <version>1.1.6</version>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.github.yulichang</groupId>-->
+ <!-- <artifactId>mybatis-plus-join-boot-starter</artifactId>-->
+ <!-- <version>1.4.12</version>-->
+ <!-- </dependency>-->
</dependencies>
<properties>
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml
index cb109f5..88b2846 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml
@@ -12,6 +12,12 @@
<artifactId>cacheVerticalGlass</artifactId>
<dependencies>
+
+ <!-- <dependency>-->
+ <!-- <groupId>com.github.yulichang</groupId>-->
+ <!-- <artifactId>mybatis-plus-join</artifactId>-->
+ <!-- <version>1.1.6</version>-->
+ <!-- </dependency>-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml b/hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml
index f447221..e090930 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml
@@ -25,6 +25,7 @@
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>sqljdbc4</artifactId>
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
index b432ec6..958affc 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -1,7 +1,6 @@
package com.mes.downstorage.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.common.PLCAutoMes;
import com.mes.common.S7control;
import com.mes.device.PlcParameterObject;
@@ -10,7 +9,6 @@
import com.mes.downstorage.entity.DownStorageCage;
import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.mapper.DownStorageCageMapper;
-import com.mes.downstorage.service.DownStorageCageDetailsService;
import com.mes.downstorage.service.DownStorageCageService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
@@ -32,19 +30,16 @@
@Slf4j
@Service
public class DownStorageCageServiceImpl extends ServiceImpl<DownStorageCageMapper, DownStorageCage> implements DownStorageCageService {
- @Autowired
- private DownStorageCageMapper downStorageCageMapper;
@Autowired
private GlassInfoService glassInfoService;
-
+ @Autowired
+ private DownStorageCageService downStorageCageService;
@Autowired
private DownGlassTaskService downGlassTaskService;
- @Autowired
- private DownStorageCageDetailsService downStorageCageDetailsService;
@Override
public List<Map> gettask(){
- downStorageCageMapper.selectList(null);
+ baseMapper.selectList(null);
// downStorageCageMapper.selectJoin();
return null;
};
@@ -54,8 +49,10 @@
@Override
public List<DownStorageCageDetails> getCacheLeisure() {
log.info(" 鏌ヨ绗煎瓙鍐呯┖闂�");
-// List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
-// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
+// MPJLambdaWrapper<DownStorageCageDetails> wrapper = new MPJLambdaWrapper<>();
+// wrapper.selectAll(DownStorageCageDetails.class)
+// List<DownStorageCageDetails> list = baseMapper.selectJoinList(
+// DownStorageCageDetails.class,Wrapper<DownStorageCageDetails>()
// .select("escd.*")
// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
// .isNull("escd.slot")
@@ -66,17 +63,20 @@
}
- @Override
- public List<Map> selectCacheEmpty(){
- return baseMapper.selectJoinList(
- Map.class,new MPJQueryWrapper<DownStorageCage>().selectAll(DownStorageCage.class)
- .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
- .leftJoin("down_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
- .isNull("escd.slot")
- );
- }
-
-
+// @Override
+// public List<Map> getCacheOut(int start, int end) {
+// log.info(" 鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗�");
+// List<Map> map = downStorageCageMapper.selectJoinList(
+// Map.class, new MPJQueryWrapper<DownStorageCageDetails>()
+// .select("escd.*")
+// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+// .leftJoin("down_workstation dw on escd.flow_card_id = dw.flow_card_id")
+// .isNotNull("escd.slot")
+// .between("dw.workstation_id", start, end)
+// .orderByAsc("escd.tempering_layout_id, escd.tempering_feed_sequence")
+// );
+// return map;
+// }
@@ -85,7 +85,7 @@
@Override
public List<DownStorageCageDetails> getCacheOut(int start, int end) {
log.info("鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗�");
-// return downStorageCageMapper.selectJoinList(
+// return baseMapper.selectJoinList(
// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
// .select("escd.*")
// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
@@ -106,7 +106,7 @@
@Override
public List<Map> getCacheInfo() {
log.info(" 鏌ヨ绗煎瓙鍐呬俊鎭�");
-// return downStorageCageMapper.selectJoinList(
+// return baseMapper.selectJoinList(
// Map.class, new MPJQueryWrapper<DownStorageCageDetails>()
// .select("escd.*")
// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
@@ -121,7 +121,7 @@
@Override
public List<DownStorageCageDetails> getIsExistIntoCacheByLayoutAndSequence(Integer tempering_layout_id, Integer tempering_feed_sequence, double width) {
log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌鐩稿悓鐗堝浘id骞朵笖澶т簬鍓嶉潰鐨勯『搴忕殑绌烘牸");
-// List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
+// List<DownStorageCageDetails> list = baseMapper.selectJoinList(
// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
// .select("escd.*")
// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
@@ -144,7 +144,7 @@
@Override
public List<DownStorageCageDetails> IsExistIntoCacheByflowcardid(String flowcardid, double width) {
log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
-// return downStorageCageMapper.selectJoinList(
+// return baseMapper.selectJoinList(
// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
// .select("escd.*")
// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
@@ -155,13 +155,14 @@
// .orderByDesc("escd.tempering_layout_id, escd.tempering_feed_sequence")
// );
return null;
+
}
@Override
public List<DownStorageCageDetails> getIsExistIntoCacheByLayout(Integer tempering_layout_id, double width) {
- log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
-// return downStorageCageMapper.selectJoinList(
+// log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
+// return baseMapper.selectJoinList(
// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
// .select("escd.*")
// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
@@ -184,7 +185,7 @@
public List<DownStorageCageDetails> getIsExistIntoCacheByflowcardid(String flowcardid, double width) {
log.info(" 鍗曠墖鎯呭喌 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌鐩稿悓娴佺▼鍗″彿鐨勭┖鏍�");
-// return downStorageCageMapper.selectJoinList(
+// return baseMapper.selectJoinList(
// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
// .select("escd.*")
// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
@@ -198,24 +199,22 @@
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// @Override
+// public List<DownStorageCageDetails> Out() {
+// log.info("鍗曠墖鎯呭喌 鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓уぇ灏忓嚭鐗囩殑灏忕墖");
+//
+//
+// return downStorageCageMapper.selectJoinList(
+// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
+// .select("escd.*")
+// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+// .leftJoin("down_workstation dw on escd.flow_card_id = dw.flow_card_id")
+// .isNotNull("escd.slot")
+//
+// .orderByDesc("escd.width")
+// .orderByDesc("escd.height")
+// );
+// }
@@ -239,21 +238,6 @@
}
- public DownGlassTask createDownGlassTask(DownStorageCageDetails glassInfo, String startCell, String endCell,String taskType ) {
- DownGlassTask downGlassTask = new DownGlassTask();
- downGlassTask.setId(glassInfo.getId());
- downGlassTask.setStartCell(startCell);
- downGlassTask.setTaskType(taskType);
- downGlassTask.setEndCell(endCell);
- downGlassTask.setWidth(glassInfo.getWidth());
- downGlassTask.setHeight(glassInfo.getHeight());
- downGlassTask.setFilmsid(String.valueOf(glassInfo.getFilmsid()));
- downGlassTask.setThickness(glassInfo.getThickness());
- downGlassTask.setFlowCardId(glassInfo.getFlowCardId());
-
- return downGlassTask;
- }
-
@Override
public boolean processInto(String Number) {
@@ -265,12 +249,7 @@
if (GlassInfo != null) {
//鍚屾壘鍒板悓娴佺▼鍗￠檮杩戠┖鏍�
List<DownStorageCageDetails> list = getIsExistIntoCacheByflowcardid(GlassInfo.getFlowcardId(), GlassInfo.getWidth());
-
- List<Map> selectCacheEmpty=selectCacheEmpty();
-
- // list<Map> list=selectCacheEmpty();
-// list<Map> = downStorageCageService.selectCacheEmpty();
- if (selectCacheEmpty.size() > 0) {
+ if (list.size() > 0) {
//瀛樺湪绌烘牸
//1.鐢熸垚浠诲姟锛� 璧峰浣嶇疆0 缁撴潫浣嶇疆this.slot 浠诲姟绫诲瀷 1 锛堣繘鐗囦换鍔★級
//2.鍥炲 1杩涚墖
@@ -309,11 +288,10 @@
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
- List<DownStorageCageDetails> list = downStorageCageDetailsService.CacheOut(1, 5);
- List<DownStorageCageDetails> list2 = downStorageCageDetailsService.CacheOut(6, 10);
- List<DownStorageCageDetails> list3 = downStorageCageDetailsService.CacheOut(1, 10);
+ List<DownStorageCageDetails> list = getCacheOut(1, 5);
+ List<DownStorageCageDetails> list2 = getCacheOut(6, 10);
+ List<DownStorageCageDetails> list3 = getCacheOut(1, 10);
//鑷姩缁戝畾鏋跺瓙
-
@@ -328,8 +306,16 @@
// selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId());
- DownGlassTask downGlassTask =createDownGlassTask(item3,"0",endcell,"2");
-
+ DownGlassTask downGlassTask = new DownGlassTask();
+ downGlassTask.setId(item3.getId()); // 璁剧疆鐜荤拑ID
+ downGlassTask.setStartCell("0");
+ downGlassTask.setEndCell(endcell);
+ downGlassTask.setTaskType("2");
+ downGlassTask.setWidth(item3.getWidth()); // 璁剧疆鐜荤拑瀹藉害
+ downGlassTask.setHeight(item3.getHeight()); // 璁剧疆鐜荤拑楂樺害
+ downGlassTask.setFilmsid(item3.getFilmsid()+""); // 璁剧疆鑶淚D
+ downGlassTask.setThickness(item3.getThickness()); // 璁剧疆鐜荤拑鍘氬害
+ downGlassTask.setFlowCardId(item3.getFlowCardId()); // 璁剧疆娴佺▼鍗″彿
downGlassTaskService.insertCacheTask(downGlassTask);
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
@@ -338,14 +324,22 @@
}
- //濡傛灉鍚屾椂鍓嶅悗绔兘绌洪棽 浼樺厛鍚庣鍑虹墖骞朵笖浼樺厛婊℃灦
- else if (!list2.isEmpty()) {
-
- DownStorageCageDetails item3 = list2.get(0);
+ //鍚屾椂璇锋眰 浼樺厛鍚庣鍑虹墖
+ else if (!list3.isEmpty()) {
+ DownStorageCageDetails item3 = list3.get(0);
String endcell = "11";
String SendEndcell = "1";
// selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId());
- DownGlassTask downGlassTask =createDownGlassTask(item3,"0",endcell,"2");
+ DownGlassTask downGlassTask = new DownGlassTask();
+ downGlassTask.setId(item3.getId()); // 璁剧疆鐜荤拑ID
+ downGlassTask.setStartCell("0");
+ downGlassTask.setEndCell(endcell);
+ downGlassTask.setTaskType("2");
+ downGlassTask.setWidth(item3.getWidth()); // 璁剧疆鐜荤拑瀹藉害
+ downGlassTask.setHeight(item3.getHeight()); // 璁剧疆鐜荤拑楂樺害
+ downGlassTask.setFilmsid(item3.getFilmsid()+""); // 璁剧疆鑶淚D
+ downGlassTask.setThickness(item3.getThickness()); // 璁剧疆鐜荤拑鍘氬害
+ downGlassTask.setFlowCardId(item3.getFlowCardId()); // 璁剧疆娴佺▼鍗″彿
downGlassTaskService.insertCacheTask(downGlassTask);
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
@@ -359,19 +353,37 @@
// 鍑哄埌 G06
//selectInfo.insertCacheTask(item.getGlassId() + "", "0", "06", "2", item.getWidth(), item.getHeight(), item.getFilmsid(), item.getThickness(), item.getFlowCardId());
-
- DownGlassTask downGlassTask =createDownGlassTask(item,"0","06","2");
+ DownGlassTask downGlassTask = new DownGlassTask();
+ downGlassTask.setId(item.getId()); // 璁剧疆鐜荤拑ID
+ downGlassTask.setStartCell("0");
+ downGlassTask.setEndCell("06");
+ downGlassTask.setTaskType("2");
+ downGlassTask.setWidth(item.getWidth()); // 璁剧疆鐜荤拑瀹藉害
+ downGlassTask.setHeight(item.getHeight()); // 璁剧疆鐜荤拑楂樺害
+ downGlassTask.setFilmsid(item.getFilmsid()+""); // 璁剧疆鑶淚D
+ downGlassTask.setThickness(item.getThickness()); // 璁剧疆鐜荤拑鍘氬害
+ downGlassTask.setFlowCardId(item.getFlowCardId()); // 璁剧疆娴佺▼鍗″彿
+ downGlassTaskService.insertCacheTask(downGlassTask);
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "1");
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
return true;
- // 鎸夌収澶у皬绗﹀悎鍚庣鍑虹墖
+ // 鎸夌収椤哄簭绗﹀悎鍚庣鍑虹墖
} else if (!list2.isEmpty()) {
DownStorageCageDetails item2 = list2.get(0);
// 鍑哄埌 G11
// selectInfo.insertCacheTask(item2.getGlassId() + "", "0", "11", "2", item2.getWidth(), item2.getHeight(), item2.getFilmsid(), item2.getThickness(), item2.getFlowCardId());
- DownGlassTask downGlassTask =createDownGlassTask(item2,"0","11","2");
+ DownGlassTask downGlassTask = new DownGlassTask();
+ downGlassTask.setId(item2.getId()); // 璁剧疆鐜荤拑ID
+ downGlassTask.setStartCell("0");
+ downGlassTask.setEndCell("11");
+ downGlassTask.setTaskType("2");
+ downGlassTask.setWidth(item2.getWidth()); // 璁剧疆鐜荤拑瀹藉害
+ downGlassTask.setHeight(item2.getHeight()); // 璁剧疆鐜荤拑楂樺害
+ downGlassTask.setFilmsid(item2.getFilmsid()+""); // 璁剧疆鑶淚D
+ downGlassTask.setThickness(item2.getThickness()); // 璁剧疆鐜荤拑鍘氬害
+ downGlassTask.setFlowCardId(item2.getFlowCardId()); // 璁剧疆娴佺▼鍗″彿
downGlassTaskService.insertCacheTask(downGlassTask);
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "2");
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java
index 19c0f67..d8df574 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java
@@ -22,8 +22,11 @@
private static final long serialVersionUID = 1L;
- @Id
+ /**
+ * id
+ */
@TableId(value = "id", type = IdType.AUTO)
+ @Id
private Long id;
/**
--
Gitblit v1.8.0