From 6d56bf4daf08c4c7c6d193d98ed0b547dc473451 Mon Sep 17 00:00:00 2001
From: renmingwang <renmingwang@hnkhzn.com>
Date: 星期三, 25 三月 2026 16:59:14 +0800
Subject: [PATCH] 添加历史任务删除，大屏布局修改
---
项目代码/大屏/src/views/indexs/index.vue | 64 ++++++++++++++++++-------------
1 files changed, 37 insertions(+), 27 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\244\247\345\261\217/src/views/indexs/index.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\244\247\345\261\217/src/views/indexs/index.vue"
index 5f7a3b6..d44a39a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\244\247\345\261\217/src/views/indexs/index.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\244\247\345\261\217/src/views/indexs/index.vue"
@@ -11,13 +11,12 @@
<div class="pagetab">
<div class="item">瀹炴椂鐩戞祴</div>
</div>
- <!-- SC01宸烽亾浠诲姟淇℃伅 -->
- <ItemWrap class="contetn_left-bottom contetn_lr-item" title="SC01宸烽亾浠诲姟淇℃伅" style="padding: 0 10px 16px 0px">
- <sc01-task-info />
- </ItemWrap>
- <!-- SC02宸烽亾浠诲姟淇℃伅 -->
- <ItemWrap class="contetn_left-bottom contetn_lr-item" title="SC02宸烽亾浠诲姟淇℃伅">
- <sc02-task-info />
+ <!-- 宸烽亾浠诲姟淇℃伅 -->
+ <ItemWrap class="contetn_left-bottom contetn_lr-item" title="宸烽亾浠诲姟淇℃伅" style="padding: 0 10px 16px 0px; height: 92%;">
+ <div class="task-content">
+ <sc01-task-info v-if="currentTask === 'sc01'" />
+ <sc02-task-info v-else-if="currentTask === 'sc02'" />
+ </div>
</ItemWrap>
</div>
<div class="contetn_center">
@@ -26,24 +25,24 @@
<inventory-stats />
</ItemWrap>
<!-- 鏃ュ嚭鍏ュ簱鏌卞舰鍥惧姣� -->
- <ItemWrap class="contetn_left-bottom contetn_lr-item" title="鏃ュ嚭鍏ュ簱瀵规瘮" style="padding: 0 10px 16px 10px">
+ <ItemWrap class="contetn_left-bottom contetn_lr-item" title="鎶ヨ淇℃伅" style="padding: 0 10px 16px 10px">
<daily-inout-chart />
</ItemWrap>
</div>
<div class="contetn_right">
- <!-- SC01璐т綅鐘舵�� -->
- <ItemWrap class="contetn_left-bottom contetn_lr-item" title="SC01璐т綅鐘舵��">
- <sc01-location-status />
- </ItemWrap>
- <!-- SC02璐т綅鐘舵�� -->
- <ItemWrap class="contetn_left-bottom contetn_lr-item" title="SC02璐т綅鐘舵��">
- <sc02-location-status />
+ <!-- 璐т綅鐘舵�� -->
+ <ItemWrap class="contetn_left-bottom contetn_lr-item" title="璐т綅鐘舵��" style="padding: 0 10px 16px 0px; height: 92%;">
+ <div class="task-content">
+ <sc01-location-status v-if="currentLocation === 'sc01'" />
+ <sc02-location-status v-else-if="currentLocation === 'sc02'" />
+ </div>
</ItemWrap>
</div>
</div>
</template>
<script>
+import { mapState, mapMutations } from 'vuex'
import sc01TaskInfo from './sc01-task-info.vue'
import sc02TaskInfo from './sc02-task-info.vue'
import inventoryStats from './inventory-stats.vue'
@@ -59,10 +58,8 @@
sc01LocationStatus,
sc02LocationStatus
},
- data() {
- return {
-
- };
+ computed: {
+ ...mapState('setting', ['currentTask', 'currentLocation'])
},
filters: {
numsFilter(msg) {
@@ -73,9 +70,8 @@
},
mounted() { },
- methods: {
+ methods: {},
- },
};
</script>
<style lang="scss" scoped>
@@ -84,25 +80,34 @@
display: flex;
justify-content: center;
gap: 10px;
+ height: 100%;
.contetn_left,
.contetn_right {
width: 600px;
- // height: 100%;
box-sizing: border-box;
gap: 10px;
- // padding: 16px 0;
+ display: flex;
+ flex-direction: column;
}
.contetn_center {
width: 660px;
gap: 10px;
+ display: flex;
+ flex-direction: column;
+ }
+
+ // 宸︿晶SC01浠诲姟淇℃伅 - 淇濇寔涓庡叾浠栧尯鍩熺浉鍚岀殑楂樺害
+ .contetn_left-item {
+ height: px; // 鎭㈠鍘熸潵鐨勫浐瀹氶珮搴︼紝鍜屽彸渚у崟涓潡鐨勯珮搴︿竴鑷�
+ flex-shrink: 0; // 闃叉鍘嬬缉
}
//宸﹀彸涓や晶 涓変釜鍧�
.contetn_lr-item {
gap: 10px;
- height: 480px;
+ height: 480px; // 鎭㈠鍘熸潵鐨勫浐瀹氶珮搴�
}
.contetn_center_top {
@@ -114,7 +119,6 @@
display: flex;
flex-direction: column;
gap: 10px;
- // justify-content: space-around;
}
.contetn_center-bottom {
@@ -126,7 +130,6 @@
.contetn_right {
display: flex;
flex-direction: column;
- // justify-content: space-around;
gap: 10px;
position: relative;
}
@@ -164,4 +167,11 @@
transform: rotate(360deg) scale(1);
}
}
-</style>
+
+// 浠诲姟鍐呭鍖哄煙
+.task-content {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+}
+</style>
\ No newline at end of file
--
Gitblit v1.9.3