fix(创新示范): 数据更正2021年数据更正

src/layout/head.vue

@@ -84,7 +84,7 @@
                 active: index === curYearIndex,
               }"
               @click="yearHandle(item.value, index)"
-              >{{ item.label }}</span
+              >{{ item.label }} {{item.value}}</span
             >
           </div>
         </el-col>

src/views/dataCenter/ConctructSystem/index.vue

@@ -107,6 +107,9 @@ export default defineComponent({
   font-size: 18px;
   color: #4198ff;
 }
+::v-deep .Progress .el-progress__text span {
+  font-size: 20px
+}
 .card-item {
   background: #fff;
   border-radius: 5px;
@@ -120,7 +123,6 @@ export default defineComponent({
   box-sizing: border-box;
 
   .card-item-xbox {
-    // border: 1px solid;
     margin: 15px 0;
     padding: 8px 15px;
     font-size: 14px;
@@ -130,9 +132,7 @@ export default defineComponent({
     }
   }
   .xbox-content {
-    // width: 546px;
     height: 150px;
-    // padding: 0px 60px;
     box-sizing: border-box;
     background-color: #f8f9fb;
     border-radius: 4px;
@@ -147,8 +147,8 @@ export default defineComponent({
         left: 80px;
         top: 20px;
         font-size: 14px;
-        // letter-spacing: 0.5em;
       }
+      
     }
   }
   .user_line {

src/views/dataCenter/ConctructSystem/mock.js

@@ -19,7 +19,7 @@ export default {
                 countynum: 0,
             },
             {
-                tit: "今年以来制定涉及JMRH发展政策情况",
+                tit: "今年以来制定涉及军民融合发展政策情况",
                 municipal: "市级",
                 county: "区县",
                 municipalnum: 0,
@@ -48,7 +48,7 @@ export default {
                 countynum: 0,
             },
             {
-                tit: "今年以来制定涉及JMRH发展政策情况",
+                tit: "今年以来制定涉及军民融合发展政策情况",
                 municipal: "市级",
                 county: "区县",
                 municipalnum: 0,
@@ -73,15 +73,15 @@ export default {
                 tit: "编制JMRH发展“十四五”规划进展",
                 municipal: "市级",
                 county: "区县",
-                municipalnum: 78,
-                countynum: 76,
+                municipalnum: 90,
+                countynum: 40,
             },
             {
-                tit: "今年以来制定涉及JMRH发展政策情况",
+                tit: "今年以来制定涉及军民融合发展政策情况",
                 municipal: "市级",
                 county: "区县",
-                municipalnum: 77,
-                countynum: 75,
+                municipalnum: 60,
+                countynum: 20,
             },
         ]
     },

src/views/dataCenter/ConctructSystem/model/Munitions/index.vue

@@ -115,8 +115,6 @@ export default defineComponent({
         yAxis: {
           type: "value",
           name: "数量(次)",
-          min: 0,
-          max: 50,
         },
         xAxis: {
           type: "category",

src/views/dataCenter/ConctructSystem/model/Munitions/mock.js

 export default {
   "typeOne": {
-    meetingCount:0,
+    meetingCount: 0,
 
     cityData: []
 
   },
-  "typeTwo":  {
-    meetingCount:0,
+  "typeTwo": {
+    meetingCount: 0,
 
     cityData: []
 
   },
-  "typeThree":{
-    meetingCount:43,
-    cityData: [40, 40.40, 40, 40, 40, 40, 40, 40, 40, 40, 40]
+  "typeThree": {
+    meetingCount: 43,
+    cityData: [8, 4,1, 4, 4, 1, 2, 6, 3, 2, 6, 6]
   },
 }
\ No newline at end of file

src/views/dataCenter/ConctructSystem/model/Outline/index.vue

@@ -78,7 +78,6 @@ export default defineComponent({
         yAxis: {
           type: "value",
           show: false,
-          max:300
         },
         xAxis: {
           type: "category",

src/views/dataCenter/ConctructSystem/model/Outline/mock.js

 export default {
   "typeOne": [],
   "typeTwo":  [],
-  "typeThree": [250, 170, 190, 145, 128, 194, 160, 210, 150, 300, 160],
+  "typeThree": [14, 15, 10.4, 12, 11, 15, 13, 13, 13, 11, 11.2],
 }
\ No newline at end of file

src/views/dataCenter/ConctructSystem/model/Platform/index.vue

@@ -117,8 +117,6 @@ export default defineComponent({
         yAxis: {
           type: "value",
           name: "数量(次)",
-          min: 0,
-          max: 250,
         },
         xAxis: {
           type: "category",

src/views/dataCenter/ConctructSystem/model/Platform/mock.js

 export default {
   "typeOne": {
-    meetingCount:0,
+    meetingCount: 0,
 
     cityData: []
 
   },
-  "typeTwo":  {
-    meetingCount:0,
+  "typeTwo": {
+    meetingCount: 0,
 
     cityData: []
 
   },
-  "typeThree":{
-    meetingCount:43,
-    cityData: [40, 40.40, 40, 40, 40, 40, 40, 40, 40, 40, 40]
+  "typeThree": {
+    meetingCount: 112,
+    cityData: [14, 16, 12,6, 7, 7, 12, 5, 12, 14,7]
   },
 }
\ No newline at end of file

src/views/dataCenter/army/model/EconomicConstruct/mock.js

@@ -5,27 +5,27 @@ export default {
             name: "国防要求建设项目",
             info: [{
                     label: "项目数量",
-                    value: 0,
+                    value: 67,
                     unit: "个"
                 },
                 {
                     label: "投资额",
-                    value: 0,
+                    value: 438.32,
                     unit: "亿元"
                 },
             ]
         },
         provinceData: {
+            process:0.4731,
             name: "省军民融合重大示范项目",
-            process:0,
             info: [{
                     label: "项目数量",
-                    value: 0,
+                    value: 42,
                     unit: "个"
                 },
                 {
                     label: "投资额",
-                    value: 0,
+                    value: 138.84,
                     unit: "亿元"
                 },
             ]
@@ -99,7 +99,7 @@ export default {
             ]
         },
         provinceData: {
-            process:0,
+            process: 0,
             name: "省军民融合重大示范项目",
             info: [{
                     label: "项目数量",
@@ -162,7 +162,7 @@ export default {
                     city: "丽水",
                     value: 0,
                 },
-            ],
+            ]
         }
     },
     "typeThree": {
@@ -171,27 +171,27 @@ export default {
             name: "国防要求建设项目",
             info: [{
                     label: "项目数量",
-                    value: 67,
+                    value: 0,
                     unit: "个"
                 },
                 {
                     label: "投资额",
-                    value: 438.32,
+                    value: 0,
                     unit: "亿元"
                 },
             ]
         },
         provinceData: {
-            process:0.4731,
+            process: 0,
             name: "省军民融合重大示范项目",
             info: [{
                     label: "项目数量",
-                    value: 42,
+                    value: 0,
                     unit: "个"
                 },
                 {
                     label: "投资额",
-                    value: 138.84,
+                    value: 0,
                     unit: "亿元"
                 },
             ]
@@ -250,7 +250,6 @@ export default {
                 },
             ],
         }
-
     },
 
 }
\ No newline at end of file

src/views/dataCenter/army/model/Person/mock.js

@@ -2,17 +2,17 @@ export default {
     "typeOne": {
         info:[{
             label: "入伍总人数",
-            value: 0,
+            value: "1470",
             unit:"人"
         },
         {
             label: "入伍总比列",
-            value: 0,
+            value: "0.5%",
             unit:""
         }],
         seriesData: [{
-            value: [],
-            rate: [],
+            value: [595, 173, 128, 74, 84, 47, 142, 39, 49, 100, 39],
+            rate: [0.5, 0.4, 0.5, 1, 0.5, 0.2, 0.6, 0.9, 0.8, 1, 0.6],
         }]
     },
     "typeTwo": {
@@ -34,17 +34,17 @@ export default {
     "typeThree": {
         info:[{
             label: "入伍总人数",
-            value: "1470",
+            value: 0,
             unit:"人"
         },
         {
             label: "入伍总比列",
-            value: "0.5%",
+            value: 0,
             unit:""
         }],
         seriesData: [{
-            value: [595, 173, 128, 74, 84, 47, 142, 39, 49, 100, 39],
-            rate: [0.5, 0.4, 0.5, 1, 0.5, 0.2, 0.6, 0.9, 0.8, 1, 0.6],
+            value: [],
+            rate: [],
         }]
     }
 

src/views/dataCenter/industrial/mock.js

@@ -11,11 +11,11 @@ export default {
         ],
         extendCardItems: [{
                 label: "参与军民融合产业互动的规模以上企业主营业务收入",
-                value: 0,
+                value: "7633.65",
             },
             {
                 label: "参与军民融合产业互动的规模以上企业主营业务收入增长率",
-                value: 0,
+                value: "26.6",
             },
         ],
     },
@@ -26,16 +26,16 @@ export default {
             },
             {
                 label: "国防科技工业产值总量增长率",
-                value: 0,
+                value: 0
             },
         ],
         extendCardItems: [{
                 label: "参与军民融合产业互动的规模以上企业主营业务收入",
-                value: 0,
+                value: "3545.5",
             },
             {
                 label: "参与军民融合产业互动的规模以上企业主营业务收入增长率",
-                value: 0,
+                value: "31.5",
             },
         ],
     },

src/views/dataCenter/industrial/model/BusinessIncome/mock.js

 export default {
     "typeOne": {
-        incomCount: 0,
+        incomCount: 5258.05,
         seriesData: [{
                 label: "数字军工(网络、人工智能)领域",
-                value: 0
+                value: 1458.46
             },
             {
                 label: "高端装备领域",
-                value: 0
+                value: 565.92
             },
             {
                 label: "核电(新能源领域)",
-                value: 0
+                value: 555.97
             },
             {
                 label: "生物安全领域",
-                value: 0
+                value: 465.57
             },
             {
                 label: "航空航天领域",
-                value: 0
+                value: 375.76
             },
             {
                 label: "船舶与海洋装备领域",
-                value: 0
+                value: 152.77
             },
             {
                 label: "军队现代后勤保障领域",
-                value: 0
+                value: 738.18
             },
             {
                 label: "军用材料与基础件配套领域",
-                value: 0
+                value: 872
             },
             {
                 label: "其他",
-                value: 0
+                value: 373.41
             },
         ]
     },

src/views/dataCenter/industrial/model/IncomDistribution/index.vue

@@ -53,6 +53,7 @@ export default defineComponent({
   },
   watch: {
     seriesData() {
+      this.mapEcharts.clear();
       this.mapEcharts.showLoading();
       this.mapEcharts.setOption(this.optionBar);
       this.mapEcharts.hideLoading();

src/views/dataCenter/industrial/model/IncomDistribution/mock.js

 export default {
     "typeOne": {
         seriesData: [{
-            value: [],
+            value: [2513.1, 810.23, 121.96, 177.83, 578.79, 602.33, 158.11,60.18,16.21,174.92,41.39],
             rateData: [],
         }],
 

src/views/dataCenter/industrial/model/IncomExtendLine/mock.js

 export default {
     "typeOne": {
         seriesData: [{
-            value: [],
+            value: [5204.49, 6029.77, 7633.65, 3545.5]
 
         }],
 
     },
     "typeTwo": {
         seriesData: [{
-            value: [],
-
+            value: [5204.49, 6029.77, 7633.65, 3545.5]
         }],
 
     },

src/views/dataCenter/innovation/index.vue

@@ -170,8 +170,6 @@ export default defineComponent({
         yAxis: {
           type: "value",
           name: "数量(个)",
-          min: 0,
-          max: 250,
         },
         xAxis: {
           type: "category",

src/views/dataCenter/innovation/mock.js

 export default {
     "typeOne": {
-        count:0,
+        count: 130,
 
         cityData: [{
             value: [],
         }]
     },
     "typeTwo": {
-        count:0,
+        count: 0,
 
         cityData: [{
             value: [],
         }]
     },
     "typeThree": {
-        count:155,
+        count: 155,
         cityData: [{
             value: [75, 37, 4, 17, 8, 10, 1, 1, 0, 0, 2],
         }]

src/views/dataCenter/innovation/model/Munitions/index.vue

@@ -110,10 +110,6 @@ export default defineComponent({
         };
       });
 
-      // const seriesBar = {
-
-      // };
-
       return {
         tooltip: {
           trigger: "axis",
@@ -126,7 +122,7 @@ export default defineComponent({
             html += `<div class="munition-echart ">
                 <span class=" title color_1">${params[0].axisValue}市</span>
                 <br />
-                <span class="text text-color_1">${params[0].data.value}</span>个
+                <span class="text text-color_1">${params[0].data.value}</span>亿元
                </div>
              `;
 
@@ -136,16 +132,15 @@ export default defineComponent({
         legend: {},
         grid: {
           top: "10%",
-          left: "1%",
+          left: "2%",
           right: "2%",
           bottom: "3%",
           containLabel: true,
         },
         yAxis: {
           type: "value",
-          name: "数量(次)",
-          min: 0,
-          max: 500,
+          name: "金额(亿元)",
+        
         },
         xAxis: {
           type: "category",

src/views/dataCenter/innovation/model/Munitions/mock.js

 export default {
     "typeOne": {
-        money: 0,
-
+        money: 266.29,
         cityData: [{
-            value: [],
+            value: [157.82, 16.63, 8.86, 9.29, 25.02, 23.83, 7.79, 2.81, 0.7, 9.51,4.07],
         }]
     },
 

src/views/dataCenter/innovation/model/Outline/mock.js

 export default {
     "typeOne": [],
-    "typeTwo": [],
+    "typeTwo": [19, 13.5, 6.5, 12.5, 15.5, 14, 6.5, 10.5, 8, 4, 6],
     "typeThree": [19, 13.5, 6.5, 12.5, 15.5, 14, 6.5, 10.5, 8, 4, 6],
 
 }
\ No newline at end of file

src/views/dataCenter/innovation/model/Platform/mock.js

 export default {
     "typeOne": {
-        count:0,
-
+        count: 139,
         cityData: [{
-            value: [],
+            value: [130, 133, 139],
         }]
     },
     "typeTwo": {
-        count:0,
-
+        count: 0,
         cityData: [{
-            value: [],
+            value: [130, 133, 139],
         }]
     },
     "typeThree": {
-        count:139,
+        count: 0,
         cityData: [{
-            value: [225, 160, 170],
+            value: [130, 133, 139],
         }]
     }
 }
\ No newline at end of file

src/views/dataCenter/innovation/model/ScientificInvestment/index.vue

@@ -25,7 +25,7 @@
             <span>{{ item.label }}</span>
           </el-row>
           <div class="pie-value">
-            {{ item.value }}
+            {{ item.value || "--" }}
             <span>亿元</span>
           </div>
         </div>

src/views/dataCenter/innovation/model/ScientificInvestment/mock.js

@@ -2,32 +2,32 @@ export default {
     "typeOne": {
         cardItems: [{
                 label: "联合科研攻关投入金额",
-                value: 0
+                value:0
             },
             {
                 label: "联合科研攻关投入金额增长率",
-                value: 0,
+                value: 0
             },
         ],
         seriesData: [{
                 label: "数字军工(网络、人工智能)",
-                value: 0
+                value: 122
             },
             {
                 label: "海洋",
-                value: 0
+                value: 9.02
             },
             {
                 label: "太空",
-                value: 0
+                value: 12.19
             },
             {
                 label: "生物",
-                value: 0
+                value: 9.73
             },
             {
                 label: "核电",
-                value: 0
+                value: 18.74
             },
         ]
     },
@@ -68,32 +68,32 @@ export default {
     "typeThree": {
         cardItems: [{
                 label: "联合科研攻关投入金额",
-                value: "38.13"
+                value: "78.54"
             },
             {
                 label: "联合科研攻关投入金额增长率",
-                value: "19%",
+                value: 0,
             },
         ],
         seriesData: [{
                 label: "数字军工(网络、人工智能)",
-                value: 25.17
+                value: 62.33
             },
             {
                 label: "海洋",
-                value: 20.18
+                value: 4.23
             },
             {
                 label: "太空",
-                value: 30.96
+                value: 6.33
             },
             {
                 label: "生物",
-                value: 10.22
+                value: 5.31
             },
             {
                 label: "核电",
-                value: 5.9
+                value: 8.34
             },
         ]
     }

src/views/dataCenter/map/cradMock.js

 export default {
     "typeOne": {
         list: [
-            { label: "领跑产品（技术）", value: 0, unit: "个" },
-            { label: "军地协同创新平台", value: 0, unit: "个" },
+          { label: "领跑产品（技术）", value: "130", unit: "个" },
+          { label: "军地协同创新平台", value: "139", unit: "个" },
             { label: "新兴领域研发经费", value: 0, unit: "亿元" },
           ],
           list2x: [
-            { label: "军工科研设备设施开放共享", value: 0, unit: "个" },
-            { label: "军民资源共享信息平台数量", value: 0, unit: "个" },
-            { label: "军地需求对接活动数量", value: 0, unit: "个" },
+            { label: "军工科研设备设施开放共享", value: "687", unit: "个" },
+            { label: "军民资源共享信息平台数量", value: "212", unit: "个" },
+            { label: "军地需求对接活动数量", value: "56", unit: "个" },
           ],
     },
     "typeTwo": {
@@ -25,14 +25,14 @@ export default {
     },
     "typeThree": {
         list: [
-            { label: "领跑产品（技术）", value: "130", unit: "个" },
-            { label: "军地协同创新平台", value: "139", unit: "个" },
+            { label: "领跑产品（技术）", value: 0, unit: "个" },
+            { label: "军地协同创新平台", value: 0, unit: "个" },
             { label: "新兴领域研发经费", value: "86.55", unit: "亿元" },
           ],
           list2x: [
-            { label: "军工科研设备设施开放共享", value: "687", unit: "个" },
-            { label: "军民资源共享信息平台数量", value: "212", unit: "个" },
-            { label: "军地需求对接活动数量", value: "56", unit: "个" },
+            { label: "军工科研设备设施开放共享", value: 0, unit: "个" },
+            { label: "军民资源共享信息平台数量", value: 0, unit: "个" },
+            { label: "军地需求对接活动数量", value: 0, unit: "个" },
           ],
 
     },

src/views/dataCenter/map/index.vue

@@ -29,7 +29,7 @@
     /></el-col>
     <el-col class="card-item"><Industrial /></el-col>
     <el-col class="card-item"
-      ><CardItem :infoList="list2x" title="资源开发共享"
+      ><CardItem :infoList="list2x" title="资源开放共享"
     /></el-col>
     <el-col class="card-item"><SystemConstruct /></el-col>
   </div>

src/views/dataCenter/map/model/CardList/strongArmyMock.js

@@ -2,23 +2,23 @@ export default {
     "typeOne": {
         // 贯彻国防要求的建设项目
         country: [{
-                label: "贯彻国防要求的建设项目",
-                value: 0,
-                unit: "个"
-            },
-            {
-                label: "总投资",
-                value: 0,
-                unit: "亿元"
-            },
+            label: "贯彻国防要求的建设项目",
+            value: 67,
+            unit: "个"
+        },
+        {
+            label: "总投资",
+            value: 438.32,
+            unit: "亿元"
+        },
         ],
         // 国防科技工业军品收入
         technologyIncome: 0,
         // 民口单位人均军品收入
         militaryIncome: 0,
         // 应届大学生应征入伍
-        enlistVal: 0,
-        enlistRateVal: 0
+        enlistVal: 1470,
+        enlistRateVal: "0.5%"
     },
     "typeTwo": {
         // 贯彻国防要求的建设项目
@@ -44,23 +44,22 @@ export default {
     "typeThree": {
         // 贯彻国防要求的建设项目
         country: [{
-                label: "贯彻国防要求的建设项目",
-                value: 67,
-                unit: "个"
-            },
-            {
-                label: "总投资",
-                value: 438.32,
-                unit: "亿元"
-            },
+            label: "贯彻国防要求的建设项目",
+            value: 0,
+            unit: "个"
+        },
+        {
+            label: "总投资",
+            value: 0,
+            unit: "亿元"
+        },
         ],
         // 国防科技工业军品收入
         technologyIncome: 84.91,
         // 民口单位人均军品收入
         militaryIncome: 90.56,
         // 应届大学生应征入伍
-        enlistVal: 1470,
-        enlistRateVal: "0.5%"
-
+        enlistVal: 0,
+        enlistRateVal: 0
     },
 }
\ No newline at end of file