diff --git a/pages/market/components/cardMoudule.vue b/pages/market/components/cardMoudule.vue
index b48cb00..2be83e9 100644
--- a/pages/market/components/cardMoudule.vue
+++ b/pages/market/components/cardMoudule.vue
@@ -17,7 +17,7 @@
       </view>
 
       <view class="largeAmountOfTextCss" v-if="item.cardType == 2">
-        为了精准掌握玉林中燃经营区域及周边市场发展态势，预测2023财年市场开发计划和未来市场发展方向，按照集团三年发展规划及高质量发展的要求，玉林中燃积极开展了一次全面、系统、深入的全方面市场调研工作。
+        {{ item.value }}
       </view>
 
       <view class="u-demo-block" v-if="item.cardType == 3">
diff --git a/pages/market/components/reportModule1.vue b/pages/market/components/reportModule1.vue
index 43acd59..cfc1f9f 100644
--- a/pages/market/components/reportModule1.vue
+++ b/pages/market/components/reportModule1.vue
@@ -34,19 +34,19 @@
       </u-collapse>
     </view>
     <view class="cardCss">
-      <u-collapse :border="false" :value="['2']">
+      <u-collapse :border="false" :value="['3']">
         <u-collapse-item name="2">
           <text slot="title" class="slot-title">实施情况</text>
-          <view class="largeAmountOfTextCss" v-if="reportData.implementationSituation != '' && reportData.implementationSituation != null">
-            {{reportData.implementationSituation}}
+          <view class="largeAmountOfTextCss">
+            {{reportData.implementationSituation || ""}}
           </view>
         </u-collapse-item>
       </u-collapse>
     </view>
 
     <view class="cardCss">
-      <u-collapse :border="false" :value="['2']">
-        <u-collapse-item name="2">
+      <u-collapse :border="false" :value="['3']">
+        <u-collapse-item name="3">
           <text slot="title" class="slot-title">预算主体附件</text>
           <view class="attachmentCss">
             <view class="flexCss">
@@ -87,7 +87,6 @@
     },
     data() {
       return {
-        list:12
       }
     },
     computed: {
diff --git a/pages/market/components/reportModule2.vue b/pages/market/components/reportModule2.vue
index 60d9241..936cb3d 100644
--- a/pages/market/components/reportModule2.vue
+++ b/pages/market/components/reportModule2.vue
@@ -1,345 +1,412 @@
 <template>
   <view class="ComCss">
-    <cardMoudule :cardData="data1" :required="false" title="总体概况"></cardMoudule>
-    <cardMoudule :cardData="data2" :required="true" title="城市总体发展规划"></cardMoudule>
-    <cardMoudule :cardData="data3" :required="false" title="经营区域及人口_经营区域(四至边界)"></cardMoudule>
-    <cardMoudule :cardData="data4" :required="false" title="经营区域及人口_经营区域人口"></cardMoudule>
-    <cardMoudule :cardData="data5" :required="true" title="管道燃气竞争对手及发展现状"></cardMoudule>
-    <cardMoudule :cardData="data6" :required="false" title="管道燃气竞争对手及发展现状"></cardMoudule>
-    <cardMoudule :cardData="data7" :required="true" title="气源保障与管网规划"></cardMoudule>
-    <cardMoudule :cardData="data8" :required="false" title="建成区: 经营区域城市建成区"></cardMoudule>
-    <cardMoudule :cardData="data9" :required="false" title="乡镇及农村:乡镇及农村区域"></cardMoudule>
-    <cardMoudule :cardData="data10" :required="false" title="历史近4年和当前预算完成情况"></cardMoudule>
-    <cardMoudule :cardData="data11" :required="false" title="能源市场分析_天燃气与各燃气经济价格对比表"></cardMoudule>
-    <cardMoudule :cardData="data12" :required="false" title="能源市场分析_不同类型的客户选用燃料分析"></cardMoudule>
-    <cardMoudule :cardData="data13" :required="false" title="市场开发团队建设状况"></cardMoudule>
+    <cardMoudule :cardData="population" :required="false" title="总体概况"></cardMoudule>
+    <cardMoudule :cardData="urbanDevelopment" :required="true" title="城市总体发展规划"></cardMoudule>
+    <cardMoudule :cardData="natureOfBusiness" :required="false" title="经营区域及人口_经营区域(四至边界)"></cardMoudule>
+    <cardMoudule :cardData="regionalPopulation" :required="false" title="经营区域及人口_经营区域人口"></cardMoudule>
+    <cardMoudule :cardData="gasCompetition1" :required="true" title="管道燃气竞争对手及发展现状"></cardMoudule>
+    <cardMoudule :cardData="gasCompetition2" :required="false" title="管道燃气竞争对手及发展现状"></cardMoudule>
+    <cardMoudule :cardData="guarantee" :required="true" title="气源保障与管网规划"></cardMoudule>
+    <cardMoudule :cardData="builtUpArea" :required="false" title="建成区: 经营区域城市建成区"></cardMoudule>
+    <cardMoudule :cardData="ruralAreas" :required="false" title="乡镇及农村:乡镇及农村区域"></cardMoudule>
+    <cardMoudule :cardData="completionStatus" :required="false" title="历史近4年和当前预算完成情况"></cardMoudule>
+    <cardMoudule :cardData="naturalGas" :required="false" title="能源市场分析_天燃气与各燃气经济价格对比表"></cardMoudule>
+    <cardMoudule :cardData="energyAnalysis" :required="false" title="能源市场分析_不同类型的客户选用燃料分析"></cardMoudule>
+    <cardMoudule :cardData="teamStatus" :required="false" title="市场开发团队建设状况"></cardMoudule>
   </view>
 </template>
 
 <script>
-  import {
-    data
-  } from "../../../uni_modules/uview-ui/libs/mixin/mixin"
   import cardMoudule from "./cardMoudule.vue"
   export default {
     components: {
       cardMoudule
     },
     props: {
-
+      reportData: {
+        type: Object
+      },
+      attachment: {
+        type: Object
+      },
     },
     data() {
       return {
-        data1: [{
+        population: [{
             cardType: 1,
             required: true,
             title: '预算主体名称',
-            value: "2023年玉林市城市总体规划",
-            icon: "arrow-down"
+            value: "",
+            icon: "arrow-down",
+            key: "mainName"
           },
           {
             cardType: 1,
             required: false,
             title: '成立时间(年/月)',
-            value: "2019年9月",
-            icon: "calendar"
+            value: "",
+            icon: "calendar",
+            key: "establishmentTime"
           },
           {
             cardType: 1,
             required: false,
             title: '与中燃合资时间(年/月)',
-            value: "2019年9月",
-            icon: "calendar"
+            value: "",
+            icon: "calendar",
+            key: "mergeTime"
           },
           {
             cardType: 1,
             required: false,
             title: '过渡气源通气时间(年/月)',
-            value: "2019年9月",
-            icon: "calendar"
+            value: "",
+            icon: "calendar",
+            key: "transitionTime"
+          },
+          {
+            cardType: 1,
+            required: false,
+            title: '管输气通气时间(年/月)',
+            value: "",
+            icon: "calendar",
+            key: "conduitTime"
           },
           {
             cardType: 1,
             required: true,
             title: '特许经营区域范围的行政区划(或与政府约定的经营区域范围)',
-            value: "文本",
+            value: "",
+            key: "privilegeRegion"
           },
           {
             cardType: 1,
             required: true,
             title: '经营区域面积(平方公里)',
-            value: "176",
+            value: "",
+            key: "manageArea"
           },
           {
             cardType: 1,
             required: true,
             title: '经营区域城市建成区行政区划',
-            value: "文本",
+            value: "",
+            key: "manageRegion"
           },
           {
             cardType: 1,
             required: true,
             title: '居民管道燃气安装确认户数',
-            value: "100",
+            value: "",
+            key: "confirmHousehold"
           },
           {
             cardType: 1,
             required: true,
             title: '经营区域城市建成区中压管网已覆盖户',
-            value: "10",
+            value: "",
+            key: "builtCoveredHousehold"
           },
           {
             cardType: 1,
             required: true,
             title: '气化率%',
-            value: "10",
+            value: "",
+            key: "gasRate"
           },
           {
             cardType: 1,
             required: true,
             title: '管网覆盖率%',
-            value: "10",
+            value: "",
+            key: "coverageRate"
           },
           {
             cardType: 1,
             required: true,
             title: '经营区域范围内，城市建成区以外的管网已覆盖的乡镇明细清单(填乡镇名字)',
-            value: "文本",
+            value: "",
+            key: "coveredTowns"
           },
           {
             cardType: 1,
             required: true,
             title: '经营区域范国内，城市建成区以外的管网已覆盖的乡镇人口户数(户)',
-            value: "文本",
+            value: "",
+            key: "outsideCoveredHousehold"
           },
           {
             cardType: 1,
             required: true,
             title: '经营区域范围内，管网未盖、但符合集团投资标准乡镇清单(填乡镇名字)',
-            value: "文本",
+            value: "",
+            key: "uncoveredTowns"
           },
           {
             cardType: 1,
             required: true,
             title: '经营区域范围内，管网未覆盖、但符合集团投资标准乡镇人口(户)',
-            value: "文本",
+            value: "",
+            key: "uncoveredHousehold"
           },
         ],
-        data2: [{
+        urbanDevelopment: [{
           cardType: 2,
           required: true,
           title: '预算主体名称',
-          value: "2023年玉林市城市总体规划",
-          icon: "arrow-down"
+          value: "",
+          icon: "arrow-down",
+          key: "developmentPlan"
         }],
-        data3: [{
+        natureOfBusiness: [{
             cardType: 1,
             required: true,
             title: '东至',
-            value: "100度",
+            value: "",
+            key: "manageRegionEast"
           },
           {
             cardType: 1,
             required: true,
             title: '西至',
-            value: "100度",
+            value: "",
+            key: "manageRegionWest"
           },
           {
             cardType: 1,
             required: true,
             title: '南至',
-            value: "100度",
+            value: "",
+            key: "manageRegionSouth"
           },
           {
             cardType: 1,
             required: true,
             title: '北至',
-            value: "100度",
+            value: "",
+            key: "manageRegionNorth"
           }
         ],
-        data4: [{
+        regionalPopulation: [{
             cardType: 1,
             required: true,
             title: '经营区域范围内总人口(万人)',
-            value: "100",
+            value: "",
+            key: "manageTotalNumber"
           },
           {
             cardType: 1,
             required: true,
             title: '建成区常住人口(万人)',
-            value: "100",
+            value: "",
+            key: "builtResidentNumber"
           },
           {
             cardType: 1,
             required: true,
             title: '建成区常住人口(万户)',
-            value: "100",
+            value: "",
+            key: "builtResidentHousehold"
           },
           {
             cardType: 1,
             required: true,
             title: '建成区户均人口(人/户)',
-            value: "100",
+            value: "",
+            key: "builtAverage"
           },
           {
             cardType: 1,
             required: true,
             title: '乡镇常住人口(万人)',
-            value: "100",
+            value: "",
+            key: "townsResidentNumber"
           },
           {
             cardType: 1,
             required: true,
             title: '乡镇常住人口(万户)',
-            value: "100",
+            value: "",
+            key: "townsResidentHousehold"
           },
           {
             cardType: 1,
             required: true,
             title: '乡镇户均人口(人/户)',
-            value: "100",
+            value: "",
+            key: "townsAverage"
           }
         ],
-        data5: [{
+        gasCompetition1: [{
           cardType: 2,
           required: true,
-          value: "2023年玉林市城市总体规划",
+          value: "",
+          key: "competitorDevelopmentSituation"
         }],
-        data6: [{
+        gasCompetition2: [{
             cardType: 3,
             required: true,
             title: '新户',
-            value: "2023年玉林市城市总体规划",
+            value: "",
           },
           {
             cardType: 2,
             required: true,
-            value: "2023年玉林市城市总体规划",
+            value: "",
+            key: "newDevelopmentSituation"
           },
           {
             cardType: 3,
             required: true,
             title: '老户',
-            value: "2023年玉林市城市总体规划",
+            value: "",
           },
           {
             cardType: 2,
             required: true,
-            value: "2023年玉林市城市总体规划",
+            value: "",
+            key: "oldDevelopmentSituation"
           },
           {
             cardType: 3,
             required: true,
             title: '农村居民市场',
-            value: "2023年玉林市城市总体规划",
+            value: "",
           },
           {
             cardType: 2,
             required: true,
-            value: "2023年玉林市城市总体规划",
+            value: "",
+            key: "villageDevelopmentSituation"
           },
           {
             cardType: 3,
             required: true,
             title: '工商户',
-            value: "2023年玉林市城市总体规划",
+            value: "",
           },
           {
             cardType: 2,
             required: true,
-            value: "2023年玉林市城市总体规划",
+            value: "",
+            key: "commerceDevelopmentSituation"
           }
         ],
-        data7: [{
+        guarantee: [{
           cardType: 2,
           required: true,
-          title: '预算主体名称',
-          value: "2023年玉林市城市总体规划",
-          icon: "arrow-down"
+          value: "",
+          icon: "arrow-down",
+          key: "pipelinePlan"
         }],
-        data8: [{
+        builtUpArea: [{
             cardType: 3,
             required: true,
             title: '新居民',
-            value: "2023年玉林市城市总体规划",
+            value: "",
           },
           {
             cardType: 1,
             required: true,
             title: '总规模户数',
-            value: "100",
+            value: "",
+            key: "cityNewUser",
+            id: "0"
           },
           {
             cardType: 1,
             required: true,
             title: '累计财务确认安装户数',
-            value: "100",
+            value: "",
+            key: "cityNewUser",
+            id: "1"
           },
           {
             cardType: 1,
             required: true,
             title: '累计报装户数',
-            value: "100",
+            value: "",
+            key: "cityNewUser",
+            id: "2"
           },
           {
             cardType: 1,
             required: true,
             title: '现有点火通气户数',
-            value: "100",
+            value: "",
+            key: "cityNewUser",
+            id: "3"
           },
           {
             cardType: 1,
             required: true,
             title: '累计不可开发户数',
-            value: "100",
+            value: "",
+            key: "cityNewUser",
+            id: "4"
           },
           {
             cardType: 1,
             required: true,
             title: '剩余可开发户数',
-            value: "100",
+            value: "",
+            key: "cityNewUser",
+            id: "5"
           },
           {
             cardType: 3,
             required: true,
             title: '老居民',
             value: "2023年玉林市城市总体规划",
+            key: ""
           },
           {
             cardType: 1,
             required: true,
             title: '总规模户数',
-            value: "100",
+            value: "",
+            key: "cityOldUser",
+            id: "0"
           },
           {
             cardType: 1,
             required: true,
             title: '累计财务确认安装户数',
-            value: "100",
+            value: "",
+            key: "cityOldUser",
+            id: "1"
           },
           {
             cardType: 1,
             required: true,
             title: '累计报装户数',
-            value: "100",
+            value: "",
+            key: "cityOldUser",
+            id: "2"
           },
           {
             cardType: 1,
             required: true,
             title: '现有点火通气户数',
-            value: "100",
+            value: "",
+            key: "cityOldUser",
+            id: "3"
           },
           {
             cardType: 1,
             required: true,
             title: '累计不可开发户数',
-            value: "100",
+            value: "",
+            key: "cityOldUser",
+            id: "4"
           },
           {
             cardType: 1,
             required: true,
             title: '剩余可开发户数',
-            value: "100",
+            value: "",
+            key: "cityOldUser",
+            id: "5"
           },
           {
             cardType: 3,
@@ -351,37 +418,49 @@
             cardType: 1,
             required: true,
             title: '总规模户数',
-            value: "100",
+            value: "",
+            key: "cityCommerceUser",
+            id: "0"
           },
           {
             cardType: 1,
             required: true,
             title: '累计财务确认安装户数',
-            value: "100",
+            value: "",
+            key: "cityCommerceUser",
+            id: "1"
           },
           {
             cardType: 1,
             required: true,
             title: '累计报装户数',
-            value: "100",
+            value: "",
+            key: "cityCommerceUser",
+            id: "2"
           },
           {
             cardType: 1,
             required: true,
             title: '现有点火通气户数',
-            value: "100",
+            value: "",
+            key: "cityCommerceUser",
+            id: "3"
           },
           {
             cardType: 1,
             required: true,
             title: '累计不可开发户数',
-            value: "100",
+            value: "",
+            key: "cityCommerceUser",
+            id: "4"
           },
           {
             cardType: 1,
             required: true,
             title: '剩余可开发户数',
-            value: "100",
+            value: "",
+            key: "cityCommerceUser",
+            id: "5"
           },
           {
             cardType: 3,
@@ -393,37 +472,49 @@
             cardType: 1,
             required: true,
             title: '总规模户数',
-            value: "100",
+            value: "",
+            key: "cityIndustryUser",
+            id: "0"
           },
           {
             cardType: 1,
             required: true,
             title: '累计财务确认安装户数',
-            value: "100",
+            value: "",
+            key: "cityIndustryUser",
+            id: "1"
           },
           {
             cardType: 1,
             required: true,
             title: '累计报装户数',
-            value: "100",
+            value: "",
+            key: "cityIndustryUser",
+            id: "2"
           },
           {
             cardType: 1,
             required: true,
             title: '现有点火通气户数',
-            value: "100",
+            value: "",
+            key: "cityIndustryUser",
+            id: "3"
           },
           {
             cardType: 1,
             required: true,
             title: '累计不可开发户数',
-            value: "100",
+            value: "",
+            key: "cityIndustryUser",
+            id: "4"
           },
           {
             cardType: 1,
             required: true,
             title: '剩余可开发户数',
-            value: "100",
+            value: "",
+            key: "cityIndustryUser",
+            id: "5"
           },
           {
             cardType: 3,
@@ -435,206 +526,262 @@
             cardType: 1,
             required: true,
             title: '总规模户数',
-            value: "100",
+            value: "",
+            key: "cityTotalUser",
+            id: "0"
           },
           {
             cardType: 1,
             required: true,
             title: '累计财务确认安装户数',
-            value: "100",
+            value: "",
+            key: "cityTotalUser",
+            id: "1"
           },
           {
             cardType: 1,
             required: true,
             title: '累计报装户数',
-            value: "100",
+            value: "",
+            key: "cityTotalUser",
+            id: "2"
           },
           {
             cardType: 1,
             required: true,
             title: '现有点火通气户数',
-            value: "100",
+            value: "",
+            key: "cityTotalUser",
+            id: "3"
           },
           {
             cardType: 1,
             required: true,
             title: '累计不可开发户数',
-            value: "100",
+            value: "",
+            key: "cityTotalUser",
+            id: "4"
           },
           {
             cardType: 1,
             required: true,
             title: '剩余可开发户数',
-            value: "100",
+            value: "",
+            key: "cityTotalUser",
+            id: "5"
           }
         ],
-        data9: [{
+        ruralAreas: [{
             cardType: 3,
             required: true,
             title: '新居民',
-            value: "2023年玉林市城市总体规划",
           },
           {
             cardType: 1,
             required: true,
             title: '总规模户数',
-            value: "100",
+            value: "",
+            key: "townsNewUser",
+            id: "0"
           },
           {
             cardType: 1,
             required: true,
             title: '累计财务确认安装户数',
-            value: "100",
+            value: "",
+            key: "townsNewUser",
+            id: "1"
           },
           {
             cardType: 1,
             required: true,
             title: '累计报装户数',
-            value: "100",
+            value: "",
+            key: "townsNewUser",
+            id: "2"
           },
           {
             cardType: 1,
             required: true,
             title: '现有点火通气户数',
-            value: "100",
+            value: "",
+            key: "townsNewUser",
+            id: "3"
           },
           {
             cardType: 1,
             required: true,
             title: '累计不可开发户数',
-            value: "100",
+            value: "",
+            key: "townsNewUser",
+            id: "4"
           },
           {
             cardType: 1,
             required: true,
             title: '剩余可开发户数',
-            value: "100",
+            value: "",
+            key: "townsNewUser",
+            id: "5"
           },
           {
             cardType: 3,
             required: true,
             title: '老居民',
-            value: "2023年玉林市城市总体规划",
           },
           {
             cardType: 1,
             required: true,
             title: '总规模户数',
-            value: "100",
+            value: "",
+            key: "townsOldUser",
+            id: "0"
           },
           {
             cardType: 1,
             required: true,
             title: '累计财务确认安装户数',
-            value: "100",
+            value: "",
+            key: "townsOldUser",
+            id: "1"
           },
           {
             cardType: 1,
             required: true,
             title: '累计报装户数',
-            value: "100",
+            value: "",
+            key: "townsOldUser",
+            id: "2"
           },
           {
             cardType: 1,
             required: true,
             title: '现有点火通气户数',
-            value: "100",
+            value: "",
+            key: "townsOldUser",
+            id: "3"
           },
           {
             cardType: 1,
             required: true,
             title: '累计不可开发户数',
-            value: "100",
+            value: "",
+            key: "townsOldUser",
+            id: "4"
           },
           {
             cardType: 1,
             required: true,
             title: '剩余可开发户数',
-            value: "100",
+            value: "",
+            key: "townsOldUser",
+            id: "5"
           },
           {
             cardType: 3,
             required: true,
             title: '商业(含公福)',
-            value: "2023年玉林市城市总体规划",
           },
           {
             cardType: 1,
             required: true,
             title: '总规模户数',
-            value: "100",
+            value: "",
+            key: "townsCommerceUser",
+            id: "0"
           },
           {
             cardType: 1,
             required: true,
             title: '累计财务确认安装户数',
-            value: "100",
+            value: "",
+            key: "townsCommerceUser",
+            id: "1"
           },
           {
             cardType: 1,
             required: true,
             title: '累计报装户数',
-            value: "100",
+            value: "",
+            key: "townsCommerceUser",
+            id: "2"
           },
           {
             cardType: 1,
             required: true,
             title: '现有点火通气户数',
-            value: "100",
+            value: "",
+            key: "townsCommerceUser",
+            id: "3"
           },
           {
             cardType: 1,
             required: true,
             title: '累计不可开发户数',
-            value: "100",
+            value: "",
+            key: "townsCommerceUser",
+            id: "4"
           },
           {
             cardType: 1,
             required: true,
             title: '剩余可开发户数',
-            value: "100",
+            value: "",
+            key: "townsCommerceUser",
+            id: "5"
           },
           {
             cardType: 3,
             required: true,
             title: '工业',
-            value: "2023年玉林市城市总体规划",
           },
           {
             cardType: 1,
             required: true,
             title: '总规模户数',
-            value: "100",
+            value: "",
+            key: "townsIndustryUser",
+            id: "0"
           },
           {
             cardType: 1,
             required: true,
             title: '累计财务确认安装户数',
-            value: "100",
+            value: "",
+            key: "townsIndustryUser",
+            id: "1"
           },
           {
             cardType: 1,
             required: true,
             title: '累计报装户数',
-            value: "100",
+            value: "",
+            key: "townsIndustryUser",
+            id: "2"
           },
           {
             cardType: 1,
             required: true,
             title: '现有点火通气户数',
-            value: "100",
+            value: "",
+            key: "townsIndustryUser",
+            id: "3"
           },
           {
             cardType: 1,
             required: true,
             title: '累计不可开发户数',
-            value: "100",
+            value: "",
+            key: "townsIndustryUser",
+            id: "4"
           },
           {
             cardType: 1,
             required: true,
             title: '剩余可开发户数',
-            value: "100",
+            value: "",
+            key: "townsIndustryUser",
+            id: "5"
           },
           {
             cardType: 3,
@@ -646,146 +793,1120 @@
             cardType: 1,
             required: true,
             title: '总规模户数',
-            value: "100",
+            value: "",
+            key: "townsTotalUser",
+            id: "0"
           },
           {
             cardType: 1,
             required: true,
             title: '累计财务确认安装户数',
-            value: "100",
+            value: "",
+            key: "townsTotalUser",
+            id: "1"
           },
           {
             cardType: 1,
             required: true,
             title: '累计报装户数',
-            value: "100",
+            value: "",
+            key: "townsTotalUser",
+            id: "2"
           },
           {
             cardType: 1,
             required: true,
             title: '现有点火通气户数',
-            value: "100",
+            value: "",
+            key: "townsTotalUser",
+            id: "3"
           },
           {
             cardType: 1,
             required: true,
             title: '累计不可开发户数',
-            value: "100",
+            value: "",
+            key: "townsTotalUser",
+            id: "4"
           },
           {
             cardType: 1,
             required: true,
             title: '剩余可开发户数',
-            value: "100",
+            value: "",
+            key: "townsTotalUser",
+            id: "5"
           }
         ],
-        data10: [{
+        completionStatus: [
+          //新建居民用户历史完成情况
+          {
             cardType: 3,
             required: true,
-            title: '新建居民用户(含乡镇新房)_2023财年(预计)',
-            value: "2023年玉林市城市总体规划",
+            title: `新建居民用户(含乡镇新房)_${this.attachment.fiscalYear}财年(预计)`,
           },
           {
             cardType: 1,
             required: true,
             title: '总预算任务数',
-            value: "100",
+            value: "",
+            key: "newUserSituation",
+            id: "0"
           },
           {
             cardType: 1,
             required: true,
             title: '实际完成数',
-            value: "100",
-          }
-        ],
-        data11: [{
+            value: "",
+            key: "newUserSituation",
+            id: "1"
+          },
+          {
             cardType: 3,
             required: true,
-            title: '民用天燃气(Nm3)',
-            value: "2023年玉林市城市总体规划",
+            title: `新建居民用户(含乡镇新房)_${this.attachment.fiscalYear - 1}财年`,
           },
           {
             cardType: 1,
             required: true,
-            title: '平台热值(Kcal)',
-            value: "100",
+            title: '总预算任务数',
+            value: "",
+            key: "newUserSituation",
+            id: "2"
           },
           {
             cardType: 1,
             required: true,
-            title: '市场价(元)',
-            value: "100",
+            title: '实际完成数',
+            value: "",
+            key: "newUserSituation",
+            id: "3"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `新建居民用户(含乡镇新房)_${this.attachment.fiscalYear - 2}财年`,
           },
           {
             cardType: 1,
             required: true,
-            title: '折合1Nm3天燃气价格(元)',
-            value: "100",
-          }
-        ],
-        data12: [{
-          cardType: 2,
-          required: true,
-          title: '预算主体名称',
-          value: "2023年玉林市城市总体规划",
-        }],
-        data13: [{
+            title: '总预算任务数',
+            value: "",
+            key: "newUserSituation",
+            id: "4"
+          },
+          {
             cardType: 1,
             required: true,
-            title: '现有部门经理(人)',
-            value: "100",
+            title: '实际完成数',
+            value: "",
+            key: "newUserSituation",
+            id: "5"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `新建居民用户(含乡镇新房)_${this.attachment.fiscalYear - 3}财年`,
           },
           {
             cardType: 1,
             required: true,
-            title: '现有副经理(人)',
-            value: "100",
+            title: '总预算任务数',
+            value: "",
+            key: "newUserSituation",
+            id: "6"
           },
           {
             cardType: 1,
             required: true,
-            title: '现有主管(人)',
-            value: "100",
+            title: '实际完成数',
+            value: "",
+            key: "newUserSituation",
+            id: "7"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `新建居民用户(含乡镇新房)_${this.attachment.fiscalYear - 4}财年`,
           },
           {
             cardType: 1,
             required: true,
-            title: '现有业务员(人)',
-            value: "100",
+            title: '总预算任务数',
+            value: "",
+            key: "newUserSituation",
+            id: "8"
           },
           {
             cardType: 1,
             required: true,
-            title: '现有内勤(人)',
-            value: "100",
+            title: '实际完成数',
+            value: "",
+            key: "newUserSituation",
+            id: "9"
+          },
+          //城市老居民用户历史完成情况
+          {
+            cardType: 3,
+            required: true,
+            title: `城市老居民用户_${this.attachment.fiscalYear}财年(预计)`,
           },
           {
             cardType: 1,
             required: true,
-            title: '现有其他人员(人)',
-            value: "100",
+            title: '总预算任务数',
+            value: "",
+            key: "oldUserSituation",
+            id: "0"
           },
           {
             cardType: 1,
             required: true,
-            title: '现有合计(人)',
-            value: "100",
+            title: '实际完成数',
+            value: "",
+            key: "oldUserSituation",
+            id: "1"
           },
-        ],
-      }
-    },
-    computed: {
-
-    },
-    onLoad() {
-
-    },
-    methods: {
-
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  
+          {
+            cardType: 3,
+            required: true,
+            title: `城市老居民用户_${this.attachment.fiscalYear - 1}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "oldUserSituation",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "oldUserSituation",
+            id: "3"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `城市老居民用户_${this.attachment.fiscalYear - 2}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "oldUserSituation",
+            id: "4"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "oldUserSituation",
+            id: "5"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `城市老居民用户_${this.attachment.fiscalYear - 3}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "oldUserSituation",
+            id: "6"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "oldUserSituation",
+            id: "7"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `城市老居民用户_${this.attachment.fiscalYear - 4}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "oldUserSituation",
+            id: "8"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "oldUserSituation",
+            id: "9"
+          },
+          //农村气代媒
+          {
+            cardType: 3,
+            required: true,
+            title: `农村气代媒(含气代柴薪)_${this.attachment.fiscalYear}财年(预计)`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "gasCoalSituation",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "gasCoalSituation",
+            id: "1"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `农村气代媒(含气代柴薪)_${this.attachment.fiscalYear - 1}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "gasCoalSituation",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "gasCoalSituation",
+            id: "3"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `农村气代媒(含气代柴薪)_${this.attachment.fiscalYear - 2}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "gasCoalSituation",
+            id: "4"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "gasCoalSituation",
+            id: "5"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `农村气代媒(含气代柴薪)_${this.attachment.fiscalYear - 3}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "gasCoalSituation",
+            id: "6"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "gasCoalSituation",
+            id: "7"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `农村气代媒(含气代柴薪)_${this.attachment.fiscalYear - 4}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "gasCoalSituation",
+            id: "8"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "gasCoalSituation",
+            id: "9"
+          },
+          //乡村燃气居民历史完成情况
+          {
+            cardType: 3,
+            required: true,
+            title: `乡村燃气居民_${this.attachment.fiscalYear}财年(预计)`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "villageGasSituation",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "villageGasSituation",
+            id: "1"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `乡村燃气居民_${this.attachment.fiscalYear - 1}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "villageGasSituation",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "villageGasSituation",
+            id: "3"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `乡村燃气居民_${this.attachment.fiscalYear - 2}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "villageGasSituation",
+            id: "4"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "villageGasSituation",
+            id: "5"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `乡村燃气居民_${this.attachment.fiscalYear - 3}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "villageGasSituation",
+            id: "6"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "villageGasSituation",
+            id: "7"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `乡村燃气居民_${this.attachment.fiscalYear - 4}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "villageGasSituation",
+            id: "8"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "villageGasSituation",
+            id: "9"
+          },
+          //商业用户历史完成情况
+          {
+            cardType: 3,
+            required: true,
+            title: `商业用户_${this.attachment.fiscalYear}财年(预计)`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "commerceUserSituation",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "commerceUserSituation",
+            id: "1"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `商业用户_${this.attachment.fiscalYear - 1}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "commerceUserSituation",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "commerceUserSituation",
+            id: "3"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `商业用户_${this.attachment.fiscalYear - 2}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "commerceUserSituation",
+            id: "4"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "commerceUserSituation",
+            id: "5"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `商业用户_${this.attachment.fiscalYear - 3}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "commerceUserSituation",
+            id: "6"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "commerceUserSituation",
+            id: "7"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `商业用户_${this.attachment.fiscalYear - 4}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "commerceUserSituation",
+            id: "8"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "commerceUserSituation",
+            id: "9"
+          },
+          //工业用户历史完成情况
+          {
+            cardType: 3,
+            required: true,
+            title: `工业用户_${this.attachment.fiscalYear}财年(预计)`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "industryUserSituation",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "industryUserSituation",
+            id: "1"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `工业用户_${this.attachment.fiscalYear - 1}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "industryUserSituation",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "industryUserSituation",
+            id: "3"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `工业用户_${this.attachment.fiscalYear - 2}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "industryUserSituation",
+            id: "4"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "industryUserSituation",
+            id: "5"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `工业用户_${this.attachment.fiscalYear - 3}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "industryUserSituation",
+            id: "6"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "industryUserSituation",
+            id: "7"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `工业用户_${this.attachment.fiscalYear - 4}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "industryUserSituation",
+            id: "8"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "industryUserSituation",
+            id: "9"
+          },
+          //历史完成情况合计
+          {
+            cardType: 3,
+            required: true,
+            title: `合计_${this.attachment.fiscalYear}财年(预计)`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "completeTotal",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "completeTotal",
+            id: "1"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `合计_${this.attachment.fiscalYear - 1}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "completeTotal",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "completeTotal",
+            id: "3"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `合计_${this.attachment.fiscalYear - 2}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "completeTotal",
+            id: "4"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "completeTotal",
+            id: "5"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `合计_${this.attachment.fiscalYear - 3}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "completeTotal",
+            id: "6"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "completeTotal",
+            id: "7"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `合计_${this.attachment.fiscalYear - 4}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总预算任务数',
+            value: "",
+            key: "completeTotal",
+            id: "8"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '实际完成数',
+            value: "",
+            key: "completeTotal",
+            id: "9"
+          },
+        ],
+        naturalGas: [
+          //民用天然气
+          {
+            cardType: 3,
+            required: true,
+            title: '民用天燃气(Nm3)',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '平台热值(Kcal)',
+            value: "",
+            key: "domesticNaturalGas",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '市场价(元)',
+            value: "",
+            key: "domesticNaturalGas",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '折合1Nm3天燃气价格(元)',
+            value: "",
+            key: "domesticNaturalGas",
+            id: "2"
+          },
+          //商用天然气
+          {
+            cardType: 3,
+            required: true,
+            title: '商用天然气(Nm3)',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '平台热值(Kcal)',
+            value: "",
+            key: "commerceNaturalGas",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '市场价(元)',
+            value: "",
+            key: "commerceNaturalGas",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '折合1Nm3天燃气价格(元)',
+            value: "",
+            key: "commerceNaturalGas",
+            id: "2"
+          },
+          //液化气
+          {
+            cardType: 3,
+            required: true,
+            title: '液化气(kg)',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '平台热值(Kcal)',
+            value: "",
+            key: "liquefiedGas",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '市场价(元)',
+            value: "",
+            key: "liquefiedGas",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '折合1Nm3天燃气价格(元)',
+            value: "",
+            key: "liquefiedGas",
+            id: "2"
+          },
+          //环保油
+          {
+            cardType: 3,
+            required: true,
+            title: '环保油(kg)',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '平台热值(Kcal)',
+            value: "",
+            key: "environmentallyFriendlyOil",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '市场价(元)',
+            value: "",
+            key: "environmentallyFriendlyOil",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '折合1Nm3天燃气价格(元)',
+            value: "",
+            key: "environmentallyFriendlyOil",
+            id: "2"
+          },
+          //煤炭
+          {
+            cardType: 3,
+            required: true,
+            title: '媒(kg)',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '平台热值(Kcal)',
+            value: "",
+            key: "coal",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '市场价(元)',
+            value: "",
+            key: "coal",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '折合1Nm3天燃气价格(元)',
+            value: "",
+            key: "coal",
+            id: "2"
+          },
+          //商业用电
+          {
+            cardType: 3,
+            required: true,
+            title: '商业用电(度)',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '平台热值(Kcal)',
+            value: "",
+            key: "commerceElectricity",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '市场价(元)',
+            value: "",
+            key: "commerceElectricity",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '折合1Nm3天燃气价格(元)',
+            value: "",
+            key: "commerceElectricity",
+            id: "2"
+          }
+        ],
+        energyAnalysis: [{
+          cardType: 2,
+          required: true,
+          title: '预算主体名称',
+          key:"selectAnalyze",
+          value: "",
+        }],
+        teamStatus: [{
+            cardType: 1,
+            required: true,
+            title: '现有部门经理(人)',
+            value: "",
+            key:"departmentManagerNumber"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '现有副经理(人)',
+            value: "",
+            key:"assistantManagerNumber"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '现有主管(人)',
+            value: "",
+            key:"directorNumber"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '现有业务员(人)',
+            value: "",
+            key:"salesmanNumber"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '现有内勤(人)',
+            value: "",
+            key:"officeStaffNumber"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '现有其他人员(人)',
+            value: "",
+            key:"otherNumber"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '现有合计(人)',
+            value: "",
+            key:"totalNumber"
+          },
+        ],
+      }
+    },
+    computed: {
+
+    },
+    mounted() {
+      this.initData()
+      // this.fiscalYear = this.attachment.fiscalYear;
+    },
+    methods: {
+      initData() {
+        this.population.forEach(data => {
+          if (data.key in this.reportData) {
+            data.value = this.reportData[data.key];
+          }
+        });
+        this.urbanDevelopment.forEach(data => {
+          if (data.key in this.reportData) {
+            data.value = this.reportData[data.key];
+          }
+        });
+        this.natureOfBusiness.forEach(data => {
+          if (data.key in this.reportData) {
+            data.value = this.reportData[data.key];
+          }
+        });
+        this.regionalPopulation.forEach(data => {
+          if (data.key in this.reportData) {
+            data.value = this.reportData[data.key];
+          }
+        });
+        this.gasCompetition1.forEach(data => {
+          if (data.key in this.reportData) {
+            data.value = this.reportData[data.key];
+          }
+        });
+        this.gasCompetition2.forEach(data => {
+          if (data.key in this.reportData) {
+            data.value = this.reportData[data.key];
+          }
+        });
+        this.guarantee.forEach(data => {
+          if (data.key in this.reportData) {
+            data.value = this.reportData[data.key];
+          }
+        });
+        //城市新用户发展规模
+        this.builtUpArea.forEach(data => {
+          if (data.key in this.attachment) {
+            let Arr = this.attachment[data.key].split(",");
+            data.value = Arr[data.id];
+          }
+        });
+        this.ruralAreas.forEach(data => {
+          if (data.key in this.attachment) {
+            let Arr = this.attachment[data.key].split(",");
+            data.value = Arr[data.id];
+          }
+        });
+        this.completionStatus.forEach(data => {
+          if (data.key in this.attachment) {
+            let Arr = this.attachment[data.key].split(",");
+            data.value = Arr[data.id];
+          }
+        });
+        this.naturalGas.forEach(data => {
+          if (data.key in this.attachment) {
+            let Arr = this.attachment[data.key].split(",");
+            data.value = Arr[data.id];
+          }
+        });
+        this.energyAnalysis.forEach(data => {
+          if (data.key in this.attachment) {
+            data.value = this.attachment[data.key];
+          }
+        });
+        this.teamStatus.forEach(data => {
+          if (data.key in this.attachment) {
+            data.value = this.attachment[data.key];
+          }
+        });
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+
 </style>
diff --git a/pages/market/components/reportModule3.vue b/pages/market/components/reportModule3.vue
index e4bec20..c429bbd 100644
--- a/pages/market/components/reportModule3.vue
+++ b/pages/market/components/reportModule3.vue
@@ -9,20 +9,34 @@
     <cardMoudule :cardData="data7" :required="false" title="城市居民用户_老居民用户"></cardMoudule>
     <cardMoudule :cardData="data8" :required="false" title="城市居民用户_老居民用户"></cardMoudule>
     <cardMoudule :cardData="data9" :required="false" title="城市居民用户_老居民用户"></cardMoudule>
+    <cardMoudule :cardData="data10" :required="false" title="农村燃气居民用户_乡村燃气居民"></cardMoudule>
+    <cardMoudule :cardData="data11" :required="false" title="农村燃气居民用户_乡村燃气居民"></cardMoudule>
+    <cardMoudule :cardData="data12" :required="false" title="工商业用户"></cardMoudule>
+    <cardMoudule :cardData="data13" :required="true" title="安装费单价情况"></cardMoudule>
+    <cardMoudule :cardData="data14" :required="false" title="天燃气销售业务"></cardMoudule>
+    <cardMoudule :cardData="data15" :required="false" title="天燃气销售业务"></cardMoudule>
+    <cardMoudule :cardData="data16" :required="true" title="“天燃气贸易”业务"></cardMoudule>
+    <cardMoudule :cardData="data17" :required="true" title="气源及燃气购销价格调研"></cardMoudule>
+    <cardMoudule :cardData="data18" :required="true" title="财务确认安装且未回款户数"></cardMoudule>
   </view>
 </template>
 
 <script>
-  import {
-    data
-  } from "../../../uni_modules/uview-ui/libs/mixin/mixin"
   import cardMoudule from "./cardMoudule.vue"
   export default {
     components: {
       cardMoudule
     },
     props: {
-
+      reportData: {
+        type: Object
+      },
+      newBuildingInfo: {
+        type: Object
+      },
+      newBuildingItem: {
+        type: Object
+      },
     },
     data() {
       return {
@@ -31,60 +45,400 @@
             required: true,
             title: '当地近四年新建居民累计确认安装户数及政府拍卖土地、新开工/新竣工住宅房地产情况:',
           },
+          //新户财务确认安装数
           {
             cardType: 3,
             required: true,
             title: '新户财务确认安装数(户)',
-            value: "100",
           },
           {
             cardType: 1,
             required: true,
-            title: '2019年',
-            value: "100",
-          }
+            title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 4}年`,
+            value: "",
+            key: "cityNewInstalled",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 3}年`,
+            value: "",
+            key: "cityNewInstalled",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 2}年`,
+            value: "",
+            key: "cityNewInstalled",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 1}年(预计)`,
+            value: "",
+            key: "cityNewInstalled",
+            id: "3"
+          },
+          //政府拍卖/转让/拆迁土地面积合计
+          {
+            cardType: 3,
+            required: true,
+            title: '政府拍卖/转让/拆迁土地面积合计',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 4}年`,
+            value: "",
+            key: "auctionArea",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 3}年`,
+            value: "",
+            key: "auctionArea",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 2}年`,
+            value: "",
+            key: "auctionArea",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 1}年(预计)`,
+            value: "",
+            key: "auctionArea",
+            id: "3"
+          },
+          //新开工住宅房地面积
+          {
+            cardType: 3,
+            required: true,
+            title: '新开工住宅房地面积',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 4}年`,
+            value: "",
+            key: "newStartArea",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 3}年`,
+            value: "",
+            key: "newStartArea",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 2}年`,
+            value: "",
+            key: "newStartArea",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 1}年(预计)`,
+            value: "",
+            key: "newStartArea",
+            id: "3"
+          },
+          //新竣工住宅房地产面积
+          {
+            cardType: 3,
+            required: true,
+            title: '新竣工住宅房地产面积',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 4}年`,
+            value: "",
+            key: "newCompletedArea",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 3}年`,
+            value: "",
+            key: "newCompletedArea",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 2}年`,
+            value: "",
+            key: "newCompletedArea",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 1}年(预计)`,
+            value: "",
+            key: "newCompletedArea",
+            id: "3"
+          },
         ],
         data2: [{
             cardType: 4,
             required: true,
-            title: '2023年楼盘户数预计在未来三年安装确认的新建楼盘信息:预计2021财年-2022财年已签约且在2023财年安装确认项目',
+            title: `${this.reportData.fiscalYear}年楼盘户数预计在未来三年安装确认的新建楼盘信息:预计${this.reportData.fiscalYear - 2}财年-${this.reportData.fiscalYear - 1}财年已签约且在${this.reportData.fiscalYear}财年安装确认项目`,
             value: "2023年玉林市城市总体规划",
           },
           {
             cardType: 3,
             required: true,
-            title: '2021财年及之前签约且在2023财年安装',
+            title: `${this.reportData.fiscalYear - 2}财年及之前签约且在${this.reportData.fiscalYear}财年安装`,
           },
           {
             cardType: 1,
             required: true,
             title: '小区名称',
-            value: 100
-          }
+            value: "",
+            key: "communityName",
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总规模户数',
+            value: "",
+            key: "householdNumber",
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '预计安装户数',
+            value: "",
+            key: "predictInstallNumber",
+          },
+
         ],
         data3: [{
             cardType: 4,
             required: true,
-            title: '预计2023-2025财年安装确认项目(预计2023财年签约，23财年、24财年、25财年安装)',
-            value: "2023年玉林市城市总体规划",
+            title: `预计${this.reportData.fiscalYear}-${parseInt(this.reportData.fiscalYear)+2}财年安装确认项目
+            (预计${parseInt(this.reportData.fiscalYear)}财年签约，
+            ${this.reportData.fiscalYear}财年、${parseInt(this.reportData.fiscalYear)+1}财年、${parseInt(this.reportData.fiscalYear)+2}财年安装)`,
           },
+          // 23财年
           {
             cardType: 3,
             required: true,
-            title: '2023财年',
+            title: `${parseInt(this.reportData.fiscalYear)}财年`,
           },
           {
             cardType: 1,
             required: true,
             title: '楼盘名称',
-            value: "文本"
-          }
+            value: "",
+            key: "buildingItemDetail1",
+            id: "name"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '楼盘类型',
+            value: "",
+            key: "buildingItemDetail1",
+            id: "type"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '开发商名称',
+            value: "",
+            key: "buildingItemDetail1",
+            id: "devName"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '预计管道天燃气安装户数',
+            value: "",
+            key: "buildingItemDetail1",
+            id: "number"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '签约时间(含计划签约)',
+            value: "",
+            key: "buildingItemDetail1",
+            id: "time"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '预计燃气安装',
+            value: "",
+            key: "buildingItemDetail1",
+            id: "installTime"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear)}财年小计`,
+            value: "",
+            key: "currentInstallSubtotal"
+          },
+
+          // 24财年
+          {
+            cardType: 3,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear)+1}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '楼盘名称',
+            value: "",
+            key: "buildingItemDetail2",
+            id: "name"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '楼盘类型',
+            value: "",
+            key: "buildingItemDetail2",
+            id: "type"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '开发商名称',
+            value: "",
+            key: "buildingItemDetail2",
+            id: "devName"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '预计管道天燃气安装户数',
+            value: "",
+            key: "buildingItemDetail2",
+            id: "number"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '签约时间(含计划签约)',
+            value: "",
+            key: "buildingItemDetail2",
+            id: "time"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '预计燃气安装',
+            value: "",
+            key: "buildingItemDetail2",
+            id: "installTime"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear)+1}财年小计`,
+            value: "",
+            key: "afterInstallSubtotal"
+          },
+          // 25财年
+          {
+            cardType: 3,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear)+2}财年`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '楼盘名称',
+            value: "",
+            key: "buildingItemDetail3",
+            id: "name"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '楼盘类型',
+            value: "",
+            key: "buildingItemDetail3",
+            id: "type"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '开发商名称',
+            value: "",
+            key: "buildingItemDetail3",
+            id: "devName"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '预计管道天燃气安装户数',
+            value: "",
+            key: "buildingItemDetail3",
+            id: "number"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '签约时间(含计划签约)',
+            value: "",
+            key: "buildingItemDetail3",
+            id: "time"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '预计燃气安装',
+            value: "",
+            key: "buildingItemDetail3",
+            id: "installTime"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear)+2}财年小计`,
+            value: "",
+            key: "lastInstallSubtotal"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `合计`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `预计管道天燃气安装户数`,
+            key: "installTotal"
+          },
         ],
         data4: [{
             cardType: 4,
             required: true,
             title: '老居民用户(按小区个数换算 )',
-            value: "2023年玉林市城市总体规划",
           },
           {
             cardType: 3,
@@ -102,86 +456,1242 @@
             cardType: 4,
             required: true,
             title: '老居民用户(按常住人口换算 )',
-            value: "2023年玉林市城市总体规划",
           },
           {
             cardType: 3,
             required: true,
-            title: '户数情况',
+            title: '城区常驻人口数(人)',
           },
           {
             cardType: 1,
             required: true,
-            title: '总老户小区个数',
-            value: "100"
-          }
-        ],
-        data6: [{
-            cardType: 4,
+            title: '数量',
+            value: ""
+          },
+          {
+            cardType: 1,
             required: true,
-            title: '过去及未来三年城区老居民用户财务确认安装户数及回款户数、金额情况',
-            value: "2023年玉林市城市总体规划",
+            title: '异常情况说明',
+            value: ""
           },
           {
             cardType: 3,
             required: true,
-            title: '年度财务确认安装数',
+            title: '城区常驻人口户数(A)',
           },
           {
             cardType: 1,
             required: true,
-            title: '2019财年',
-            value: "100"
-          }
-        ],
-        data7: [{
+            title: '数量',
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '异常情况说明',
+            value: ""
+          },
+          {
             cardType: 3,
             required: true,
-            title: '过去及未来三年城区老居民用户情况说明',
-            value: "2023年玉林市城市总体规划",
+            title: '城区累计点火通气的居民户数',
           },
           {
-            cardType: 2,
+            cardType: 1,
             required: true,
-            title: '年度财务确认安装数',
+            title: '数量',
+            value: ""
           },
-        ],
-        data8: [{
+          {
+            cardType: 1,
+            required: true,
+            title: '异常情况说明',
+            value: ""
+          },
+          {
             cardType: 3,
             required: true,
-            title: '目前管网已经覆盖的区域老户开发情况',
-            value: "2023年玉林市城市总体规划",
+            title: '城区连续六个月均有用气的居民数(B)',
           },
           {
             cardType: 1,
             required: true,
-            title: '老户规模(户)',
-            value:"10"
+            title: '数量',
+            value: ""
           },
-        ],
-        data9: [{
+          {
+            cardType: 1,
+            required: true,
+            title: '异常情况说明',
+            value: ""
+          },
+          {
             cardType: 3,
             required: true,
-            title: '管网未覆盖区域老户开发情况',
-            value: "2023年玉林市城市总体规划",
+            title: '城区所有“老户”小区中有人居住但无法安装管道天燃气用户数(C)',
           },
           {
             cardType: 1,
             required: true,
-            title: '老户规模(户)',
-            value:"10"
+            title: '数量',
+            value: ""
           },
-        ],
-      }
-    },
-    computed: {
-
-    },
-    onLoad() {
-
-    },
-    methods: {
-
+          {
+            cardType: 1,
+            required: true,
+            title: '异常情况说明',
+            value: ""
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: '城区“老户”小区中应收账款户数(D)',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '数量',
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '异常情况说明',
+            value: ""
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: '区剩余有效可安装确认户数(=A-B-C-D)',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '数量',
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '异常情况说明',
+            value: ""
+          }
+        ],
+        data6: [{
+            cardType: 4,
+            required: true,
+            title: '过去及未来三年城区老居民用户财务确认安装户数及回款户数、金额情况',
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: '年度财务确认安装数',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear) - 4}财年`,
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear) - 3}财年`,
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear) - 2}财年`,
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear) - 1}财年`,
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear)}财年(预计)`,
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear)+1}财年(预计)`,
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear)+2}财年(预计)`,
+            value: ""
+          },
+
+          {
+            cardType: 3,
+            required: true,
+            title: '实际新增报装回款户数(含应收款户)',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear) - 4}财年`,
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear) - 3}财年`,
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear) - 2}财年`,
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear) - 1}财年`,
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear)}财年(预计)`,
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear)+1}财年(预计)`,
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear)+2}财年(预计)`,
+            value: ""
+          },
+
+          {
+            cardType: 3,
+            required: true,
+            title: '年老户安装费回款金额(万元)',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear) - 4}财年`,
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear) - 3}财年`,
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear) - 2}财年`,
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear) - 1}财年`,
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear)}财年(预计)`,
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear)+1}财年(预计)`,
+            value: ""
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear)+2}财年(预计)`,
+            value: ""
+          },
+        ],
+        data7: [{
+            cardType: 3,
+            required: true,
+            title: '过去及未来三年城区老居民用户情况说明',
+          },
+          {
+            cardType: 2,
+            required: true,
+            title: '年度财务确认安装数',
+            key: "cityOldUserSituation",
+            value: ""
+          },
+        ],
+        data8: [{
+            cardType: 3,
+            required: true,
+            title: '目前管网已经覆盖的区域老户开发情况',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '老户规模(户)',
+            value: "",
+            key: "coveredOldHousehold"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '已签约户数(户)',
+            value: "",
+            key: "coveredSignedHousehold"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '已确认户数(户)',
+            value: "",
+            key: "coveredConfirmHousehold"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '不可开发户数(户)',
+            value: "",
+            key: "coveredUnexploitableHousehold"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '剩余可开发户数(户)',
+            value: "",
+            key: "coveredExploitableHousehold"
+          },
+        ],
+        data9: [{
+            cardType: 3,
+            required: true,
+            title: '管网未覆盖区域老户开发情况',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '老户规模(户)',
+            value: "",
+            key: "uncoveredOldHousehold"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '已签约户数(户)',
+            value: "",
+            key: "uncoveredSignedHousehold"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '已确认户数(户)',
+            value: "",
+            key: "uncoveredConfirmHousehold"
+          },
+        ],
+        data10: [{
+            cardType: 4,
+            required: false,
+            title: '乡村燃气居民',
+          },
+          // 管网已覆盖_镇区
+          {
+            cardType: 3,
+            required: true,
+            title: '管网已覆盖_镇区',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '个数',
+            value: "",
+            key: "coveredTownsSituation",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总规模户数',
+            value: "",
+            key: "coveredTownsSituation",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计可开发户数',
+            value: "",
+            key: "coveredTownsSituation",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计财务确认安装户数',
+            value: "",
+            key: "coveredTownsSituation",
+            id: "3"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计报装户数',
+            value: "",
+            key: "coveredTownsSituation",
+            id: "4"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计点火通气户数',
+            value: "",
+            key: "coveredTownsSituation",
+            id: "5"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计不可开发户数',
+            value: "",
+            key: "coveredTownsSituation",
+            id: "6"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '剩余可安装确认户数',
+            value: "",
+            key: "coveredTownsSituation",
+            id: "7"
+          },
+          // 管网已覆盖_自然村
+          {
+            cardType: 3,
+            required: true,
+            title: '管网已覆盖_自然村',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '个数',
+            value: "",
+            key: "coveredVillageSituation",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总规模户数',
+            value: "",
+            key: "coveredVillageSituation",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计可开发户数',
+            value: "",
+            key: "coveredVillageSituation",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计财务确认安装户数',
+            value: "",
+            key: "coveredVillageSituation",
+            id: "3"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计报装户数',
+            value: "",
+            key: "coveredVillageSituation",
+            id: "4"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计点火通气户数',
+            value: "",
+            key: "coveredVillageSituation",
+            id: "5"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计不可开发户数',
+            value: "",
+            key: "coveredVillageSituation",
+            id: "6"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '剩余可安装确认户数',
+            value: "",
+            key: "coveredVillageSituation",
+            id: "7"
+          },
+          // 管网未覆盖、但符合农村燃气投资标准_镇区
+          {
+            cardType: 3,
+            required: true,
+            title: '管网未覆盖、但符合农村燃气投资标准_镇区',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '个数',
+            value: "",
+            key: "uncoveredTownsSituation",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总规模户数',
+            value: "",
+            key: "uncoveredTownsSituation",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计可开发户数',
+            value: "",
+            key: "uncoveredTownsSituation",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计财务确认安装户数',
+            value: "",
+            key: "uncoveredTownsSituation",
+            id: "3"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计报装户数',
+            value: "",
+            key: "uncoveredTownsSituation",
+            id: "4"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计点火通气户数',
+            value: "",
+            key: "uncoveredTownsSituation",
+            id: "5"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计不可开发户数',
+            value: "",
+            key: "uncoveredTownsSituation",
+            id: "6"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '剩余可安装确认户数',
+            value: "",
+            key: "uncoveredTownsSituation",
+            id: "7"
+          },
+          //管网未覆盖、但符合农村燃气投资标准_自然村
+          {
+            cardType: 3,
+            required: true,
+            title: '管网未覆盖、但符合农村燃气投资标准_自然村',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '个数',
+            value: "",
+            key: "uncoveredVillageSituation",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总规模户数',
+            value: "",
+            key: "uncoveredVillageSituation",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计可开发户数',
+            value: "",
+            key: "uncoveredVillageSituation",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计财务确认安装户数',
+            value: "",
+            key: "uncoveredVillageSituation",
+            id: "3"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计报装户数',
+            value: "",
+            key: "uncoveredVillageSituation",
+            id: "4"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计点火通气户数',
+            value: "",
+            key: "uncoveredVillageSituation",
+            id: "5"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计不可开发户数',
+            value: "",
+            key: "uncoveredVillageSituation",
+            id: "6"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '剩余可安装确认户数',
+            value: "",
+            key: "uncoveredVillageSituation",
+            id: "7"
+          },
+          // 合计
+          {
+            cardType: 3,
+            required: true,
+            title: '合计',
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '个数',
+            value: "",
+            key: "totalSituation",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '总规模户数',
+            value: "",
+            key: "totalSituation",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计可开发户数',
+            value: "",
+            key: "totalSituation",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计财务确认安装户数',
+            value: "",
+            key: "totalSituation",
+            id: "3"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计报装户数',
+            value: "",
+            key: "totalSituation",
+            id: "4"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计点火通气户数',
+            value: "",
+            key: "totalSituation",
+            id: "5"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '累计不可开发户数',
+            value: "",
+            key: "totalSituation",
+            id: "6"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: '剩余可安装确认户数',
+            value: "",
+            key: "totalSituation",
+            id: "7"
+          },
+        ],
+        data11: [{
+            cardType: 3,
+            required: true,
+            title: '乡村燃气居民情况说明',
+          },
+          {
+            cardType: 2,
+            required: true,
+            value: "",
+            key: "villageGasInfo"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: '乡镇新户',
+          },
+          {
+            cardType: 2,
+            required: true,
+            value: "",
+            key: "townsNewUserInfo"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: '农村气代媒 (气代柴薪)',
+          },
+          {
+            cardType: 2,
+            required: true,
+            value: "",
+            key: "townsGasCoal"
+          },
+        ],
+        data12: [{
+            cardType: 3,
+            required: true,
+            title: '工业用户',
+          },
+          {
+            cardType: 2,
+            required: true,
+            value: "",
+            key: "industryUser"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: '商业公福用户',
+          },
+          {
+            cardType: 2,
+            required: true,
+            value: "",
+            key: "industryCommerceUser"
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: '工商业煤改气用户',
+          },
+          {
+            cardType: 2,
+            required: true,
+            value: "",
+            key: "commerceCoalGas"
+          },
+        ],
+        data13: [{
+          cardType: 2,
+          required: true,
+          value: "",
+          key: "installPrice"
+        }],
+        data14: [{
+            cardType: 4,
+            required: true,
+            title: `分析现有居民、工商业用户、加气站及批发、管输等用气情况，预测${this.reportData.fiscalYear}财年销气量`,
+          },
+          {
+            cardType: 3,
+            required: true,
+            title: `截至目前已通气用户在${this.reportData.fiscalYear}财年的基础用气量`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "居民",
+            value: "",
+            key: "baseSales",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "商业",
+            value: "",
+            key: "baseSales",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "工业",
+            value: "",
+            key: "baseSales",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "加气站",
+            value: "",
+            key: "baseSales",
+            id: "3"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "批发及其它",
+            value: "",
+            key: "baseSales",
+            id: "4"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "管输",
+            value: "",
+            key: "baseSales",
+            id: "5"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "合计",
+            value: "",
+            key: "baseSales",
+            id: "6"
+          },
+
+          {
+            cardType: 3,
+            required: true,
+            title: `预计到${parseInt(this.reportData.fiscalYear)-1}财年底通气/点火的用户在${parseInt(this.reportData.fiscalYear)}财年带来气量增长`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "居民",
+            value: "",
+            key: "useSalesGrowth",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "商业",
+            value: "",
+            key: "useSalesGrowth",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "工业",
+            value: "",
+            key: "useSalesGrowth",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "加气站",
+            value: "",
+            key: "useSalesGrowth",
+            id: "3"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "批发及其它",
+            value: "",
+            key: "useSalesGrowth",
+            id: "4"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "管输",
+            value: "",
+            key: "useSalesGrowth",
+            id: "5"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "合计",
+            value: "",
+            key: "useSalesGrowth",
+            id: "6"
+          },
+
+
+          {
+            cardType: 3,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear)-1}财年签约但在${parseInt(this.reportData.fiscalYear)}财年
+            点火通气的用户在${parseInt(this.reportData.fiscalYear)}财年带来气量增长`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "居民",
+            value: "",
+            key: "signSalesGrowth",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "商业",
+            value: "",
+            key: "signSalesGrowth",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "工业",
+            value: "",
+            key: "signSalesGrowth",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "加气站",
+            value: "",
+            key: "signSalesGrowth",
+            id: "3"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "批发及其它",
+            value: "",
+            key: "signSalesGrowth",
+            id: "4"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "管输",
+            value: "",
+            key: "signSalesGrowth",
+            id: "5"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "合计",
+            value: "",
+            key: "signSalesGrowth",
+            id: "6"
+          },
+
+          {
+            cardType: 3,
+            required: true,
+            title: `预计${parseInt(this.reportData.fiscalYear)}财年新签约点火通气的用户在${parseInt(this.reportData.fiscalYear)}财年带来气量增长`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "居民",
+            value: "",
+            key: "predictSalesGrowth",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "商业",
+            value: "",
+            key: "predictSalesGrowth",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "工业",
+            value: "",
+            key: "predictSalesGrowth",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "加气站",
+            value: "",
+            key: "predictSalesGrowth",
+            id: "3"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "批发及其它",
+            value: "",
+            key: "predictSalesGrowth",
+            id: "4"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "管输",
+            value: "",
+            key: "predictSalesGrowth",
+            id: "5"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "合计",
+            value: "",
+            key: "predictSalesGrowth",
+            id: "6"
+          },
+
+          {
+            cardType: 3,
+            required: true,
+            title: `${parseInt(this.reportData.fiscalYear)}财年销气预测合计`,
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "居民",
+            value: "",
+            key: "predictSalesTotal",
+            id: "0"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "商业",
+            value: "",
+            key: "predictSalesTotal",
+            id: "1"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "工业",
+            value: "",
+            key: "predictSalesTotal",
+            id: "2"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "加气站",
+            value: "",
+            key: "predictSalesTotal",
+            id: "3"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "批发及其它",
+            value: "",
+            key: "predictSalesTotal",
+            id: "4"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "管输",
+            value: "",
+            key: "predictSalesTotal",
+            id: "5"
+          },
+          {
+            cardType: 1,
+            required: true,
+            title: "合计",
+            value: "",
+            key: "predictSalesTotal",
+            id: "6"
+          },
+        ],
+        data15: [{
+            cardType: 3,
+            required: true,
+            title: "其他说明",
+          },
+          {
+            cardType: 2,
+            required: true,
+            value:"",
+            key:"otherInfo"
+          },
+          {
+              cardType: 3,
+              required: true,
+              title: "汽车加气量无新增原因说明",
+            },
+            {
+              cardType: 2,
+              required: true,
+              value:"",
+              key:"carGasInfo"
+            }
+        ],
+        data16:[{
+          cardType: 2,
+          required: true,
+          value:"",
+          key:"gasTrade"
+        }],
+        data17:[{
+          cardType: 2,
+          required: true,
+          value:"",
+          key:"priceSurvey"
+        }],
+        data18:[{
+          cardType: 2,
+          required: true,
+          value:"",
+          key:"outstandingPaymentNumber"
+        }]
+
+      }
+    },
+    computed: {
+
+    },
+    mounted() {
+      this.initData()
+    },
+    methods: {
+      initData() {
+        this.data1.forEach(data => {
+          if (data.key in this.reportData) {
+            let Arr = this.reportData[data.key].split(",");
+            data.value = Arr[data.id];
+          }
+        });
+        this.data2.forEach(data => {
+          if (data.key in this.newBuildingInfo) {
+            data.value = this.newBuildingInfo[data.key];
+          }
+        });
+        // console.log(this.data3);
+        this.data3.forEach(data => {
+          if (data.key in this.newBuildingItem) {
+            // console.log(this.newBuildingItem[data.key]);
+            if (this.newBuildingItem[data.key].length > 0) {
+              data.value = this.newBuildingItem[data.key][0][data.id];
+            } else {
+              data.value = this.newBuildingItem[data.key]
+            }
+          }
+        });
+        // this.data4
+        this.data7.forEach(data => {
+          if (data.key in this.reportData) {
+            data.value = this.reportData[data.key];
+          }
+        });
+        this.data8.forEach(data => {
+          if (data.key in this.reportData) {
+            data.value = this.reportData[data.key];
+          }
+        });
+        this.data9.forEach(data => {
+          if (data.key in this.reportData) {
+            data.value = this.reportData[data.key];
+          }
+        });
+        this.data10.forEach(data => {
+          if (data.key in this.reportData) {
+            let Arr = this.reportData[data.key].split(",");
+            data.value = Arr[data.id];
+          }
+        });
+        this.data11.forEach(data => {
+          if (data.key in this.reportData) {
+            data.value = this.reportData[data.key];
+          }
+        });
+        this.data12.forEach(data => {
+          if (data.key in this.reportData) {
+            data.value = this.reportData[data.key];
+          }
+        });
+        this.data13.forEach(data => {
+          if (data.key in this.reportData) {
+            data.value = this.reportData[data.key];
+          }
+        });
+        this.data14.forEach(data => {
+          if (data.key in this.reportData) {
+            let Arr = this.reportData[data.key].split(",");
+            data.value = Arr[data.id];
+          }
+        });
+        this.data15.forEach(data => {
+          if (data.key in this.reportData) {
+            data.value = this.reportData[data.key];
+          }
+        });
+        this.data16.forEach(data => {
+          if (data.key in this.reportData) {
+            data.value = this.reportData[data.key];
+          }
+        });
+        this.data17.forEach(data => {
+          if (data.key in this.reportData) {
+            data.value = this.reportData[data.key];
+          }
+        });
+        this.data18.forEach(data => {
+          if (data.key in this.reportData) {
+            data.value = this.reportData[data.key];
+          }
+        });
+      }
     }
   }
 </script>
diff --git a/pages/market/reportDetails.vue b/pages/market/reportDetails.vue
index babdfc0..6696520 100644
--- a/pages/market/reportDetails.vue
+++ b/pages/market/reportDetails.vue
@@ -14,8 +14,8 @@
     </view>
     <view class="bodyCss">
       <reportModule1 v-if="current == 0" :reportData="reportData1"></reportModule1>
-      <reportModule2 v-if="current == 1"></reportModule2>
-      <reportModule3 v-if="current == 2"></reportModule3>
+      <reportModule2 v-if="current == 1" :reportData="reportData2" :attachment="reportData2attachment"></reportModule2>
+      <reportModule3 v-if="current == 2" :reportData="reportData3" :newBuildingInfo="reportData3newBuildingInfo" :newBuildingItem="reportData3newBuildingItem"></reportModule3>
       <reportModule4 v-if="current == 3"></reportModule4>
       <reportModule5 v-if="current == 4"></reportModule5>
     </view>
@@ -55,7 +55,10 @@
         reportNo:null,
         reportData1:{},
         reportData2:{},
+        reportData2attachment:{},
         reportData3:{},
+        reportData3newBuildingInfo:{},
+        reportData3newBuildingItem:{},
         reportData4:{},
         reportData5:{},
         tabList: [{
@@ -91,19 +94,38 @@
           if(res.code === 200){
             this.reportData1 = res.data;
           }
-          console.log(this.reportData1);
+          console.log("1、组织",this.reportData1);
         })
         getGeneralOverview(this.reportNo).then(res =>{
           if(res.code === 200){
             this.reportData2 = res.data;
           }
-          console.log(this.reportData2);
+          console.log("2、天然气",this.reportData2);
+        })
+        getGeneralOverviewAttach(this.reportNo).then(res =>{
+          if(res.code === 200){
+            this.reportData2attachment = res.data;
+          }
+          console.log("3、天然气附表",this.reportData2attachment);
+        })
+        getBusinessAnalyze(this.reportNo).then(res =>{
+          if(res.code === 200){
+            this.reportData3 = res.data;
+          }
+          console.log("4、重点业务市场分析",this.reportData3);
+        })
+        getNewBuildingInfo(this.reportNo).then(res =>{
+          if(res.code === 200){
+            this.reportData3newBuildingInfo = res.data;
+          }
+          console.log("5、楼盘预计未来三年确认的新建楼盘信息",this.reportData3newBuildingInfo);
+        })
+        getNewBuildingItem(this.reportNo).then(res =>{
+          if(res.code === 200){
+            this.reportData3newBuildingItem = res.data;
+          }
+          console.log("6、预计未来三年安装确认项目",this.reportData3newBuildingItem);
         })
-        // getGeneralOverview()
-        // getGeneralOverviewAttach
-        // getBusinessAnalyze
-        // getNewBuildingInfo
-        // getNewBuildingItem
         // getDevelopmentPlan
         // getTargetSuggestion
       }
--
libgit2 0.21.2