Skip to content

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

fix(创新示范): 数据更正

上级 a41a415d
隐藏空白字符变更
内嵌 并排
正在显示 包含 124 行增加 和 119 行删除
src/views/dataCenter/army/model/EconomicConstruct/index.vue
浏览文件 @ dab8646d
......@@ -9,16 +9,16 @@
<div class="info-details">
<div class="info-item">
<span class="title">项目数量</span>
<div><span>18</span>个</div>
<div><span>67</span>个</div>
</div>
<div class="info-item">
<span class="title">投资额</span>
<div><span>888</span>亿元</div>
<div><span>438.32</span>亿元</div>
</div>
</div>
<!-- 环形进度条 -->
<div id="circularEchart" class="circular"></div>
<div v-show="false" id="circularEchart" class="circular"></div>
</div>
</div>
</el-col>
......@@ -35,12 +35,12 @@
<div class="info-details">
<div class="info-item">
<span class="title">项目数量</span>
<div><span>18</span>个</div>
<div><span>42</span>个</div>
</div>
<div class="info-item">
<span class="title">投资额</span>
<div><span>900</span>亿元</div>
<div><span>138.84</span>亿元</div>
</div>
</div>
<!-- 环形进度条 -->
......@@ -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">
......@@ -322,7 +322,7 @@ export default defineComponent({
};
},
ptionCirRight() {
const value = 1;
const value = 0.4731;
return {
backgroundColor: "#fff",
title: [
......@@ -337,9 +337,9 @@ export default defineComponent({
color: "#333",
textAlign: "center",
},
subtext: `${(value * 100).toFixed(0)}%`,
subtext: `${(value * 100)}%`,
subtextStyle: {
fontSize: "22",
fontSize: "16",
color: "#4198ff",
textAlign: "center",
},
......@@ -524,7 +524,7 @@ export default defineComponent({
}
}
div {
padding-left: 20px;
padding-left: 10px;
display: flex;
align-items: center;
font-size: 14px;
......
src/views/dataCenter/industrial/model/IncomExtendLine/index.vue
浏览文件 @ dab8646d
......@@ -25,11 +25,11 @@ const seriesData = [
{
// name: "国防要求建设项目",
type: "level_1",
value: [820, 832, 1260],
value: [5204.49, 6029.77, 7633.65, 3545.5],
},
];
const xAxisValue = ["2019", "2020", "2021"];
const xAxisValue = ["2018年", "2019年", "2020年", "2021上半年"];
/**
* 全省军民协同创新平台情况/国防科技工业产值规模分布 -- 折线图
......@@ -113,12 +113,12 @@ export default defineComponent({
return {
tooltip: {
trigger: "axis",
className: "extend-tooltip",
formatter: "<span class='title'>{b0}年</span>: <br /> <span class='bar-text'>{c0}</span> 亿元",
className: "extend-tooltip",
formatter: "<span class='title'>{b0}</span>: <br /> <span class='bar-text'>{c0}</span> 亿元",
},
legend: {},
grid: {
top: 0,
top: "5%",
left: "0%",
right: "5%",
bottom: "9%",
......
src/views/dataCenter/map/index.vue
浏览文件 @ dab8646d
......@@ -59,13 +59,13 @@ export default defineComponent({
return {
list: [
{ label: "领跑产品（技术）", value: "50", unit: "个" },
{ label: "军地协同创新平台", value: "20", unit: "个" },
{ label: "新兴领域研发经费", value: "20", unit: "亿元" },
{ label: "军地协同创新平台", value: "139", unit: "个" },
{ label: "新兴领域研发经费", value: "86.55", unit: "亿元" },
],
list2x: [
{ label: "军工科研设备设施开放共享", value: "20", unit: "个" },
{ label: "军民资源共享信息平台数量", value: "20", unit: "个" },
{ label: "军地需求对接活动数量", value: "20", unit: "个" },
{ label: "军工科研设备设施开放共享", value: "867", unit: "个" },
{ label: "军民资源共享信息平台数量", value: "212", unit: "个" },
{ label: "军地需求对接活动数量", value: "56", unit: "个" },
],
};
},
......
src/views/dataCenter/map/model/CardList/index.vue
浏览文件 @ dab8646d
......@@ -9,8 +9,8 @@
justify="space-between"
align="middle"
>
<el-col :span="18"> {{ item.label }}</el-col>
<el-col :span="6">
<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-size12 color-999">{{ item.unit }}</span>
......
src/views/dataCenter/map/model/CardList/industrial.vue
浏览文件 @ dab8646d
......@@ -6,58 +6,35 @@
/>
<div class="info">
<el-row class="year" align="middle">
<el-icon color="#409EFC"> <Aim /> </el-icon>
2021年
</el-row>
<el-row class="info-item font-size14 color-666 item-bg margin-bottom8">
<el-row class="title">
军民融合
<div class="info-row" v-for="(item, index) in list" :key="index">
<el-row class="year" align="middle">
<el-icon color="#409EFC"> <Aim /> </el-icon>
{{ item.title }}
</el-row>
<el-col :span="24">
<el-row justify="space-between">
<div class="item-row">
<span class="font-size14 color-666">增长率</span>
<el-col class="font-size20 color-pramiry">31.5% </el-col>
</div>
<el-row class="info-item font-size14 color-666 item-bg margin-bottom8">
<el-col :span="24">
<el-row justify="space-between">
<div class="item-row">
<span class="font-size14 color-666">增长率</span>
<div class="item-row">
<span class="font-size14 color-666">主营业务收入</span>
<el-col class="font-size20 color-pramiry">{{ item.rate }}</el-col>
</div>
<el-col class="font-size20 color-pramiry"
>3545.5 <span class="font-size12 color-999">亿元</span>
</el-col>
</div>
</el-row>
</el-col>
</el-row>
<div class="item-row">
<span class="font-size14 color-666">{{ item.label }}</span>
<el-row class="info-item font-size14 color-666 item-bg margin-bottom8">
<el-row class="title">
国防科技工业
<el-col class="font-size20 color-pramiry"
>{{ item.value }}
<span v-if="item.valueUnit" class="font-size12 color-999">{{
item.valueUnit
}}</span>
</el-col>
</div>
</el-row>
</el-col>
</el-row>
<el-col :span="24">
<el-row justify="space-between">
<div class="item-row">
<span class="font-size14 color-666">增长率</span>
<el-col class="font-size20 color-pramiry">22.8% </el-col>
</div>
<div class="item-row">
<span class="font-size14 color-666">产值</span>
<el-col class="font-size20 color-pramiry"
>1113.4 <span class="font-size12 color-999">亿元</span>
</el-col>
</div>
</el-row>
</el-col>
</el-row>
</div>
</div>
</template>
<script lang="ts">
......@@ -67,7 +44,8 @@
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";
const date = [];
export default defineComponent({
components: {
......@@ -75,10 +53,30 @@ export default defineComponent({
Aim,
},
setup() {},
data() {
return {
list: [
{
title: "军民融合",
rate: "31.5%",
value: "3545.5",
label: "主营业务收入",
valueUnit: "",
},
{
title: "国防科技工业",
rate: "22.8%",
value: "1113.4",
label: "产值",
valueUnit: "亿元",
},
],
};
},
methods: {
detailsHandle() {
console.log("--DataCenterRouter-sssss-", DataCenterRouter)
this.$router.push(DataCenterRouter.DATA_INDUSTRIAL)
console.log("--DataCenterRouter-sssss-", DataCenterRouter);
this.$router.push(DataCenterRouter.DATA_INDUSTRIAL);
},
},
});
......@@ -89,47 +87,50 @@ export default defineComponent({
display: flex;
flex-direction: column;
height: 100%;
.margin-bottom8 {
margin-bottom: 8px;
&:last-of-type {
margin-bottom: 0;
.info-row {
margin-bottom: 10px;
.year {
margin: 10px 0;
}
.item-row {
padding: 3px 20px;
display: flex;
flex-direction: column;
text-align: center;
}
}
.year {
margin: 10px 0;
}
.item-row {
padding: 0 20px;
display: flex;
flex-direction: column;
text-align: center;
.info-item {
margin-bottom: 10px;
padding: 15px 10px;
&:last-of-type {
margin-bottom: 0;
}
.info-item {
margin-bottom: 10px;
padding: 15px 10px;
.title {
margin-left: 15px;
margin-bottom: 5px;
color: #333;
font-weight: bold;
position: relative;
&::before {
content: " ";
display: inline-block;
position: absolute;
top: 6px;
left: -12px;
width: 8px;
height: 8px;
border-radius: 50%;
background: #87bded;
}
}
}
}
.margin-bottom8 {
margin-bottom: 8px;
&:last-of-type {
margin-bottom: 0;
}
.title {
margin-left: 15px;
margin-bottom: 5px;
color: #333;
font-weight: bold;
position: relative;
&::before{
content: " ";
display: inline-block;
position: absolute;
top: 6px;
left: -12px;
width: 8px;
height: 8px;
border-radius: 50%;
background: #87bded;
}
}
}
}
</style>
src/views/dataCenter/map/model/CardList/strongArmy.vue
浏览文件 @ dab8646d
......@@ -13,8 +13,8 @@
>
贯彻国防要求的建设项目
<el-row align="middle">
<span class="font-size20 color-pramiry">30</span>
<span class="font-size12 color-999">亿元</span>
<span class="font-size20 color-pramiry">67</span>
<span class="font-size12 color-999">个</span>
</el-row>
</el-row>
......@@ -25,11 +25,11 @@
>
总投资
<el-row align="middle">
<span class="font-size20 color-pramiry">30</span>
<span class="font-size20 color-pramiry">438.32</span>
<span class="font-size12 color-999">亿元</span>
</el-row>
</el-row>
<!--
<el-row
class="font-size14 color-666"
justify="space-between"
......@@ -39,7 +39,7 @@
<el-row align="middle">
<span class="font-size20 color-pramiry">30%</span>
</el-row>
</el-row>
</el-row> -->
</div>
<!-- foot -->
......@@ -77,7 +77,7 @@
</el-col>
</el-row>
<el-row>
<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>
......@@ -112,9 +112,13 @@ export default defineComponent({
</script>
<style lang="scss" scoped>
@import url("./common.css");
.item-bg{
padding: 12px 8px;
}
.info {
padding: 10px 0;
.text-list {
padding: 18px 8px;
.el-row {
margin-bottom: 6px;
padding: 0 8px;
......@@ -128,15 +132,15 @@ export default defineComponent({
margin-left: 0 !important;
}
.foot-wrapper {
margin-top: 10px;
margin-top: 8px;
width: 100%;
.padding0-8 {
padding: 0 8px;
}
.margin-bottom8 {
margin-bottom: 8px;
}
}
.rate{
margin-top: 12px;
}}
</style>
src/views/dataCenter/map/model/CardList/systemConstruct.vue
浏览文件 @ dab8646d
......@@ -9,7 +9,7 @@
<div class="info">
<el-row class="year" align="middle">
<el-icon color="#409EFC"> <Aim /> </el-icon>
2021年
组织管理体系
</el-row>
<el-row
......
src/views/dataCenter/map/model/InvestmentProgress/index.vue
浏览文件 @ dab8646d
<template>
<MapTitle text='各市"千百十"项目投资金额及进度情况' />
<MapTitle text='军民融合"十百千"项目投资金额及进度情况' />
<div id="InvestmentProgress" class="investment-progress"></div>
</template>
<script lang="ts">
......
src/views/dataCenter/map/model/RankList/index.vue
浏览文件 @ dab8646d
<template>
<MapTitle text="创新示范区县(市、区）排名" />
<el-scrollbar height="260px">
<el-scrollbar height="240px">
<el-table
:data="tableData"
size="small"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论