From e577122bee1f1403400d976d7609d3c437d60a68 Mon Sep 17 00:00:00 2001
From: yanfeiyong <2060201549@qq.com>
Date: Wed, 14 May 2025 09:11:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=97=A0=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=EF=BC=8C=E6=B8=85=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectDetails/Projectpicture.vue         |  1 -
 src/views/components/analysis/chanyexfgl.vue  |  2 +-
 src/views/components/analysis/map.vue         | 22 +++++++++----
 src/views/evalute/evalist/index.vue           | 33 ++++++++++---------
 src/views/statistics/1.vue                    |  2 +-
 src/views/statistics/index.vue                | 11 ++++---
 6 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/src/views/components/ProjectDetails/Projectpicture.vue b/src/views/components/ProjectDetails/Projectpicture.vue
index 0b4debb..4300f53 100644
--- a/src/views/components/ProjectDetails/Projectpicture.vue
+++ b/src/views/components/ProjectDetails/Projectpicture.vue
@@ -83,7 +83,6 @@ export default {
         };
     },
     mounted() {
-        // console.log("传过来的" + this.id);
         this.fetchData();
         this.fetchDescriptionData();
     },
diff --git a/src/views/components/analysis/chanyexfgl.vue b/src/views/components/analysis/chanyexfgl.vue
index 566e8ab..1c61008 100644
--- a/src/views/components/analysis/chanyexfgl.vue
+++ b/src/views/components/analysis/chanyexfgl.vue
@@ -67,7 +67,7 @@ export default {
 <style scoped>
 .progress-container {
     width: 100%;
-    height: 100%;
+    height: 9rem;
     padding: 0 3rem 0 0;
     overflow: auto;
     font-family: aliregular;
diff --git a/src/views/components/analysis/map.vue b/src/views/components/analysis/map.vue
index e6b29d2..f031b91 100644
--- a/src/views/components/analysis/map.vue
+++ b/src/views/components/analysis/map.vue
@@ -3,6 +3,7 @@
     <div class="containertwo">
       <!-- 地图区域 -->
       <div class="mapareaone">
+        
         <!-- 展开/隐藏控制按钮（放在盒子右侧外部） -->
         <div class="collapse-control" @click="toggleCollapse">
           <img v-show="!isCollapsed" src="@/assets/images/icon-sq@2x.png" alt="隐藏" class="control-icon">
@@ -16,6 +17,7 @@
             <ProjectList />
           </div>
         </div>
+
         <!-- 右侧搜索 -->
         <div class="rightdiv">
           <el-input v-model="searchBox" placeholder="请输入项目名称" class="search-input" @input="handleSearchInput"
@@ -23,6 +25,7 @@
             <el-button slot="append" icon="el-icon-search" @click="toSearch"></el-button>
           </el-input>
         </div>
+
         <!-- 搜索结果列表 -->
         <div class="search-results" v-if="searchList && searchList.length > 0">
           <div class="search-item" v-for="(item, index) in searchList" :key="index" @click="centerMap(item)">
@@ -33,7 +36,6 @@
         <!-- 右侧地图区域 -->
         <div class="map-container">
           <div id="mars2dContainerSSS" class="mars2d-container"></div>
-
         </div>
       </div>
     </div>
@@ -44,6 +46,7 @@
         <i class="el-icon-close"></i>
       </div>
       <div class="dialog-content">
+         <!-- @click="goToDetail ↓" -->
         <div class="dialog-title">{{ selectedProject.name }}</div>
         <div class="dialog-info">
           <p><span class="label">状态:</span>
@@ -67,10 +70,8 @@ import * as mars2d from 'mars2d';
 import ProjectList from '@/views/components/analysis/projectList.vue'
 import { getBasicInformationPage } from "@/api/ManageApi/index";
 import { debounce } from 'lodash';
-
 import suzhouData from '@/assets/json/suzhou.json'
 
-
 // 自定义指令
 // 点击外部关闭弹窗
 const clickOutside = {
@@ -167,19 +168,27 @@ export default {
     }
   },
   methods: {
+    /** 详情按钮操作 */
+    goToDetail() {
+      const id = this.selectedProject.id;
+      this.$store.commit("SET_CRUMBS", "项目详情");
+      this.$router.push({
+        path: `/manage-add/${id}`,
+        query: { action: 'detail' }
+      });
+    },
     // 初始化地图
     initMap() {
       this.map = new mars2d.Map('mars2dContainerSSS', this.mapOptions);
       this.map.on('load', this.onMapLoad);
     },
-
     onMapLoad() {
       this.addSuzhouIndustrialParkLayer();
     },
     // 园区
     async addSuzhouIndustrialParkLayer() {
       try {
-        const geoJsonData = suzhouData; // 直接使用导入的数据
+        const geoJsonData = suzhouData;
         const graphicLayer = new mars2d.layer.GraphicLayer({
           name: "苏州园区高亮区域",
           zIndex: 10
@@ -463,6 +472,7 @@ export default {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+  cursor: pointer;
 }
 
 .dialog-info {
@@ -505,7 +515,7 @@ export default {
 
 .map-container {
   width: 100%;
-  height: 25rem;
+  height: 100%;
   position: relative;
 }
 
diff --git a/src/views/evalute/evalist/index.vue b/src/views/evalute/evalist/index.vue
index 836f994..a677494 100644
--- a/src/views/evalute/evalist/index.vue
+++ b/src/views/evalute/evalist/index.vue
@@ -38,8 +38,8 @@
         <el-row>
           <el-col :span="8">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search"  @click="handleQuery">查询</el-button>
-              <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
+              <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -72,9 +72,9 @@
             {{ scope.row.pjdj }} / {{ scope.row.count }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right"  align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
-            <el-button  type="text" @click="handleInfo(scope.row, 'detail')">详情</el-button>
+            <el-button type="text" @click="handleInfo(scope.row, 'detail')">详情</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -105,7 +105,7 @@ export default {
         endTime: '',
         xzfl: '',
         pjdj: '',
-        qdpjdj:'',
+        qdpjdj: '',
       },
       showSearch: true,
       dialogVisible: false,
@@ -131,11 +131,10 @@ export default {
   methods: {
     checkPermi,
     checkRole,
-    handleSortChange({ prop, order }) {
-      if (order === 'ascending') {
-        this.postList.sort((a, b) => a[prop] - b[prop]);
-      } else if (order === 'descending') {
-        this.postList.sort((a, b) => b[prop] - a[prop]);
+    handleSortChange({ column, prop, order }) {
+      if (prop === 'pjdj') {
+        this.queryParams.sort = order === 'ascending' ? 1 : 2;
+        this.getList();
       }
     },
     handleQuery() {
@@ -163,23 +162,27 @@ export default {
         xzfl: this.queryParams.xzfl,
         pjdj: this.queryParams.pjdj,
         begainTime: this.queryParams.begainTime || null,
-        endTime: this.queryParams.endTime || null
+        endTime: this.queryParams.endTime || null,
+        sort: this.queryParams.sort || 1 // 默认正序
       };
 
       getProjectEvaluationList(params)
         .then(response => {
-          this.postList = response.data.records;
-          this.total = response.data.total;
+          this.postList = response.data?.records || [];
+          this.total = response.data?.total || 0;
+        })
+        .catch(error => {
+          console.error('获取项目评价失败:', error);
+          this.$message.error('数据加载失败');
         })
         .finally(() => {
           this.loading = false;
         });
     },
     handleSelectionChange(selection) {
-      // 处理选择项变化
     },
     handleInfo(row, type) {
-      this.$store.commit("SET_CRUMBS",  "项目详情");
+      this.$store.commit("SET_CRUMBS", "项目详情");
       const id = row.id || this.ids[0];
       this.$router.push({ path: `/manage-add/${id}`, query: { action: type } });
     },
diff --git a/src/views/statistics/1.vue b/src/views/statistics/1.vue
index db8d707..a9a9a36 100644
--- a/src/views/statistics/1.vue
+++ b/src/views/statistics/1.vue
@@ -159,7 +159,7 @@ export default {
 
 .dashboard-rowtwo {
   display: flex;
-  height: auto;
+  flex: 1;
   gap: 0.5rem;
 
 }
diff --git a/src/views/statistics/index.vue b/src/views/statistics/index.vue
index db8d707..3a4c6ee 100644
--- a/src/views/statistics/index.vue
+++ b/src/views/statistics/index.vue
@@ -1,5 +1,4 @@
 <template>
-  <!-- 正式的统计页面 -->
   <div class="dashboard-container">
     <!-- 1 -->
     <div class="dashboard-row">
@@ -58,11 +57,11 @@
           <Cydxml />
         </div>
       </div>
-      <div class="dashboard-col" style="height: 11rem;">
+      <div class="dashboard-col">
         <div class="itemhead">
           <span>产业导向细分产业分析</span>
         </div>
-        <div class="relaitem" style="height: 9rem;">
+        <div class="relaitem">
           <Cydxxfgl />
         </div>
       </div>
@@ -108,7 +107,7 @@ export default {
   methods: {
     handleYearChange(years) {
       this.years = years;
-      console.log("index.vue: handleYearChange called with years:", years);
+      console.log("index.vue: handleYearChange called with years:", years); 
     },
     async getData() {
       const response = await investall();
@@ -159,7 +158,7 @@ export default {
 
 .dashboard-rowtwo {
   display: flex;
-  height: auto;
+  flex: 2;
   gap: 0.5rem;
 
 }
@@ -255,4 +254,6 @@ export default {
 .bgcicon {
   padding: 0 !important;
 }
+
+
 </style>
\ No newline at end of file