Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
cxsfjx_project_echarts
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
邓文彬
cxsfjx_project_echarts
Commits
528f6c9f
提交
528f6c9f
authored
11月 30, 2021
作者:
邓文彬
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(资源开放共享): 模块名称替换
上级
3dc4b955
隐藏空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
124 行增加
和
60 行删除
+124
-60
index.vue
src/views/dataCenter/resourceShare/index.vue
+12
-12
index.vue
src/views/dataCenter/resourceShare/model/Activity/index.vue
+12
-12
mock.js
src/views/dataCenter/resourceShare/model/Activity/mock.js
+0
-0
index.vue
src/views/dataCenter/resourceShare/model/Facility/index.vue
+11
-11
mock.js
src/views/dataCenter/resourceShare/model/Facility/mock.js
+0
-0
index.vue
...ews/dataCenter/resourceShare/model/PlatformInfo/index.vue
+12
-12
mock.js
...views/dataCenter/resourceShare/model/PlatformInfo/mock.js
+0
-0
index.vue
src/views/dataCenter/resourceShare/model/TargetBar/index.vue
+24
-3
index.vue
...ews/dataCenter/resourceShare/model/TotalContrac/index.vue
+53
-10
mock.js
...views/dataCenter/resourceShare/model/TotalContrac/mock.js
+0
-0
没有找到文件。
src/views/dataCenter/resourceShare/index.vue
浏览文件 @
528f6c9f
...
...
@@ -8,7 +8,7 @@
<el-col
:span=
"16"
>
<el-row
class=
"map-right card-item"
>
<el-col
:span=
"12"
>
<
IncomExtendLine
<
Activity
echartsId=
"activityBar"
echartsTitle=
"军地需求对接活动情况"
echartsDesText=
"活动分布情况"
...
...
@@ -16,7 +16,7 @@
/>
</el-col>
<el-col
:span=
"11"
:offset=
"1"
>
<
IncomDistribution
/>
<
TotalContrac
/>
</el-col>
</el-row>
</el-col>
...
...
@@ -26,13 +26,13 @@
<el-row
class=
"footer-warpper"
:gutter=
"16"
>
<el-col
class=
"map-right"
:span=
"16"
>
<div
class=
"footer-item card-item"
>
<
BusinessIncome
/>
<
PlatformInfo
/>
</div>
</el-col>
<el-col
class=
"map-left"
:span=
"8"
>
<div
class=
"business-extend footer-item card-item"
>
<
Industrial
<
Facility
echartsId=
"industryDistribute"
echartsTitle=
"军工科研设备设施开放共享情况"
:cardItems=
"industryCardItems"
...
...
@@ -44,10 +44,10 @@
<
script
lang=
"ts"
>
import
{
defineComponent
}
from
"vue"
;
import
TargetBar
from
"./model/TargetBar/index.vue"
;
import
IncomExtendLine
from
"./model/IncomExtendLine
/index.vue"
;
import
IncomDistribution
from
"./model/IncomDistribution
/index.vue"
;
import
BusinessIncome
from
"./model/BusinessIncome
/index.vue"
;
import
Industrial
from
"./model/Industrial
/index.vue"
;
import
Activity
from
"./model/Activity
/index.vue"
;
import
TotalContrac
from
"./model/TotalContrac
/index.vue"
;
import
PlatformInfo
from
"./model/PlatformInfo
/index.vue"
;
import
Facility
from
"./model/Facility
/index.vue"
;
import
Mock
from
"./mock"
;
import
{
mapState
}
from
"vuex"
;
...
...
@@ -58,10 +58,10 @@ import { mapState } from "vuex";
export
default
defineComponent
({
components
:
{
TargetBar
,
IncomExtendLine
,
IncomDistribution
,
BusinessIncome
,
Industrial
,
Activity
,
TotalContrac
,
PlatformInfo
,
Facility
,
},
setup
()
{},
computed
:
{
...
...
src/views/dataCenter/resourceShare/model/
IncomExtendLine
/index.vue
→
src/views/dataCenter/resourceShare/model/
Activity
/index.vue
浏览文件 @
528f6c9f
<
template
>
<MapTitle
:text=
"echartsTitle"
/>
<div
class=
"describes"
>
<div
class=
"
activity-
describes"
>
<div
class=
"meeting"
>
<div>
军地需求对接活动数量
</div>
<div
class=
"frequency"
>
...
...
@@ -38,7 +38,7 @@ const xAxisCity = [
];
/**
*
全省军民协同创新平台情况/国防科技工业产值规模分布 -- 折线图
*
军地需求对接活动数量
*/
export
default
defineComponent
({
props
:
{
...
...
@@ -124,7 +124,7 @@ export default defineComponent({
formatter
:
(
params
)
=>
{
let
html
=
``
;
html
+=
`<div class="
munition-echart
">
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>次
...
...
@@ -172,23 +172,23 @@ export default defineComponent({
});
</
script
>
<
style
>
.
munition-echart
{
.
activity-echart-tooltip
{
width
:
60px
;
}
.
munition-echart
.name
{
.
activity-echart-tooltip
.name
{
margin-bottom
:
15px
;
font-size
:
14px
;
color
:
#333
;
font-weight
:
bold
;
}
.
munition-echart
.title
{
.
activity-echart-tooltip
.title
{
padding-left
:
10px
;
font-weight
:
600
;
font-size
:
12px
;
color
:
#666
;
position
:
relative
;
}
.
munition-echart
.title
::before
{
.
activity-echart-tooltip
.title
::before
{
position
:
absolute
;
top
:
5px
;
left
:
0
;
...
...
@@ -198,17 +198,17 @@ export default defineComponent({
display
:
inline-block
;
border-radius
:
50%
;
}
.
munition-echart
.text
{
.
activity-echart-tooltip
.text
{
padding-left
:
20px
;
margin-bottom
:
20px
;
}
.
munition-echart
.text
:last-of-type
{
.
activity-echart-tooltip
.text
:last-of-type
{
margin
:
0
;
}
.
munition-echart
.text-color_1
{
.
activity-echart-tooltip
.text-color_1
{
color
:
#4198ff
;
}
.
munition-echart
.color_1
::before
{
.
activity-echart-tooltip
.color_1
::before
{
background
:
#4198ff
;
}
</
style
>
...
...
@@ -218,7 +218,7 @@ export default defineComponent({
height
:
calc
(
100%
-
150px
);
box-sizing
:
border-box
;
}
.describes
{
.
activity-
describes
{
margin
:
0
10px
;
height
:
100px
;
box-sizing
:
border-box
;
...
...
src/views/dataCenter/resourceShare/model/
IncomExtendLine
/mock.js
→
src/views/dataCenter/resourceShare/model/
Activity
/mock.js
浏览文件 @
528f6c9f
File moved
src/views/dataCenter/resourceShare/model/
Industrial
/index.vue
→
src/views/dataCenter/resourceShare/model/
Facility
/index.vue
浏览文件 @
528f6c9f
<
template
>
<MapTitle
:text=
"echartsTitle"
/>
<div
:id=
"echartsId"
class=
"
incom
-echarts-line"
></div>
<div
:id=
"echartsId"
class=
"
facility
-echarts-line"
></div>
</
template
>
<
script
lang=
"ts"
>
import
{
defineComponent
}
from
"vue"
;
...
...
@@ -15,7 +15,7 @@ let MAP_ECHARTS = null;
const
xAxisValue
=
[
"2018年"
,
"2019年"
,
"2020年"
,
"2021年"
];
/**
*
*
军工科研设备设施开放共享情况
*/
export
default
defineComponent
({
props
:
{
...
...
@@ -80,10 +80,10 @@ export default defineComponent({
axisPointer
:
{
type
:
"shadow"
,
},
className
:
"
incom
-echart-tooltip"
,
className
:
"
facility
-echart-tooltip"
,
formatter
:
(
params
)
=>
{
let
html
=
`<span class="name">
${
params
[
0
].
axisValue
}
</span>`
;
html
+=
`<div class="
incom
-echart-tooltip ">
html
+=
`<div class="
facility
-echart-tooltip ">
<span class="text text-color_1">
${
params
[
0
].
data
.
value
}
</span>个
</div>`
;
...
...
@@ -128,10 +128,10 @@ export default defineComponent({
});
</
script
>
<
style
>
.
incom
-echart-tooltip
{
.
facility
-echart-tooltip
{
width
:
80px
;
}
.
incom
-echart-tooltip
.name
{
.
facility
-echart-tooltip
.name
{
padding-left
:
10px
;
margin-bottom
:
15px
;
font-size
:
14px
;
...
...
@@ -139,7 +139,7 @@ export default defineComponent({
font-weight
:
bold
;
position
:
relative
;
}
.
incom
-echart-tooltip
.name
::before
{
.
facility
-echart-tooltip
.name
::before
{
position
:
absolute
;
top
:
5px
;
left
:
0
;
...
...
@@ -151,14 +151,14 @@ export default defineComponent({
background
:
#4198ff
;
}
.
incom
-echart-tooltip
.text
{
.
facility
-echart-tooltip
.text
{
padding-left
:
20px
;
margin-bottom
:
20px
;
}
.
incom
-echart-tooltip
.text
:last-of-type
{
.
facility
-echart-tooltip
.text
:last-of-type
{
margin
:
0
;
}
.
incom
-echart-tooltip
.text-color_1
{
.
facility
-echart-tooltip
.text-color_1
{
color
:
#4198ff
;
}
...
...
@@ -166,7 +166,7 @@ export default defineComponent({
</
style
>
<
style
lang=
"scss"
scoped
>
.
incom
-echarts-line
{
.
facility
-echarts-line
{
flex
:
1
;
height
:
calc
(
100%
-
40px
);
box-sizing
:
border-box
;
...
...
src/views/dataCenter/resourceShare/model/
Industrial
/mock.js
→
src/views/dataCenter/resourceShare/model/
Facility
/mock.js
浏览文件 @
528f6c9f
File moved
src/views/dataCenter/resourceShare/model/
BusinessIncome
/index.vue
→
src/views/dataCenter/resourceShare/model/
PlatformInfo
/index.vue
浏览文件 @
528f6c9f
<
template
>
<MapTitle
text=
"军民资源共享信息平台情况"
/>
<div
class=
"describes"
>
<div
class=
"
platform-
describes"
>
<div
class=
"meeting"
>
<div>
军民资源共享信息平台数量
</div>
<div
class=
"frequency"
>
...
...
@@ -38,7 +38,7 @@ const xAxisCity = [
];
/**
*
全省军民协同创新平台情况/国防科技工业产值规模分布 -- 折线图
*
军民资源共享信息平台情况
*/
export
default
defineComponent
({
components
:
{
...
...
@@ -95,7 +95,7 @@ export default defineComponent({
formatter
:
(
params
)
=>
{
let
html
=
``
;
html
+=
`<div class="
munition-echart
">
html
+=
`<div class="
platform-info-target-tooltip
">
<span class=" title color_1">
${
params
[
0
].
axisValue
}
市</span>
<br />
<span class="text text-color_1">
${
params
[
0
].
data
.
value
}
</span>个
...
...
@@ -143,23 +143,23 @@ export default defineComponent({
});
</
script
>
<
style
>
.
munition-echart
{
.
platform-info-target-tooltip
{
width
:
60px
;
}
.
munition-echart
.name
{
.
platform-info-target-tooltip
.name
{
margin-bottom
:
15px
;
font-size
:
14px
;
color
:
#333
;
font-weight
:
bold
;
}
.
munition-echart
.title
{
.
platform-info-target-tooltip
.title
{
padding-left
:
10px
;
font-weight
:
600
;
font-size
:
12px
;
color
:
#666
;
position
:
relative
;
}
.
munition-echart
.title
::before
{
.
platform-info-target-tooltip
.title
::before
{
position
:
absolute
;
top
:
5px
;
left
:
0
;
...
...
@@ -169,17 +169,17 @@ export default defineComponent({
display
:
inline-block
;
border-radius
:
50%
;
}
.
munition-echart
.text
{
.
platform-info-target-tooltip
.text
{
padding-left
:
20px
;
margin-bottom
:
20px
;
}
.
munition-echart
.text
:last-of-type
{
.
platform-info-target-tooltip
.text
:last-of-type
{
margin
:
0
;
}
.
munition-echart
.text-color_1
{
.
platform-info-target-tooltip
.text-color_1
{
color
:
#4198ff
;
}
.
munition-echart
.color_1
::before
{
.
platform-info-target-tooltip
.color_1
::before
{
background
:
#4198ff
;
}
</
style
>
...
...
@@ -189,7 +189,7 @@ export default defineComponent({
height
:
calc
(
100%
-
140px
);
box-sizing
:
border-box
;
}
.describes
{
.
platform-
describes
{
margin
:
0
10px
;
height
:
100px
;
box-sizing
:
border-box
;
...
...
src/views/dataCenter/resourceShare/model/
BusinessIncome
/mock.js
→
src/views/dataCenter/resourceShare/model/
PlatformInfo
/mock.js
浏览文件 @
528f6c9f
File moved
src/views/dataCenter/resourceShare/model/TargetBar/index.vue
浏览文件 @
528f6c9f
...
...
@@ -74,7 +74,7 @@ export default defineComponent({
type
:
"shadow"
,
},
textStyle
:
{},
className
:
"
target-bar
-tooltip"
,
className
:
"
resource-share-target
-tooltip"
,
formatter
:
"<span class='title'>{b0}</span>: <br /> <span class='bar-text'>{c0}</span> 分"
,
},
...
...
@@ -131,11 +131,32 @@ export default defineComponent({
});
</
script
>
<
style
>
.target-bar-tooltip
.title
{
.resource-share-target-tooltip
{
width
:
60px
;
}
.resource-share-target-tooltip
.title
{
padding-left
:
10px
;
color
:
#333
;
font-weight
:
bold
;
position
:
relative
;
}
.resource-share-target-tooltip
.title
::before
{
position
:
absolute
;
top
:
8px
;
left
:
0
;
content
:
" "
;
width
:
6px
;
height
:
6px
;
display
:
inline-block
;
border-radius
:
50%
;
background
:
#4198ff
;
}
.resource-share-target-tooltip
.bar-text
{
padding-left
:
10px
;
color
:
#4198ff
;
position
:
relative
;
}
.
target-bar
-tooltip
.bar-text
{
.
resource-share-target
-tooltip
.bar-text
{
padding-left
:
10px
;
color
:
#4198ff
;
}
...
...
src/views/dataCenter/resourceShare/model/
IncomDistribution
/index.vue
→
src/views/dataCenter/resourceShare/model/
TotalContrac
/index.vue
浏览文件 @
528f6c9f
<
template
>
<div
class=
"describes"
>
<div
class=
"
total-contrac-
describes"
>
<div
class=
"meeting"
>
<div>
合同成交总额
</div>
<div
class=
"frequency"
>
...
...
@@ -120,12 +120,11 @@ export default defineComponent({
color
:
PieColor
[
`level_
${
index
+
1
}
`
],
},
tooltip
:
{
borderColor
:
"none"
,
className
:
"business-pie-tooltip"
,
formatter
:
`<div class="business-pie-tooltip">
className
:
"resource-share-tooltip"
,
formatter
:
`<div class="resource-share-tooltip">
<span class='title'>
${
valItem
.
label
}
</span>:
<br />
<div class=
'pie-text'
>
<div class=
"pie-text level_
${
index
+
1
}
"
>
<span>
${
valItem
.
value
}
</span>万元
</div>
</div>`
,
...
...
@@ -168,19 +167,63 @@ export default defineComponent({
</
script
>
<
style
>
.
business-pi
e-tooltip
.title
{
.
resource-shar
e-tooltip
.title
{
color
:
#333
;
font-weight
:
bold
;
}
.
business-pi
e-tooltip
.pie-text
{
.
resource-shar
e-tooltip
.pie-text
{
padding-left
:
10px
;
margin-top
:
5px
;
font-size
:
12px
;
display
:
flex
;
justify-content
:
flex-end
;
align-items
:
center
;
position
:
relative
;
}
.business-pie-tooltip
.pie-text
span
{
.resource-share-tooltip
.level_1
::before
{
background
:
#6fdef7
;
}
.resource-share-tooltip
.level_2
::before
{
background
:
#9cbcfa
;
}
.resource-share-tooltip
.level_3
::before
{
background
:
#1781df
;
}
.resource-share-tooltip
.level_4
::before
{
background
:
#ffa741
;
}
.resource-share-tooltip
.level_5
::before
{
background
:
#47d6ad
;
}
.resource-share-tooltip
.level_6
::before
{
background
:
#6fdef7
;
}
.resource-share-tooltip
.level_7
::before
{
background
:
#f78a77
;
}
.resource-share-tooltip
.level_8
::before
{
background
:
#8a8aa8
;
}
.resource-share-tooltip
.level_9
::before
{
background
:
#634cf0
;
}
.resource-share-tooltip
.level_10
::before
{
background
:
#ffcf3c
;
}
.resource-share-tooltip
.level_11
::before
{
background
:
#b470fc
;
}
.resource-share-tooltip
.pie-text
::before
{
position
:
absolute
;
top
:
8px
;
left
:
0
;
content
:
" "
;
width
:
6px
;
height
:
6px
;
display
:
inline-block
;
border-radius
:
50%
;
}
.resource-share-tooltip
.pie-text
span
{
color
:
#4198ff
;
margin-right
:
5px
;
font-size
:
16px
;
...
...
@@ -188,8 +231,8 @@ export default defineComponent({
</
style
>
<
style
lang=
"scss"
scoped
>
.describes
{
margin
:
3
0
px
0
10px
0
;
.
total-contrac-
describes
{
margin
:
3
5
px
0
10px
0
;
height
:
100px
;
box-sizing
:
border-box
;
.meeting
{
...
...
src/views/dataCenter/resourceShare/model/
IncomDistribution
/mock.js
→
src/views/dataCenter/resourceShare/model/
TotalContrac
/mock.js
浏览文件 @
528f6c9f
File moved
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论