From 60087945430822537743764af5ca1b5987469aef Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 21 十月 2025 13:48:47 +0800
Subject: [PATCH] 提交 调整界面显示

---
 northglass-erp-client/erp-customer-client/src/views/MainView.vue                  |    5 +++--
 northglass-erp-client/erp-customer-client/src/views/order/OrderUnfinishedView.vue |    4 ++--
 northglass-erp-client/erp-customer-client/index.html                              |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/northglass-erp-client/erp-customer-client/index.html b/northglass-erp-client/erp-customer-client/index.html
index 489bf1c..8336bf7 100644
--- a/northglass-erp-client/erp-customer-client/index.html
+++ b/northglass-erp-client/erp-customer-client/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8">
     <link rel="icon" href="/favicon.ico">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0,user-scalable=no">
     <title>ERP-Customer</title>
   </head>
   <body>
diff --git a/northglass-erp-client/erp-customer-client/src/views/MainView.vue b/northglass-erp-client/erp-customer-client/src/views/MainView.vue
index b3c735b..603f259 100644
--- a/northglass-erp-client/erp-customer-client/src/views/MainView.vue
+++ b/northglass-erp-client/erp-customer-client/src/views/MainView.vue
@@ -52,7 +52,7 @@
           </el-sub-menu>
         </el-menu>
       </el-header>
-      <el-main>
+      <el-main >
         <router-view></router-view>
       </el-main>
     </el-container>
@@ -64,7 +64,6 @@
 #main-div{
   width: 100vw;
   height: 100vh;
-  overflow-y: auto;
 }
 .el-menu--horizontal > .el-menu-item:nth-child(1) {
   margin-right: auto;
@@ -83,6 +82,8 @@
 }
 .el-main{
   margin-top: 5rem;
+  width: 100vw;
+  height: calc(100vh - 5rem);
 }
 
 
diff --git a/northglass-erp-client/erp-customer-client/src/views/order/OrderUnfinishedView.vue b/northglass-erp-client/erp-customer-client/src/views/order/OrderUnfinishedView.vue
index 27236ec..9818457 100644
--- a/northglass-erp-client/erp-customer-client/src/views/order/OrderUnfinishedView.vue
+++ b/northglass-erp-client/erp-customer-client/src/views/order/OrderUnfinishedView.vue
@@ -42,8 +42,8 @@
 
 </script>
 
-<template>
-  <div class="grid-container" v-loading="loading">
+<template >
+  <div class="grid-container" >
     <div class="grid-item" v-for="(item,index) in order">
       <el-row>
         <el-col :span="24">

--
Gitblit v1.8.0