Skip to content

C
cxsfjx_project_echarts
提交 bdebee9c authored 作者: ww1xhqc's avatar ww1xhqc
浏览文件
操作

fix(创新示范评价)：填充真实数据

上级 28fddd3c
隐藏空白字符变更
内嵌 并排
正在显示 包含 209 行增加 和 132 行删除
src/views/dataCenter/army/index.vue
浏览文件 @ bdebee9c
......@@ -59,7 +59,7 @@ export default defineComponent({
},
],
extendCardItems: [
{ label: "参与军民融合产业互动的规模以上企业主营收入", value: "202" },
{ label: "参与军民融合产业互动的规模以上企业主营收入", value: "3545.5" },
{
label: "参与军民融合产业互动的规模以上企业主营收入增长率",
value: "19",
......
src/views/dataCenter/army/model/EconomicConstruct/index.vue
浏览文件 @ bdebee9c
......@@ -50,7 +50,7 @@
</el-col>
</el-row>
<div class="bar-title">各市"千百十"项目投资金额及进度情况</div>
<div class="bar-title">各市"千百十"项目投资金额及进度情况(截至第二季度)</div>
<div id="economicConstruct" class="economic-construct"></div>
</template>
<script lang="ts">
......@@ -61,52 +61,52 @@ import * as echarts from "echarts";
const SeriesData = {
name: "国防要求建设项目",
type: "level_1",
value: [20, 20, 40, 52, 52, 44, 118, 132, 124, 156, 112],
value: [37.28, 61.75, 34.54, 8.20, 34.63, 74.4, 32.74, 75.35, 28.13, 27.25, 12.76],
rate: [
{
city: "杭州",
value: 20,
value: 49.28,
},
{
city: "宁波",
value: 30,
value: 45.7,
},
{
city: "温州",
value: 30,
value: 25.68,
},
{
city: "胡洲",
value: 70,
city: "湖州",
value: 36.89,
},
{
city: "嘉兴",
value: 80,
value: 84.07,
},
{
city: "绍兴",
value: 60,
value: 53.85,
},
{
city: "金华",
value: 40,
value: 36.05,
},
{
city: "衡州",
value: 30,
city: "衢州",
value: 57.74,
},
{
city: "舟山",
value: 10,
value: 56.43,
},
{
city: "台州",
value: 50,
value: 55.68,
},
{
city: "丽水",
value: 50,
value: 32.85,
},
],
};
......@@ -114,11 +114,11 @@ const xAxisValue = [
"杭州",
"宁波",
"温州",
"胡洲",
"湖州",
"嘉兴",
"绍兴",
"金华",
"衡州",
"衢州",
"舟山",
"台州",
"丽水",
......@@ -147,6 +147,7 @@ export default defineComponent({
computed: {
optionBar() {
const seriesBar = {
name: "收入规模",
type: "bar",
itemStyle: {
color: "#4198ff",
......@@ -154,6 +155,7 @@ export default defineComponent({
barWidth: 20,
data: SeriesData.value.map((item) => {
return {
name: item.name,
value: item,
label: "收入规模",
};
......@@ -161,6 +163,7 @@ export default defineComponent({
};
const seriesLine = {
name: "项目进度",
type: "line",
itemStyle: {
color: "#3aba67",
......@@ -200,8 +203,8 @@ export default defineComponent({
},
legend: {},
grid: {
top: "5%",
left: "0%",
top: "20%",
left: "5%",
right: "5%",
bottom: "3%",
containLabel: true,
......
src/views/dataCenter/army/model/Munitions/index.vue
浏览文件 @ bdebee9c
......@@ -3,12 +3,12 @@
<el-row>
<el-col :span="8">
<div class="title">国防科技工业军品收入规模及增长率</div>
<div class="title2X">国防科技工业军品收入规模及增长率</div>
<div id="countryEcharts" class="echart-item"></div>
</el-col>
<el-col class="city-echarts" :span="15" :offset="1">
<div class="title">各市收入规模及增长率</div>
<div class="title2X">各市收入规模及增长率</div>
<div id="cityEcharts" class="echart-item"></div>
</el-col>
</el-row>
......@@ -22,11 +22,13 @@ import { Aim } from "@element-plus/icons";
// 国家增长率
const seriesCountryData = [
{
value: [820, 832, 901, 934, 1290],
rate: [60, 70, 75, 85, 80],
value: [820, 832, 901],
rate: [60, 70, 75,],
},
];
const xAxisCountry = ["2018", "2019", "2020", "2021", "2022"];
const xAxisCountry = ["2018", "2019", "2020","2021","2022",];
// 城市增长率
const xAxisCity = [
......@@ -43,8 +45,8 @@ const xAxisCity = [
"丽水",
];
const cityData = {
value: [820, 832, 901, 934, 1290, 794, 518, 213, 962, 1105, 888],
rate: [60, 70, 75, 85, 80, 51, 75, 56, 75, 78, 85],
value: [32.68, 7.42, 1.36, 3.47, 19.56, 12.5, 1.7,0.86 , 2.61, 2.58, 0.17],
rate: [30.75, 66, 19.8, 38.95, 57.59, 117, 83, 13.2, -32, 46.4, 150.7],
};
/**
......@@ -69,6 +71,7 @@ export default defineComponent({
optionCountry() {
const seriesBarList = seriesCountryData.map((item) => {
return {
name: "收入规模",
type: "bar",
itemStyle: {
color: "#4198ff",
......@@ -86,6 +89,8 @@ export default defineComponent({
const seriesLineList = seriesCountryData.map((item) => {
return {
name: "增长率",
type: "line",
stack: "Total",
itemStyle: {
......@@ -160,6 +165,8 @@ export default defineComponent({
optionCity() {
const seriesBar = {
type: "bar",
name: "收入规模",
itemStyle: {
color: "#4198ff",
},
......@@ -183,6 +190,8 @@ export default defineComponent({
emphasis: {
focus: "series",
},
name: "增长率",
data: cityData.rate.map((item) => {
return {
......@@ -218,7 +227,7 @@ export default defineComponent({
legend: {},
grid: {
top: "10%",
left: "0%",
left: "5%",
right: "2%",
bottom: "3%",
containLabel: true,
......@@ -227,12 +236,14 @@ export default defineComponent({
{
type: "value",
name: "规模(亿元)",
min: 0,
max: 50,
},
{
type: "value",
name: "增长率(%)",
min: 0,
max: 100,
min: -50,
max: 170,
},
],
xAxis: {
......@@ -334,7 +345,7 @@ export default defineComponent({
margin-top: 10px;
}
.title {
.title2X {
margin-top: 15px;
font-size: 14px;
color: #4198ff;
......
src/views/dataCenter/army/model/Person/index.vue
浏览文件 @ bdebee9c
......@@ -4,7 +4,7 @@
<div class="card-items">
<div class="item">
<span>入伍总人数</span>
<div class="value-des"><span>500</span>亿元</div>
<div class="value-des"><span>500</span>人</div>
</div>
<div class="item">
......@@ -13,7 +13,7 @@
</div>
</div>
<div class="text">各市收入</div>
<div class="text">各市输送人才情况</div>
</div>
<div id="locPerson" class="incom-echarts-line"></div>
......@@ -61,6 +61,8 @@ export default defineComponent({
computed: {
optionBar() {
const seriesBar = {
name: "入伍人数",
type: "bar",
itemStyle: {
color: "#4198ff",
......@@ -76,6 +78,7 @@ export default defineComponent({
};
const seriesLine = {
name: "入伍比率",
type: "line",
stack: "Total",
itemStyle: {
......@@ -129,7 +132,7 @@ export default defineComponent({
yAxis: [
{
type: "value",
name: "规模(亿元)",
name: "入伍人数",
},
{
type: "value",
......@@ -220,7 +223,7 @@ export default defineComponent({
box-sizing: border-box;
}
.describes {
margin: 0 10px 12px 0;
margin: 0 10px 5px 0;
box-sizing: border-box;
.card-items {
margin: 15px 0;
......
src/views/dataCenter/army/model/Science/index.vue
浏览文件 @ bdebee9c
<template>
<MapTitle text="民口单位服务武器装备科研生产情况" />
<MapTitle text="民口单位服务武器装备科研生产情况(截至2021第二季度)" />
<el-row class="science-info" justify="space-between">
<el-col :span="11">
<div class="card-item">
<span>民口单位军品收入</span>
<div>10<span>亿元</span></div>
<div>53.35<span>亿元</span></div>
</div>
<div class="card-item">
<span>人均民口单位军品收入</span>
<div>10<span>万元</span></div>
<div>90.56<span>元</span></div>
</div>
</el-col>
......@@ -28,14 +28,14 @@
:key="index"
>
<span>{{ item.city }}</span>
<span class="rate-value">{{ item.value }}%</span>
<span class="rate-value">{{ item.increace }}%</span>
</div>
</el-scrollbar>
</div>
</el-col>
</el-row>
<div class="science-title">各市民口单位军品收入</div>
<div class="science-title">各市民口单位军品收入(亿元)</div>
<div id="incomDistribution" class="incom-distribution"></div>
</template>
<script lang="ts">
......@@ -44,54 +44,68 @@ import MapTitle from "@/components/mapTitle/index.vue";
import * as echarts from "echarts";
const SeriesData = {
name: "国防要求建设项目",
type: "level_1",
value: [820, 832, 901, 934, 1290, 1330, 1320],
rate: [
{
city: "杭州",
value: 20,
value: 15.63,
increace: 69.53,
},
{
city: "宁波",
value: 30,
value: 7.42,
increace: 66,
},
{
city: "温州",
value: 30,
value: 1.23,
increace: 18.6,
},
{
city: "胡洲",
value: 70,
city: "湖州",
value: 2.65,
increace: 79.1,
},
{
city: "嘉兴",
value: 80,
value: 6,
increace: 28.06,
},
{
city: "绍兴",
value: 60,
value: 12.5,
increace: 117,
},
{
city: "金华",
value: 40,
increace: 83,
value: 1.7,
},
{
city: "衡州",
value: 30,
city: "衢州",
increace: 13.2,
value: 0.86,
},
{
city: "舟山",
value: 10,
increace: -32,
value: 2.61,
},
{
city: "台州",
value: 50,
increace: 46.4,
value: 2.58,
},
{
city: "丽水",
value: 50,
increace: 150.7,
value: 0.17,
},
],
};
......@@ -99,11 +113,11 @@ const xAxisValue = [
"杭州",
"宁波",
"温州",
"胡洲",
"湖州",
"嘉兴",
"绍兴",
"金华",
"衡州",
"衢州",
"舟山",
"台州",
"丽水",
......
src/views/dataCenter/army/model/StrongArmy/index.vue
浏览文件 @ bdebee9c
......@@ -2,7 +2,7 @@
<MapTitle text="服务强军兴军总览" />
<div class="echarts-search">
<div class="title">各市产业融合创新指标情况</div>
<div class="title">各市服务强军兴军创新指标情况</div>
<el-row class="" justify="space-between">
<div class="years" align="middle">
<span
......@@ -16,7 +16,7 @@
>
</div>
<el-select v-model="value" size="small" placeholder="Select">
<!-- <el-select v-model="value" size="small" placeholder="Select">
<el-option
v-for="item in options"
:key="item.value"
......@@ -24,7 +24,7 @@
:value="item.value"
>
</el-option>
</el-select>
</el-select> -->
</el-row>
</div>
......@@ -39,11 +39,11 @@ const xAxisValue = [
"杭州",
"宁波",
"温州",
"胡洲",
"湖州",
"嘉兴",
"绍兴",
"金华",
"衡州",
"衢州",
"舟山",
"台州",
"丽水",
......@@ -66,8 +66,8 @@ export default defineComponent({
{ label: "规模以上企业收入及增长率", value: 3 },
{ label: "国防科工产值", value: 4 },
],
years: [2019, 2020, 2021],
curYearIndex: 0,
years: [2019, 2020, "2021上半"],
curYearIndex: 2,
mapEcharts: null,
};
},
......@@ -113,7 +113,7 @@ export default defineComponent({
position: "top",
},
barWidth: 20,
data: [20, 60, 70, 80, 68, 75, 80, 51, 26, 12, 35],
data: [25, 27, 18, 22, 28, 24, 19, 20, 21, 22, 19],
},
],
};
......
src/views/dataCenter/industrial/index.vue
浏览文件 @ bdebee9c
......@@ -56,14 +56,14 @@ export default defineComponent({
data() {
return {
industryCardItems: [
{ label: "国防科技工业产值总量", value: "202" },
{ label: "国防科技工业产值总量", value: "1113.4" },
{
label: "国防科技工业产值总量增长率",
value: "19",
},
],
extendCardItems: [
{ label: "参与军民融合产业互动的规模以上企业主营收入", value: "202" },
{ label: "参与军民融合产业互动的规模以上企业主营收入", value: "3545.5" },
{
label: "参与军民融合产业互动的规模以上企业主营收入增长率",
value: "19",
......
src/views/dataCenter/industrial/model/BusinessIncome/index.vue
浏览文件 @ bdebee9c
......@@ -23,7 +23,7 @@
</el-row>
<div class="pie-value">
<span>{{ item.value }}</span
>万元
>亿元
</div>
</el-col>
</el-row>
......@@ -37,15 +37,15 @@ import * as echarts from "echarts";
import { Aim } from "@element-plus/icons";
const PIE_LIST = [
{ label: "数字军工(网络、人工智能)领域", value: 220 },
{ label: "高端装备领域", value: 220 },
{ label: "核电(新能源领域)", value: 80 },
{ label: "生物安全领域", value: 120 },
{ label: "航空航天领域", value: 150 },
{ label: "船舶与海洋装备领域", value: 60 },
{ label: "军队现代后勤保障领域", value: 100 },
{ label: "军用材料与基础件配套领域", value: 220 },
{ label: "其他", value: 160 },
{ 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.90 },
{ label: "军用材料与基础件配套领域", value: 365.24 },
{ label: "其他", value: 401.22 },
];
const PieColor = {
......
src/views/dataCenter/industrial/model/IncomDistribution/index.vue
浏览文件 @ bdebee9c
......@@ -12,8 +12,8 @@ const seriesData = [
{
name: "主营业务收入",
type: "level_1",
value: [820, 832, 901, 934, 1290, 1330, 1320, 846, 945, 462, 622],
rateData: [30, 40, 60, 80, 70, 75,85,52,33,12,12]
value: [1553.8, 754.1, 61.4, 129.2, 373.1, 381.2, 112.8, 42.8, 6, 91.8, 39.3],
rateData: [24.2, 42.2, 4.6, 36.7, 38.5, 42.6,55.8,16.2,-1.9,10.2,54.5]
},
];
......@@ -22,11 +22,11 @@ const xAxisValue = [
"杭州",
"宁波",
"温州",
"胡洲",
"湖州",
"嘉兴",
"绍兴",
"金华",
"衡州",
"衢州",
"舟山",
"台州",
"丽水",
......@@ -52,6 +52,7 @@ export default defineComponent({
optionBar() {
const seriesBarList = seriesData.map((item,index) => {
return {
name: "主营业务收入",
type: "bar",
itemStyle: {
color: "#4198ff",
......@@ -69,6 +70,7 @@ export default defineComponent({
const seriesLineList = seriesData.map((item) => {
return {
name: "增长率",
type: "line",
itemStyle: {
color: "#fac858",
......@@ -111,7 +113,9 @@ export default defineComponent({
return html;
},
},
legend: {},
legend: {
right: "2%",
},
grid: {
left: "0%",
right: "5%",
......@@ -122,11 +126,13 @@ export default defineComponent({
{
type: "value",
name: "金额(亿元)",
min: -10,
max: 1600,
},
{
type: "value",
name: "增长率%",
min: 0,
min: -10,
max: 100,
},
],
......
src/views/dataCenter/industrial/model/IncomExtendLine/index.vue
浏览文件 @ bdebee9c
......@@ -2,11 +2,11 @@
<MapTitle :text="echartsTitle" />
<div class="describes">
<div class="card-items">
<div class="item" v-for="item in cardItems" :key="item.text">
<div class="item" v-for="(item,index) in cardItems" :key="item.text">
<span>{{ item.label }}</span>
<div class="value-des">
<span>{{ item.value || "--" }}</span
>亿元
>{{index === 0?"亿元":"%"}}
</div>
</div>
</div>
......
src/views/dataCenter/industrial/model/TargetBar/index.vue
浏览文件 @ bdebee9c
......@@ -16,7 +16,7 @@
>
</div>
<el-select v-model="value" size="small" placeholder="请选择">
<!-- <el-select v-model="value" size="small" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
......@@ -24,7 +24,7 @@
:value="item.value"
>
</el-option>
</el-select>
</el-select> -->
</el-row>
</div>
......@@ -66,8 +66,8 @@ export default defineComponent({
{ label: "规模以上企业收入及增长率", value: 3 },
{ label: "国防科工产值", value: 4 },
],
years: [2019, 2020, 2021],
curYearIndex: 0,
years: [2019, 2020, "2021上半"],
curYearIndex: 2,
mapEcharts: null,
};
},
......@@ -98,6 +98,7 @@ export default defineComponent({
yAxis: {
type: "value",
show: false,
max:20
},
xAxis: {
type: "category",
......@@ -115,7 +116,7 @@ export default defineComponent({
position: "top",
// formatter: "{c}亿元"
},
data: [820, 832, 901, 934, 1290, 1330, 1320, 1518,825,561,899],
data: [14.5, 9, 6, 10, 13, 14, 13.5, 8, 6, 12.5, 15],
},
],
};
......
src/views/dataCenter/map/model/CardList/industrial.vue
浏览文件 @ bdebee9c
......@@ -8,7 +8,7 @@
<div class="info">
<el-row class="year" align="middle">
<el-icon color="#409EFC"> <Aim /> </el-icon>
2021年
2021年(截至第二季度)
</el-row>
<el-row class="info-item font-size14 color-666 item-bg margin-bottom8">
......
src/views/dataCenter/map/model/CardList/strongArmy.vue
浏览文件 @ bdebee9c
......@@ -81,7 +81,7 @@
<el-col class="padding0-8 font-size14 color-666">应征入伍率</el-col>
<el-col class="padding0-8">
<span class="font-size20 color-pramiry">30</span>
<span class="font-size12 color-999">亿元</span>
<span class="font-size12 color-999">%</span>
</el-col>
</el-row>
</el-col>
......
src/views/dataCenter/map/model/InvestmentProgress/index.vue
浏览文件 @ bdebee9c
<template>
<MapTitle text='各市"千百十"项目投资金额及进度情况' />
<MapTitle text='各市"千百十"项目投资金额及进度情况(截至第二季度)' />
<div id="InvestmentProgress" class="investment-progress"></div>
</template>
<script lang="ts">
......@@ -12,11 +12,11 @@ import * as echarts from "echarts";
const seriesData = [
{
name: "省军民融合重大示范项目",
name: "投资金额",
type: "level_2",
echartType: "bar",
barValue: [820, 832, 901, 934, 1290, 1330, 1320, 1251, 1120, 1050, 888],
growthRate: [50, 60, 70, 80, 80, 60, 85, 62, 75, 85, 72],
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],
},
];
......@@ -68,6 +68,7 @@ export default defineComponent({
const seriesLineList = seriesData.map((item) => {
return {
name: "项目进度",
type: "line",
itemStyle: {
color: "#75ce95",
......
src/views/dataCenter/map/model/Performance/index.vue
浏览文件 @ bdebee9c
<template>
<MapTitle
text="全省军民融合创新示范绩效评价情况(2020上半年度)"
text="全省军民融合创新示范绩效评价情况(截至第二季度)"
:detailsHandle="detailsHandle"
/>
<div id="performanceBar" class="performance-bar"></div>
......@@ -24,31 +24,31 @@ const seriesData = [
{
name: "服务强军兴军",
type: "level_1",
value: [12, 12, 11, 14, 12, 12, 12, 12, 22, 10, 20],
value: [25, 27, 18, 22, 28, 24, 19, 20, 21, 22, 19],
},
{
name: "产业融合发展",
type: "level_2",
{
name: "军民协同创新",
type: "level_3",
value: [12, 12, 22, 21, 12, 22, 11, 22, 22, 12, 20],
value: [19, 13.5, 6.5, 12.5, 15.5, 14, 6.5, 10.5, 8, 4, 6],
},
{
name: "军民协同创新",
type: "level_3",
name: "产业融合发展",
type: "level_2",
value: [12, 12, 21, 15, 12, 2, 12, 21, 22, 12, 20],
value: [14.5, 9, 6, 10, 13, 14, 13.5, 8, 6, 12.5, 15],
},
{
name: "资源开放共享",
type: "level_4",
value: [8, 12, 5, 14, 22, 22, 12, 22, 22, 15, 20],
value: [13.2, 14, 10, 11, 14, 12.5, 7.5, 13.5, 10, 12, 10],
},
{
name: "五大体系建设",
type: "level_5",
value: [22, 12, 21, 12, 12, 12, 12, 22, 21, 19, 20],
value: [14, 15, 10.4, 12, 11, 15, 13, 13, 13, 11, 11.2],
},
];
......@@ -56,11 +56,11 @@ const xAxisValue = [
"杭州",
"宁波",
"温州",
"胡洲",
"湖州",
"嘉兴",
"绍兴",
"金华",
"衡州",
"衢州",
"舟山",
"台州",
"丽水",
......
src/views/dataCenter/map/model/RankList/index.vue
浏览文件 @ bdebee9c
<template>
<MapTitle text="创新示范区、县排名" />
<MapTitle text="创新示范区、县排名（截至第二季度）" />
<el-scrollbar height="260px">
<el-table
......@@ -45,31 +45,76 @@ import MapTitle from "@/components/mapTitle/index.vue";
import { Bottom, Top } from "@element-plus/icons";
const TabData = [
{
name: "上城区",
score: 50,
name: "南湖区",
score: 69.5,
type: 1,
},
{
name: "萧山区",
score: 50,
score: 68,
type: 2,
},
{
name: "海曙区",
score: 50,
name: "鄞州区",
score: 67,
type: 2,
},
{
name: "西湖区",
score: 50,
score: 66,
type: 2,
},
{
name: "象山县",
score: 50,
name: "长兴县",
score: 66,
type: 1
},
{
name: "诸暨市",
score: 63,
type: 2,
},
{
name: "海曙区",
score: 60,
type: 2,
},
{
name: "上城区",
score: 60,
type: 1,
},
{
name: "永康市",
score: 59.5,
type: 2,
},
{
name: "衢江区",
score: 57.5,
type: 2,
},
{
name: "象山县",
score: 57,
type: 2,
},
{
name: "德清县",
score: 55.5,
type: 2,
},
{
name: "温岭市",
score: 52,
type: 2,
},
{
name: "缙云县",
score: 46.5,
type: 1,
}
];
const Colors = {
1: "#e45c5c",
......
vite.config.ts
浏览文件 @ bdebee9c
......@@ -2,17 +2,10 @@ import { defineConfig, UserConfigExport } from "vite";
import vue from "@vitejs/plugin-vue";
import vueJsx from "@vitejs/plugin-vue-jsx";
import legacy from "@vitejs/plugin-legacy";
import viteMocker from "vite-plugin-mocker";
// import viteMocker from "vite-plugin-mocker";
import { resolve } from 'path'
export default defineConfig({
// css: {
// preprocessorOptions: {
// scss: {
// additionalData: '@import "./src/assets/scss/common.scss";'
// }
// }
// },
resolve: {
alias: {
'@': resolve('./src')
......@@ -27,11 +20,11 @@ export default defineConfig({
targets: ["ie >= 11"],
additionalLegacyPolyfills: ["regenerator-runtime/runtime"],
}),
viteMocker({
dir: "/mocks",
pattern: "/mock",
delay: [0, 200],
}),
// viteMocker({
// dir: "/mocks",
// pattern: "/mock",
// delay: [0, 200],
// }),
],
server: {
// proxy: { // 配置域名代理
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论