Merge branch 'master' of https://git.yfzx.zjtys.com.cn/cold-coffee/cxsfjx_project

src/views/dataCenter/map/cradMock.js

@@ -6,9 +6,9 @@ export default {
       { label: "新兴领域研发经费", value: 0, unit: "亿元" },
     ],
     list2x: [
-      { label: "军工科研设备设施开放共享", value: "687", unit: "个" },
-      { label: "军民资源共享信息平台数量", value: "212", unit: "个" },
-      { label: "军地需求对接活动数量", value: "56", unit: "个" },
+      { label: "军工科研设备设施开放共享", value: "687", unit: "台" },
+      { label: "军民资源共享信息平台数量", value: "212", unit: "台" },
+      { label: "军地需求对接活动数量", value: "56", unit: "台" },
     ],
   },
   "typeThree": {
@@ -18,9 +18,9 @@ export default {
       { label: "新兴领域研发经费", value: 136.85, unit: "亿元" },
     ],
     list2x: [
-      { label: "军工科研设备设施开放共享", value: 687, unit: "个" },
-      { label: "军民资源共享信息平台数量", value: 222, unit: "个" },
-      { label: "军地需求对接活动数量", value: 45, unit: "个" },
+      { label: "军工科研设备设施开放共享", value: 687, unit: "台" },
+      { label: "军民资源共享信息平台数量", value: 222, unit: "台" },
+      { label: "军地需求对接活动数量", value: 45, unit: "台" },
     ],
   },
   "typeTwo": {
@@ -30,9 +30,9 @@ export default {
       { label: "新兴领域研发经费", value: "86.55", unit: "亿元" },
     ],
     list2x: [
-      { label: "军工科研设备设施开放共享", value: 687, unit: "个" },
-      { label: "军民资源共享信息平台数量", value: 222, unit: "个" },
-      { label: "军地需求对接活动数量", value: 45, unit: "个" },
+      { label: "军工科研设备设施开放共享", value: 687, unit: "台" },
+      { label: "军民资源共享信息平台数量", value: 222, unit: "台" },
+      { label: "军地需求对接活动数量", value: 45, unit: "台" },
     ],
 
   },

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

@@ -3,7 +3,7 @@
     <div class="meeting">
       <div>合同成交总额</div>
       <div class="frequency">
-        {{ seriesData[0].count || "--" }}
+        {{ seriesData[0].value.reduce((total, num) => total + num)  || "--" }}
         <span class="second">万元</span>
       </div>
     </div>
@@ -76,6 +76,9 @@ export default defineComponent({
           itemStyle: {
             color: "#4198ff",
           },
+            itemStyle: {
+          color: "#3aba67",
+        },
           barWidth: 20,
 
           data: item.value.map((item) => {

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

@@ -16,7 +16,7 @@ export default {
     "typeTwo": {
         seriesData: [{
             count: 379027.7,
-            value: [14348.7, 11374.5, 500, 11374.5, 324830, 7300, 560, 4306, 600, 500, 3334]
+            value: [14348.7, 11374.5, 500, 11374.5, 157880, 7300, 560, 4306, 600, 500, 3334]
         }],
     },
 }
\ No newline at end of file

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

 <template>
   <MapTitle text="军工科研设备设施开放共享情况" />
+  <div class="facility-title">
+    <div class="title">历年军工科研设备设施开发共享情况</div>
+  </div>
 
   <div id="industryDistribute" class="facility-echarts-line"></div>
 </template>
@@ -18,9 +21,7 @@ const xAxisValue = ["2018年", "2019年", "2020年", "2021年"];
  * 军工科研设备设施开放共享情况
  */
 export default defineComponent({
-  props: {
-   
-  },
+  props: {},
   components: {
     MapTitle,
   },
@@ -54,10 +55,10 @@ export default defineComponent({
           itemStyle: {
             color: "#4198FF",
           },
-           label: {
-              show: true,
-              position: "right",
-            },
+          label: {
+            show: true,
+            position: "right",
+          },
           barWidth: 18,
           data: item.value.map((barItem, barIndex) => {
             return {
@@ -77,28 +78,38 @@ export default defineComponent({
           formatter: (params) => {
             let html = `<span class="name">${params[0].axisValue}</span>`;
             html += `<div class="facility-echart-tooltip ">
-                <span class="text text-color_1">${params[0].data.value}</span>个
+                <span class="text text-color_1">${params[0].data.value}</span>台
                </div>`;
 
             return html;
           },
         },
         grid: {
+          top: "8%",
           left: "3%",
-          right: "5%",
+          right: "10%",
           bottom: "3%",
           containLabel: true,
         },
         legend: {
           right: "2%",
         },
-        yAxis: {
-          type: "category",
-          data: xAxisValue,
-        },
-        xAxis: {
-          type: "value",
-        },
+        yAxis: [
+          {
+            type: "category",
+            data: xAxisValue,
+          },
+        ],
+        xAxis: [
+          {
+            type: "value",
+            max:1000,
+            name: "数量(台)",
+             axisLine: {
+              show: true,
+            },
+          },
+        ],
         series: [...seriesBarList],
       };
     },
@@ -125,12 +136,12 @@ export default defineComponent({
   width: 80px;
 }
 .facility-echart-tooltip .name {
-    padding-left: 10px;
+  padding-left: 10px;
   margin-bottom: 15px;
   font-size: 14px;
   color: #333;
   font-weight: bold;
-   position: relative;
+  position: relative;
 }
 .facility-echart-tooltip .name::before {
   position: absolute;
@@ -142,7 +153,6 @@ export default defineComponent({
   display: inline-block;
   border-radius: 50%;
   background: #4198ff;
-
 }
 .facility-echart-tooltip .text {
   padding-left: 20px;
@@ -154,14 +164,20 @@ export default defineComponent({
 .facility-echart-tooltip .text-color_1 {
   color: #4198ff;
 }
-
-
 </style>
 
 <style lang="scss" scoped>
 .facility-echarts-line {
   flex: 1;
-  height: calc(100% - 40px);
+  height: calc(100% - 60px);
   box-sizing: border-box;
 }
+.facility-title {
+  padding-left: 10px;
+  .title {
+    color: #4198ff;
+    margin: 10px 0;
+    font-size: 16px;
+  }
+}
 </style>

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

@@ -10,13 +10,13 @@ export default {
     },
     "typeThree": {
         seriesData: [{
-            value: [687, 212, 193, 156],
+            value: [258, 351, 396, 687],
         }],
 
     },
     "typeTwo": {
         seriesData: [{
-            value: [687, 212, 193, 156],
+            value: [258, 351, 396, 687],
         }],
     },
 }
\ No newline at end of file