fix(创新示范): 2021年第三季度数据更正

src/views/dataCenter/industrial/mock.js

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

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

@@ -40,35 +40,35 @@ export default {
         ]
     },
     "typeTwo": {
-        incomCount: 0,
+        incomCount: 5421.69,
 
-        seriesData:[{
+        seriesData: [{
             label: "数字军工(网络、人工智能)领域",
-            value: 0
+            value: 1514.47
         }, {
             label: "高端装备领域",
-            value: 0
+            value: 595.05
         }, {
             label: "核电(新能源领域)",
-            value: 0
+            value: 495.34
         }, {
             label: "生物安全领域",
-            value: 0
+            value: 410.08
         }, {
             label: "航空航天领域",
-            value: 0
+            value: 383.21
         }, {
             label: "船舶与海洋装备领域",
-            value: 0
+            value: 133.65
         }, {
             label: "军队现代后勤保障领域",
-            value: 0
+            value: 756.54
         }, {
             label: "军用材料与基础件配套领域",
-            value: 0
+            value: 553.96
         }, {
             label: "其他",
-            value: 0
+            value: 579.36
         }, ]
     },
     "typeThree": {

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

 export default {
     "typeOne": {
         seriesData: [{
-            value: [2513.1, 810.23, 121.96, 177.83, 578.79, 602.33, 158.11,60.18,16.21,174.92,41.39],
+            value: [2513.1, 810.23, 121.96, 177.83, 578.79, 602.33, 158.11, 60.18, 16.21, 174.92, 41.39],
             rateData: [],
         }],
 
     },
     "typeTwo": {
         seriesData: [{
-            value: [],
-            rateData: [],
+            value: [2433.92, 1063.99, 105.95, 195.74, 583.98, 576.44, 181.04, 63.51, 10.12, 147.99, 59],
+            rateData: [20.53, 28.54, 3.22,30.44,27.98,24.95,46.74,12.95,-3.72,12.25,41.31],
         }],
 
     },

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

 export default {
     "typeOne": {
         seriesData: [{
-            name: "",
-            type: "",
-            echartType: "",
+            name: "产值规模",
+            type: "level_2",
+            echartType: "bar",
             barValue: [],
             growthRate: [],
         }],
@@ -11,11 +11,11 @@ export default {
     },
     "typeTwo": {
         seriesData: [{
-            name: "",
-            type: "",
-            echartType: "",
-            barValue: [],
-            growthRate: [],
+            name: "产值规模",
+            type: "level_2",
+            echartType: "bar",
+            barValue: [82.97, 20.30, 24.07, 11.75, 173.74, 107.57, 124.36, 27.55, 18.31, 27.96, 3.06],
+            growthRate: [18.85, 1.46, 27.66, 27.04, 18.85, 38.97,33.64,14.61,49.12,0.21,60.12],
         }],
 
     },

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

@@ -57,18 +57,6 @@ export default defineComponent({
       countryEcharts: null,
    
       enterprises: null,
-      cards: [
-        {
-          label: "全省“民参军”企事业单位军品科研经费支出总额",
-          value: "284",
-          unit: "40次",
-        },
-        {
-          label: "全省“民参军”企事业单位R & D",
-          value: "5%",
-          unit: "",
-        },
-      ],
     };
   },
   mounted() {

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

@@ -2,15 +2,14 @@ export default {
     "typeOne": {
         money: 266.29,
         cityData: [{
-            value: [157.82, 16.63, 8.86, 9.29, 25.02, 23.83, 7.79, 2.81, 0.7, 9.51,4.07],
+            value: [157.82, 16.63, 8.86, 9.29, 25.02, 23.83, 7.79, 2.81, 0.7, 9.51, 4.07],
         }]
     },
 
     "typeTwo": {
-        money: 0,
-
+        money: 215.1,
         cityData: [{
-            value: [],
+            value: [129.12, 14.02, 5.57, 7.27, 19.89, 19.71, 8.07, 2.43, 0.29, 5.85, 2.89],
         }]
     },
     "typeThree": {

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

 export default {
     "typeOne": [],
-    "typeTwo": [19, 13.5, 6.5, 12.5, 15.5, 14, 6.5, 10.5, 8, 4, 6],
+    "typeTwo": [],
     "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/map/index.vue

 <template>
-{{curDataType}}
   <el-row class="map-warpper" :gutter="16">
     <el-col class="map-left" :span="8">
       <div class="performance-com card-item"><Performance /></div>

src/views/dataCenter/map/model/CardList/industrial.vue

@@ -8,19 +8,12 @@
   <div class="info">
     <div class="info-row" v-for="(item, index) in list" :key="index">
       <el-row class="year" align="middle">
-        <el-icon color="#409EFC"> <Aim /> </el-icon>
         {{ item.title }}
       </el-row>
 
       <el-row class="info-item font-size14 color-666 item-bg margin-bottom8">
         <el-col :span="24">
           <el-row justify="space-between">
-            <div class="item-row">
-              <span class="font-size14 color-666">增长率</span>
-
-              <el-col class="font-size20 color-pramiry">{{ item.rate || "--"}}</el-col>
-            </div>
-
             <div class="item-row">
               <span class="font-size14 color-666">{{ item.label }}</span>
 
@@ -31,6 +24,12 @@
                 }}</span>
               </el-col>
             </div>
+
+             <div class="item-row">
+              <span class="font-size14 color-666">增长率</span>
+
+              <el-col class="font-size20 color-pramiry">{{ item.rate || "--"}}</el-col>
+            </div>
           </el-row>
         </el-col>
       </el-row>

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

 export default {
     "typeOne": [{
-            title: "军民融合",
+            title: "军民融合主营业务收入",
             rate: "",
             value: "",
             label: "主营业务收入",
             valueUnit: "亿元",
         },
         {
-            title: "国防科技工业",
+            title: "国防科技工业产值",
             rate: "",
             value: "",
             label: "产值",
@@ -15,14 +15,14 @@ export default {
         },
     ],
     "typeTwo": [{
-            title: "军民融合",
+            title: "军民融合主营业务收入",
             rate: "",
             value: "",
             label: "主营业务收入",
             valueUnit: "亿元",
         },
         {
-            title: "国防科技工业",
+            title: "国防科技工业产值",
             rate: "",
             value: "",
             label: "产值",
@@ -30,14 +30,14 @@ export default {
         },
     ],
     "typeThree": [{
-            title: "军民融合",
+            title: "军民融合主营业务收入",
             rate: "31.5%",
             value: "3545.5",
             label: "主营业务收入",
             valueUnit: "亿元",
         },
         {
-            title: "国防科技工业",
+            title: "国防科技工业产值",
             rate: "22.8%",
             value: "1113.4",
             label: "产值",

src/views/dataCenter/map/model/CardList/systemConstruct.vue

@@ -8,7 +8,6 @@
 
   <div class="info">
     <el-row class="year" align="middle">
-      <el-icon color="#409EFC"> <Aim /> </el-icon>
       组织管理体系
     </el-row>
 
@@ -137,18 +136,6 @@ export default defineComponent({
   .item-text {
     margin-left: 15px;
     color: #333;
-    position: relative;
-    &::before {
-      content: " ";
-      display: inline-block;
-      position: absolute;
-      top: 5px;
-      left: -10px;
-      width: 6px;
-      height: 6px;
-      border-radius: 50%;
-      background: #87bded;
-    }
   }
   .flex-one {
     flex-wrap: nowrap;

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

 export default {
     "typeOne":[
-        {
-          name: "国防科工军品收入",
-          type: "level_1",
-          echartType: "bar",
-          growthRate: [],
-          barValue: [],
-        },
-        {
-          name: "民口单位军品收入",
-          type: "level_2",
-          echartType: "bar",
-          growthRate: [],
-          barValue: [],
-        },
+      {
+        name: "国防科工军品收入",
+        type: "level_1",
+        echartType: "bar",
+        growthRate: ["", 42.17, 21.19],
+        barValue: [107.32, 157.51, 172.11],
+      },
+      {
+        name: "民口单位军品收入",
+        type: "level_2",
+        echartType: "bar",
+        barValue: [71.93, 117.94, 139.15],
+        growthRate: ["",60,80],
+      },
       ],
     "typeTwo": [
         {
           name: "国防科工军品收入",
           type: "level_1",
           echartType: "bar",
-          growthRate: [],
-          barValue: [],
+          growthRate: ["", 42.17, 21.19],
+          barValue: [107.32, 157.51, 172.11],
         },
         {
           name: "民口单位军品收入",
           type: "level_2",
           echartType: "bar",
-          barValue: [],
-          growthRate: [],
+          barValue: [71.93, 117.94, 139.15],
+          growthRate: ["",60,80],
         },
       ],
     "typeThree": [

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

@@ -128,9 +128,12 @@ export default defineComponent({
   },
   watch: {
     seriesData() {
-      this.mapEcharts.showLoading();
-      this.mapEcharts.setOption(this.optionBar);
-      this.mapEcharts.hideLoading();
+      this.mapEcharts.clear();
+      setTimeout(() => {
+        this.mapEcharts.showLoading();
+        this.mapEcharts.setOption(this.optionBar);
+        this.mapEcharts.hideLoading();
+      }, 200);
     },
   },
   methods: {