From 4efebef143f1ed702bc5bc1c29349e2a7f2af414 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 02 九月 2024 08:17:26 +0800
Subject: [PATCH] Merge branch 'master' into hwh
---
Web/src/views/device/deviceInfo/index.vue | 2
Web/src/views/device/alarmManage/index.vue | 52 +++----------
Web/src/views/device/sortPallet/index.vue | 140 +++++++++++++---------------------
3 files changed, 66 insertions(+), 128 deletions(-)
diff --git a/Web/src/views/device/alarmManage/index.vue b/Web/src/views/device/alarmManage/index.vue
index af81810..348d4e7 100644
--- a/Web/src/views/device/alarmManage/index.vue
+++ b/Web/src/views/device/alarmManage/index.vue
@@ -1975,8 +1975,8 @@
}
.grid-item-line-box {
- width: 20px;
- height: 20px;
+ width: 18px;
+ height: 18px;
background-color: rgb(97, 250, 145);
position: absolute;
display: flex;
@@ -2003,7 +2003,6 @@
}
.grid-container {
- margin-top: 10px;
width: 100%;
display: grid;
grid-template-columns: repeat(51, 1fr);
@@ -2012,40 +2011,8 @@
/* 姣忚楂樺害 */
gap: 0px;
/* Gap between cells */
-}
-
-.grid-item {
- background-color: #9c9c9c;
- border: 1px solid #797777;
- text-align: center;
- line-height: 1.4vw;
- /* 琛岄珮 */
- width: 100%;
- /* 鑷�傚簲瀹藉害 */
- height: 100%;
- /* 鑷�傚簲楂樺害 */
- color: #fff;
- font-size: 0.7vw;
-}
-
-.card {
- width: 100%;
- position: absolute;
- border-top: none;
- z-index: 90;
- margin-top: 310px;
-}
-
-.grid-container {
- margin-top: 10px;
- width: 100%;
- display: grid;
- grid-template-columns: repeat(51, 1fr);
- /* 姣忓垪瀹藉害 */
- grid-template-rows: repeat(12, 1fr);
- /* 姣忚楂樺害 */
- gap: 0px;
- /* Gap between cells */
+
+ margin-top: -20px;;
}
.grid-item {
@@ -2062,15 +2029,20 @@
font-size: 0.6vw;
}
+.card {
+ width: 100%;
+ position: absolute;
+ border-top: none;
+ z-index: 90;
+ margin-top: 310px;
+}
+
.active {
background-color: rgb(57, 141, 251);
/* IsUse 涓�1鏃惰儗鏅鑹蹭负钃濊壊 */
color: #f5f5f5;
}
-.active2>div {
- display: none;
-}
.active2>div {
display: none;
}
diff --git a/Web/src/views/device/deviceInfo/index.vue b/Web/src/views/device/deviceInfo/index.vue
index b4dd519..d256dac 100644
--- a/Web/src/views/device/deviceInfo/index.vue
+++ b/Web/src/views/device/deviceInfo/index.vue
@@ -2016,7 +2016,6 @@
}
.grid-container {
- margin-top: 10px;
width: 100%;
display: grid;
grid-template-columns: repeat(51, 1fr);
@@ -2025,6 +2024,7 @@
/* 姣忚楂樺害 */
gap: 0px;
/* Gap between cells */
+ margin-top: -20px
}
.grid-item {
diff --git a/Web/src/views/device/sortPallet/index.vue b/Web/src/views/device/sortPallet/index.vue
index db8b0dc..676a25b 100644
--- a/Web/src/views/device/sortPallet/index.vue
+++ b/Web/src/views/device/sortPallet/index.vue
@@ -1,97 +1,63 @@
<template>
<el-container>
- <el-card shadow="hover" :body-style="{ paddingBottom: '0', padding: '10px' }" style="width: 100%;display: flex;align-items: center;justify-content: center;">
- <div class="card-page">
- <el-button type="primary" :plain="isPlain1" @click="floorTogglePlain(1)">1鍙风爜鍨涙満鍣ㄤ汉</el-button>
- <el-button type="primary" :plain="isPlain2" @click="floorTogglePlain(2)">2鍙风爜鍨涙満鍣ㄤ汉</el-button>
- <el-button type="primary" :plain="isPlain3" @click="floorTogglePlain(3)">3鍙风爜鍨涙満鍣ㄤ汉</el-button>
+ <div class="card-container">
+ <el-card class="other-box-card" v-for="deviceInfo in deviceList" :key="deviceInfo.id">
+ <div slot="header" class="linefix">
+ <span>{{ deviceInfo.name }}</span>
+ <div :class="['lineStatus', { 'device-status-0': deviceInfo.status === 0 }, { 'device-status-1': deviceInfo.status === 1 }]"></div>
+ </div>
+ <div class="otherValuefix" >
+ <el-form label-position="left" label-width="90px">
+ <el-form-item label="WMS鏄庣粏鍗曞彿">
+ <el-input></el-input>
+ </el-form-item>
+ <el-form-item label="浠诲姟鍙�">
+ <el-input v-model="deviceInfo.taskNumber"></el-input>
+ </el-form-item>
+ <el-form-item label="鐗╂枡缂栫爜">
+ <el-input></el-input>
+ </el-form-item>
+ <el-form-item label="鐗╂枡鍚嶇О">
+ <el-input></el-input>
+ </el-form-item>
+ <el-form-item label="鍖呰鍚嶇О">
+ <el-input></el-input>
+ </el-form-item>
+ <el-form-item label="鐘舵��">
+ <el-input></el-input>
+ </el-form-item>
+ <el-form-item label="鎶撶鍝佺">
+ <el-input></el-input>
+ </el-form-item>
+ <el-form-item label="DB璁板綍绠辨暟">
+ <el-input></el-input>
+ </el-form-item>
+ <el-form-item label="鎵樼洏鍙�">
+ <el-input></el-input>
+ </el-form-item>
+ <el-form-item label="鐮佸灈绠辨暟">
+ <el-input></el-input>
+ </el-form-item>
+ <el-form-item label="WMS涓嬪彂鏁伴噺">
+ <el-input></el-input>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="otherButtonfix">
+ <el-form label-position="left">
+ <el-form-item>
+ <el-button type="primary">缁戝畾</el-button>
+ <el-button>缁撴壒</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ </el-card>
</div>
- </el-card>
- </el-container>
- <el-container>
- <div class="card-container">
- <el-card class="other-box-card" v-for="deviceInfo in deviceList" :key="deviceInfo.id">
- <div slot="header" class="linefix">
- <span>{{ deviceInfo.name }}</span>
- <div :class="['lineStatus', { 'device-status-0': deviceInfo.status === 0 }, { 'device-status-1': deviceInfo.status === 1 }]"></div>
- </div>
- <div class="otherValuefix" >
- <el-form label-position="left" label-width="90px">
- <el-form-item label="WMS鏄庣粏鍗曞彿">
- <el-input></el-input>
- </el-form-item>
- <el-form-item label="浠诲姟鍙�">
- <el-input v-model="deviceInfo.taskNumber"></el-input>
- </el-form-item>
- <el-form-item label="鐗╂枡缂栫爜">
- <el-input></el-input>
- </el-form-item>
- <el-form-item label="鐗╂枡鍚嶇О">
- <el-input></el-input>
- </el-form-item>
- <el-form-item label="鍖呰鍚嶇О">
- <el-input></el-input>
- </el-form-item>
- <el-form-item label="鐘舵��">
- <el-input></el-input>
- </el-form-item>
- <el-form-item label="鎶撶鍝佺">
- <el-input></el-input>
- </el-form-item>
- <el-form-item label="DB璁板綍绠辨暟">
- <el-input></el-input>
- </el-form-item>
- <el-form-item label="鎵樼洏鍙�">
- <el-input></el-input>
- </el-form-item>
- <el-form-item label="鐮佸灈绠辨暟">
- <el-input></el-input>
- </el-form-item>
- <el-form-item label="WMS涓嬪彂鏁伴噺">
- <el-input></el-input>
- </el-form-item>
- </el-form>
- </div>
- <div class="otherButtonfix">
- <el-form label-position="left">
- <el-form-item>
- <el-button type="primary">缁戝畾</el-button>
- <el-button>缁撴壒</el-button>
- </el-form-item>
- </el-form>
- </div>
- </el-card>
- </div>
</el-container>
</template>
<script lang="ts" setup>
import { ref, reactive } from 'vue';
-
- const stackList=[
-
- ];
- const isPlain1 = ref(false);//涓�灞�
- const isPlain2 = ref(true);//浜屽眰
- const isPlain3 = ref(true);//涓夊眰
- //鍒囨崲灞傚钩闈�
- function floorTogglePlain(buttonNumber) {
- if (buttonNumber === 1) {
- isPlain1.value = !isPlain1.value;
- isPlain2.value =true;
- isPlain3.value =true;
-
- } else if (buttonNumber === 2) {
- isPlain2.value = !isPlain2.value;
- isPlain1.value =true;
- isPlain3.value =true;
-
- } else if (buttonNumber === 3) {
- isPlain3.value = !isPlain3.value;
- isPlain1.value =true;
- isPlain2.value =true;
- }
- }
const deviceList=[
{
@@ -175,7 +141,7 @@
}
.otherValuefix{
width: 100%;
- height: 550px;
+ height: 600px;
padding: 10px;
border-bottom: 1px solid rgb(197, 195, 195);
}
--
Gitblit v1.8.0