Skip to content

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

fix(创新示范): 模块对接mock，等待数据更正

上级 8610f7c1
隐藏空白字符变更
内嵌 并排
正在显示 包含 585 行增加 和 235 行删除
src/views/dataCenter/army/model/Person/index.vue
浏览文件 @ eaa9d7b4
......@@ -2,19 +2,13 @@
<MapTitle text="地方为国防和军队建设培养输送人才情况" />
<div class="describes">
<div class="card-items">
<div class="item">
<span>入伍总人数</span>
<div class="item" v-for="item in info" :key="item.label">
<span>{{item.label}}</span>
<div class="value-des">
<span>1470</span>人
</div>
</div>
<div class="item">
<span>入伍总比列</span>
<div class="value-des">
<span>0.5%</span>
<span>{{item.value || "--"}}</span>{{item.unit}}
</div>
</div>
</div>
<div class="text">各市输送人才情况</div>
......@@ -72,6 +66,9 @@ export default defineComponent({
...mapState({
curDataType: (state) => state.curDataType,
}),
info() {
return Mock[this.curDataType].info;
},
seriesData() {
return Mock[this.curDataType].seriesData;
},
......
src/views/dataCenter/army/model/Person/mock.js
浏览文件 @ eaa9d7b4
export default {
"typeOne": {
info:[{
label: "入伍总人数",
value: 0,
unit:"人"
},
{
label: "入伍总比列",
value: 0,
unit:""
}],
seriesData: [{
value: [],
rate: [],
}]
},
"typeTwo": {
info:[{
label: "入伍总人数",
value: 0,
unit:"人"
},
{
label: "入伍总比列",
value: 0,
unit:""
}],
seriesData: [{
value: [],
rate: [],
}]
},
"typeThree": {
info:[{
label: "入伍总人数",
value: "1470",
unit:"人"
},
{
label: "入伍总比列",
value: "0.5%",
unit:""
}],
seriesData: [{
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],
......
src/views/dataCenter/army/model/Science/index.vue
浏览文件 @ eaa9d7b4
......@@ -2,19 +2,11 @@
<MapTitle text="民口单位服务武器装备科研生产情况" />
<el-row class="science-info" justify="space-between">
<el-col :span="11">
<div class="card-item">
<span>民口单位军品收入</span>
<div class="card-item" v-for="item in info" :key="item.label">
<span>{{item.label}}</span>
<div>
53.35
<span>亿元</span>
</div>
</div>
<div class="card-item">
<span>人均民口单位军品收入</span>
<div>
90.56
<span>元</span>
{{item.value || "--"}}
<span>{{item.unit}}</span>
</div>
</div>
</el-col>
......@@ -28,7 +20,7 @@
</div>
<el-scrollbar height="92px">
<div class="rate-list-item" v-for="(item, index) in this.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>
......@@ -93,8 +85,11 @@ export default defineComponent({
...mapState({
curDataType: (state) => state.curDataType,
}),
info() {
return Mock[this.curDataType].info;
},
seriesData() {
return Mock[this.curDataType];
return Mock[this.curDataType].seriesData;
},
optionBar() {
const seriesLine = {
......
src/views/dataCenter/army/model/Science/mock.js
浏览文件 @ eaa9d7b4
export default {
"typeOne": [],
"typeTwo": [],
"typeThree": [{
city: "杭州",
value: 15.63,
increace: 69.53,
},
{
city: "宁波",
value: 7.42,
increace: 66,
},
{
city: "温州",
value: 1.23,
increace: 18.6,
},
{
city: "湖州",
value: 2.65,
increace: 79.1,
},
{
city: "嘉兴",
value: 6,
increace: 28.06,
},
{
city: "绍兴",
value: 12.5,
increace: 117,
},
{
city: "金华",
increace: 83,
value: 1.7,
},
{
city: "衢州",
increace: 13.2,
value: 0.86,
},
{
city: "舟山",
increace: -32,
value: 2.61,
},
{
city: "台州",
increace: 46.4,
value: 2.58,
},
{
city: "丽水",
increace: 150.7,
value: 0.17,
},
],
"typeOne": {
info: [{
label: "民口单位军品收入",
value: 0,
unit: "亿元"
}, {
label: "人均民口单位军品收入",
value: 0,
unit: "元"
}],
seriesData: [{
city: "杭州",
value: 0,
increace:0,
},
{
city: "宁波",
value: 0,
increace:0,
},
{
city: "温州",
value: 0,
increace:0,
},
{
city: "湖州",
value: 0,
increace:0,
},
{
city: "嘉兴",
value: 0,
increace:0,
},
{
city: "绍兴",
value: 0,
increace:0,
},
{
city: "金华",
value: 0,
increace:0,
},
{
city: "衢州",
value: 0,
increace:0,
},
{
city: "舟山",
value: 0,
increace:0,
},
{
city: "台州",
value: 0,
increace:0,
},
{
city: "丽水",
value: 0,
increace:0,
},
],
},
"typeTwo": {
info: [{
label: "民口单位军品收入",
value:0,
unit: "亿元"
}, {
label: "人均民口单位军品收入",
value: 0,
unit: "元"
}],
seriesData: [{
city: "杭州",
value: 0,
increace:0,
},
{
city: "宁波",
value: 0,
increace:0,
},
{
city: "温州",
value: 0,
increace:0,
},
{
city: "湖州",
value: 0,
increace:0,
},
{
city: "嘉兴",
value: 0,
increace:0,
},
{
city: "绍兴",
value: 0,
increace:0,
},
{
city: "金华",
value: 0,
increace:0,
},
{
city: "衢州",
value: 0,
increace:0,
},
{
city: "舟山",
value: 0,
increace:0,
},
{
city: "台州",
value: 0,
increace:0,
},
{
city: "丽水",
value: 0,
increace:0,
},
],
},
"typeThree": {
info: [{
label: "民口单位军品收入",
value: 53.35,
unit: "亿元"
}, {
label: "人均民口单位军品收入",
value: 90.56,
unit: "元"
}],
seriesData: [{
city: "杭州",
value: 15.63,
increace: 69.53,
},
{
city: "宁波",
value: 7.42,
increace: 66,
},
{
city: "温州",
value: 1.23,
increace: 18.6,
},
{
city: "湖州",
value: 2.65,
increace: 79.1,
},
{
city: "嘉兴",
value: 6,
increace: 28.06,
},
{
city: "绍兴",
value: 12.5,
increace: 117,
},
{
city: "金华",
increace: 83,
value: 1.7,
},
{
city: "衢州",
increace: 13.2,
value: 0.86,
},
{
city: "舟山",
increace: -32,
value: 2.61,
},
{
city: "台州",
increace: 46.4,
value: 2.58,
},
{
city: "丽水",
increace: 150.7,
value: 0.17,
},
],
}
}
\ No newline at end of file
src/views/dataCenter/industrial/index.vue
浏览文件 @ eaa9d7b4
......@@ -50,6 +50,9 @@ import IncomDistribution from "./model/IncomDistribution/index.vue";
import BusinessIncome from "./model/BusinessIncome/index.vue";
import Industrial from "./model/Industrial/index.vue";
import Mock from "./mock";
import { mapState } from "vuex";
export default defineComponent({
components: {
TargetBar,
......@@ -59,25 +62,20 @@ export default defineComponent({
Industrial,
},
setup() {},
computed: {
...mapState({
curDataType: (state) => state.curDataType,
}),
industryCardItems() {
return Mock[this.curDataType].industryCardItems;
},
extendCardItems() {
return Mock[this.curDataType].extendCardItems;
},
},
data() {
return {
industryCardItems: [
{ label: "国防科技工业产值总量", value: "1113.4" },
{
label: "国防科技工业产值总量增长率",
value: "22.8",
},
],
extendCardItems: [
{
label: "参与军民融合产业互动的规模以上企业主营业务收入",
value: "3545.5",
},
{
label: "参与军民融合产业互动的规模以上企业主营业务收入增长率",
value: "31.5",
},
],
};
},
});
......
src/views/dataCenter/industrial/mock.js 0 → 100644
浏览文件 @ eaa9d7b4
export default {
"typeOne": {
industryCardItems: [{
label: "国防科技工业产值总量",
value: 0
},
{
label: "国防科技工业产值总量增长率",
value: 0,
},
],
extendCardItems: [{
label: "参与军民融合产业互动的规模以上企业主营业务收入",
value: 0,
},
{
label: "参与军民融合产业互动的规模以上企业主营业务收入增长率",
value: 0,
},
],
},
"typeTwo": {
industryCardItems: [{
label: "国防科技工业产值总量",
value: 0
},
{
label: "国防科技工业产值总量增长率",
value: 0,
},
],
extendCardItems: [{
label: "参与军民融合产业互动的规模以上企业主营业务收入",
value: 0,
},
{
label: "参与军民融合产业互动的规模以上企业主营业务收入增长率",
value: 0,
},
],
},
"typeThree": {
industryCardItems: [{
label: "国防科技工业产值总量",
value: "1113.4"
},
{
label: "国防科技工业产值总量增长率",
value: "22.8",
},
],
extendCardItems: [{
label: "参与军民融合产业互动的规模以上企业主营业务收入",
value: "3545.5",
},
{
label: "参与军民融合产业互动的规模以上企业主营业务收入增长率",
value: "31.5",
},
],
}
}
\ No newline at end of file
src/views/dataCenter/industrial/model/BusinessIncome/index.vue
浏览文件 @ eaa9d7b4
......@@ -7,13 +7,12 @@
<div id="businessIncome" class="business-income"></div>
<div class="money-logo">
<div>
<!-- <img src="@/assets/img/qiandai.svg" alt="" /> -->
<div>
营业收入
<span>(亿元)</span>
</div>
</div>
<span class="mony-number">3532.82</span>
<span class="mony-number">{{incomCount ||"--"}}</span>
</div>
</div>
</el-col>
......@@ -46,17 +45,6 @@ import { Aim } from "@element-plus/icons";
import Mock from "./mock";
import { mapState } from "vuex";
// const PIE_LIST = [
// { label: "数字军工(网络、人工智能)领域", value: 932.66 },
// { label: "高端装备领域", value: 383.17 },
// { label: "核电(新能源领域)", value: 311.27 },
// { label: "生物安全领域", value: 267.96 },
// { label: "航空航天领域", value: 269.18 },
// { label: "船舶与海洋装备领域", value: 84.22 },
// { label: "军队现代后勤保障领域", value: 517.9 },
// { label: "军用材料与基础件配套领域", value: 365.24 },
// { label: "其他", value: 401.22 },
// ];
const PieColor = {
level_1: "#1781df",
......@@ -81,7 +69,6 @@ export default defineComponent({
setup() {},
data() {
return {
// pieList: this.seriesData,
pieColor: PieColor,
mapEcharts: null,
};
......@@ -100,8 +87,11 @@ export default defineComponent({
...mapState({
curDataType: (state) => state.curDataType,
}),
incomCount() {
return Mock[this.curDataType].incomCount;
},
seriesData() {
return Mock[this.curDataType];
return Mock[this.curDataType].seriesData;
},
optionBar() {
const pieData = this.seriesData.map((item, index) => {
......
src/views/dataCenter/industrial/model/BusinessIncome/mock.js
浏览文件 @ eaa9d7b4
export default {
"typeOne": [],
"typeTwo": [],
"typeThree": [
{ label: "数字军工(网络、人工智能)领域", value: 932.66 },
{ label: "高端装备领域", value: 383.17 },
{ label: "核电(新能源领域)", value: 311.27 },
{ label: "生物安全领域", value: 267.96 },
{ label: "航空航天领域", value: 269.18 },
{ label: "船舶与海洋装备领域", value: 84.22 },
{ label: "军队现代后勤保障领域", value: 517.9 },
{ label: "军用材料与基础件配套领域", value: 365.24 },
{ label: "其他", value: 401.22 },
]
"typeOne": {
incomCount: 0,
seriesData: [{
label: "数字军工(网络、人工智能)领域",
value: 0
},
{
label: "高端装备领域",
value: 0
},
{
label: "核电(新能源领域)",
value: 0
},
{
label: "生物安全领域",
value: 0
},
{
label: "航空航天领域",
value: 0
},
{
label: "船舶与海洋装备领域",
value: 0
},
{
label: "军队现代后勤保障领域",
value: 0
},
{
label: "军用材料与基础件配套领域",
value: 0
},
{
label: "其他",
value: 0
},
]
},
"typeTwo": {
incomCount: 0,
seriesData:[{
label: "数字军工(网络、人工智能)领域",
value: 0
}, {
label: "高端装备领域",
value: 0
}, {
label: "核电(新能源领域)",
value: 0
}, {
label: "生物安全领域",
value: 0
}, {
label: "航空航天领域",
value: 0
}, {
label: "船舶与海洋装备领域",
value: 0
}, {
label: "军队现代后勤保障领域",
value: 0
}, {
label: "军用材料与基础件配套领域",
value: 0
}, {
label: "其他",
value: 0
}, ]
},
"typeThree": {
incomCount: 3532.82,
seriesData: [{
label: "数字军工(网络、人工智能)领域",
value: 932.66
},
{
label: "高端装备领域",
value: 383.17
},
{
label: "核电(新能源领域)",
value: 311.27
},
{
label: "生物安全领域",
value: 267.96
},
{
label: "航空航天领域",
value: 269.18
},
{
label: "船舶与海洋装备领域",
value: 84.22
},
{
label: "军队现代后勤保障领域",
value: 517.9
},
{
label: "军用材料与基础件配套领域",
value: 365.24
},
{
label: "其他",
value: 401.22
},
]
}
}
\ No newline at end of file
src/views/dataCenter/innovation/index.vue
浏览文件 @ eaa9d7b4
......@@ -30,33 +30,20 @@
<el-col :span="12">
<div class="card-item">
<MapTitle text="领跑技术（产品）参军情况" />
<!-- <div class="meeting">
<div>省直部门新认定的领跑技术（产品）</div>
<div class="frequency">
{{shu}}
<span class="second">
<i class="el-icon-top"></i>
</span>
</div>
</div>-->
<div class="echarts-search">
<div class="card-items">
<div class="item">
<span>省直部门新认定的领跑技术（产品）</span>
<div class="value-des">
<span>{{shu}}</span>个
<span>{{count|| "--"}}</span>个
</div>
</div>
</div>
</div>
<div id="TargetBars" class="target-bar"></div>
<!-- <Industrial
echartsId="technologyInfo"
echartsTitle="领跑技术(产品)参军情况1"
:cardItems="industryCardItems"
/>-->
</div>
</el-col>
</el-row>
......@@ -132,6 +119,9 @@ export default defineComponent({
seriesData() {
return Mock[this.curDataType].cityData;
},
count() {
return Mock[this.curDataType].count;
},
optionCity() {
const seriesBar = this.seriesData.map((item) => {
return {
......
src/views/dataCenter/innovation/mock.js
浏览文件 @ eaa9d7b4
export default {
"typeOne": {
count:0,
cityData: [{
value: [],
}]
},
"typeTwo": {
count:0,
cityData: [{
value: [],
}]
},
"typeThree": {
count:155,
cityData: [{
value: [75, 37, 4, 17, 8, 10, 1, 1, 0, 0, 2],
}]
......
src/views/dataCenter/innovation/model/Munitions/index.vue
浏览文件 @ eaa9d7b4
......@@ -4,19 +4,12 @@
<div class="meeting">
<div>全省“民参军”企事业单位军品科研经费支出总额</div>
<div class="frequency">
{{shu}}
{{money || "--"}}
<span class="second">亿元</span>
</div>
</div>
<el-row class="investment">
<!-- <el-col class="card-list" :span="6">
<div class="card-item" v-for="item in cards" :key="item.label">
<p>{{ item.label }}</p>
<div>
{{ item.value }}<span class="unit">{{ item.unit }}</span>
</div>
</div>
</el-col>-->
<el-col class="city-echarts">
<div class="title2X">“民参军”企事业单位军品科研经费分布情况</div>
<div id="enterprises" class="echart-item"></div>
......@@ -62,7 +55,7 @@ export default defineComponent({
data() {
return {
countryEcharts: null,
shu: 135.03,
enterprises: null,
cards: [
{
......@@ -95,6 +88,9 @@ export default defineComponent({
seriesData() {
return Mock[this.curDataType].cityData;
},
money() {
return Mock[this.curDataType].money;
},
optionCity() {
const seriesBar = this.seriesData.map((item) => {
return {
......
src/views/dataCenter/innovation/model/Munitions/mock.js
浏览文件 @ eaa9d7b4
export default {
"typeOne": {
money: 0,
cityData: [{
value: [],
}]
},
"typeTwo": {
money: 0,
cityData: [{
value: [],
}]
},
"typeThree": {
money: 135.03,
cityData: [{
value: [79.83, 9.08, 3.4, 11.8, 5.17, 13.95, 4.52, 1.58, 0.18, 3.69, 1.82],
}]
......
src/views/dataCenter/innovation/model/Platform/index.vue
浏览文件 @ eaa9d7b4
......@@ -7,7 +7,7 @@
<div class="item">
<span>协同创新平台</span>
<div class="value-des">
<span>139</span>个
<span>{{count || "--"}}</span>个
</div>
</div>
......@@ -67,6 +67,9 @@ export default defineComponent({
...mapState({
curDataType: (state) => state.curDataType,
}),
count() {
return Mock[this.curDataType].count;
},
seriesData() {
return Mock[this.curDataType].cityData;
},
......
src/views/dataCenter/innovation/model/Platform/mock.js
浏览文件 @ eaa9d7b4
export default {
"typeOne": {
count:0,
cityData: [{
value: [],
}]
},
"typeTwo": {
count:0,
cityData: [{
value: [],
}]
},
"typeThree": {
count:139,
cityData: [{
value: [225, 160, 170],
}]
......
src/views/dataCenter/innovation/model/ScientificInvestment/index.vue
浏览文件 @ eaa9d7b4
......@@ -40,69 +40,6 @@ import * as echarts from "echarts";
import Mock from "./mock";
import { mapState } from "vuex";
// const SeriesData = {
// 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,
// ],
// rate: [
// {
// city: "杭州",
// value: 49.28,
// },
// {
// city: "宁波",
// value: 45.7,
// },
// {
// city: "温州",
// value: 25.68,
// },
// {
// city: "湖州",
// value: 36.89,
// },
// {
// city: "嘉兴",
// value: 84.07,
// },
// {
// city: "绍兴",
// value: 53.85,
// },
// {
// city: "金华",
// value: 36.05,
// },
// {
// city: "衢州",
// value: 57.74,
// },
// {
// city: "舟山",
// value: 56.43,
// },
// {
// city: "台州",
// value: 55.68,
// },
// {
// city: "丽水",
// value: 32.85,
// },
// ],
// };
// const PIE_LIST = [
// { label: "数字军工(网络、人工智能)", value: 25.17 },
// { label: "海洋", value: 20.18 },
// { label: "太空", value: 30.96 },
// { label: "生物", value: 10.22 },
// { label: "核电", value: 5.9 },
// // { label: "人工智能领域", value: 12.24 },
// ];
const PieColor = {
level_1: "#47d6ad",
level_2: "#6fdef7",
......@@ -126,13 +63,7 @@ export default defineComponent({
mapEcharts: null,
cirLeftCharts: null,
cirRightEchart: null,
cardItems: [
{ label: "联合科研攻关投入金额", value: "38.13" },
{
label: "联合科研攻关投入金额增长率",
value: "19%",
},
],
// pieList: PIE_LIST,
pieColor: PieColor,
};
......@@ -151,8 +82,11 @@ export default defineComponent({
...mapState({
curDataType: (state) => state.curDataType,
}),
cardItems() {
return Mock[this.curDataType].cardItems;
},
seriesData() {
return Mock[this.curDataType];
return Mock[this.curDataType].seriesData;
},
optionBar() {
const pieData = this.seriesData.map((item, index) => {
......
src/views/dataCenter/innovation/model/ScientificInvestment/mock.js
浏览文件 @ eaa9d7b4
export default {
"typeOne": [],
"typeOne": {
cardItems: [{
label: "联合科研攻关投入金额",
value: 0
},
{
label: "联合科研攻关投入金额增长率",
value: 0,
},
],
seriesData: [{
label: "数字军工(网络、人工智能)",
value: 0
},
{
label: "海洋",
value: 0
},
{
label: "太空",
value: 0
},
{
label: "生物",
value: 0
},
{
label: "核电",
value: 0
},
]
},
"typeTwo": [],
"typeTwo": {
cardItems: [{
label: "联合科研攻关投入金额",
value: 0
},
{
label: "联合科研攻关投入金额增长率",
value: 0,
},
],
seriesData: [{
label: "数字军工(网络、人工智能)",
value: 0
},
{
label: "海洋",
value: 0
},
{
label: "太空",
value: 0
},
{
label: "生物",
value: 0
},
{
label: "核电",
value: 0
},
]
},
"typeThree": [
{ label: "数字军工(网络、人工智能)", value: 25.17 },
{ label: "海洋", value: 20.18 },
{ label: "太空", value: 30.96 },
{ label: "生物", value: 10.22 },
{ label: "核电", value: 5.9 },
// { label: "人工智能领域", value: 12.24 },
]
"typeThree": {
cardItems: [{
label: "联合科研攻关投入金额",
value: "38.13"
},
{
label: "联合科研攻关投入金额增长率",
value: "19%",
},
],
seriesData: [{
label: "数字军工(网络、人工智能)",
value: 25.17
},
{
label: "海洋",
value: 20.18
},
{
label: "太空",
value: 30.96
},
{
label: "生物",
value: 10.22
},
{
label: "核电",
value: 5.9
},
]
}
}
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论