合并分支 'FXF' 到 'master'

src/views/dataCenter/ConctructSystem/mock.js

@@ -44,15 +44,15 @@ export default {
             tit: "编制军民融合发展“十四五”规划进展",
             municipal: "市级",
             county: "区县",
-                municipalnum: 0,
-                countynum: 0,
+            municipalnum: 100,
+            countynum: 82,
         },
         {
             tit: "今年以来制定涉及军民融合发展政策情况",
             municipal: "市级",
             county: "区县",
-                municipalnum: 0,
-                countynum: 0,
+            municipalnum: 82,
+            countynum: 89,
         },
         ]
 

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

@@ -6,13 +6,13 @@ export default {
 
   },
   "typeThree": {
-    meetingCount: 0,
+    meetingCount: 43,
+    cityData: [8, 4, 1, 4, 4, 1, 2, 6, 3, 2, 6, 6]
 
-    cityData: []
 
   },
   "typeTwo": {
     meetingCount: 43,
-    cityData: [8, 4,1, 4, 4, 1, 2, 6, 3, 2, 6, 6]
+    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

@@ -48,6 +48,14 @@ export default defineComponent({
   mounted() {
     this.initEcharts();
   },
+  watch: {
+    seriesData() {
+      MAP_ECHARTS.showLoading();
+      MAP_ECHARTS.setOption(this.optionBar, true);
+      MAP_ECHARTS.hideLoading();
+    },
+  },
+
   computed: {
     ...mapState({
       curDataType: (state) => state.curDataType,
@@ -91,7 +99,7 @@ export default defineComponent({
             label: {
               show: true,
               position: "top",
-              formatter: "{c} 分",
+              // formatter: "{c} 分",
             },
             barWidth: 20,
             data: this.seriesData,
@@ -100,13 +108,6 @@ export default defineComponent({
       };
     },
   },
-  watch: {
-    seriesData() {
-      MAP_ECHARTS.showLoading();
-      MAP_ECHARTS.setOption(this.optionBar, true);
-      MAP_ECHARTS.hideLoading();
-    },
-  },
   methods: {
     initEcharts() {
       const dom = document.getElementById("synergyInnovation");

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

 export default {
   "typeOne": [],
-  "typeThree":  [],
+  "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

@@ -13,6 +13,6 @@ export default {
   },
   "typeTwo": {
     meetingCount: 112,
-    cityData: [14, 16, 12,6, 7, 7, 12, 5, 12, 14,7]
+    cityData: [14, 16, 12, 6, 7, 7, 12, 5, 12, 14, 7]
   },
 }
\ No newline at end of file

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

@@ -8,13 +8,14 @@ export default {
 
   },
   "typeThree": {
-    cardItems: [{ label: "人员总数", value: 0 }],
+    cardItems: [{ label: "人员总数", value: "267" }],
     pieList: [
-      { label: "专职", value: 0 },
-      { label: "兼职", value: 0 },
+      { label: "专职", value: 142 },
+      { label: "兼职", value: 125 },
     ]
+
   },
-  "typeTwo":{
+  "typeTwo": {
     cardItems: [{ label: "人员总数", value: "267" }],
     pieList: [
       { label: "专职", value: 142 },

src/views/dataCenter/army/model/EconomicConstruct/index.vue

@@ -186,7 +186,7 @@ export default defineComponent({
             type: "value",
             name: "进度%",
             min: 0,
-            max: 100,
+            // max: 100,
             splitLine: {
               show: false,
             },

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

@@ -16,7 +16,7 @@ export default {
             ]
         },
         provinceData: {
-            process:0.4731,
+            process: 0.4731,
             name: "省军民融合重大示范项目",
             info: [{
                 label: "项目数量",
@@ -99,7 +99,7 @@ export default {
             ]
         },
         provinceData: {
-            process: 0.4731,
+            process: 0.807,
             name: "省军民融合重大示范项目",
             info: [{
                 label: "项目数量",
@@ -108,7 +108,7 @@ export default {
             },
             {
                 label: "投资额",
-                    value: 138.84,
+                value: 190.27,
                 unit: "亿元"
             },
             ]
@@ -118,52 +118,52 @@ export default {
             name: "国防要求建设项目",
             type: "level_1",
             value: [
-                37.28, 61.75, 34.54, 8.2, 34.63, 74.4, 32.74, 75.35, 28.13, 27.25, 12.76,
+                55.05, 107.49, 87.64, 13.27, 65.12, 122.31, 69.38, 120.73, 39.58, 25.34, 15.88
             ],
             rate: [{
                 city: "杭州",
-                    value: 49.28,
+                value: 72.48,
             },
             {
                 city: "宁波",
-                    value: 45.7,
+                value: 79.55,
             },
             {
                 city: "温州",
-                    value: 25.68,
+                value: 65.15,
             },
             {
                 city: "湖州",
-                    value: 36.89,
+                value: 59.69,
             },
             {
                 city: "嘉兴",
-                    value: 84.07,
+                value: 162.03,
             },
             {
                 city: "绍兴",
-                    value: 53.85,
+                value: 88.68,
             },
             {
                 city: "金华",
-                    value: 36.05,
+                value: 77.59,
             },
             {
                 city: "衢州",
-                    value: 57.74,
+                value: 92.51,
             },
             {
                 city: "舟山",
-                    value: 56.43,
+                value: 79.40,
             },
 
             {
                 city: "台州",
-                    value: 55.68,
+                value: 47.73,
             },
             {
                 city: "丽水",
-                    value: 32.85,
+                value: 57.89,
             },
             ],
         }

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

 export default {
     "typeOne": {
-        info:[{
+        info: [{
             label: "入伍总人数",
             value: "1470",
-            unit:"人"
+            unit: "人"
         },
         {
             label: "入伍总比列",
             value: "0.5%",
-            unit:""
+            unit: ""
         }],
         seriesData: [{
             value: [595, 173, 128, 74, 84, 47, 142, 39, 49, 100, 39],
@@ -16,31 +16,31 @@ export default {
         }]
     },
     "typeThree": {
-        info:[{
+        info: [{
             label: "入伍总人数",
-            value: 0,
-            unit:"人"
+            value: "1470",
+            unit: "人"
         },
         {
             label: "入伍总比列",
-            value: 0,
-            unit:""
+            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": {
-        info:[{
+        info: [{
             label: "入伍总人数",
             value: "1470",
-            unit:"人"
+            unit: "人"
         },
         {
             label: "入伍总比列",
             value: "0.5%",
-            unit:""
+            unit: ""
         }],
         seriesData: [{
             value: [595, 173, 128, 74, 84, 47, 142, 39, 49, 100, 39],

src/views/dataCenter/army/model/Science/index.vue

@@ -3,10 +3,10 @@
   <el-row class="science-info" justify="space-between">
     <el-col :span="11">
       <div class="card-item" v-for="item in info" :key="item.label">
-        <span>{{item.label}}</span>
+        <span>{{ item.label }}</span>
         <div>
-          {{item.value || "--"}}
-          <span>{{item.unit}}</span>
+          {{ item.value || "--" }}
+          <span>{{ item.unit }}</span>
         </div>
       </div>
     </el-col>
@@ -20,7 +20,11 @@
         </div>
 
         <el-scrollbar height="92px">
-          <div class="rate-list-item" v-for="(item, index) in seriesData" :key="index">
+          <div
+            class="rate-list-item"
+            v-for="(item, index) in seriesData"
+            :key="index"
+          >
             <span>{{ item.city }}</span>
             <span class="rate-value">{{ item.increace }}%</span>
           </div>
@@ -115,7 +119,7 @@ export default defineComponent({
           ]),
         },
 
-        data: this.seriesData,
+        data: this.seriesData.map((item) => item.value),
       };
 
       return {
@@ -123,12 +127,13 @@ export default defineComponent({
           trigger: "axis",
           className: "science-echart",
           formatter: (params) => {
+            // console.log(1111111, params);
             let html = `<span class="name">${params[0].axisValue}市</span>`;
 
             html += `<div class="science-echart ">
                 <span class=" title color_1">民口单位军品收入</span>
                 <br />
-                <span class="text text-color_1">${params[0].data.value}</span>亿元
+                <span class="text text-color_1">${params[0].value}</span>亿元
                </div>`;
 
             return html;

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

@@ -14,128 +14,128 @@ export default {
         seriesData: [{
             city: "杭州",
             value: 0,
-                increace:0,
+            increace: 0,
         },
         {
             city: "宁波",
             value: 0,
-                increace:0,
+            increace: 0,
         },
         {
             city: "温州",
             value: 0,
-                increace:0,
+            increace: 0,
         },
         {
             city: "湖州",
             value: 0,
-                increace:0,
+            increace: 0,
         },
         {
             city: "嘉兴",
             value: 0,
-                increace:0,
+            increace: 0,
         },
         {
             city: "绍兴",
             value: 0,
-                increace:0,
+            increace: 0,
         },
         {
             city: "金华",
             value: 0,
-                increace:0,
+            increace: 0,
         },
         {
             city: "衢州",
             value: 0,
-                increace:0,
+            increace: 0,
         },
         {
             city: "舟山",
             value: 0,
-                increace:0,
+            increace: 0,
         },
 
         {
             city: "台州",
             value: 0,
-                increace:0,
+            increace: 0,
         },
         {
             city: "丽水",
             value: 0,
-                increace:0,
+            increace: 0,
         },
         ],
     },
     "typeThree": {
         info: [{
             label: "民口单位军品收入",
-            value:0,
+            value: 89.46,
             unit: "亿元"
 
 
         }, {
             label: "人均民口单位军品收入",
-            value: 0,
+            value: 138.56,
             unit: "元"
         }],
         seriesData: [{
             city: "杭州",
-                value: 0,
-                increace:0,
+            value: 23.1,
+            increace: 42,
         },
         {
             city: "宁波",
-                value: 0,
-                increace:0,
+            value: 13.26,
+            increace: 40,
         },
         {
             city: "温州",
-                value: 0,
-                increace:0,
+            value: 2.4,
+            increace: 70,
         },
         {
             city: "湖州",
-                value: 0,
-                increace:0,
+            value: 5.94,
+            increace: 39,
         },
         {
             city: "嘉兴",
-                value: 0,
-                increace:0,
+            value: 9.66,
+            increace: 0,
         },
         {
             city: "绍兴",
-                value: 0,
-                increace:0,
+            value: 20.08,
+            increace: 125,
         },
         {
             city: "金华",
-                value: 0,
-                increace:0,
+            value: 4.56,
+            increace: 64,
         },
         {
             city: "衢州",
-                value: 0,
-                increace:0,
+            value: 0.80,
+            increace: 31,
         },
         {
             city: "舟山",
-                value: 0,
-                increace:0,
+            value: 4.79,
+            increace: -20,
         },
 
         {
             city: "台州",
-                value: 0,
-                increace:0,
+            value: 4.71,
+            increace: 7,
         },
         {
             city: "丽水",
-                value: 0,
-                increace:0,
+            value: 0.16,
+            increace: -6,
         },
         ],
     },

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

 export default {
     "typeOne": [],
-    "typeThree": [],
+    "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],
 
 }
\ No newline at end of file

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

@@ -2,7 +2,7 @@
   <MapTitle text="产业融合发展总览" />
 
   <div class="echarts-search">
-    <div class="title">各市产业融合创新指标情况</div>
+    <div class="title">各市产业融合发展创新指标情况</div>
   </div>
 
   <div id="TargetBar" class="target-bar"></div>

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

 export default {
     "typeOne": [],
-    "typeThree": [],
+    "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],
 
 }
\ No newline at end of file

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

@@ -9,7 +9,7 @@ export default {
     "typeThree": {
         money: 215.1,
         cityData: [{
-            value: [129.12, 14.02, 5.57, 7.27, 19.89, 19.71, 8.07, 2.43, 0.29, 5.85, 2.89],
+            value: [106.36, 14.02, 5.57, 7.27, 19.89, 19.71, 8.07, 2.43, 0.29, 5.85, 2.89],
         }]
     },
     "typeTwo": {

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

 export default {
     "typeOne": [],
-    "typeThree": [],
+    "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],
 
 }
\ No newline at end of file

src/views/dataCenter/map/cradMock.js

@@ -7,8 +7,8 @@ export default {
     ],
     list2x: [
       { label: "军工科研设备设施开放共享", value: "687", unit: "台" },
-      { label: "军民资源共享信息平台数量", value: "212", unit: "台" },
-      { label: "军地需求对接活动数量", value: "56", unit: "台" },
+      { label: "军民资源共享信息平台数量", value: "212", unit: "个" },
+      { label: "军地需求对接活动数量", value: "56", unit: "次" },
     ],
   },
   "typeThree": {
@@ -19,8 +19,8 @@ export default {
     ],
     list2x: [
       { label: "军工科研设备设施开放共享", value: 687, unit: "台" },
-      { label: "军民资源共享信息平台数量", value: 222, unit: "台" },
-      { label: "军地需求对接活动数量", value: 45, unit: "台" },
+      { label: "军民资源共享信息平台数量", value: 100, unit: "个" },
+      { label: "军地需求对接活动数量", value: 52, unit: "次" },
     ],
   },
   "typeTwo": {
@@ -31,8 +31,8 @@ export default {
     ],
     list2x: [
       { label: "军工科研设备设施开放共享", value: 687, unit: "台" },
-      { label: "军民资源共享信息平台数量", value: 222, unit: "台" },
-      { label: "军地需求对接活动数量", value: 45, unit: "台" },
+      { label: "军民资源共享信息平台数量", value: 222, unit: "个" },
+      { label: "军地需求对接活动数量", value: 45, unit: "次" },
     ],
 
   },

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

@@ -34,9 +34,9 @@ export default {
         },
         ],
         // 国防科技工业军品收入
-        technologyIncome: 84.91,
+        technologyIncome: 123.38,
         // 民口单位人均军品收入
-        militaryIncome: 90.56,
+        militaryIncome: 138.56,
         // 应届大学生应征入伍
         enlistVal: 1470,
         enlistRateVal: 0.5

src/views/dataCenter/map/model/InvestmentProgress/index.vue

@@ -129,7 +129,7 @@ export default defineComponent({
             type: "value",
             name: "项目进度%",
             min: 0,
-            max: 100,
+            // max: 100,
           },
         ],
         xAxis: {

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

 export default {
-    "typeOne":[
+  "typeOne": [
     {
       name: "投资金额",
       type: "level_2",
@@ -13,8 +13,8 @@ export default {
       name: "投资金额",
       type: "level_2",
       echartType: "bar",
-        barValue: [],
-        growthRate: [],
+      barValue: [55.05, 107.49, 87.64, 13.27, 65.12, 122.31, 69.38, 120.73, 39.58, 25.34, 15.88],
+      growthRate: [72.48, 79.55, 65.15, 59.69, 162.03, 88.68, 77.59, 92.51, 79.40, 47.73, 57.89],
     },
   ],
   "typeTwo": [
@@ -23,7 +23,7 @@ export default {
       type: "level_2",
       echartType: "bar",
       barValue: [37.28, 61.75, 34.54, 8.20, 34.63, 74.4, 32.74, 75.35, 28.13, 27.25, 12.76],
-        growthRate: [49.28, 45.7, 25.68, 36.89, 84.07, 53.85, 36.05, 57.74,56.43, 55.68, 32.85],
+      growthRate: [49.28, 45.7, 25.68, 36.89, 84.07, 53.85, 36.05, 57.74, 56.43, 55.68, 32.85],
     },
   ],
 

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

@@ -32,31 +32,31 @@ export default {
   "typeThree": [{
     name: "服务强军兴军",
     type: "level_1",
-      value: [],
+    value: [19.5, 27, 22.5, 22, 22, 26, 24, 19, 22, 21, 11],
   },
   {
     name: "军民协同创新",
     type: "level_3",
 
-      value: [],
+    value: [20, 15.5, 8, 13.5, 16.5, 15.5, 9.5, 12, 7.5, 4.5, 7],
   },
   {
     name: "产业融合发展",
     type: "level_2",
 
-      value: [],
+    value: [15.5, 14, 13, 10.5, 16.5, 18.5, 10.5, 11.5, 13, 10, 17.5],
   },
   {
     name: "资源开放共享",
     type: "level_4",
 
-      value: [],
+    value: [15, 13.4, 13, 14, 13, 13, 12.5, 12, 10.5, 13.5, 8.5],
   },
   {
     name: "五大体系建设",
     type: "level_5",
 
-      value: [],
+    value: [15, 15, 12, 13.5, 14, 15, 14, 13, 14, 13, 12.2],
   },
   ],
   "typeTwo": [{

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

 export default {
   "typeOne": [],
-  "typeThree": [],
+  "typeThree": [
+    {
+      name: "南湖区",
+      score: 83.5,
+      type: 1,
+    },
+    {
+      name: "萧山区",
+      score: 82.5,
+      type: 2,
+    },
+    {
+      name: "鄞州区",
+      score: 80,
+      type: 2,
+    },
+    {
+      name: "德清县",
+      score: 78,
+      type: 2,
+    },
+    {
+      name: "西湖区",
+      score: 75.5,
+      type: 1,
+    },
+    {
+      name: "诸暨市",
+      score: 72,
+      type: 2,
+    },
+    {
+      name: "上城区",
+      score: 70.5,
+      type: 2,
+    },
+    {
+      name: "海曙区",
+      score: 68,
+      type: 1,
+    },
+    {
+      name: "长兴县",
+      score: 65.5,
+      type: 2,
+    },
+    {
+      name: "象山县",
+      score: 65,
+      type: 2,
+    },
+    {
+      name: "永康市",
+      score: 60.5,
+      type: 2,
+    },
+
+    {
+      name: "温岭市",
+      score: 55,
+      type: 2,
+    },
+    {
+      name: "衢江区",
+      score: 54,
+      type: 2,
+    },
+
+    {
+      name: "缙云县",
+      score: 41,
+      type: 1,
+    },
+  ],
   "typeTwo": [
     {
       name: "南湖区",

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

@@ -9,7 +9,7 @@ export default {
     "typeThree": {
         seriesData: [{
             count: 0,
-            value: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+            value: [41071, 11374.5, 2280, 550, 167880, 3500, 57931.8, 3880, 1500, 7660, 5000]
         }],
 
     },

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

@@ -8,8 +8,8 @@ export default {
     },
     "typeThree": {
         seriesData: [{
-            count: 0,
-            value: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+            count: 100,
+            value: [12, 6, 23, 16, 12, 10, 1, 6, 2, 9, 3]
         }],
 
     },

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

 export default {
     "typeOne": [],
-    "typeThree": [],
+    "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],
 
 }
\ No newline at end of file

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

@@ -5,45 +5,46 @@ export default {
     },
 
     "typeThree": {
+        count: 52,
 
         seriesData: [{
             label: "杭州市",
-            value: 0
+            value: 3
         },
         {
             label: "宁波市",
-            value: 0
+            value: 3
         },
         {
             label: "温州市",
-            value: 0
+            value: 1
         },
         {
             label: "湖州市",
-            value: 0
+            value: 1
         },
         {
             label: "嘉兴市",
-            value: 0
+            value: 24
         },
         {
             label: "绍兴市",
-            value: 0
+            value: 2
         }, {
             label: "金华市",
-            value: 0
+            value: 10
         }, {
             label: "衢州市",
-            value: 0
+            value: 3
         }, {
             label: "舟山市",
-            value: 0
+            value: 3
         }, {
             label: "台州市",
-            value: 0
+            value: 1
         }, {
             label: "丽水市",
-            value: 0
+            value: 1
         },
         ]
     },