功能区和投资主体

src/api/ManageApi/index.js

@@ -672,18 +672,20 @@ export function allinformation(params){
 }
 
 // //投资主体
-export function investall() {
+export function investall(params) {
   return request({
     url: '/gysl/zwStats/investors',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 
 // 功能区
-export function fungong(){
+export function fungong(params){
   return request({
     url:'/gysl/zwStats/ribbon',
-    method:'get'
+    method:'get',
+    params
   })
 }
 

src/views/components/ProjectDetails/Companyenter.vue

@@ -171,7 +171,7 @@ export default {
       form: {
         ...this.qyrzInfo
       },
-      tableData: [], // 初始化为空数组
+      tableData: [], 
       pagination: {
         currentPage: 1,
         pageSize: 10,
@@ -192,7 +192,7 @@ export default {
     };
   },
   created() {
-    this.fetchTableData(); // 仅加载数据，不主动保存
+    this.fetchTableData(); 
   },
   methods: {
     async fetchTableData() {
@@ -202,21 +202,19 @@ export default {
         this.tableData = response.data.records.map(item => ({ ...item, isEditing: false }));
         this.pagination.total = response.data.total;
 
-        // 数据加载完成后，更新 form.rzqys 并通知父组件
+        // 更新 form.rzqys
         this.form.rzqys = this.tableData.length;
-        this.$emit('update-data', { ...this.form }); // 确保传递完整数据
-      } catch (error) {
-        console.error('获取数据失败:', error);
-      }
+        this.$emit('update-data', { ...this.form }); 
+      } catch (error) {}
     }
   },
   watch: {
     qyrzInfo: {
       handler(newVal) {
-        // 仅合并父组件传入的字段，保留子组件自己的状态（如 tableData 生成的 rzqys）
+        //（如 tableData 生成的 rzqys）
         this.form = {
           ...newVal,
-          rzqys: this.tableData.length // 优先使用本地计算的 rzqys
+          rzqys: this.tableData.length //rzqys
         };
       },
       immediate: true,
@@ -232,12 +230,10 @@ export default {
         size: this.pagination.pageSize
       };
       return getqyBasicInformationPage(params).then(response => {
-        // console.log('Fetched Data:', response.data.records);
         this.tableData = response.data.records.map(item => ({
           ...item,
           isEditing: false
         }));
-        // console.log('Table Data:', this.tableData);
         this.pagination.total = response.data.total;
       }).catch();
     },
@@ -270,7 +266,6 @@ export default {
       updateqyBasicInformation(row).then(response => {
         this.$modal.msgSuccess('保存成功');
       }).catch(error => {
-        console.error('保存失败:', error);
         this.$modal.msgError('保存失败');
       });
     },
@@ -279,15 +274,11 @@ export default {
       deleteqyBasicInformation([id]).then(response => {
         this.$modal.msgSuccess('删除成功');
         this.tableData.splice(index, 1);
-        // 重新获取表格数据以确保分页正确
         this.fetchTableData().then(() => {
-          // 更新 form 数据
           this.form.rzqys = this.tableData.length;
-          // 调用 save 方法发送最新的数据
           this.save();
         });
       }).catch(error => {
-        console.error('删除失败:', error);
         this.$modal.msgError('删除失败');
       });
     },
@@ -331,7 +322,7 @@ export default {
         this.$modal.msgWarning("请先选择文件");
         return;
       }
-      // 将 xmId 添加到请求参数中
+      // xmId 请求参数
       const formData = new FormData();
       formData.append('file', this.$refs.upload.uploadFiles[0].raw);
       formData.append('xmId', this.upload.data.xmId);

src/views/components/ProjectDetails/luotu.vue

@@ -39,8 +39,6 @@ import 'mars2d/mars2d.css';
 import * as mars2d from 'mars2d';
 import axios from 'axios';
 
-const attributionHtml = `©2024 高德软件- <span>审图号：GS(2021)6375号</span>
-- 甲测资字11111093 - <a href="https://map.amap.com/doc/serviceitem.html" target="_blank" trace="tos">服务条款</a> `
 
 export default {
     data() {
@@ -163,7 +161,6 @@ export default {
                     this.$message.warning('未能获取详细地址信息');
                 }
             }).catch(error => {
-                console.error('逆地理编码失败:', error);
                 this.$message.error('获取地址信息失败');
             }).finally(() => {
                 this.loadingAddress = false;

src/views/components/analysis/all.vue

@@ -137,6 +137,7 @@ export default {
             if (year) {
                 this.selectedYear = year;
                 this.fetchProjectData();
+                this.$emit('year-change', this.selectedYear); //传值
             }
         },
 

src/views/components/analysis/function.vue

@@ -1,12 +1,11 @@
 <template>
   <!-- 功能区 -->
-  <div style="width: 100%;height: 100%;">
+  <div style="width: 100%; height: 100%;">
     <div class="itemsall">
       <span>{{ functionnumber }}</span>
       <span>项目总数</span>
     </div>
-    <div ref="chart" style="width: 30rem; height: 100%;">
-    </div>
+    <div ref="chart" style="width: 30rem; height: 100%;"></div>
   </div>
 </template>
 
@@ -16,6 +15,12 @@ import { fungong } from '@/api/ManageApi/index';
 
 export default {
   name: 'FunctionChart',
+  props: {
+    years: {
+      type: String,
+      default: new Date().getFullYear().toString()
+    }
+  },
   data() {
     return {
       functionnumber: 0,
@@ -30,18 +35,33 @@ export default {
   },
   mounted() {
     this.getData();
+    console.log("function.vue: mounted with years:", this.years); // 调试日志
+  },
+  watch: {
+    years: {
+      immediate: true,
+      handler(newVal) {
+        console.log("function.vue: years changed to:", newVal); // 调试日志
+        this.getData();
+      }
+    }
   },
   methods: {
     async getData() {
+      console.log("function.vue: getData called with years:", this.years); // 调试日志
       try {
-        const response = await fungong();
+        const response = await fungong({ years: this.years });
         if (response && response.code === 200 && response.data) {
           const totalnumber = response.data.reduce((sum, item) => sum + item.count, 0);
           this.functionnumber = totalnumber;
           this.chartData = this.processData(response.data);
           this.renderChart();
-        } else { }
-      } catch (error) { }
+        } else {
+          console.error("function.vue: 获取数据失败:", response); // 调试日志
+        }
+      } catch (error) {
+        console.error("function.vue: 请求失败:", error); // 调试日志
+      }
     },
     processData(data) {
       const names = ['高端制造与国际贸易区', '独墅湖科教创新区', '阳澄湖半岛旅游度假区', '金鸡湖商务区', '苏相合作区'];

src/views/components/analysis/invest.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 投资主体 -->
-  <div style="width: 100%;height: 100%;">
+  <div style="width: 100%; height: 100%;">
     <div class="itemsall">
       <span>{{ functionnumber }}</span>
       <span>项目总数</span>
@@ -10,15 +10,20 @@
 </template>
 
 <script>
-
 import * as echarts from 'echarts';
 import { investall } from '@/api/ManageApi/index';
 
 export default {
   name: 'RingChart',
+  props: {
+    years: {
+      type: String,
+      default: new Date().getFullYear().toString()
+    }
+  },
   data() {
     return {
-      functionnumber:0,
+      functionnumber: 0,
       chartData: [
         { value: 54, name: '国企', itemStyle: { color: '#36C3FB' } },
         { value: 65, name: '民企', itemStyle: { color: '#5B76F9' } },
@@ -29,17 +34,31 @@ export default {
   },
   mounted() {
     this.getData();
+    console.log("invest.vue: mounted with years:", this.years); // 调试日志
+  },
+  watch: {
+    years: {
+      immediate: true,
+      handler(newVal) {
+        console.log("invest.vue: years changed to:", newVal); // 调试日志
+        this.getData();
+      }
+    }
   },
   methods: {
     async getData() {
-      const response = await investall();
+      console.log("invest.vue: getData called with years:", this.years); // 调试日志
+      const response = await investall({
+        years: this.years,
+      });
       if (response && response.code === 200 && response.data) {
         const totalCount = response.data.reduce((sum, item) => sum + item.count, 0);
         this.functionnumber = totalCount;
         this.chartData = this.processData(response.data);
         this.renderChart();
-        
-      } else {}
+      } else {
+        console.error("invest.vue: 获取数据失败:", response); // 调试日志
+      }
     },
     processData(data) {
       const names = ['国企', '民企', '外企', '其他'];
@@ -47,7 +66,7 @@ export default {
       return names.map((name, index) => ({
         value: counts[index] || 0,
         name: name,
-        itemStyle: { color: ['#36C3FB', '#5B76F9', '#FAC858'][index] },
+        itemStyle: { color: ['#36C3FB', '#5B76F9', '#FAC858', '#50DFB3'][index] },
       }));
     },
     renderChart() {
@@ -58,12 +77,11 @@ export default {
           trigger: 'item'
         },
         legend: {
-          orient: 'vertical', // 图例垂直排列
-          right: '18.5%', // 图例在右侧
-          top: 'center', // 图例垂直居中
-          itemGap: 18, // 右侧间隔
+          orient: 'vertical',
+          right: '18.5%',
+          top: 'center',
+          itemGap: 18,
           formatter: function (name) {
-            // 自定义图例显示格式
             const item = this.chartData.find(item => item.name === name);
             return `${name} ${item.value}个`;
           }.bind(this)
@@ -76,7 +94,7 @@ export default {
             center: ['30%', '50%'],
             data: this.chartData,
             label: {
-              show: false 
+              show: false
             },
             emphasis: {
               itemStyle: {

src/views/statistics/index.vue

@@ -4,7 +4,7 @@
     <div class="dashboard-row">
       <div class="dashboard-col wide">
         <div class="allarea">
-          <AllArea />
+          <AllArea @year-change="handleYearChange" />
         </div>
       </div>
       <div class="dashboard-col narrow">
@@ -27,15 +27,14 @@
           <span>功能区</span>
         </div>
         <div class="relaitem">
-
-          <FunctionArea />
+          <FunctionArea :years="years" />
         </div>
-        
+
         <div class="itemhead" style="margin: 0;">
           <span>投资主体</span>
         </div>
         <div class="relaitem">
-          <InvestArea />
+          <InvestArea :years="years" />
         </div>
       </div>
     </div>
@@ -96,6 +95,7 @@ export default {
   },
   data() {
     return {
+      years: new Date().getFullYear().toString(),
       allnumber: {
         touzinumber: 0
       },
@@ -105,6 +105,10 @@ export default {
     };
   },
   methods: {
+    handleYearChange(years) {
+      this.years = years;
+      console.log("index.vue: handleYearChange called with years:", years); // 添加调试日志
+    },
     async getData() {
       const response = await investall();
       if (response && response.data) {
@@ -133,6 +137,7 @@ export default {
 };
 </script>
 
+
 <style scoped>
 .dashboard-container {
   display: flex;
@@ -147,25 +152,27 @@ export default {
 .dashboard-row {
   display: flex;
   flex: 1;
-  gap: 0.5rem; 
+  gap: 0.5rem;
 }
-.dashboard-rowtwo{
+
+.dashboard-rowtwo {
   display: flex;
   flex: 3;
-  gap: 0.5rem; 
+  gap: 0.5rem;
   flex-wrap: nowrap;
 }
+
 .dashboard-col {
   flex: 1;
   background-color: #FFFFFF;
-  border-radius: 0.5rem; 
+  border-radius: 0.5rem;
   display: flex;
   flex-direction: column;
   overflow: hidden;
 }
 
 .dashboard-col.wide {
-  flex: 2; 
+  flex: 2;
 }
 
 .dashboard-col.narrow {
@@ -184,7 +191,7 @@ export default {
 
 .relaitem {
   flex: 1;
-  position: relative; 
+  position: relative;
 }
 
 .itemsall {
@@ -252,12 +259,12 @@ export default {
   .dashboard-row {
     flex-direction: column;
   }
-  
-  .dashboard-col.wide, 
+
+  .dashboard-col.wide,
   .dashboard-col.narrow {
     flex: 1;
   }
-  
+
   .itemsall {
     top: 2rem;
     left: 50%;