From fa8de19c41cf345790d9357b774ad15c493858cb Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Fri, 29 Mar 2024 16:53:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=BA=E5=AF=B8=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 src/App.vue                                   |  7 +++-
 src/assets/styles/public.scss                 |  6 ++++
 src/layout/components/Navbar.vue              |  4 +--
 src/views/components/myDialog/index.vue       |  1 +
 src/views/project/index.vue                   | 34 +++++++++++++++----
 .../projectInfo/components/tabFour/index.vue  |  1 +
 7 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/.env.development b/.env.development
index 1666dd3..bfc2703 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ ENV = 'development'
 
 # 金鸡湖现代服务业品牌管理系统/开发环境
 # VUE_APP_BASE_API = 'http://192.168.0.114:9040'
-VUE_APP_BASE_API = 'http://192.168.0.105:9040'
+VUE_APP_BASE_API = 'http://39.101.188.84:9040'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/App.vue b/src/App.vue
index 1f899f5..b1a9742 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -14,8 +14,13 @@ export default {
     autofit.init({
       dh: 919,
       dw: 1920,
-      el: "body",
+      el: "#app",
       resize: true,
+      // ignore:[
+      //   {
+      //     el:".ignoreElement",
+      //   }
+      // ],
     });
   },
   metaInfo() {
diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss
index 0b5980d..03869d3 100644
--- a/src/assets/styles/public.scss
+++ b/src/assets/styles/public.scss
@@ -33,6 +33,9 @@
       overflow-y: auto;
       // padding-bottom: 20px;
     }
+    .el-table::before {
+      height: 0;
+    }
     .el-table {
       margin-bottom: 25px;
       th {
@@ -528,6 +531,9 @@
             .iconfont {
               font-size: 65px;
             }
+            .icon-jc-daishenpi1-copy {
+              color: #979797;
+            }
             .icon-jc-shenpitongguo-copy {
               color: #4EB997;
             }
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 99c21f8..b01c4fc 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -34,7 +34,7 @@
       </template>
 
       <el-dropdown
-        class="avatar-container right-menu-item hover-effect"
+        class="avatar-container right-menu-item hover-effect ignoreElement"
         trigger="click"
       >
         <div class="avatar-wrapper">
@@ -110,7 +110,7 @@ export default {
       })
         .then(() => {
           this.$store.dispatch("LogOut").then(() => {
-            location.href = "/index";
+            location.href = "/demo/JinJiHu";
           });
         })
         .catch(() => {});
diff --git a/src/views/components/myDialog/index.vue b/src/views/components/myDialog/index.vue
index a95ce42..3d58a13 100644
--- a/src/views/components/myDialog/index.vue
+++ b/src/views/components/myDialog/index.vue
@@ -6,6 +6,7 @@
    :close-on-press-escape="false"
    :custom-class="myclass ? 'custom-my-class':''"
    @close="resetCancel"
+   append-to-body
   >
     <slot></slot>
     <div slot="footer" class="dialog-footer">
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index cffed52..b69a491 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -4,16 +4,16 @@
  * @Author: JC9527
  * @Date: 2024-03-25 09:07:08
  * @LastEditors: JC9527
- * @LastEditTime: 2024-03-29 09:50:06
+ * @LastEditTime: 2024-03-29 16:51:22
 -->
 <template>
-  <div class="L-public-main">
+  <div class="L-public-main" id="L-size-main">
     <div class="L-main">
-      <header>
+      <header id="L-header">
         <el-form :inline="true" :model="formInline" size="small" class="demo-form-inline" ref="queryFrom">
           <el-col :span="22">
             <el-form-item label="项目分类：">
-              <el-select v-model="formInline.projectClassify" placeholder="请选择">
+              <el-select class="ignoreElement" v-model="formInline.projectClassify" placeholder="请选择">
                 <el-option
                   v-for="dict in dict.type.jjh_project_type"
                   :key="dict.value"
@@ -30,6 +30,7 @@
             </el-form-item>
             <el-form-item label="年份：">
               <el-date-picker
+                class="ignoreElement"
                 v-model="formInline.projectYear"
                 format="yyyy"
                 value-format="yyyy"
@@ -38,7 +39,7 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item label="状态：">
-              <el-select v-model="formInline.status" placeholder="请选择">
+              <el-select class="ignoreElement" v-model="formInline.status" placeholder="请选择">
                 <el-option
                   v-for="dict in dict.type.jjh_status"
                   :key="dict.value"
@@ -58,7 +59,7 @@
         </el-form>
       </header>
       <section>
-        <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName">
+        <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" :height="tabHeader" :max-height="tabHeader">
           <el-table-column label="项目分类" key="projectClassify" width="250px" prop="projectClassify">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.jjh_project_type" :value="scope.row.projectClassify"/>
@@ -99,6 +100,7 @@
           </el-table-column>
         </el-table>
         <my-pagination 
+          id="L-pagination"
           :total="total"
           :page="pagination.current"
           :limit="pagination.size"
@@ -112,7 +114,7 @@
         <el-col :span="12">
           <el-form :model="importFrom" size="small" ref="importFrom" label-width="100px" :rules="rules">
             <el-form-item label="项目分类：" class="importFormItem" prop="projectClassify">
-              <el-select v-model="importFrom.projectClassify" placeholder="请选择">
+              <el-select class="ignoreElement" v-model="importFrom.projectClassify" placeholder="请选择">
                 <el-option
                   v-for="dict in dict.type.jjh_project_type"
                   :key="dict.value"
@@ -123,6 +125,7 @@
             </el-form-item>
             <el-form-item label="年份：" class="importFormItem" prop="projectYear">
               <el-date-picker
+                class="ignoreElement"
                 v-model="importFrom.projectYear"
                 type="year"
                 format="yyyy"
@@ -267,6 +270,7 @@ export default {
         // url: process.env.VUE_APP_BASE_API + "/jjh/jProject/export"
         url: process.env.VUE_APP_BASE_API + "/jjh/jProject/importTemplateProject"
       },
+      tabHeader: undefined,
     };
   },
   mounted() {
@@ -274,8 +278,14 @@ export default {
       this.formInline.projectClassify = this.$route.query.projectId;
       this.pagination = { ...this.pagination,...this.formInline };
     }
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+    
     this.getList();
   },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   methods:{
     // 列表获取
     getList(){
@@ -396,6 +406,16 @@ export default {
         return 'evenNumber-row';
       }
       return '';
+    },
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('L-size-main'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('L-header'); // 通过元素的 ID 获取元素
+      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      const paginationtHeight = pagination.offsetHeight;
+      this.tabHeader = elementHeight - headerHeight - paginationtHeight - 140;
     }
   }
 };
diff --git a/src/views/project/projectInfo/components/tabFour/index.vue b/src/views/project/projectInfo/components/tabFour/index.vue
index 40bd15c..8d6d9d4 100644
--- a/src/views/project/projectInfo/components/tabFour/index.vue
+++ b/src/views/project/projectInfo/components/tabFour/index.vue
@@ -17,6 +17,7 @@
                 placeholder="选择备忘时间">
               </el-date-picker> -->
               <el-date-picker
+                class="ignoreElement"
                 v-model="memoTime"
                 format="yyyy-MM-dd HH:mm:ss"
                 value-format="yyyy-MM-dd HH:mm:ss"