提交 c47db53d authored 作者: 冯小芳's avatar 冯小芳

第四季度数据填写

上级 ddc2125b
......@@ -23,7 +23,11 @@
<div class="container">
<!-- 二级导航栏 -->
<el-row v-if="(secodndList || []).length > 0" class="second-nav" :gutter="20">
<el-row
v-if="(secodndList || []).length > 0"
class="second-nav"
:gutter="20"
>
<el-col v-for="(item, index) in secodndList" :key="index" :span="4">
<el-card
shadow="hover"
......@@ -31,17 +35,21 @@
'second-active-nav': index === secondIndex,
}"
@click="secondHandle(item, index)"
>{{ item.name }}</el-card>
>{{ item.name }}</el-card
>
</el-col>
</el-row>
<!-- 行动轨迹记录 -->
<el-row v-if="curRouteHistoy.length > 0" class="proceed-record">
<el-col class="nav-history" :span="17">
<el-row class="pointer" @click="$router.go(-1)" align="middle">
<el-icon>
<ArrowLeftBold />
</el-icon>返回
<el-row
class="pointer"
@click="$router.go(-1)"
align="middle"
v-if="$route.path !== '/dataCenter/map'"
>
<el-icon> <ArrowLeftBold /> </el-icon>返回
<el-divider direction="vertical"></el-divider>
</el-row>
......@@ -65,7 +73,8 @@
:class="{
'lignht-color': index === curRouteHistoy.length - 1,
}"
>{{ item.label }}</span>
>{{ item.label }}</span
>
</div>
</el-col>
</el-col>
......@@ -81,7 +90,8 @@
disabed: item.disabed,
}"
@click="yearHandle(item, index)"
>{{ item.label }}</span>
>{{ item.label }}</span
>
</div>
</el-col>
</el-row>
......@@ -109,11 +119,6 @@ export default defineComponent({
secondIndex: 0,
curRouteHistoy: [],
years: [
{
label: "2020年第四季度",
value: "typeOne",
disabed: true,
},
{
label: "2021年第二季度",
value: "typeTwo",
......@@ -124,6 +129,11 @@ export default defineComponent({
value: "typeThree",
disabed: false,
},
{
label: "2020年第四季度",
value: "typeOne",
disabed: false,
},
],
curYearIndex: 1,
};
......
......@@ -5,17 +5,17 @@ const whiteRoutes = ["/login", "/sso"]
export default (router: Router) => {
router.beforeEach((to, from, next) => {
const token = localStorage.getItem(TOKEN_KEY)
if (whiteRoutes.includes(to.path)) {
return next()
}
// const token = localStorage.getItem(TOKEN_KEY)
// if (whiteRoutes.includes(to.path)) {
// return next()
// }
if (!token) {
router.replace(BaseRouteRouter.LOGIN);
} else {
next()
}
// if (!token) {
// router.replace(BaseRouteRouter.LOGIN);
// } else {
// next()
// }
next()
})
return router
}
\ No newline at end of file
......@@ -16,16 +16,16 @@ export default {
]
},
provinceData: {
process: 0.4731,
process: 0,
name: "省军民融合重大示范项目",
info: [{
label: "项目数量",
value: 42,
value: 44,
unit: "个"
},
{
label: "投资额",
value: 138.84,
value: 307.71,
unit: "亿元"
},
]
......
......@@ -22,7 +22,7 @@ import Mock from "./mock";
import { mapState } from "vuex";
let MAP_ECHARTS = null;
let CITY_ECHARTS = null
let CITY_ECHARTS = null;
const xAxisCountry = ["2018", "2019", "2020", "2021"];
// 城市增长率
......@@ -66,7 +66,7 @@ export default defineComponent({
},
cityData() {
CITY_ECHARTS.showLoading();
CITY_ECHARTS.setOption(this.optionCity,true);
CITY_ECHARTS.setOption(this.optionCity, true);
CITY_ECHARTS.hideLoading();
},
},
......@@ -150,9 +150,9 @@ export default defineComponent({
},
},
legend: {
textStyle:{
color:"#d4f7ff"
}
textStyle: {
color: "#d4f7ff",
},
},
grid: {
top: "10%",
......@@ -166,11 +166,10 @@ export default defineComponent({
type: "value",
name: "收入(亿元)",
min: 0,
max: 200,
splitLine: {
lineStyle: {
// 使用深浅的间隔色
type: 'dashed',
type: "dashed",
color: ["#125ba3"],
},
},
......@@ -189,7 +188,7 @@ export default defineComponent({
splitLine: {
lineStyle: {
// 使用深浅的间隔色
type: 'dashed',
type: "dashed",
color: ["#125ba3"],
},
},
......@@ -286,9 +285,9 @@ export default defineComponent({
},
},
legend: {
textStyle:{
color:"#d4f7ff"
}
textStyle: {
color: "#d4f7ff",
},
},
grid: {
top: "10%",
......@@ -302,11 +301,10 @@ export default defineComponent({
type: "value",
name: "规模(亿元)",
min: 0,
max: 50,
splitLine: {
lineStyle: {
// 使用深浅的间隔色
type: 'dashed',
type: "dashed",
color: ["#125ba3"],
},
},
......@@ -331,7 +329,7 @@ export default defineComponent({
splitLine: {
lineStyle: {
// 使用深浅的间隔色
type: 'dashed',
type: "dashed",
color: ["#125ba3"],
},
},
......
export default {
"typeOne": {
seriesData: [{
value: [],
rate: [],
value: [107.32, 157.51, 172.11, 241.13],
rate: ["", 42.17, 21.19, 37.85],
}],
cityData: {
value: [],
rate: [],
value: [96.16, 22.17, 7.5, 16.61, 49.6, 14.75, 4.28, 1.68, 12.31, 15.33, 0.74],
rate: [49.64, 28.75, 52.64, 41.4, 17.75, 44.36, 32.6, 28.29, 14.57, 76.18, 59.93],
}
},
"typeThree": {
seriesData: [{
value: [107.32, 157.51, 172.11,129.13],
rate: ["", 42.17, 21.19,30],
value: [107.32, 157.51, 172.11, 129.13],
rate: ["", 42.17, 21.19, 30],
}],
cityData: {
value: [48.2, 14.39, 3.07, 6.09, 19.42, 22.78, 4.6, 1.3, 8.6, 5.31, 0.26],
......@@ -21,8 +22,8 @@ export default {
},
"typeTwo": {
seriesData: [{
value: [107.32, 157.51, 172.11,129.13],
rate: ["", 42.17, 21.19,30],
value: [107.32, 157.51, 172.11, 129.13],
rate: ["", 42.17, 21.19, 30],
}],
cityData: {
value: [32.68, 7.42, 1.36, 3.47, 19.56, 12.5, 1.7, 0.86, 2.61, 2.58, 0.17],
......
......@@ -2,70 +2,70 @@ export default {
"typeOne": {
info: [{
label: "民口单位军品收入",
value: 0,
value: 164.42,
unit: "亿元"
}, {
label: "人均民口单位军品收入",
value: 0,
value: 249,
unit: "元"
}],
seriesData: [{
city: "杭州",
value: 0,
increace: 0,
value: 38.41,
increace: 42.76,
},
{
city: "宁波",
value: 0,
increace: 0,
value: 16.18,
increace: 28.68,
},
{
city: "温州",
value: 0,
increace: 0,
value: 4.91,
increace: 52.64,
},
{
city: "湖州",
value: 0,
increace: 0,
value: 9.41,
increace: 52.58,
},
{
city: "嘉兴",
value: 0,
increace: 0,
value: 13.78,
increace: 30.09,
},
{
city: "绍兴",
value: 0,
increace: 0,
value: 10.22,
increace: 44.36,
},
{
city: "金华",
value: 0,
increace: 0,
value: 3.22,
increace: 32.87,
},
{
city: "衢州",
value: 0,
increace: 0,
value: 1.67,
increace: 34.23,
},
{
city: "舟山",
value: 0,
increace: 0,
value: 10.74,
increace: 14.57,
},
{
city: "台州",
value: 0,
increace: 0,
value: 8.7,
increace: 76.24,
},
{
city: "丽水",
value: 0,
increace: 0,
value: 0.46,
increace: 59.93,
},
],
},
......
......@@ -2,20 +2,20 @@ export default {
"typeOne": {
industryCardItems: [{
label: "国防科技工业产值总量",
value: 0
value: 2066.8
},
{
label: "国防科技工业产值总量增长率",
value: 0,
value: "19%",
},
],
extendCardItems: [{
label: "参与军民融合产业互动的规模以上企业主营业务收入",
value: "7633.65",
value: "6509.2",
},
{
label: "参与军民融合产业互动的规模以上企业主营业务收入增长率",
value: "26.6",
value: "21",
},
],
},
......
export default {
"typeOne": {
incomCount: 5258.05,
incomCount: 0,
seriesData: [{
label: "数字军工(网络、人工智能)领域",
value: 1458.46
value: 2238.5
},
{
label: "高端装备领域",
value: 565.92
value: "--"
},
{
label: "核电(新能源领域)",
value: 555.97
value: 721.2
},
{
label: "生物安全领域",
value: 465.57
value: 554.4
},
{
label: "航空航天领域",
value: 375.76
value: 497.5
},
{
label: "船舶与海洋装备领域",
value: 152.77
value: 194.9
},
{
label: "军队现代后勤保障领域",
value: 738.18
value: "--"
},
{
label: "军用材料与基础件配套领域",
value: 872
value: 752.3
},
{
label: "其他",
value: 373.41
value: "--"
},
]
},
......@@ -69,7 +69,7 @@ export default {
}, {
label: "其他",
value: 579.36
}, ]
},]
},
"typeTwo": {
incomCount: 3532.82,
......
......@@ -124,9 +124,9 @@ export default defineComponent({
},
legend: {
right: "2%",
textStyle:{
color:"#d4f7ff"
}
textStyle: {
color: "#d4f7ff",
},
},
grid: {
left: "0%",
......@@ -139,11 +139,10 @@ export default defineComponent({
type: "value",
name: "金额(亿元)",
min: -10,
max: 1600,
splitLine: {
lineStyle: {
// 使用深浅的间隔色
type: 'dashed',
type: "dashed",
color: ["#125ba3"],
},
},
......@@ -162,7 +161,7 @@ export default defineComponent({
splitLine: {
lineStyle: {
// 使用深浅的间隔色
type: 'dashed',
type: "dashed",
color: ["#125ba3"],
},
},
......
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],
rateData: [],
value: [3307, 961.5, 128.7, 220.5, 798.1, 541.7, 205, 57.7, 18.1, 188.6, 82.3],
rateData: [32, 19, 6, 24, 38, -10, 30, -9, 12, 8, 99],
}],
},
"typeThree": {
seriesData: [{
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],
rateData: [20.53, 28.54, 3.22, 30.44, 27.98, 24.95, 46.74, 12.95, -3.72, 12.25, 41.31],
}],
},
......
......@@ -6,7 +6,8 @@
<span>{{ item.label }}</span>
<div class="value-des">
<span class="value-des-val">{{ item.value || "--" }}</span>
<span v-if="index === 0"> 亿元</span>
<span v-if="index === 0" class="money"> 亿元</span>
<span v-if="index === 1"> %</span>
</div>
</div>
</div>
......@@ -25,7 +26,7 @@ import { mapState } from "vuex";
let MAP_ECHARTS = null;
const xAxisValue = ["2018年", "2019年", "2020年", "2021上半年"];
const xAxisValue = ["2018年", "2019年", "2020年", "2021年"];
/**
* 全省军民协同创新平台情况/国防科技工业产值规模分布 -- 折线图
......@@ -99,7 +100,7 @@ export default defineComponent({
label: {
show: true,
position: "top",
color:"#19ecff",
color: "#19ecff",
},
areaStyle: {
opacity: 0.8,
......@@ -124,10 +125,10 @@ export default defineComponent({
trigger: "axis",
className: "extend-tooltip",
axisPointer: {
type: 'line',
type: "line",
lineStyle: {
type: 'solid', // 打开就是实线类型
color: '#4198ff',
type: "solid", // 打开就是实线类型
color: "#4198ff",
},
},
formatter:
......@@ -224,12 +225,14 @@ export default defineComponent({
}
.value-des {
margin-top: 10px;
font-size: 12px;
color: #d4f7ff;
.value-des-val {
font-size: 20px;
margin-right: 5px;
color: #19ecff;
.value-des-val {
margin-right: 5px;
}
.money {
font-size: 12px;
color: #fff;
}
.value-des-unit {
color: #4198ff;
......
export default {
"typeOne": {
seriesData: [{
value: [5204.49, 6029.77, 7633.65, 3545.5]
value: [5204.49, 6029.77, 7633.65, 6509.2]
}],
......
......@@ -6,7 +6,8 @@
<span>{{ item.label }}</span>
<div class="value-des">
<span class="value-des-val">{{ item.value || "--" }}</span>
<span v-if="index===0">亿元</span>
<span v-if="index === 0" class="money"> 亿元</span>
<!-- <span v-if="index === 1"> %</span> -->
</div>
</div>
</div>
......@@ -196,7 +197,7 @@ export default defineComponent({
{
type: "value",
name: "增长率%",
min: -10,
min: 0,
max: 100,
splitLine: {
lineStyle: {
......@@ -342,12 +343,15 @@ export default defineComponent({
}
.value-des {
margin-top: 10px;
font-size: 12px;
color: #d4f7ff;
.value-des-val {
font-size: 20px;
margin-right: 5px;
color: #19ecff;
.value-des-val {
margin-right: 5px;
}
.money {
font-size: 12px;
color: #fff;
}
.value-des-unit {
color: #4198ff;
......
......@@ -4,8 +4,8 @@ export default {
name: "产值规模",
type: "level_2",
echartType: "bar",
barValue: [],
growthRate: [],
barValue: [971.9, 218.4, 35.6, 254.8, 233.5, 170.4, 136, 40.4, 23.7, 43.8, 38.3],
growthRate: [19.77, 20.92, 37.43, 33.8, 19.25, 18.88, 39.8, 10.55, 40.27, 23.37, 74.81],
}],
},
......@@ -15,7 +15,7 @@ export default {
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],
growthRate: [18.85, 1.46, 27.66, 27.04, 18.85, 38.97, 33.64, 14.61, 49.12, 0.21, 60.12],
}],
},
......
export default {
"typeOne": {
count: 130,
count: 209,
cityData: [{
value: [],
value: [103, 43, 4, 20, 14, 12, 2, 3, 0, 1, 3],
}]
},
"typeThree": {
......
export default {
"typeOne": {
money: 266.29,
money: 294.5,
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: [184.7, 19.1, 7, 9, 28.6, 20.6, 9.7, 3, 0.4, 8.1, 4.3],
}]
},
......
......@@ -2,32 +2,32 @@ export default {
"typeOne": {
cardItems: [{
label: "联合科研攻关投入金额",
value:0
value: 136.85
},
{
label: "联合科研攻关投入金额增长率",
value: 0
value: "74%",
},
],
seriesData: [{
label: "数字军工(网络、人工智能)",
value: 122
value: 100.51
},
{
label: "海洋",
value: 9.02
value: 6.46
},
{
label: "太空",
value: 12.19
value: 9.65
},
{
label: "生物",
value: 9.73
value: 6.23
},
{
label: "核电",
value: 18.74
value: 13.6
},
]
},
......
export default {
"typeOne": {
list: [
{ label: "领跑产品(技术)", value: "130", unit: "个" },
{ label: "领跑产品(技术)", value: "205", unit: "个" },
{ label: "军地协同创新平台", value: "139", unit: "个" },
{ label: "新兴领域研发经费", value: 0, unit: "亿元" },
],
list2x: [
{ label: "军工科研设备设施开放共享", value: "687", unit: "台" },
{ label: "军民资源共享信息平台数量", value: "212", unit: "个" },
{ label: "军地需求对接活动数量", value: "56", unit: "次" },
{ label: "军民资源共享信息平台数量", value: "258", unit: "个" },
{ label: "军地需求对接活动数量", value: "--", unit: "次" },
],
},
"typeThree": {
......
export default {
"typeOne": [{
title: "军民融合主营业务收入",
rate: "",
value: "",
rate: "20.5%",
value: "6509.2",
label: "主营业务收入",
valueUnit: "亿元",
},
{
title: "国防科技工业产值",
rate: "",
value: "",
rate: "19.2%",
value: "2066.8",
label: "产值",
valueUnit: "亿元",
},
......
......@@ -13,12 +13,12 @@ export default {
},
],
// 国防科技工业军品收入
technologyIncome: 0,
technologyIncome: 241.13,
// 民口单位人均军品收入
militaryIncome: 0,
militaryIncome: 249,
// 应届大学生应征入伍
enlistVal: 1470,
enlistRateVal: "0.5%"
enlistRateVal: "0.5"
},
"typeThree": {
// 贯彻国防要求的建设项目
......
export default {
"typeOne": {
meetingCount: 43, // 各地召开融委全体会议次数
workeCount: 93, // 与当地军分区(警备区)建立并落实军地协作工作机制
fullTime: 142, // 专职
partTime: 125 // 兼职
meetingCount: 0, // 各地召开融委全体会议次数
workeCount: 0, // 与当地军分区(警备区)建立并落实军地协作工作机制
fullTime: 0, // 专职
partTime: 0 // 兼职
},
"typeThree": {
meetingCount: 43, // 各地召开融委全体会议次数
......
export default {
"typeOne":[
"typeOne": [
{
name: "国防科工军品收入",
type: "level_1",
echartType: "bar",
growthRate: ["", 42.17, 21.19,30],
barValue: [107.32, 157.51, 172.11,129.13],
growthRate: ["", 42.17, 21.19, 37.85],
barValue: [107.32, 157.51, 172.11, 241.13],
},
{
name: "民口单位军品收入",
type: "level_2",
echartType: "bar",
barValue: [71.93, 117.94, 139.15,89.46],
growthRate: ["",60,80,40],
barValue: [71.93, 117.94, 139.15, 164.42],
growthRate: ["", 60, 80, 40.28],
},
],
"typeThree": [
......@@ -20,15 +20,15 @@ export default {
name: "国防科工军品收入",
type: "level_1",
echartType: "bar",
growthRate: ["", 42.17, 21.19,30],
barValue: [107.32, 157.51, 172.11,129.13],
growthRate: ["", 42.17, 21.19, 30],
barValue: [107.32, 157.51, 172.11, 129.13],
},
{
name: "民口单位军品收入",
type: "level_2",
echartType: "bar",
barValue: [71.93, 117.94, 139.15,89.46],
growthRate: ["",60,80,40],
barValue: [71.93, 117.94, 139.15, 89.46],
growthRate: ["", 60, 80, 40],
},
],
"typeTwo": [
......@@ -36,15 +36,15 @@ export default {
name: "国防科工军品收入",
type: "level_1",
echartType: "bar",
growthRate: ["", 42.17, 21.19,30],
barValue: [107.32, 157.51, 172.11,129.13],
growthRate: ["", 42.17, 21.19, 30],
barValue: [107.32, 157.51, 172.11, 129.13],
},
{
name: "民口单位军品收入",
type: "level_2",
echartType: "bar",
barValue: [71.93, 117.94, 139.15,89.46],
growthRate: ["",60,80,40],
barValue: [71.93, 117.94, 139.15, 89.46],
growthRate: ["", 60, 80, 40],
},
],
......
export default {
"typeOne": {
seriesData: [{
value: []
count: 0,
value: [294300, 11374.5, 5649.7, 66070, 2555400, 20700, 46641, 56000, 611500, 3968.98, 1528]
}],
......
export default {
"typeOne": {
seriesData: [{
name: "产值规模",
type: "level_2",
echartType: "bar",
value: [],
value: [258, 351, 396, 687],
}],
},
......
export default {
"typeOne": {
seriesData: [{
value: [5204.49, 6029.77, 7633.65, 3545.5]
count: 258,
value: [12, 27, 45, 33, 24, 10, 8, 6, 47, 35, 11]
}],
......
export default {
"typeOne": {
count: 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
}, {
label: "台州市",
value: 0
}, {
label: "丽水市",
value: 0
},
]
},
......
......@@ -6,8 +6,8 @@ import legacy from "@vitejs/plugin-legacy";
import { resolve } from 'path'
export default defineConfig({
// server:{
// host:'0.0.0.0',
server:{
host:'0.0.0.0',
// proxy: { // 配置域名代理
// "/api": {
// target: "http://192.168.0.100:9064",
......@@ -15,7 +15,7 @@ export default defineConfig({
// rewrite: (path) => path.replace(/^\/api/, ""),
// },
// },
// },
},
resolve: {
alias: {
'@': resolve('./src')
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论