3.31

src/layout/head.vue

@@ -130,13 +130,8 @@ export default defineComponent({
           disabed: false,
         },
         {
-<<<<<<< HEAD
-          label: "2020年第四季度",
-          value: "typeOne",
-=======
           label: "2021年第四季度",
-          value: "four",
->>>>>>> a917f61207d692e4bd354a67b40b3398dfc0dbdf
+          value: "typeFour",
           disabed: false,
         },
       ],

src/views/dataCenter/ConctructSystem/mock.js

 export default {
-    "typeOne": {
+    "typeFour": {
         industryCardItems: [{
             label: "国家部委、军委机关批复立项项目",
             value: 0,
@@ -15,15 +15,15 @@ export default {
             tit: "编制军民融合发展“十四五”规划进展",
             municipal: "市级",
             county: "区县",
-            municipalnum: 0,
-            countynum: 0,
+            municipalnum: 100,
+            countynum: 44,
         },
         {
             tit: "今年以来制定涉及军民融合发展政策情况",
             municipal: "市级",
             county: "区县",
-            municipalnum: 0,
-            countynum: 0,
+            municipalnum: 100,
+            countynum: 70,
         },
         ]
 

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

 export default {
-  "typeOne": {
-    meetingCount: 0,
+  "typeFour": {
+    meetingCount: 90,
 
-    cityData: []
+    cityData: [14, 11, 11, 6, 8, 7, 8, 7, 5, 6, 7]
 
   },
   "typeThree": {

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

 export default {
-  "typeOne": [],
+  "typeFour": [15, 15, 15, 14, 14, 15, 13.6, 13, 14, 14, 12],
   "typeThree": [15, 15, 12, 13.5, 14, 15, 14, 13, 14, 13, 12.2],
   "typeTwo": [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/mock.js

 export default {
-  "typeOne": {
-    meetingCount: 0,
+  "typeFour": {
+    meetingCount: 199,
 
-    cityData: []
+    cityData: [54, 17, 18, 10, 15, 12, 17, 7, 21, 18, 10]
 
   },
   "typeThree": {

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

@@ -128,7 +128,7 @@ export default defineComponent({
                 color: "#999",
               },
               text1: {
-                padding: [-5, 30, 0, 8],
+                padding: [-5, 52, 0, 8],
                 color: "#fff",
               },
               text0: {

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

 export default {
-  "typeOne": {
-    cardItems: [{ label: "人员总数", value: 0 }],
+  "typeFour": {
+    cardItems: [{ label: "人员总数", value: 278 }],
     pieList: [
-      { label: "专职", value: 0 },
-      { label: "兼职", value: 0 },
+      { label: "专职", value: 148 },
+      { label: "兼职", value: 130 },
     ]
 
   },

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

 export default {
-    "typeOne": {
+    "typeFour": {
         countryData: {
             // 国防数据
             name: "国防要求建设项目",
@@ -16,7 +16,7 @@ export default {
             ]
         },
         provinceData: {
-            process: 0,
+            process: 0.64,
             name: "省军民融合重大示范项目",
             info: [{
                 label: "项目数量",

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

 export default {
-    "typeOne": {
+    "typeFour": {
         seriesData: [{
             value: [107.32, 157.51, 172.11, 241.13],
             rate: ["", 42.17, 21.19, 37.85],

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

 export default {
-    "typeOne": {
+    "typeFour": {
         info: [{
             label: "入伍总人数",
             value: "1470",

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

 export default {
-    "typeOne": {
+    "typeFour": {
         info: [{
             label: "民口单位军品收入",
             value: 164.42,

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

 export default {
-    "typeOne": [],
+    "typeFour": [28.5, 24.5, 26, 24, 27, 26, 20, 24.5, 21.5, 24.5, 18],
     "typeThree": [19.5, 27, 22.5, 22, 22, 26, 24, 19, 22, 21, 11],
     "typeTwo": [25, 27, 18, 22, 28, 24, 19, 20, 21, 22, 30],
 

src/views/dataCenter/industrial/mock.js

 export default {
-    "typeOne": {
+    "typeFour": {
         industryCardItems: [{
             label: "国防科技工业产值总量",
             value: 2066.8

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

 export default {
-    "typeOne": {
-        incomCount: 0,
+    "typeFour": {
+        incomCount: 7599.96,
         seriesData: [{
             label: "数字军工(网络、人工智能)领域",
             value: 2238.5
         },
         {
             label: "高端装备领域",
-            value: "--"
+            value: 818.2
         },
         {
             label: "核电(新能源领域)",
@@ -27,7 +27,7 @@ export default {
         },
         {
             label: "军队现代后勤保障领域",
-            value: "--"
+            value: 1089.72
         },
         {
             label: "军用材料与基础件配套领域",
@@ -35,7 +35,7 @@ export default {
         },
         {
             label: "其他",
-            value: "--"
+            value: 733.24
         },
         ]
     },

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

 export default {
-    "typeOne": {
+    "typeFour": {
         seriesData: [{
             value: [3307, 961.5, 128.7, 220.5, 798.1, 541.7, 205, 57.7, 18.1, 188.6, 82.3],
             rateData: [32, 19, 6, 24, 38, -10, 30, -9, 12, 8, 99],

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

 export default {
-    "typeOne": {
+    "typeFour": {
         seriesData: [{
             value: [5204.49, 6029.77, 7633.65, 6509.2]
 

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

 export default {
-    "typeOne": {
+    "typeFour": {
         seriesData: [{
             name: "产值规模",
             type: "level_2",

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

 export default {
-    "typeOne": [],
+    "typeFour": [16.5, 15.5, 8, 12.5, 13, 16.5, 15, 10.5, 17.5, 13, 14.5],
     "typeThree": [15.5, 14, 13, 10.5, 16.5, 18.5, 10.5, 11.5, 13, 10, 17.5],
     "typeTwo": [14.5, 9, 6, 10, 13, 14, 13.5, 8, 6, 12.5, 15],
 

src/views/dataCenter/innovation/mock.js

 export default {
-    "typeOne": {
+    "typeFour": {
         count: 209,
 
         cityData: [{

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

 export default {
-    "typeOne": {
+    "typeFour": {
         money: 294.5,
         cityData: [{
             value: [184.7, 19.1, 7, 9, 28.6, 20.6, 9.7, 3, 0.4, 8.1, 4.3],

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

 export default {
-    "typeOne": [],
+    "typeFour": [18, 14, 10, 13.5, 15.5, 16, 9.5, 9.5, 6.5, 9.5, 10.5],
     "typeThree": [20, 15.5, 8, 13.5, 16.5, 15.5, 9.5, 12, 7.5, 4.5, 7],
     "typeTwo": [19, 13.5, 6.5, 12.5, 15.5, 14, 6.5, 10.5, 8, 4, 6],
 

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

 export default {
-    "typeOne": {
+    "typeFour": {
         count: 139,
         cityData: [{
             value: [130, 133, 139],

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

 export default {
-    "typeOne": {
+    "typeFour": {
         cardItems: [{
             label: "联合科研攻关投入金额",
-            value: 136.85
+            value: 206.68
         },
         {
             label: "联合科研攻关投入金额增长率",
-            value: "74%",
+            value: "20%",
         },
         ],
         seriesData: [{
             label: "数字军工(网络、人工智能)",
-            value: 100.51
+            value: 151.05
         },
         {
             label: "海洋",
-            value: 6.46
+            value: 9.88
         },
         {
             label: "太空",
-            value: 9.65
+            value: 13.80
         },
         {
             label: "生物",
-            value: 6.23
+            value: 8.34
         },
         {
             label: "核电",
-            value: 13.6
+            value: 23.61
         },
         ]
     },
@@ -39,7 +39,7 @@ export default {
         },
         {
             label: "联合科研攻关投入金额增长率",
-            value: "74%",
+            value: "20%",
         },
         ],
         seriesData: [{

src/views/dataCenter/map/cradMock.js

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

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

 export default {
-    "typeOne": [{
+    "typeFour": [{
         title: "军民融合主营业务收入",
         rate: "20.5%",
         value: "6509.2",

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

 export default {
-    "typeOne": {
+    "typeFour": {
         // 贯彻国防要求的建设项目
         country: [{
             label: "贯彻国防要求的建设项目",

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

 export default {
-    "typeOne": {
-        meetingCount: 0, // 各地召开融委全体会议次数
-        workeCount: 0, // 与当地军分区（警备区）建立并落实军地协作工作机制
-        fullTime: 0, // 专职
-        partTime: 0 // 兼职
+    "typeFour": {
+        meetingCount: 90, // 各地召开融委全体会议次数
+        workeCount: 72, // 与当地军分区（警备区）建立并落实军地协作工作机制
+        fullTime: 148, // 专职
+        partTime: 130 // 兼职
     },
     "typeThree": {
         meetingCount: 43, // 各地召开融委全体会议次数

src/views/dataCenter/map/model/Income/mock.js

 export default {
-  "typeOne": [
+  "typeFour": [
     {
       name: "国防科工军品收入",
       type: "level_1",

src/views/dataCenter/map/model/InvestmentProgress/mock.js

 export default {
-  "typeOne": [
+  "typeFour": [
     {
       name: "投资金额",
       type: "level_2",

src/views/dataCenter/map/model/Performance/mock.js

 export default {
-  "typeOne": [{
+  "typeFour": [{
     name: "服务强军兴军",
     type: "level_1",
-    value: [],
+    value: [28.5, 24.5, 26, 24, 27, 26, 20, 24.5, 21.5, 24.5, 18],
   },
   {
     name: "军民协同创新",
     type: "level_3",
 
-    value: [],
+    value: [18, 14, 10, 13.5, 15.5, 16, 9.5, 9.5, 6.5, 9.5, 10.5],
   },
   {
     name: "产业融合发展",
     type: "level_2",
 
-    value: [],
+    value: [16.5, 15.5, 8, 12.5, 13, 16.5, 15, 10.5, 17.5, 13, 14.5],
   },
   {
     name: "资源开放共享",
     type: "level_4",
 
-    value: [],
+    value: [14, 13, 14, 13.4, 14, 12, 12, 12, 15, 14, 11.5],
   },
   {
     name: "五大体系建设",
     type: "level_5",
 
-    value: [],
+    value: [15, 15, 15, 14, 14, 15, 13.6, 13, 14, 14, 12],
   },
   ],
   "typeThree": [{

src/views/dataCenter/map/model/RankList/mock.js

 export default {
-  "typeOne": [],
+  "typeFour": [
+    {
+      name: "萧山区",
+      score: 88,
+      type: 1,
+    },
+    {
+      name: "南湖区",
+      score: 84.5,
+      type: 2,
+    },
+    {
+      name: "鄞州区",
+      score: 82.5,
+      type: 2,
+    },
+    {
+      name: "西湖区",
+      score: 81.5,
+      type: 1,
+    },
+
+    {
+      name: "德清县",
+      score: 78,
+      type: 2,
+    },
+    {
+      name: "海曙区",
+      score: 77.5,
+      type: 1,
+    },
+    {
+      name: "长兴县",
+      score: 76.5,
+      type: 2,
+    },
+    {
+      name: "诸暨市",
+      score: 74.5,
+      type: 2,
+    },
+
+    {
+      name: "上城区",
+      score: 69.5,
+      type: 2,
+    },
+
+    {
+      name: "永康市",
+      score: 61,
+      type: 2,
+    },
+    {
+      name: "衢江区",
+      score: 60.5,
+      type: 2,
+    },
+    {
+      name: "温岭市",
+      score: 58,
+      type: 2,
+    },
+
+    {
+      name: "象山县",
+      score: 53,
+      type: 2,
+    },
+    {
+      name: "缙云县",
+      score: 52,
+      type: 1,
+    },
+  ],
   "typeThree": [
     {
       name: "南湖区",

src/views/dataCenter/resourceShare/mock.js

 export default {
-    "typeOne": {
+    "typeFour": {
         industryCardItems: [{
-                label: "国防科技工业产值总量",
-                value: 0
-            },
-            {
-                label: "国防科技工业产值总量增长率",
-                value: 0,
-            },
+            label: "国防科技工业产值总量",
+            value: 0
+        },
+        {
+            label: "国防科技工业产值总量增长率",
+            value: 0,
+        },
         ],
         extendCardItems: [{
-                label: "参与军民融合产业互动的规模以上企业主营业务收入",
-                value: "7633.65",
-            },
-            {
-                label: "参与军民融合产业互动的规模以上企业主营业务收入增长率",
-                value: "26.6",
-            },
+            label: "参与军民融合产业互动的规模以上企业主营业务收入",
+            value: "7633.65",
+        },
+        {
+            label: "参与军民融合产业互动的规模以上企业主营业务收入增长率",
+            value: "26.6",
+        },
         ],
     },
     "typeThree": {
         industryCardItems: [{
-                label: "国防科技工业产值总量",
-                value: 1656.9
-            },
-            {
-                label: "国防科技工业产值总量增长率",
-                value: 19
-            },
+            label: "国防科技工业产值总量",
+            value: 1656.9
+        },
+        {
+            label: "国防科技工业产值总量增长率",
+            value: 19
+        },
         ],
         extendCardItems: [{
-                label: "参与军民融合产业互动的规模以上企业主营业务收入",
-                value: "5421.69",
-            },
-            {
-                label: "参与军民融合产业互动的规模以上企业主营业务收入增长率",
-                value: "23.75",
-            },
+            label: "参与军民融合产业互动的规模以上企业主营业务收入",
+            value: "5421.69",
+        },
+        {
+            label: "参与军民融合产业互动的规模以上企业主营业务收入增长率",
+            value: "23.75",
+        },
         ],
     },
     "typeTwo": {
         industryCardItems: [{
-                label: "国防科技工业产值总量",
-                value: "1113.4"
-            },
-            {
-                label: "国防科技工业产值总量增长率",
-                value: "22.8",
-            },
+            label: "国防科技工业产值总量",
+            value: "1113.4"
+        },
+        {
+            label: "国防科技工业产值总量增长率",
+            value: "22.8",
+        },
         ],
         extendCardItems: [{
-                label: "参与军民融合产业互动的规模以上企业主营业务收入",
-                value: "3545.5",
-            },
-            {
-                label: "参与军民融合产业互动的规模以上企业主营业务收入增长率",
-                value: "31.5",
-            },
+            label: "参与军民融合产业互动的规模以上企业主营业务收入",
+            value: "3545.5",
+        },
+        {
+            label: "参与军民融合产业互动的规模以上企业主营业务收入增长率",
+            value: "31.5",
+        },
         ],
     }
 

src/views/dataCenter/resourceShare/model/Activity/mock.js

 export default {
-    "typeOne": {
+    "typeFour": {
         seriesData: [{
             count: 0,
             value: [294300, 11374.5, 5649.7, 66070, 2555400, 20700, 46641, 56000, 611500, 3968.98, 1528]

src/views/dataCenter/resourceShare/model/Facility/mock.js

 export default {
-    "typeOne": {
+    "typeFour": {
         seriesData: [{
             value: [258, 351, 396, 687],
         }],

src/views/dataCenter/resourceShare/model/PlatformInfo/mock.js

 export default {
-    "typeOne": {
+    "typeFour": {
         seriesData: [{
             count: 258,
             value: [12, 27, 45, 33, 24, 10, 8, 6, 47, 35, 11]

src/views/dataCenter/resourceShare/model/TargetBar/mock.js

 export default {
-    "typeOne": [],
+    "typeFour": [14, 13, 14, 13.4, 14, 12, 12, 12, 15, 14, 11.5],
     "typeThree": [15, 13.4, 13, 14, 13, 13, 12.5, 12, 10.5, 13.5, 8.5],
     "typeTwo": [13.2, 14, 10, 10, 14, 12.5, 7.5, 13.5, 10, 12, 10],
 

src/views/dataCenter/resourceShare/model/TotalContrac/index.vue

@@ -33,7 +33,7 @@
           </el-row>
 
           <div class="pie-value">
-            {{ item.value || "--" }}
+            {{ item.value }}
             <span>次</span>
           </div>
         </div>

src/views/dataCenter/resourceShare/model/TotalContrac/mock.js

 export default {
-    "typeOne": {
-        count: 0,
+    "typeFour": {
+        count: 86,
 
         seriesData: [{
             label: "杭州市",
-            value: 0
+            value: 63
         },
         {
             label: "宁波市",
-            value: 0
+            value: 3
         },
         {
             label: "温州市",
-            value: 0
+            value: 2
         },
         {
             label: "湖州市",
@@ -27,19 +27,19 @@ export default {
             value: 0
         }, {
             label: "金华市",
-            value: 0
+            value: 10
         }, {
             label: "衢州市",
             value: 0
         }, {
             label: "舟山市",
-            value: 0
+            value: 3
         }, {
             label: "台州市",
-            value: 0
+            value: 2
         }, {
             label: "丽水市",
-            value: 0
+            value: 3
         },
         ]