From 3a2580cb8238e77ad7778a8fa95e95d46e0b79f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Wed, 23 Apr 2025 15:39:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=B0=91=E6=91=84=E5=83=8F=E5=A4=B4?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A7=E5=88=B6=20=E7=9B=B4=E6=8E=A5=E4=B8=8D?=
 =?UTF-8?q?=E9=87=87=E7=94=A8=E9=AA=8C=E8=AF=81=E7=A0=81=20=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9B=98=E7=82=B9=E7=AE=A1=E7=90=86=E4=B8=8B?=
 =?UTF-8?q?=E4=BE=A7=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                 |  2 +-
 src/views/Home/Index.vue                 | 49 ++----------------------
 src/views/Login/components/LoginForm.vue | 19 ++++-----
 src/views/logistics/stock/index.vue      |  2 +-
 4 files changed, 16 insertions(+), 56 deletions(-)

diff --git a/.env.dev b/.env.dev
index cade296..c93a36b 100644
--- a/.env.dev
+++ b/.env.dev
@@ -4,7 +4,7 @@ NODE_ENV=production
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://192.168.0.10:48080'
+VITE_BASE_URL='http://172.18.94.172:48080'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
 VITE_UPLOAD_TYPE=server
diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index d53510a..09a450c 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -2,7 +2,7 @@
   <ContentWrap>
     <el-row :gutter="20">
       <!-- 左侧区域 -->
-      <el-col :span="7">
+      <el-col :span="12">
         <!-- 左上：统计信息 -->
         <el-card style="height: 250px" shadow="always" class="mb-20px">
           <template #header>
@@ -29,31 +29,8 @@
         </el-card>
       </el-col>
 
-      <!-- 中间区域 -->
-      <el-col :span="10">
-        <!-- 中上和中中：选择相机直播 -->
-        <el-card shadow="always">
-          <template #header>
-            <div class="card-header">
-              <span>选择相机</span>
-            </div>
-          </template>
-          <el-select v-model="selectedCamera" placeholder="请选择相机" style="width: 100%">
-            <el-option
-              v-for="camera in cameraList"
-              :key="camera.id"
-              :label="camera.name"
-              :value="camera.id"
-            />
-          </el-select>
-          <div style="height: 420px; background-color: #555555" class="mt-20px">
-            <Camera v-if="selectedCamera" :cameraId="selectedCamera" />
-          </div>
-        </el-card>
-      </el-col>
-
       <!-- 右侧区域 -->
-      <el-col :span="7">
+      <el-col :span="12">
         <!-- 右上：快捷方式 -->
         <el-card style="height: 250px" shadow="always" class="mb-20px">
           <template #header>
@@ -105,7 +82,7 @@
           <Echart style="width: 100%; height: 200px" :options="stockPieOptions" />
         </el-card>
       </el-col>
-      <el-col :span="10">
+      <el-col :span="17">
         <el-card shadow="always">
           <template #header>
             <div class="card-header">
@@ -115,25 +92,7 @@
           <Echart style="width: 100%; height: 200px" :options="laneInventoryLineOptions" />
         </el-card>
       </el-col>
-      <el-col :span="7">
-        <!-- 左下：实时滚动信息 -->
-        <el-card shadow="always">
-          <template #header>
-            <div class="card-header">
-              <span>实时滚动信息</span>
-            </div>
-          </template>
-          <el-scrollbar height="200px">
-            <div
-              v-for="(item, index) in realTimeLogs.slice().reverse()"
-              :key="index"
-              class="log-item"
-            >
-              {{ item }}
-            </div>
-          </el-scrollbar>
-        </el-card>
-      </el-col>
+     
     </el-row>
   </ContentWrap>
 </template>
diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue
index c4beb0c..24b4a1b 100644
--- a/src/views/Login/components/LoginForm.vue
+++ b/src/views/Login/components/LoginForm.vue
@@ -49,13 +49,13 @@
           />
         </el-form-item>
       </el-col>
-      <Verify
+      <!-- <Verify
         ref="verify"
         :captchaType="captchaType"
         :imgSize="{ width: '400px', height: '200px' }"
         mode="pop"
         @success="handleLogin"
-      />
+      /> -->
     </el-row>
   </el-form>
 </template>
@@ -108,13 +108,14 @@ const loginData = reactive({
 // 获取验证码
 const getCode = async () => {
   // 情况一，未开启：则直接登录
-  if (loginData.captchaEnable === 'false') {
-    await handleLogin({})
-  } else {
-    // 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录
-    // 弹出验证码
-    verify.value.show()
-  }
+  // if (loginData.captchaEnable === 'false') {
+    
+  // } else {
+  //   // 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录
+  //   // 弹出验证码
+  //   verify.value.show()
+  // }
+  await handleLogin({})
 }
 // 记住我
 const getLoginFormCache = () => {
diff --git a/src/views/logistics/stock/index.vue b/src/views/logistics/stock/index.vue
index 1ec6175..3af1f12 100644
--- a/src/views/logistics/stock/index.vue
+++ b/src/views/logistics/stock/index.vue
@@ -69,7 +69,7 @@
   
   
   </ContentWrap>
-  <ContentWrap>
+  <ContentWrap v-if="f">
     
   <el-row  :gutter="20">
     <el-col style="height: 30vh;" :span="5">