From 30317b7c1d87231f09f77d39b3d7ab54c26844ed Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 04 九月 2025 15:45:09 +0800
Subject: [PATCH] 1、各模块大屏运行情况查询修改
---
UI-Project/src/views/hollow/hollowslicecage.vue | 101 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 88 insertions(+), 13 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index b99bdf7..eb01fe4 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -30,6 +30,7 @@
const tableDatass = ref([])
const ganghua = ref('')
const diaodu = ref('')
+const hollowPriority = ref('')
const flowCardId = ref('')
const filmsId = ref('')
const adjust = ref([]);
@@ -313,6 +314,24 @@
catch (error) {
}
}
+// 涓┖浼樺厛绾у紑鍏�
+// const handlehollowPriority = async () => {
+// try {
+// const body = {
+// flag: hollowPriority.value,
+// };
+// var url="/hollowGlass/hollowGlassOutRelationInfo/priorityHollowSwitch?flag="+hollowPriority.value;
+// const response = await request.post(url)
+// if (response.code == 200) {
+// ElMessage.success(response.message);
+// hollowPriority.value = response.data
+// }else {
+// ElMessage.error(response.message);
+// }
+// }
+// catch (error) {
+// }
+// }
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/hollowGlassMessage`;
const handleMessage = (data) => {
@@ -392,6 +411,11 @@
}else{
diaodu.value = ''
}
+// if(data.priorityHollowSwitch!=null){
+// hollowPriority.value = data.priorityHollowSwitch[0]
+// }else{
+// hollowPriority.value = ''
+// }
if(data.bigStorageCageInfos!=null){
adjustedRects.value = data.bigStorageCageInfos[0][1].map((rect, index) => ({
id: index + 1,
@@ -658,6 +682,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="danger" @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button>
<el-switch style="margin-top: 7px;margin-left: 10px;" v-model="diaodu" class="mb-2" :inactive-text="$t('searchOrder.Schedulingswitch')" @change="handlediaodu" />
+ <!-- <el-switch style="margin-top: 7px;margin-left: 10px;" v-model="hollowPriority" class="mb-2" :inactive-text="$t('searchOrder.hollowPriority')" @change="handlehollowPriority" /> -->
<div id="dotClass">
<div>{{ $t('searchOrder.inkageEntity') }}</div>
<i :style="{ marginTop: '2px', backgroundColor: inkageEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
@@ -679,7 +704,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 +778,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 +793,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 +967,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,21 +1110,21 @@
}
}
.img-zkdlpl{
- margin-left: 40px;
- margin-top: 8px;
- background-image:url('../../assets/zklpl2.png');
+ margin-left: 20px;
+ margin-top: 0px;
+ background-image:url('/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
}
.img-car1{
display: flex;
- background-image:url('../../assets/xiaoche.png');
+ background-image:url('/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
@@ -1062,7 +1137,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