From 24396a880cbe70f73ab9b73e22e7ed069cf7a3f3 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Tue, 3 Sep 2024 17:38:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83=E5=A4=87?=
 =?UTF-8?q?=E5=BF=98=E5=BD=95=E8=B7=B3=E8=BD=AC=E3=80=81=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E5=B1=95=E7=A4=BA=E3=80=81=E6=8B=A8=E4=BB=98?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  4 +-
 package.json                                  |  2 +-
 src/assets/styles/publicPro.scss              | 68 +++++++++++++++----
 src/views/homeTwo/index.vue                   |  4 +-
 .../components/capitalConditionTOP5/index.vue | 31 +++++----
 src/views/workbenchPro/index.vue              | 36 +++++++---
 6 files changed, 101 insertions(+), 44 deletions(-)

diff --git a/.env.development b/.env.development
index 710cf5d..1ffa280 100644
--- a/.env.development
+++ b/.env.development
@@ -5,9 +5,9 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
 ENV = 'development'
 
 # 金鸡湖现代服务业品牌管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.0.110:9040'
+VUE_APP_BASE_API = 'http://192.168.0.110:9040'
 # 测试环境数据库
-VUE_APP_BASE_API = 'http://39.101.188.84:9040'
+# VUE_APP_BASE_API = 'http://39.101.188.84:9040'
 # 脱敏三方测试用数据库
 # VUE_APP_BASE_API = 'http://39.101.188.84:9031'
 # 正式环境数据库
diff --git a/package.json b/package.json
index 2c1b8aa..2782af0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202408301742",
+  "version": "1.0.202409031604",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",
diff --git a/src/assets/styles/publicPro.scss b/src/assets/styles/publicPro.scss
index b5f654f..ff22117 100644
--- a/src/assets/styles/publicPro.scss
+++ b/src/assets/styles/publicPro.scss
@@ -264,12 +264,14 @@
 
       .service-left {
         padding: 10px;
+        height: 100%;
+        overflow: hidden;
         display: flex;
         flex-direction: column;
 
-        .home-mainPro-top,
-        .home-mainPro-middle,
-        .home-mainPro-bottom {
+        .home-mainPro-top {
+          height: 32%;
+          // height: 250px;
           display: flex;
           align-items: center;
 
@@ -288,12 +290,6 @@
           .pro-right-box {
             width: 45%;
           }
-        }
-
-
-        .home-mainPro-top {
-          // height: 32%;
-          height: 250px;
           .home-mainPro-top-box {
             width: 100%;
             height: 100%;
@@ -534,14 +530,32 @@
 
         .home-mainPro-middle {
           margin: 10px 0;
-          // height: 45%;
-          flex: 2;
+          height: 40%;
+          display: flex;
+          align-items: center;
+          // overflow: hidden;
+
+          .pro-left-box,
+          .pro-right-box {
+            height: 100%;
+            padding: 10px;
+            background-color: #F5F8FA;
+            border-radius: 10px;
+            display: flex;
+            flex-direction: column;
+          }
+          .pro-left-box {
+            width: 55%;
+          }
+          .pro-right-box {
+            width: 45%;
+          }
+          // flex: 2;
           // 企业获得资金拨付排名TOP5
           .capitalConditionTOP5-box,.wancheng-project {
             flex: 1;
             section {
               margin-top: 10px;
-
               .el-table--border {
                 border: 1px solid #dfe6ec;
               }
@@ -605,8 +619,26 @@
 
         }
         .home-mainPro-bottom {
-          // height: 25.5%;
-          flex: 1.3;
+          height: 25.5%;
+          // flex: 1.3;
+          display: flex;
+          align-items: center;
+
+          .pro-left-box,
+          .pro-right-box {
+            height: 100%;
+            padding: 10px;
+            background-color: #F5F8FA;
+            border-radius: 10px;
+            display: flex;
+            flex-direction: column;
+          }
+          .pro-left-box {
+            width: 55%;
+          }
+          .pro-right-box {
+            width: 45%;
+          }
           .wancheng-project {
             flex: 1;
             section {
@@ -681,6 +713,7 @@
             }
           }
         }
+
       }
 
 
@@ -826,6 +859,13 @@
             color: #0086FF;
           }
         }
+        .el-radio-group {
+          .el-radio-button {
+            .el-radio-button__inner {
+              padding: 5px 15px;
+            }
+          }
+        }
         .years-select {
           margin-right: 10px;
         }
diff --git a/src/views/homeTwo/index.vue b/src/views/homeTwo/index.vue
index d13afab..2e90b97 100644
--- a/src/views/homeTwo/index.vue
+++ b/src/views/homeTwo/index.vue
@@ -10,7 +10,7 @@
           <el-col :span="12" class="enterprise-honor" id="one-table" style="margin-right: 10px;">
             <div class="box-header" id="one-table-header">
               <span class="garden"></span>
-              <span class="box-header-title">企业荣誉资质（5个）</span>
+              <span class="box-header-title">企业荣誉资质</span>
             </div>
             <div class="two-tables" :style="{height : tabOneHeader + 'px'}" v-if="enterpriseHonor.length > 0">
               <div class="table-items" v-for="item in enterpriseHonor" :key="item.id">
@@ -34,7 +34,7 @@
           <el-col :span="12" class="relevancy-project">
             <div class="box-header">
               <span class="garden"></span>
-              <span class="box-header-title">关联项目进展（3个）</span>
+              <span class="box-header-title">关联项目进展</span>
             </div>
             <div class="promoteProject-box-wai-box" :style="{height:tableTwoHeight + 'px'}" v-if="tableTwoData.length > 0">
               <div class="promoteProject-box-div" v-for="(item,index) in tableTwoData" :key="index">
diff --git a/src/views/workbenchPro/components/capitalConditionTOP5/index.vue b/src/views/workbenchPro/components/capitalConditionTOP5/index.vue
index f89d1ff..38f4a2c 100644
--- a/src/views/workbenchPro/components/capitalConditionTOP5/index.vue
+++ b/src/views/workbenchPro/components/capitalConditionTOP5/index.vue
@@ -1,7 +1,7 @@
 <!-- 拨付资金企业申请情况TOP5 -->
 <template>
   <section>
-    <el-table v-loading="loading" :data="tableData" :height="tabHeader" border :header-cell-style="{background:'#E8F3FC'}">
+    <el-table v-loading="loading" :data="tableData" :height="height" border :header-cell-style="{background:'#E8F3FC'}">
       <el-table-column label="排名" key="type" prop="type" align="center" width="80">
         <template slot-scope="scope">
           <div class="project-trace-table-ranking" :style="{backgroundColor: scope.row.rankingBg}">{{ scope.row.ranking }}</div>
@@ -22,9 +22,9 @@
         </template>
       </el-table-column>
       <el-table-column label="拨付类型" key="projectName" prop="projectName" align="center" width="130">
-        <!-- <template slot-scope="scope">
-          <div class="project-table-Info">{{ scope.row.projectName }}</div>
-        </template> -->
+        <template slot-scope="scope">
+          <div >{{ scope.row.projectName  == "区级总部" ? '总部专项' : '服务业专项'}}</div>
+        </template>
       </el-table-column>
       <el-table-column label="所属企业" key="qymc" prop="qymc" align="center" />
     </el-table>
@@ -45,6 +45,10 @@ export default {
       type:Number,
       default:2,
     },
+    height:{
+      type:Number,
+      default:0,
+    },
     yearsValue:{
       type:Number,
       default:1,
@@ -63,8 +67,8 @@ export default {
     },
   },
   mounted() {
-    this.cancalDebounce();
-    window.addEventListener('resize', this.cancalDebounce);
+    // this.cancalDebounce();
+    // window.addEventListener('resize', this.cancalDebounce);
     this.getList();
   },
   methods:{
@@ -92,7 +96,6 @@ export default {
       })
     },
     ProjectInfo(item){
-      console.log(item,"item");
       if((item.projectName == "区级总部" || item.projectName == "市级服务业领军") && item.projectId) {
         this.$router.push({
           name: 'projectInfo',
@@ -111,13 +114,13 @@ export default {
       }
     },
     // 屏幕尺寸变化
-    cancalDebounce(){
-      const element = document.getElementById('home-mainPro-middle-id'); // 通过元素的 ID 获取元素
-      const header = document.getElementById('TOP-header-id'); // 通过元素的 ID 获取元素
-      const elementHeight = element.offsetHeight;
-      const headerHeight = header.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - 30;
-    }
+    // cancalDebounce(){
+    //   const element = document.getElementById('home-mainPro-middle-id'); // 通过元素的 ID 获取元素
+    //   const header = document.getElementById('TOP-header-id'); // 通过元素的 ID 获取元素
+    //   const elementHeight = element.offsetHeight;
+    //   const headerHeight = header.offsetHeight;
+    //   this.tabHeader = elementHeight - headerHeight - 20;
+    // }
   },
 }
 </script>
diff --git a/src/views/workbenchPro/index.vue b/src/views/workbenchPro/index.vue
index bea488e..6ce71c6 100644
--- a/src/views/workbenchPro/index.vue
+++ b/src/views/workbenchPro/index.vue
@@ -88,7 +88,7 @@
                 </div>
               </div>
               <div class="capitalConditionTOP5-box">
-                <table-three :typeValue="typeValue" :yearsValue="yearsChange"></table-three>
+                <table-three :typeValue="typeValue" :yearsValue="yearsChange" :height="tabHeaderOne"></table-three>
               </div>
             </div>
             <div class="pro-right-box">
@@ -98,7 +98,7 @@
               </div>
               <div class="wancheng-project">
                 <section>
-                  <el-table v-loading="loadingProject" :data="tableData" :height="tabHeader" border :header-cell-style="{background:'#E8F3FC'}">
+                  <el-table v-loading="loadingProject" :data="tableData" :height="tabHeaderOne" border :header-cell-style="{background:'#E8F3FC'}">
                     <el-table-column label="项目名称" key="type" prop="type" align="center" width="180">
                       <template slot-scope="scope">
                         <div class="project-trace-table-name" @click="goProjectInfo(scope.row.id)"><dict-tag :options="dict.type.project_small_type" :value="scope.row.projectSmallType"/></div>
@@ -127,7 +127,7 @@
                   <el-table v-loading="loadingTwo" :data="tableDataTWo" :height="tabHeaderTwo" border :header-cell-style="{background:'#E8F3FC'}">
                     <el-table-column label="项目名称" key="type" prop="type" align="center" width="180">
                       <template slot-scope="scope">
-                        <div class="project-trace-table-name" @click="goProjectInfo(scope.row.id)"><dict-tag :options="dict.type.project_small_type" :value="scope.row.projectSmallType"/></div>
+                        <div class="project-trace-table-name" @click="goProjectInfo(scope.row.id,1)"><dict-tag :options="dict.type.project_small_type" :value="scope.row.projectSmallType"/></div>
                       </template>
                     </el-table-column>
                     <el-table-column label="申报时间" key="createTime" prop="createTime" align="center" width="120">
@@ -162,7 +162,7 @@
                     </el-table-column>
                     <el-table-column label="备忘录类型" key="type" prop="type" align="center" width="100">
                       <template slot-scope="scope">
-                        <div class="project-trace-table-name" @click="goProjectInfo(scope.row.projectId)">{{ scope.row.type == 1 ? '企业备忘' : scope.row.type == 2 ? '项目备忘' : '' }}</div>
+                        <div class="project-trace-table-name" @click="goProjectInfo(scope.row,2)">{{ scope.row.type == 1 ? '企业备忘' : scope.row.type == 2 ? '项目备忘' : '' }}</div>
                       </template>
                     </el-table-column>
                     
@@ -365,7 +365,7 @@ export default {
       yearsChange: 1,
       typeValue: 2,
       tableData:[],
-      tabHeader:null,
+      tabHeaderOne:null,
       tableDataTWo:[],
       tableDataThree:[],
       tabHeaderTwo:null,
@@ -418,11 +418,25 @@ export default {
         this.loadingTwo = false;
       })
     },
-    goProjectInfo(item){
-      this.$router.push({
-        name: 'projectInfo',
-        query: { userId: Number(item) }
-      })
+    goProjectInfo(item,id){
+      if(id == 1) {
+        this.$router.push({
+          name: 'projectInfo',
+          query: { userId: Number(item) }
+        })
+      } else {
+        if(item.type == '1') {
+          this.$router.push({
+            name: 'enterpriselibraryInfo',
+            query: { userId: Number(item.projectId) }
+          })
+        } else if(item.type == '2'){
+          this.$router.push({
+            name: 'projectInfo',
+            query: { userId: Number(item.projectId) }
+          })
+        }
+      }
     },
     // 备忘录更新情况
     getMemorandum(){
@@ -585,7 +599,7 @@ export default {
       const headerHeight = header.offsetHeight;
       const elementHeightTwo = elementTwo.offsetHeight;
       const headerHeightTwo = headerTwo.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - 23;
+      this.tabHeaderOne = elementHeight - headerHeight - 28;
       this.tabHeaderTwo = elementHeightTwo - headerHeightTwo - 28;
     }
   },