From 1ad241932bf44eb214b6eb1104e4cae0ffd3e3fc Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 27 九月 2024 15:32:23 +0800
Subject: [PATCH] 修改页面样式

---
 Web/src/views/device/deviceInfo/index.vue |    2 +-
 Web/.env                                  |    4 ++--
 Web/src/views/wcs/wcsTask/index.vue       |    8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Web/.env b/Web/.env
index 44fe1e3..3df3a3b 100644
--- a/Web/.env
+++ b/Web/.env
@@ -11,10 +11,10 @@
 VITE_PUBLIC_PATH =
 
 # 鐧婚檰鐣岄潰榛樿鐢ㄦ埛
-VITE_DEFAULT_USER = superadmin
+VITE_DEFAULT_USER = 
 
 # 鐧婚檰鐣岄潰榛樿瀵嗙爜
-VITE_DEFAULT_USER_PASSWORD = 123456
+VITE_DEFAULT_USER_PASSWORD = 
 
 # 鍥藉瘑SM鍏挜
 VITE_SM_PUBLIC_KEY = "0484C7466D950E120E5ECE5DD85D0C90EAA85081A3A2BD7C57AE6DC822EFCCBD66620C67B0103FC8DD280E36C3B282977B722AAEC3C56518EDCEBAFB72C5A05312"
\ No newline at end of file
diff --git a/Web/src/views/device/deviceInfo/index.vue b/Web/src/views/device/deviceInfo/index.vue
index 3d76125..c43003f 100644
--- a/Web/src/views/device/deviceInfo/index.vue
+++ b/Web/src/views/device/deviceInfo/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="sys-user-container">
+	<div class="sys-user-container" style="overflow: hidden;">
 		<el-row>
 			<el-col :span="3">
 				<el-collapse v-model="activeName">
diff --git a/Web/src/views/wcs/wcsTask/index.vue b/Web/src/views/wcs/wcsTask/index.vue
index 0168614..f569b3a 100644
--- a/Web/src/views/wcs/wcsTask/index.vue
+++ b/Web/src/views/wcs/wcsTask/index.vue
@@ -1,8 +1,8 @@
 锘�<template>
   <div class="wcsTask-container">
     <el-row :gutter="8" style="width: 100%; height: 100%; flex: 1">
-      <el-col :span="12" :xs="24" style="display: flex; height: 100%; flex: 1">
-        <el-card class="full-table" shadow="hover" ::body-style="{ height: 'calc(100% - 51px)' }">
+      <el-col :span="14" :xs="24" style="display: flex; height: 100%; flex: 1">
+        <el-card class="full-table" shadow="hover" :body-style="{ height: 'calc(100% - 51px)' }">
           <template #header>
             <el-icon size="16"
               style="margin-right: 3px; display: inline; vertical-align: middle"><ele-Collection /></el-icon>浠诲姟鏃ュ織
@@ -67,7 +67,7 @@
           <el-table :data="tableData" style="width: 100%" v-loading="loading" tooltip-effect="light" row-key="id"
             @cell-click="handleClick" @sort-change="sortChange" border="">
             <el-table-column type="index" label="搴忓彿" width="55" align="center" />
-            <el-table-column prop="taskNo" label="浠诲姟鍙�" show-overflow-tooltip="" />
+            <el-table-column prop="taskNo" label="浠诲姟鍙�" width="130" show-overflow-tooltip="" />
             <el-table-column prop="taskType" width="85" label="浠诲姟绫诲瀷" show-overflow-tooltip="">
               <template #default="scope">
                 <el-tag :type="dv('TaskTypeEnum', scope.row.taskType)?.tagType"> {{ dv('TaskTypeEnum',
@@ -138,7 +138,7 @@
           <editDialog ref="editDialogRef" :title="editWcsTaskTitle" @reloadTable="handleQuery" />
         </el-card>
       </el-col>
-      <el-col :span="12" :xs="24" style="display: flex; height: 100%; flex: 1">
+      <el-col :span="10" :xs="24" style="display: flex; height: 100%; flex: 1">
         <el-card class="full-table" shadow="hover" :body-style="{ height: 'calc(100% - 51px)' }">
           <template #header>
             <el-icon size="16"

--
Gitblit v1.8.0