From 77ff95afbe2d1e632de34e5df938ecf52d472127 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 26 六月 2025 09:22:31 +0800
Subject: [PATCH] 同步录制代码
---
UI-Project/src/views/Identify/identifwutwo.vue | 6
UI-Project/src/views/hollow/hollowsitwo.vue | 72 +--------
UI-Project/src/views/Returns/upreturns.vue | 8
UI-Project/src/views/Slicecage/slicecage.vue | 103 ++++++++++++--
UI-Project/src/views/hollow/hollowslicecage.vue | 72 ++++++++-
UI-Project/src/views/Returns/upreturns2.vue | 6
UI-Project/src/views/Slicecage/slicecageTwo.vue | 103 ++------------
UI-Project/src/views/Returns/upreturnhistory.vue | 1
UI-Project/src/views/Returns/upreturnhistory2.vue | 1
9 files changed, 189 insertions(+), 183 deletions(-)
diff --git a/UI-Project/src/views/Identify/identifwutwo.vue b/UI-Project/src/views/Identify/identifwutwo.vue
index c39e832..2ba788a 100644
--- a/UI-Project/src/views/Identify/identifwutwo.vue
+++ b/UI-Project/src/views/Identify/identifwutwo.vue
@@ -176,7 +176,7 @@
function getRectColor(state: number): string {
switch (state) {
case 0:
- return '#7AC5CD';
+ return '#7AC5CD';//鏈繘绗�
case 1:
return '#95d475';
case -1:
@@ -188,9 +188,9 @@
case 4:
return '#CD6090';
case 8:
- return '#911005';
+ return '#911005';//鐮存崯
case 9:
- return '#4682B4';
+ return '#4682B4';//鎷胯蛋
default:
return '#CDAF95';
}
diff --git a/UI-Project/src/views/Returns/upreturnhistory.vue b/UI-Project/src/views/Returns/upreturnhistory.vue
index f9d95f8..93e34c7 100644
--- a/UI-Project/src/views/Returns/upreturnhistory.vue
+++ b/UI-Project/src/views/Returns/upreturnhistory.vue
@@ -8,6 +8,7 @@
<el-input v-model="slot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('workOrder.upnumber')" />
<el-select v-model="selectValuesa[0]" filterable :placeholder="$t('searchOrder.taskstatus')" clearable
style="width: 200px;margin-left: 10px;">
+ <!-- 榛樿绌轰换鍔★細0 鎵ц涓細1 缁撴潫浠诲姟锛�2 -->
<el-option :label="$t('searchOrder.empty')" value="0"></el-option>
<el-option :label="$t('film.execution')" value="1"></el-option>
<el-option :label="$t('searchOrder.endtask')" value="2"></el-option>
diff --git a/UI-Project/src/views/Returns/upreturnhistory2.vue b/UI-Project/src/views/Returns/upreturnhistory2.vue
index 24a2c7e..72b09e2 100644
--- a/UI-Project/src/views/Returns/upreturnhistory2.vue
+++ b/UI-Project/src/views/Returns/upreturnhistory2.vue
@@ -8,6 +8,7 @@
<el-input v-model="slot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('workOrder.upnumber')" />
<el-select v-model="selectValuesa[0]" filterable :placeholder="$t('searchOrder.taskstatus')" clearable
style="width: 200px;margin-left: 10px;">
+ <!-- 榛樿绌轰换鍔★細0 鎵ц涓細1 缁撴潫浠诲姟锛�2 -->
<el-option :label="$t('searchOrder.empty')" value="0"></el-option>
<el-option :label="$t('film.execution')" value="1"></el-option>
<el-option :label="$t('searchOrder.endtask')" value="2"></el-option>
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index e03ede2..c2f315c 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -23,7 +23,7 @@
const canSelectProjectc = ref(false);
const tableDatax = ref([])
const tableDatad = ref([])
-const upstatus = ref(t('basicData.machineaa'));
+const upstatus = ref(t('basicData.machine'));
const cuttingMachineStatusColor = ref('#911005');
const tableDataa = ref<any[]>([]);
const tableDatab = ref<any[]>([]);
@@ -405,11 +405,11 @@
function getStatusText2(filmRemove) {
switch (filmRemove) {
case 0:
- return t('Mounting.noremoval');
+ return t('Mounting.noremoval');//涓嶉櫎鑶�
// case 1:
// return t('Mounting.coarselyground');
case 2:
- return t('Mounting.removal');
+ return t('Mounting.removal');//闄よ啘
}
}
</script>
@@ -472,6 +472,7 @@
<el-table-column align="center" :label="$t('Mounting.state')" min-width="80" prop="state">
<template #default="scope">
<el-tag :type="scope.row.state === 100 ? 'success' : 'warning'" @click="toggleEnableState(scope.row)">
+ <!-- 绛夊緟涓細0 閫氳繃锛�100 -->
{{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}
</el-tag>
</template>
@@ -578,6 +579,7 @@
<el-form-item :label="$t('Mounting.removalmethoda')" :required="true">
<el-select v-model="filmRemove" clearable :placeholder="$t('Mounting.removalmethod')">
<el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
+ <!-- 涓嶉櫎鑶滐細0 闄よ啘锛�2 -->
<!-- <el-option :label="$t('Mounting.coarselyground')" value="1"></el-option> -->
<el-option :label="$t('Mounting.removal')" value="2"></el-option>
</el-select>
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index d134ca0..f1ca805 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -409,11 +409,11 @@
function getStatusText2(filmRemove) {
switch (filmRemove) {
case 0:
- return t('Mounting.noremoval');
+ return t('Mounting.noremoval');//涓嶉櫎鑶�
// case 1:
// return t('Mounting.coarselyground');
case 2:
- return t('Mounting.removal');
+ return t('Mounting.removal');//闄よ啘
}
}
</script>
@@ -478,6 +478,7 @@
:type="scope.row.state === 100 ? 'success' : 'warning'"
@click="toggleEnableState(scope.row)"
>
+ <!-- 绛夊緟涓細0 閫氳繃锛�100 -->
{{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}
</el-tag>
</template>
@@ -602,6 +603,7 @@
<el-form-item :label="$t('Mounting.removalmethoda')" :required="true">
<el-select v-model="filmRemove" clearable :placeholder="$t('Mounting.removalmethod')">
<el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
+ <!-- 涓嶉櫎鑶滐細0 闄よ啘锛�2 -->
<!-- <el-option :label="$t('Mounting.coarselyground')" value="1"></el-option> -->
<el-option :label="$t('Mounting.removal')" value="2"></el-option>
</el-select>
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 21d3250..787819e 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -27,10 +27,13 @@
const tableDataa = ref([])
const tableDatagh = ref([])
const tableDatab = ref([])
+const tableDatac = ref([])
const tableDatad = ref([])
const tableDataf = ref([])
+const tableDatae = ref([])
const tableDatas = ref([])
const tableDatass = ref([])
+const tableDatax = ref([]);
const tableDatalack = ref([])
const tableDataspecify = ref([])
const tableDatacagedetails = ref([])
@@ -55,7 +58,7 @@
const globalDate = inject('globalDate');
const inputValuesa = reactive({});
const add = ref(false)
-const dialogProject = ref(false);
+const gap = ref('');
const glassId = ref('');
const startSlot = ref('');
const targetSlot = ref('');
@@ -741,9 +744,16 @@
temperingengineerId.value=data.temperingengineerId[0];
}
if(data.bigStorageCageDetailsOutTask!=null){
+ tableDatac.value = data.bigStorageCageDetailsOutTask[0]
adjusta.value = data.bigStorageCageDetailsOutTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
} else {
+ tableDatac.value = '',
adjusta.value = ''
+ }
+ if(data.bigStorageCageDetailsFeedTask!=null){
+ tableDatax.value = data.bigStorageCageDetailsFeedTask[0]
+ } else {
+ tableDatax.value = ''
}
if(data.bigStorageCageDetailsFeedTask!=null){
tableDatad.value = data.bigStorageCageDetailsFeedTask[0]
@@ -755,6 +765,11 @@
tableDatab.value = data.temperingGlassInfoList[0]
}else{
tableDatab.value = ''
+ }
+if(data.bigStorageCageUsage!=null){
+ tableDatae.value = data.bigStorageCageUsage[0]
+}else{
+ tableDatae.value = ''
}
if(data.carPostion!=null){
carPosition.value = data.carPostion[0]
@@ -1046,7 +1061,6 @@
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="success" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="warning" @click="handleganghua">{{ $t('searchOrder.temperingqueries') }}</el-button>
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="info" @click="dialogFormVisibles=true;fetchFlows()">{{ $t('searchOrder.searchlayout') }}</el-button>
- <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="info" @click="dialogProject=true">{{ $t('basicData.project') }}</el-button>
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="danger" @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button>
<el-switch style="margin-top: 7px;margin-left: 10px;" v-model="ganghua" class="mb-2" :inactive-text="$t('searchOrder.temperedswitch')" @change="handleChange" />
<el-switch style="margin-top: 7px;margin-left: 10px;" v-model="diaodu" class="mb-2" :inactive-text="$t('searchOrder.Schedulingswitch')" @change="handlediaodu" />
@@ -1064,7 +1078,7 @@
</div>
<!-- // 鐖剁骇妗� -->
<div class="img-dlpl" >
- <!-- <div class="img-car1" :style="'z-index:999;left:240px;top:' + 350*carPosition[0] + 'px;position:absolute;'">
+ <div class="img-car1" :style="'z-index:999;left:240px;top:' + 350*carPosition[0] + 'px;position:absolute;'">
<div
v-for="(rect, index) in adjusta"
:key="rect.id"
@@ -1091,8 +1105,8 @@
}"
>
</div>
- </div> -->
- <!-- <div style="position: relative;">
+ </div>
+ <div style="position: relative;">
<div v-show="cell1" style="width: 170px;height: 53px;position: relative;top:63px;left: 445px;">
<div v-for="(rect, rectIndex) in adjustedRects" :key="rect.id" :style="rectStyle(rect, rectIndex)">
<div
@@ -1129,13 +1143,11 @@
></div>
</div>
</div>
-</div> -->
</div>
- </div>
-
-<!-- 鏀逛负寮圭獥 -->
- <el-dialog v-model="dialogProject" top="12vh" width="70%">
- <el-table height="400px" ref="table"
+</div>
+<el-card style="flex: 1;margin-left: 1074px;margin-top: -410px;">
+ <div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 420px;">
+ <el-table height="370px" ref="table" border
:data="tableDatass" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column fixed prop="engineerId" align="center" :label="$t('Mounting.project')" min-width="100" />
<el-table-column prop="countTemp" align="center" :label="$t('searchOrder.totalfurnaces')" min-width="68" />
@@ -1145,7 +1157,60 @@
<el-table-column prop="countSlot" align="center" :label="$t('searchOrder.slotnumber')" min-width="95" />
<el-table-column prop="percent" align="center" :label="$t('searchOrder.progress')" min-width="75" />
</el-table>
- </el-dialog>
+ </div>
+ </el-card>
+<div style="padding: 10px;display: flex;height:130px;margin-top:1px">
+ <div v-for="(item, index) in tableDatae" :key="index" id="occupy">
+ <el-col style="text-align:left;font-weight: bold;">#{{ item.device_id }}</el-col>
+ <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+ <span>{{ $t('searchOrder.Usage') }}</span><span>{{ item.percentage }}%</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>{{ $t('searchOrder.free') }}</span><span>{{ item.count }}</span>
+ </el-col>
+ </div>
+ </div>
+ <div class="table-container">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 3px;">
+ <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 200px;">
+ <el-table height="200px" ref="table"
+ :row-class-name="tableRowClassName"
+ :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="140" />
+ <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
+ <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
+ <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="120">
+ <template #default="scope">
+ <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="isSame" align="center" :label="$t('searchOrder.whethersame')" min-width="120">
+ <template #default="scope">
+ <el-tag :type="getcasOnea(scope.row.isSame)">
+ {{ getStatuscasOnea(scope.row.isSame) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-card>
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 3px;">
+ <el-table height="200px" ref="table"
+ :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="140" />
+ <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
+ <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
+ <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="157">
+ <template #default="scope">
+ <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-card>
+ </div>
+ </div>
+
<el-dialog v-model="add" top="10vh" width="70%" :title="$t('searchOrder.addcage')" >
<div style="margin-bottom: 20px">
<el-form>
@@ -1272,7 +1337,7 @@
</div>
</template>
</el-table-column>
- <!-- <el-table-column prop="id" :label="$t('searchOrder.cagetableID')" align="center" min-width="90"/> -->
+ <el-table-column prop="id" :label="$t('searchOrder.cagetableID')" align="center" min-width="90"/>
<el-table-column prop="deviceId" align="center" :label="$t('searchOrder.cagenumber')" min-width="100" />
<el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="150" />
<el-table-column
@@ -1635,15 +1700,15 @@
}
}
.img-dlpl{
- margin-left: 70px;
- margin-top: 70px;
- background-image:url('../../assets/dlpl2.png');
+ margin-left: 20px;
+ margin-top: 0px;
+ background-image:url('../../assets/ganghuaqian.png');
background-repeat: no-repeat;
background-attachment: local;
- min-height: 580px;
- width: 1650px;
+ min-height: 380px;
+ width: 1050px;
max-width: 100%;
- background-size: 1650px 580px;
+ background-size: 1050px 380px;
overflow: hidden;
position:relative
}
diff --git a/UI-Project/src/views/Slicecage/slicecageTwo.vue b/UI-Project/src/views/Slicecage/slicecageTwo.vue
index 787819e..21d3250 100644
--- a/UI-Project/src/views/Slicecage/slicecageTwo.vue
+++ b/UI-Project/src/views/Slicecage/slicecageTwo.vue
@@ -27,13 +27,10 @@
const tableDataa = ref([])
const tableDatagh = ref([])
const tableDatab = ref([])
-const tableDatac = ref([])
const tableDatad = ref([])
const tableDataf = ref([])
-const tableDatae = ref([])
const tableDatas = ref([])
const tableDatass = ref([])
-const tableDatax = ref([]);
const tableDatalack = ref([])
const tableDataspecify = ref([])
const tableDatacagedetails = ref([])
@@ -58,7 +55,7 @@
const globalDate = inject('globalDate');
const inputValuesa = reactive({});
const add = ref(false)
-const gap = ref('');
+const dialogProject = ref(false);
const glassId = ref('');
const startSlot = ref('');
const targetSlot = ref('');
@@ -744,16 +741,9 @@
temperingengineerId.value=data.temperingengineerId[0];
}
if(data.bigStorageCageDetailsOutTask!=null){
- tableDatac.value = data.bigStorageCageDetailsOutTask[0]
adjusta.value = data.bigStorageCageDetailsOutTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
} else {
- tableDatac.value = '',
adjusta.value = ''
- }
- if(data.bigStorageCageDetailsFeedTask!=null){
- tableDatax.value = data.bigStorageCageDetailsFeedTask[0]
- } else {
- tableDatax.value = ''
}
if(data.bigStorageCageDetailsFeedTask!=null){
tableDatad.value = data.bigStorageCageDetailsFeedTask[0]
@@ -765,11 +755,6 @@
tableDatab.value = data.temperingGlassInfoList[0]
}else{
tableDatab.value = ''
- }
-if(data.bigStorageCageUsage!=null){
- tableDatae.value = data.bigStorageCageUsage[0]
-}else{
- tableDatae.value = ''
}
if(data.carPostion!=null){
carPosition.value = data.carPostion[0]
@@ -1061,6 +1046,7 @@
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="success" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="warning" @click="handleganghua">{{ $t('searchOrder.temperingqueries') }}</el-button>
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="info" @click="dialogFormVisibles=true;fetchFlows()">{{ $t('searchOrder.searchlayout') }}</el-button>
+ <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="info" @click="dialogProject=true">{{ $t('basicData.project') }}</el-button>
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="danger" @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button>
<el-switch style="margin-top: 7px;margin-left: 10px;" v-model="ganghua" class="mb-2" :inactive-text="$t('searchOrder.temperedswitch')" @change="handleChange" />
<el-switch style="margin-top: 7px;margin-left: 10px;" v-model="diaodu" class="mb-2" :inactive-text="$t('searchOrder.Schedulingswitch')" @change="handlediaodu" />
@@ -1078,7 +1064,7 @@
</div>
<!-- // 鐖剁骇妗� -->
<div class="img-dlpl" >
- <div class="img-car1" :style="'z-index:999;left:240px;top:' + 350*carPosition[0] + 'px;position:absolute;'">
+ <!-- <div class="img-car1" :style="'z-index:999;left:240px;top:' + 350*carPosition[0] + 'px;position:absolute;'">
<div
v-for="(rect, index) in adjusta"
:key="rect.id"
@@ -1105,8 +1091,8 @@
}"
>
</div>
- </div>
- <div style="position: relative;">
+ </div> -->
+ <!-- <div style="position: relative;">
<div v-show="cell1" style="width: 170px;height: 53px;position: relative;top:63px;left: 445px;">
<div v-for="(rect, rectIndex) in adjustedRects" :key="rect.id" :style="rectStyle(rect, rectIndex)">
<div
@@ -1143,11 +1129,13 @@
></div>
</div>
</div>
+</div> -->
</div>
-</div>
-<el-card style="flex: 1;margin-left: 1074px;margin-top: -410px;">
- <div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 420px;">
- <el-table height="370px" ref="table" border
+ </div>
+
+<!-- 鏀逛负寮圭獥 -->
+ <el-dialog v-model="dialogProject" top="12vh" width="70%">
+ <el-table height="400px" ref="table"
:data="tableDatass" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column fixed prop="engineerId" align="center" :label="$t('Mounting.project')" min-width="100" />
<el-table-column prop="countTemp" align="center" :label="$t('searchOrder.totalfurnaces')" min-width="68" />
@@ -1157,60 +1145,7 @@
<el-table-column prop="countSlot" align="center" :label="$t('searchOrder.slotnumber')" min-width="95" />
<el-table-column prop="percent" align="center" :label="$t('searchOrder.progress')" min-width="75" />
</el-table>
- </div>
- </el-card>
-<div style="padding: 10px;display: flex;height:130px;margin-top:1px">
- <div v-for="(item, index) in tableDatae" :key="index" id="occupy">
- <el-col style="text-align:left;font-weight: bold;">#{{ item.device_id }}</el-col>
- <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span>{{ $t('searchOrder.Usage') }}</span><span>{{ item.percentage }}%</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>{{ $t('searchOrder.free') }}</span><span>{{ item.count }}</span>
- </el-col>
- </div>
- </div>
- <div class="table-container">
- <el-card style="flex: 1;margin-left: 10px;margin-top: 3px;">
- <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 200px;">
- <el-table height="200px" ref="table"
- :row-class-name="tableRowClassName"
- :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="140" />
- <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
- <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
- <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="120">
- <template #default="scope">
- <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="isSame" align="center" :label="$t('searchOrder.whethersame')" min-width="120">
- <template #default="scope">
- <el-tag :type="getcasOnea(scope.row.isSame)">
- {{ getStatuscasOnea(scope.row.isSame) }}
- </el-tag>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </el-card>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 3px;">
- <el-table height="200px" ref="table"
- :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="140" />
- <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
- <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
- <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="157">
- <template #default="scope">
- <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
- </template>
- </el-table-column>
- </el-table>
- </el-card>
- </div>
- </div>
-
+ </el-dialog>
<el-dialog v-model="add" top="10vh" width="70%" :title="$t('searchOrder.addcage')" >
<div style="margin-bottom: 20px">
<el-form>
@@ -1337,7 +1272,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="id" :label="$t('searchOrder.cagetableID')" align="center" min-width="90"/>
+ <!-- <el-table-column prop="id" :label="$t('searchOrder.cagetableID')" align="center" min-width="90"/> -->
<el-table-column prop="deviceId" align="center" :label="$t('searchOrder.cagenumber')" min-width="100" />
<el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="150" />
<el-table-column
@@ -1700,15 +1635,15 @@
}
}
.img-dlpl{
- margin-left: 20px;
- margin-top: 0px;
- background-image:url('../../assets/ganghuaqian.png');
+ margin-left: 70px;
+ margin-top: 70px;
+ background-image:url('../../assets/dlpl2.png');
background-repeat: no-repeat;
background-attachment: local;
- min-height: 380px;
- width: 1050px;
+ min-height: 580px;
+ width: 1650px;
max-width: 100%;
- background-size: 1050px 380px;
+ background-size: 1650px 580px;
overflow: hidden;
position:relative
}
diff --git a/UI-Project/src/views/hollow/hollowsitwo.vue b/UI-Project/src/views/hollow/hollowsitwo.vue
index be2a2e7..b99bdf7 100644
--- a/UI-Project/src/views/hollow/hollowsitwo.vue
+++ b/UI-Project/src/views/hollow/hollowsitwo.vue
@@ -679,7 +679,7 @@
<div style="display: flex; align-items: flex-start; gap: 20px; height: 70vh;">
<!-- // 鐖剁骇妗� -->
<div class="img-zkdlpl" >
- <div class="img-car1" :style="'z-index:999;left:212px;top:' + 1300*carPosition[0] + 'px;position:absolute;'">
+ <!-- <div class="img-car1" :style="'z-index:999;left:212px;top:' + 1300*carPosition[0] + 'px;position:absolute;'">
<div
v-for="(rect, index) in adjusta"
:key="rect.id"
@@ -753,10 +753,10 @@
></div>
</div>
</div>
+</div> -->
</div>
-</div>
-<el-card style="flex: 1; height: 500px; overflow-y: auto;">
- <div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 450px;">
+<el-card style="flex: 1; height: 700px;margin-top: 40px; overflow-y: auto;">
+ <div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 550px;">
<el-table height="550px" ref="table" border
:data="tableDatass" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140" />
@@ -768,56 +768,6 @@
</el-table>
</div>
</el-card>
- </div>
- <div style="padding: 10px;display: flex;height:110px;margin-top: -170px;">
- <div v-for="(item, index) in tableDatae" :key="index" id="occupy">
- <el-col style="text-align:left;font-weight: bold;">#{{ item.device_id }}</el-col>
- <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span>{{ $t('searchOrder.Usage') }}</span><span>{{ item.percentage }}%</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>{{ $t('searchOrder.free') }}</span><span>{{ item.count }}</span>
- </el-col>
- </div>
- </div>
- <div class="table-container">
- <el-card style="flex: 1;margin-left: 10px;margin-top: 3px;">
- <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 140px;">
- <el-table height="120px" ref="table"
- :row-class-name="tableRowClassName"
- :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="140" />
- <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
- <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
- <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="120">
- <template #default="scope">
- <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="isSame" align="center" :label="$t('searchOrder.whethersame')" min-width="120">
- <template #default="scope">
- <el-tag :type="getcasOnea(scope.row.isSame)">
- {{ getStatuscasOnea(scope.row.isSame) }}
- </el-tag>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </el-card>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 3px;">
- <el-table height="120px" ref="table"
- :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="140" />
- <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
- <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
- <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="157">
- <template #default="scope">
- <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
- </template>
- </el-table-column>
- </el-table>
- </el-card>
</div>
</div>
<!-- 娣诲姞鐞嗙墖绗间俊鎭� -->
@@ -942,7 +892,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="id" :label="$t('searchOrder.cagetableID')" align="center" min-width="100"/>
+ <!-- <el-table-column prop="id" :label="$t('searchOrder.cagetableID')" align="center" min-width="100"/> -->
<el-table-column prop="deviceId" align="center" :label="$t('searchOrder.cagenumber')" min-width="150" />
<el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="150" />
<el-table-column
@@ -1085,15 +1035,15 @@
}
}
.img-zkdlpl{
- margin-left: 20px;
- margin-top: 0px;
- background-image:url('../../assets/zhongkong.png');
+ margin-left: 40px;
+ margin-top: 8px;
+ background-image:url('../../assets/zklpl2.png');
background-repeat: no-repeat;
background-attachment: local;
- min-height: 500px;
- width: 800px;
+ min-height: 800px;
+ width: 500px;
max-width: 100%;
- background-size: 800px 500px;
+ background-size: 500px 800px;
overflow: hidden;
position:relative
}
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index b99bdf7..be2a2e7 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -679,7 +679,7 @@
<div style="display: flex; align-items: flex-start; gap: 20px; height: 70vh;">
<!-- // 鐖剁骇妗� -->
<div class="img-zkdlpl" >
- <!-- <div class="img-car1" :style="'z-index:999;left:212px;top:' + 1300*carPosition[0] + 'px;position:absolute;'">
+ <div class="img-car1" :style="'z-index:999;left:212px;top:' + 1300*carPosition[0] + 'px;position:absolute;'">
<div
v-for="(rect, index) in adjusta"
:key="rect.id"
@@ -753,10 +753,10 @@
></div>
</div>
</div>
-</div> -->
</div>
-<el-card style="flex: 1; height: 700px;margin-top: 40px; overflow-y: auto;">
- <div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 550px;">
+</div>
+<el-card style="flex: 1; height: 500px; overflow-y: auto;">
+ <div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 450px;">
<el-table height="550px" ref="table" border
:data="tableDatass" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140" />
@@ -768,6 +768,56 @@
</el-table>
</div>
</el-card>
+ </div>
+ <div style="padding: 10px;display: flex;height:110px;margin-top: -170px;">
+ <div v-for="(item, index) in tableDatae" :key="index" id="occupy">
+ <el-col style="text-align:left;font-weight: bold;">#{{ item.device_id }}</el-col>
+ <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+ <span>{{ $t('searchOrder.Usage') }}</span><span>{{ item.percentage }}%</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>{{ $t('searchOrder.free') }}</span><span>{{ item.count }}</span>
+ </el-col>
+ </div>
+ </div>
+ <div class="table-container">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 3px;">
+ <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 140px;">
+ <el-table height="120px" ref="table"
+ :row-class-name="tableRowClassName"
+ :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="140" />
+ <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
+ <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
+ <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="120">
+ <template #default="scope">
+ <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="isSame" align="center" :label="$t('searchOrder.whethersame')" min-width="120">
+ <template #default="scope">
+ <el-tag :type="getcasOnea(scope.row.isSame)">
+ {{ getStatuscasOnea(scope.row.isSame) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-card>
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 3px;">
+ <el-table height="120px" ref="table"
+ :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="140" />
+ <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
+ <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
+ <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="157">
+ <template #default="scope">
+ <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-card>
</div>
</div>
<!-- 娣诲姞鐞嗙墖绗间俊鎭� -->
@@ -892,7 +942,7 @@
</div>
</template>
</el-table-column>
- <!-- <el-table-column prop="id" :label="$t('searchOrder.cagetableID')" align="center" min-width="100"/> -->
+ <el-table-column prop="id" :label="$t('searchOrder.cagetableID')" align="center" min-width="100"/>
<el-table-column prop="deviceId" align="center" :label="$t('searchOrder.cagenumber')" min-width="150" />
<el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="150" />
<el-table-column
@@ -1035,15 +1085,15 @@
}
}
.img-zkdlpl{
- margin-left: 40px;
- margin-top: 8px;
- background-image:url('../../assets/zklpl2.png');
+ margin-left: 20px;
+ margin-top: 0px;
+ background-image:url('../../assets/zhongkong.png');
background-repeat: no-repeat;
background-attachment: local;
- min-height: 800px;
- width: 500px;
+ min-height: 500px;
+ width: 800px;
max-width: 100%;
- background-size: 500px 800px;
+ background-size: 800px 500px;
overflow: hidden;
position:relative
}
--
Gitblit v1.8.0