Skip to content

C
cxsfjx_project_echarts
提交 76313091 authored 作者: Your Name's avatar Your Name
浏览文件
操作

fix(数据中心): mock数据对接，数据待完善

上级 af1ac370
隐藏空白字符变更
内嵌 并排
正在显示 包含 299 行增加 和 71 行删除
src/layout/head.vue
浏览文件 @ 76313091
......@@ -84,7 +84,7 @@
active: index === curYearIndex,
}"
@click="yearHandle(item.value, index)"
>{{ item.label }}年</span
>{{ item.label }}</span
>
</div>
</el-col>
......@@ -122,7 +122,7 @@ export default defineComponent({
value: "typeTwo",
},
{
label: "2021上半年",
label: "2021第三季度",
value: "typeThree",
},
],
......
src/views/dataCenter/map/cradMock.js 0 → 100644
浏览文件 @ 76313091
export default {
"typeOne": {
list: [
{ label: "领跑产品（技术）", value: 0, unit: "个" },
{ label: "军地协同创新平台", value: 0, unit: "个" },
{ label: "新兴领域研发经费", value: 0, unit: "亿元" },
],
list2x: [
{ label: "军工科研设备设施开放共享", value: 0, unit: "个" },
{ label: "军民资源共享信息平台数量", value: 0, unit: "个" },
{ label: "军地需求对接活动数量", value: 0, unit: "个" },
],
},
"typeTwo": {
list: [
{ label: "领跑产品（技术）", value: 0, unit: "个" },
{ label: "军地协同创新平台", value: 0, unit: "个" },
{ label: "新兴领域研发经费", value: 0, unit: "亿元" },
],
list2x: [
{ label: "军工科研设备设施开放共享", value: 0, unit: "个" },
{ label: "军民资源共享信息平台数量", value: 0, unit: "个" },
{ label: "军地需求对接活动数量", value: 0, unit: "个" },
],
},
"typeThree": {
list: [
{ label: "领跑产品（技术）", value: "130", unit: "个" },
{ label: "军地协同创新平台", value: "139", unit: "个" },
{ label: "新兴领域研发经费", value: "86.55", unit: "亿元" },
],
list2x: [
{ label: "军工科研设备设施开放共享", value: "687", unit: "个" },
{ label: "军民资源共享信息平台数量", value: "212", unit: "个" },
{ label: "军地需求对接活动数量", value: "56", unit: "个" },
],
},
}
\ No newline at end of file
src/views/dataCenter/map/index.vue
浏览文件 @ 76313091
......@@ -47,6 +47,9 @@ import Industrial from "./model/CardList/industrial.vue";
import SystemConstruct from "./model/CardList/systemConstruct.vue";
import { DataCenterRouter } from "@/route/dataCenter";
import Mock from "./cradMock";
import { mapState } from "vuex";
export default defineComponent({
components: {
......@@ -62,21 +65,21 @@ export default defineComponent({
},
setup() {},
computed: {
...mapState({
curDataType: (state) => state.curDataType,
}),
list() {
return Mock[this.curDataType].list;
},
list2x() {
return Mock[this.curDataType].list2x;
},
},
data() {
return {
dataCenterRouter: DataCenterRouter,
list: [
{ label: "领跑产品（技术）", value: "130", unit: "个" },
{ label: "军地协同创新平台", value: "139", unit: "个" },
{ label: "新兴领域研发经费", value: "86.55", unit: "亿元" },
],
list2x: [
{ label: "军工科研设备设施开放共享", value: "687", unit: "个" },
{ label: "军民资源共享信息平台数量", value: "212", unit: "个" },
{ label: "军地需求对接活动数量", value: "56", unit: "个" },
],
};
},
});
......
src/views/dataCenter/map/model/CardList/index.vue
浏览文件 @ 76313091
......@@ -12,7 +12,7 @@
<el-col :span="14"> {{ item.label }}</el-col>
<el-col :span="10">
<el-row align="middle" justify="end">
<span class="font-size20 color-pramiry">{{ item.value }}</span>
<span class="font-size20 color-pramiry">{{ item.value || "--" }}</span>
<span class="font-size12 color-999">{{ item.unit }}</span>
</el-row>
</el-col>
......
src/views/dataCenter/map/model/CardList/industrial.vue
浏览文件 @ 76313091
......@@ -18,14 +18,14 @@
<div class="item-row">
<span class="font-size14 color-666">增长率</span>
<el-col class="font-size20 color-pramiry">{{ item.rate }}</el-col>
<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>
<el-col class="font-size20 color-pramiry"
>{{ item.value }}
>{{ item.value || "--" }}
<span v-if="item.valueUnit" class="font-size12 color-999">{{
item.valueUnit
}}</span>
......@@ -45,7 +45,8 @@ import { defineComponent } from "vue";
import MapTitle from "@/components/mapTitle/index.vue";
import { Aim } from "@element-plus/icons";
import { DataCenterRouter } from "@/route/dataCenter";
const date = [];
import Mock from "./industrialMcok";
import { mapState } from "vuex";
export default defineComponent({
components: {
......@@ -55,24 +56,17 @@ export default defineComponent({
setup() {},
data() {
return {
list: [
{
title: "军民融合",
rate: "31.5%",
value: "3545.5",
label: "主营业务收入",
valueUnit: "亿元",
},
{
title: "国防科技工业",
rate: "22.8%",
value: "1113.4",
label: "产值",
valueUnit: "亿元",
},
],
};
},
computed: {
...mapState({
curDataType: (state) => state.curDataType,
}),
list(){
return Mock[this.curDataType]
},
},
methods: {
detailsHandle() {
this.$router.push(DataCenterRouter.DATA_INDUSTRIAL);
......
src/views/dataCenter/map/model/CardList/industrialMcok.js 0 → 100644
浏览文件 @ 76313091
export default {
"typeOne": [{
title: "军民融合",
rate: "",
value: "",
label: "主营业务收入",
valueUnit: "亿元",
},
{
title: "国防科技工业",
rate: "",
value: "",
label: "产值",
valueUnit: "亿元",
},
],
"typeTwo": [{
title: "军民融合",
rate: "",
value: "",
label: "主营业务收入",
valueUnit: "亿元",
},
{
title: "国防科技工业",
rate: "",
value: "",
label: "产值",
valueUnit: "亿元",
},
],
"typeThree": [{
title: "军民融合",
rate: "31.5%",
value: "3545.5",
label: "主营业务收入",
valueUnit: "亿元",
},
{
title: "国防科技工业",
rate: "22.8%",
value: "1113.4",
label: "产值",
valueUnit: "亿元",
},
],
}
\ No newline at end of file
src/views/dataCenter/map/model/CardList/strongArmy.vue
浏览文件 @ 76313091
......@@ -10,37 +10,30 @@
class="font-size14 color-666"
justify="space-between"
align="middle"
v-for="item in (pageData.country || [])"
:key="item.label"
>
贯彻国防要求的建设项目
{{ item.label }}
<el-row align="middle">
<span class="font-size20 color-pramiry">67</span>
<span class="font-size12 color-999">个</span>
<span class="font-size20 color-pramiry">{{
item.value || "--"
}}</span>
<span class="font-size12 color-999">{{ item.unit }}</span>
</el-row>
</el-row>
<el-row
class="font-size14 color-666"
justify="space-between"
align="middle"
>
总投资
<el-row align="middle">
<span class="font-size20 color-pramiry">438.32</span>
<span class="font-size12 color-999">亿元</span>
</el-row>
</el-row>
</div>
<!-- foot -->
<el-row class="foot-wrapper " :gutter="16">
<el-row class="foot-wrapper" :gutter="16">
<el-col :span="15" class="foot-row-text">
<el-row class="item-bg margin-bottom8">
<el-col class=" padding0-8 font-size14 color-666"
<el-col class="padding0-8 font-size14 color-666"
>国防科技工业军品收入</el-col
>
<el-col class="padding0-8">
<span class="font-size20 color-pramiry">84.91</span>
<span class="font-size20 color-pramiry">{{
pageData.technologyIncome || "--"
}}</span>
<span class="font-size12 color-999">亿元</span>
</el-col>
</el-row>
......@@ -50,7 +43,9 @@
>民口单位人均军品收入</el-col
>
<el-col class="padding0-8">
<span class="font-size20 color-pramiry">90.56</span>
<span class="font-size20 color-pramiry">{{
pageData.militaryIncome || "--"
}}</span>
<span class="font-size12 color-999">元</span>
</el-col>
</el-row>
......@@ -62,7 +57,9 @@
>应届大学生应征入伍</el-col
>
<el-col class="padding0-8">
<span class="font-size20 color-pramiry">1470</span>
<span class="font-size20 color-pramiry">{{
pageData.enlistVal || "--"
}}</span>
<span class="font-size12 color-999">人</span>
</el-col>
</el-row>
......@@ -70,7 +67,9 @@
<el-row class="rate">
<el-col class="padding0-8 font-size14 color-666">应征入伍率</el-col>
<el-col class="padding0-8">
<span class="font-size20 color-pramiry">0.5%</span>
<span class="font-size20 color-pramiry">{{
pageData.enlistRateVal || "--"
}}</span>
<span class="font-size12 color-999"></span>
</el-col>
</el-row>
......@@ -84,15 +83,23 @@
*/
import { defineComponent } from "vue";
import MapTitle from "@/components/mapTitle/index.vue";
import {
DataCenterRouter
} from "@/route/dataCenter"
import { DataCenterRouter } from "@/route/dataCenter";
import Mock from "./strongArmyMock";
import { mapState } from "vuex";
export default defineComponent({
components: {
MapTitle,
},
setup() {},
computed: {
...mapState({
curDataType: (state) => state.curDataType,
}),
pageData() {
return Mock[this.curDataType] || {};
},
},
methods: {
detailsHandle() {
this.$router.push(DataCenterRouter.DATA_ARMY);
......@@ -102,7 +109,7 @@ export default defineComponent({
</script>
<style lang="scss" scoped>
@import url("./common.css");
.item-bg{
.item-bg {
padding: 12px 8px;
}
.info {
......@@ -130,7 +137,8 @@ export default defineComponent({
.margin-bottom8 {
margin-bottom: 8px;
}
.rate{
margin-top: 12px;
}}
.rate {
margin-top: 12px;
}
}
</style>
src/views/dataCenter/map/model/CardList/strongArmyMock.js 0 → 100644
浏览文件 @ 76313091
export default {
"typeOne": {
// 贯彻国防要求的建设项目
country: [{
label: "贯彻国防要求的建设项目",
value: 0,
unit: "个"
},
{
label: "总投资",
value: 0,
unit: "亿元"
},
],
// 国防科技工业军品收入
technologyIncome: 0,
// 民口单位人均军品收入
militaryIncome: 0,
// 应届大学生应征入伍
enlistVal: 0,
enlistRateVal: 0
},
"typeTwo": {
// 贯彻国防要求的建设项目
country: [{
label: "贯彻国防要求的建设项目",
value: 0,
unit: "个"
},
{
label: "总投资",
value: 0,
unit: "亿元"
},
],
// 国防科技工业军品收入
technologyIncome: 0,
// 民口单位人均军品收入
militaryIncome: 0,
// 应届大学生应征入伍
enlistVal: 0,
enlistRateVal: 0
},
"typeThree": {
// 贯彻国防要求的建设项目
country: [{
label: "贯彻国防要求的建设项目",
value: 67,
unit: "个"
},
{
label: "总投资",
value: 438.32,
unit: "亿元"
},
],
// 国防科技工业军品收入
technologyIncome: 84.91,
// 民口单位人均军品收入
militaryIncome: 90.56,
// 应届大学生应征入伍
enlistVal: 1470,
enlistRateVal: "0.5%"
},
}
\ No newline at end of file
src/views/dataCenter/map/model/CardList/systemConstruct.vue
浏览文件 @ 76313091
......@@ -21,7 +21,8 @@
各地召开融委全体会议次数
</el-col>
<el-col class="jf-end flex-row font-size20 color-pramiry" :span="5">
43 <span class="margin-left5 font-size12 color-999">次</span>
{{ pageData.meetingCount || "--" }}
<span class="margin-left5 font-size12 color-999">次</span>
</el-col>
</el-row>
......@@ -34,7 +35,8 @@
与当地军分区（警备区）建立并落实军地协作工作机制
</el-col>
<el-col class="jf-end flex-row font-size20 color-pramiry" :span="5">
93 <span class="margin-left5 font-size12 color-999">次</span>
{{ pageData.workeCount || "--"
}}<span class="margin-left5 font-size12 color-999">次</span>
</el-col>
</el-row>
......@@ -46,14 +48,16 @@
<div class="item-row">
<span class="font-size14 color-666">专职</span>
<el-col class="jf-end flex-row font-size20 color-pramiry">
142 <span class="margin-left5 font-size12 color-999">人</span>
{{ pageData.fullTime || "--" }}
<span class="margin-left5 font-size12 color-999">人</span>
</el-col>
</div>
<div class="item-row">
<span class="font-size14 color-666">兼职</span>
<el-col class="flex-row font-size20 color-pramiry">
125 <span class="margin-left5 font-size12 color-999">人</span>
{{ pageData.partTime || "--" }}
<span class="margin-left5 font-size12 color-999">人</span>
</el-col>
</div>
</el-row>
......@@ -68,7 +72,9 @@
import { defineComponent } from "vue";
import MapTitle from "@/components/mapTitle/index.vue";
import { Aim } from "@element-plus/icons";
import {DataCenterRouter} from "@/route/dataCenter"
import { DataCenterRouter } from "@/route/dataCenter";
import Mock from "./systemConstructMock";
import { mapState } from "vuex";
export default defineComponent({
components: {
......@@ -76,9 +82,17 @@ export default defineComponent({
Aim,
},
setup() {},
computed: {
...mapState({
curDataType: (state) => state.curDataType,
}),
pageData() {
return Mock[this.curDataType];
},
},
methods: {
detailsHandle() {
this.$router.push( DataCenterRouter.ConctructSystem)
this.$router.push(DataCenterRouter.ConctructSystem);
},
},
});
......@@ -136,11 +150,11 @@ export default defineComponent({
background: #87bded;
}
}
.flex-one{
.flex-one {
flex-wrap: nowrap;
padding-right: 15px;
}
.jf-end{
.jf-end {
justify-content: flex-end;
}
}
......
src/views/dataCenter/map/model/CardList/systemConstructMock.js 0 → 100644
浏览文件 @ 76313091
export default {
"typeOne": {
// 贯彻国防要求的建设项目
country: [{
label: "贯彻国防要求的建设项目",
value: 0,
unit: "个"
},
{
label: "总投资",
value: 0,
unit: "亿元"
},
],
// 国防科技工业军品收入
technologyIncome: 0,
// 民口单位人均军品收入
militaryIncome: 0,
// 应届大学生应征入伍
enlistVal: 0,
enlistRateVal: 0
},
"typeTwo": {
// 贯彻国防要求的建设项目
country: [{
label: "贯彻国防要求的建设项目",
value: 0,
unit: "个"
},
{
label: "总投资",
value: 0,
unit: "亿元"
},
],
// 国防科技工业军品收入
technologyIncome: 0,
// 民口单位人均军品收入
militaryIncome: 0,
// 应届大学生应征入伍
enlistVal: 0,
enlistRateVal: 0
},
"typeThree": {
meetingCount: 43, // 各地召开融委全体会议次数
workeCount: 93, // 与当地军分区（警备区）建立并落实军地协作工作机制
fullTime: 142, // 专职
partTime: 125 // 兼职
},
}
\ No newline at end of file
src/views/dataCenter/map/model/Performance/index.vue
浏览文件 @ 76313091
<template>
<MapTitle
text="2021年上半年全省军民融合创新示范绩效评价情况"
text="全省军民融合创新示范绩效评价情况"
:detailsHandle="detailsHandle"
/>
<div id="performanceBar" class="performance-bar"></div>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论