Skip to content

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

fix(资源开放共享): UI优化

上级 528f6c9f
显示空白字符变更
内嵌 并排
正在显示 包含 54 行增加 和 52 行删除
src/App.vue
浏览文件 @ eb73949c
......@@ -39,9 +39,9 @@ export default defineComponent({
display: flex;
flex-direction: column;
height: 100%;
padding: 20px 30px;
padding: 20px;
background: #f5f9fb;
min-width: 1920px;
box-sizing: border-box;
}
.main-warpper {
......
src/layout/head.vue
浏览文件 @ eb73949c
......@@ -41,7 +41,7 @@
<!-- 行动轨迹记录 -->
<el-row v-if="curRouteHistoy.length > 0" class="proceed-record">
<el-col class="nav-history" :span="18">
<el-col class="nav-history" :span="17">
<el-row class="pointer" @click="$router.go(-1)" align="middle">
<el-icon><ArrowLeftBold /></el-icon>
返回
......@@ -124,7 +124,7 @@ export default defineComponent({
value: "typeTwo",
},
{
label: "2021第三季度",
label: "2021年第三季度",
value: "typeThree",
},
],
......
src/views/dataCenter/army/model/Person/index.vue
浏览文件 @ eb73949c
......@@ -125,7 +125,6 @@ export default defineComponent({
},
className: "person-echart",
formatter: (params) => {
console.log("-----sssssssss");
let html = `<span class="name">${params[0].axisValue}</span>`;
html += `<div class="person-echart ">
......
src/views/dataCenter/resourceShare/index.vue
浏览文件 @ eb73949c
......@@ -8,16 +8,16 @@
<el-col :span="16">
<el-row class="map-right card-item">
<el-col :span="12">
<TotalContrac />
</el-col>
<el-col :span="11" :offset="1">
<Activity
echartsId="activityBar"
echartsTitle="军地需求对接活动情况"
echartsDesText="活动分布情况"
echartsDesText=""
:cardItems="extendCardItems"
/>
</el-col>
<el-col :span="11" :offset="1">
<TotalContrac />
</el-col>
</el-row>
</el-col>
</el-row>
......
src/views/dataCenter/resourceShare/model/Activity/index.vue
浏览文件 @ eb73949c
<template>
<MapTitle :text="echartsTitle" />
<div class="activity-describes">
<div class="meeting">
<div>军地需求对接活动数量</div>
<div>合同成交总额</div>
<div class="frequency">
{{ seriesData[0].count || "--" }}
<span class="second">次</span>
<span class="second">万元</span>
</div>
</div>
<div class="text">{{ echartsDesText }}</div>
<div class="text">合同成交额分布情况</div>
</div>
<div :id="echartsId" class="bar-echarts-line"></div>
......@@ -99,8 +98,10 @@ export default defineComponent({
optionBar() {
const seriesBar = this.seriesData.map((item) => {
return {
type: "bar",
type: "line",
lineStyle: {
type: "dashed",
},
itemStyle: {
color: "#4198ff",
},
......@@ -118,16 +119,14 @@ export default defineComponent({
return {
tooltip: {
trigger: "axis",
axisPointer: {
type: "shadow",
},
formatter: (params) => {
let html = ``;
html += `<div class="activity-echart-tooltip ">
<span class=" title color_1">${params[0].axisValue}市</span>
<br />
<span class="text text-color_1">${params[0].data.value}</span>次
<span class="text text-color_1">${params[0].data.value}</span>万元
</div>
`;
......@@ -144,7 +143,7 @@ export default defineComponent({
},
yAxis: {
type: "value",
name: "数量(次)",
name: "金额(万元)",
},
xAxis: {
type: "category",
......@@ -173,7 +172,7 @@ export default defineComponent({
</script>
<style>
.activity-echart-tooltip {
width: 60px;
width: 100px;
}
.activity-echart-tooltip .name {
margin-bottom: 15px;
......@@ -219,7 +218,8 @@ export default defineComponent({
box-sizing: border-box;
}
.activity-describes {
margin: 0 10px;
margin: 35px 0 10px 0;
height: 100px;
box-sizing: border-box;
.meeting {
......@@ -237,7 +237,7 @@ export default defineComponent({
color: rgba(65, 152, 255, 1);
font-weight: 500;
}
.second{
.second {
color: #999;
}
}
......
src/views/dataCenter/resourceShare/model/Activity/mock.js
浏览文件 @ eb73949c
export default {
"typeOne": {
seriesData: [{
value: [5204.49, 6029.77, 7633.65, 3545.5]
value: []
}],
},
"typeThree": {
seriesData: [{
count:0,
count: 0,
value: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
}],
},
"typeTwo": {
seriesData: [{
count:45,
value: [3, 5, 3, 5, 4, 7, 2, 3,5, 7, 1]
count: 379027.7,
value: [14348.7, 11374.5, 500, 11374.5, 324830, 7300, 560, 4306, 600, 500, 3334]
}],
},
}
\ No newline at end of file
src/views/dataCenter/resourceShare/model/TotalContrac/index.vue
浏览文件 @ eb73949c
<template>
<MapTitle text="军地需求对接活动情况" />
<div class="total-contrac-describes">
<div class="meeting">
<div>合同成交总额</div>
<div> 军地需求对接活动情况</div>
<div class="frequency">
{{ count || "--" }}
<span class="second">亿元</span>
<span class="second">次</span>
</div>
</div>
<div class="text">合同成交额分布情况</div>
<div class="text">活动分布情况</div>
</div>
<el-row class="echart-foot">
......@@ -32,7 +34,7 @@
<div class="pie-value">
{{ item.value || "--" }}
<span>万元</span>
<span>次</span>
</div>
</div>
</div>
......@@ -99,10 +101,10 @@ export default defineComponent({
const seriesBar = {
type: "pie",
radius: [20, 140],
center: ["25%", "50%"],
radius: ["38%", "90%"],
roseType: "radius",
itemStyle: {
borderRadius: 5,
borderRadius: 0,
},
label: {
show: false,
......@@ -125,7 +127,7 @@ export default defineComponent({
<span class='title'>${valItem.label}</span>：
<br />
<div class="pie-text level_${index + 1}">
<span>${valItem.value}</span>万元
<span>${valItem.value}</span>次
</div>
</div>`,
},
......@@ -172,7 +174,7 @@ export default defineComponent({
font-weight: bold;
}
.resource-share-tooltip .pie-text {
padding-left: 10px;
/* padding-left: 10px; */
margin-top: 5px;
font-size: 12px;
display: flex;
......@@ -216,7 +218,7 @@ export default defineComponent({
.resource-share-tooltip .pie-text::before {
position: absolute;
top: 8px;
left: 0;
left: 18px;
content: " ";
width: 6px;
height: 6px;
......@@ -225,14 +227,14 @@ export default defineComponent({
}
.resource-share-tooltip .pie-text span {
color: #4198ff;
margin-right: 5px;
margin-right: 2px;
font-size: 16px;
}
</style>
<style lang="scss" scoped>
.total-contrac-describes {
margin: 35px 0 10px 0;
margin: 0 10px;
height: 100px;
box-sizing: border-box;
.meeting {
......@@ -268,7 +270,7 @@ export default defineComponent({
flex-wrap: wrap;
.list-item {
width: 120px;
width: 130px;
margin-bottom: 15px;
border-radius: 5px;
box-sizing: border-box;
......@@ -300,7 +302,7 @@ export default defineComponent({
}
.incom-distribution {
height: 335px;
width: 500px;
width: 320px;
box-sizing: border-box;
}
</style>
src/views/dataCenter/resourceShare/model/TotalContrac/mock.js
浏览文件 @ eb73949c
......@@ -49,45 +49,45 @@ export default {
},
"typeTwo": {
count: 94.9312,
count: 45,
seriesData: [{
label: "杭州市",
value: 14348.7
value: 3
},
{
label: "宁波市",
value: 11374.5
value: 5
},
{
label: "温州市",
value: 2500
value: 3
},
{
label: "湖州市",
value: 11374.5
value: 5
},
{
label: "嘉兴市",
value: 3248
value: 4
},
{
label: "绍兴市",
value: 7300
value: 7
}, {
label: "金华市",
value: 2560
value: 2
}, {
label: "衢州市",
value: 4306
value: 3
}, {
label: "舟山市",
value: 2600
value: 5
}, {
label: "台州市",
value: 2500
value: 7
}, {
label: "丽水市",
value: 3334
value: 1
},
]
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论