From a4a795a986b009779f09e9a825c0099aa0bacbb8 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 18 八月 2025 16:41:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Slicecage/slicecage.vue | 238 +++++++++++++++++++++++++++++------------------------------
1 files changed, 118 insertions(+), 120 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 2409ab7..31a2f51 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -348,9 +348,7 @@
}
);
if (confirmResult === 'confirm') {
- const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/appointEngineerId",{
- engineerId: ""
- });
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/cancelTemperingTask");
if (response.code === 200) {
ElMessage.success(response.message);
} else {
@@ -742,8 +740,8 @@
}
}
//褰撳墠鎸囧畾宸ョ▼
- if(data.bigStorageCageDetailsOutTask!=null){
- temperingengineerId.value=data.temperingengineerId[0];
+ if(data.temperingEngineerId!=null){
+ temperingengineerId.value=data.temperingEngineerId[0];
}
if(data.bigStorageCageDetailsOutTask!=null){
tableDatac.value = data.bigStorageCageDetailsOutTask[0]
@@ -1078,10 +1076,105 @@
<div style="margin-left: 70px;">{{ $t('searchOrder.outRequestEntity') }}</div>
<i :style="{ marginTop: '2px', backgroundColor: outRequestEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
</div>
+<!-- // 鐖剁骇妗� -->
+<div class="img-dlpl" >
+ <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"
+ :style="{
+ width: '30px',
+ height: '5px',
+ backgroundColor: '#409EFF',
+ marginLeft: 5+ `px`,
+ top: '10px',
+ }"
+ >
+ </div>
+ </div>
+ <div class="img-car4" :style="'z-index:999;left:630px;top:' + 350*carPosition[1] + 'px;position:absolute;'">
+ <div
+ v-for="(rect, index) in adjust"
+ :key="rect.id"
+ :style="{
+ width: '30px',
+ height: '5px',
+ backgroundColor: '#409EFF',
+ marginLeft: 5+ `px`,
+ top: '10px',
+ }"
+ >
+ </div>
+ </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
+ v-for="(subRect, subIndex) in getSubRects(rectIndex)"
+ :key="subIndex"
+ :style="subRectStyle(rectIndex, subIndex)"
+ ></div>
+ </div>
+ </div>
+ <div v-show="cell2" style="width: 170px;height: 53px;position: relative;top:72px;left: 445px;">
+ <div v-for="(rect, rectIndex) in adjustedRectsa" :key="rect.id" :style="rectStylea(rect, rectIndex)">
+ <div
+ v-for="(subRect, subIndex) in getSubRectsa(rectIndex)"
+ :key="subIndex"
+ :style="subRectStylea(rectIndex, subIndex)"
+ ></div>
+ </div>
+ </div>
+ <div v-show="cell3" style="width: 170px;height: 53px;position: relative;top:81px;left: 445px;">
+ <div v-for="(rect, rectIndex) in adjustedRectsb" :key="rect.id" :style="rectStyleb(rect, rectIndex)">
+ <div
+ v-for="(subRect, subIndex) in getSubRectsb(rectIndex)"
+ :key="subIndex"
+ :style="subRectStyleb(rectIndex, subIndex)"
+ ></div>
+ </div>
+ </div>
+ <div v-show="cell4" style="width: 170px;height: 53px;position: relative;top:89px;left: 445px;">
+ <div v-for="(rect, rectIndex) in adjustedRectsc" :key="rect.id" :style="rectStylec(rect, rectIndex)">
+ <div
+ v-for="(subRect, subIndex) in getSubRectsc(rectIndex)"
+ :key="subIndex"
+ :style="subRectStylec(rectIndex, subIndex)"
+ ></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
+ :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" />
+ <el-table-column prop="fullTemp" align="center" :label="$t('searchOrder.furnaces')" min-width="82" />
+ <el-table-column prop="countGlass" align="center" :label="$t('searchOrder.cagesnumber')" min-width="82" />
+ <el-table-column prop="area" align="center" :label="$t('large.are')" min-width="65" />
+ <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: 10px;">
- <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 300px;">
- <el-table height="300px" ref="table"
+ <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" />
@@ -1102,8 +1195,8 @@
</el-table>
</div>
</el-card>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;">
- <el-table height="300px" ref="table"
+ <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" />
@@ -1116,103 +1209,8 @@
</el-table>
</el-card>
</div>
- <div style="padding: 10px;display: flex;height:130px;">
- <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="img-dlpl" >
- <div class="img-car1" :style="'z-index:999;left:290px;top:' + 350*carPosition[0] + 'px;position:absolute;'">
- <div
- v-for="(rect, index) in adjusta"
- :key="rect.id"
- :style="{
- width: '30px',
- height: '5px',
- backgroundColor: '#409EFF',
- marginLeft: 5+ `px`,
- top: '10px',
- }"
- >
- </div>
- </div>
- <div class="img-car4" :style="'z-index:999;left:735px;top:' + 350*carPosition[1] + 'px;position:absolute;'">
- <div
- v-for="(rect, index) in adjust"
- :key="rect.id"
- :style="{
- width: '30px',
- height: '5px',
- backgroundColor: '#409EFF',
- marginLeft: 5+ `px`,
- top: '10px',
- }"
- >
- </div>
- </div>
- <div style="position: relative;">
- <div v-show="cell1" style="width: 170px;height: 53px;position: relative;top:63px;left: 525px;">
- <div v-for="(rect, rectIndex) in adjustedRects" :key="rect.id" :style="rectStyle(rect, rectIndex)">
- <div
- v-for="(subRect, subIndex) in getSubRects(rectIndex)"
- :key="subIndex"
- :style="subRectStyle(rectIndex, subIndex)"
- ></div>
- </div>
- </div>
- <div v-show="cell2" style="width: 170px;height: 53px;position: relative;top:67px;left: 525px;">
- <div v-for="(rect, rectIndex) in adjustedRectsa" :key="rect.id" :style="rectStylea(rect, rectIndex)">
- <div
- v-for="(subRect, subIndex) in getSubRectsa(rectIndex)"
- :key="subIndex"
- :style="subRectStylea(rectIndex, subIndex)"
- ></div>
- </div>
- </div>
- <div v-show="cell3" style="width: 170px;height: 53px;position: relative;top:72px;left: 525px;">
- <div v-for="(rect, rectIndex) in adjustedRectsb" :key="rect.id" :style="rectStyleb(rect, rectIndex)">
- <div
- v-for="(subRect, subIndex) in getSubRectsb(rectIndex)"
- :key="subIndex"
- :style="subRectStyleb(rectIndex, subIndex)"
- ></div>
- </div>
- </div>
- <div v-show="cell4" style="width: 170px;height: 53px;position: relative;top:77px;left: 525px;">
- <div v-for="(rect, rectIndex) in adjustedRectsc" :key="rect.id" :style="rectStylec(rect, rectIndex)">
- <div
- v-for="(subRect, subIndex) in getSubRectsc(rectIndex)"
- :key="subIndex"
- :style="subRectStylec(rectIndex, subIndex)"
- ></div>
- </div>
- </div>
-</div>
-</div>
-<el-card style="flex: 1;margin-left: 1220px;margin-top: -510px;">
- <div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 420px;">
- <el-table height="420px" 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" />
- <el-table-column prop="fullTemp" align="center" :label="$t('searchOrder.furnfullTemp')" min-width="82" />
- <el-table-column prop="countGlass" align="center" :label="$t('searchOrder.cagesnumber')" min-width="82" />
- <el-table-column prop="area" align="center" :label="$t('large.are')" min-width="70" />
- <el-table-column prop="countSlot" align="center" :label="$t('searchOrder.slotnumber')" min-width="96" />
- <el-table-column prop="percent" align="center" :label="$t('searchOrder.progress')" min-width="80" />
- </el-table>
- </div>
- </el-card>
-
</div>
+
<el-dialog v-model="add" top="10vh" width="70%" :title="$t('searchOrder.addcage')" >
<div style="margin-bottom: 20px">
<el-form>
@@ -1274,7 +1272,7 @@
</el-table>
</div>
</el-dialog>
-<el-dialog v-model="dialogFormVisiblea" top="2vh" width="97%" :title="$t('searchOrder.cageinformation')">
+<el-dialog v-model="dialogFormVisiblea" top="2vh" width="95%" :title="$t('searchOrder.cageinformation')">
<div style="display: flex;">
<el-input v-model="flowCardId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.incardnumber')" />
<el-input v-model="filmsId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('film.infilms')"/>
@@ -1296,12 +1294,12 @@
<el-table
:data="props.row.bigStorageCageDetails"
border
- style="width: 100%;margin-left: 20px;"
+ style="width: 98%;margin-left: 20px;"
row-key="id"
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
>
<!-- <el-table-column prop="menuName" label="浜岀骇鑿滃崟鏍�" align="center" min-width="140" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"/> -->
- <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" min-width="130"/>
+ <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" min-width="120"/>
<el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="130" />
<el-table-column prop="filmsId" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
<!-- <el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="80" /> -->
@@ -1339,8 +1337,8 @@
</div>
</template>
</el-table-column>
- <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="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
align="center"
@@ -1379,7 +1377,7 @@
</div>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="10vh" width="71%">
+<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
@@ -1394,7 +1392,7 @@
<div style="margin-bottom: 20px">
<el-form>
<el-row style="margin-top: -15px;margin-bottom: -2px;">
- <el-col :span="4">
+ <el-col :span="2">
<div id="dt" style="font-size: 15px;">
<el-form-item :label="$t('searchOrder.temperingtotal')" style="width: 14vw">
{{ temperingtotal }}
@@ -1611,7 +1609,7 @@
</el-dialog>
</template>
<style>
-#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
+#dt { display:block; float:left;line-height: 20px;margin-left: 150px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer{
text-align: center;
@@ -1704,19 +1702,19 @@
.img-dlpl{
margin-left: 20px;
margin-top: 0px;
- background-image:url('../../assets/ganghuaqian.png');
+ background-image:url('/ganghuaqian.png');
background-repeat: no-repeat;
background-attachment: local;
- min-height: 400px;
- width: 1200px;
+ min-height: 380px;
+ width: 1050px;
max-width: 100%;
- background-size: 1200px 400px;
+ background-size: 1050px 380px;
overflow: hidden;
position:relative
}
.img-car1{
display: flex;
- background-image:url('../../assets/xiaoche.png');
+ background-image:url('/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
@@ -1729,7 +1727,7 @@
}
.img-car4{
display: flex;
- background-image:url('../../assets/xiaoche.png');
+ background-image:url('/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
--
Gitblit v1.8.0