ThbTech/gis-bi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改图表样式

Browse Source
This commit is contained in:
jingna 2025-04-18 18:12:05 +08:00
parent 3f159ff8ff
commit 64958d398e
10 changed files with 54 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/core-frontend/src/assets/newimg/dataset.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 550 B

BIN
core/core-frontend/src/assets/newimg/editpro.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 432 B

BIN
core/core-frontend/src/assets/newimg/icon/dataset.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 550 B

BIN
core/core-frontend/src/assets/newimg/icon/editpro.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 432 B

6
core/core-frontend/src/assets/svg/combinationpage.svg Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="16px" height="16px" xmlns="http://www.w3.org/2000/svg">
<g transform="matrix(1 0 0 1 -203 -82 )">
<path d="M 12.8855043658858 11.909153844436 C 12.8855043658858 12.4442260881217 12.4503003640099 12.8794300899976 11.9152281203243 12.8794300899976 L 7.9726657585029 12.8794300899976 C 7.43759351481719 12.8794300899976 7.00238951294136 12.4442260881217 7.00238951294136 11.909153844436 L 7.00238951294136 9.00368476294693 L 4.08477187967571 9.00368476294693 C 3.54969963599012 9.00368476294693 3.11449563411418 8.56848076107104 3.11449563411418 8.03340851738537 L 3.11449563411418 4.09084615556398 C 3.11449563411418 3.55577391187833 3.54969963599012 3.12056991000244 4.08477187967571 3.12056991000244 L 8.0273342414971 3.12056991000244 C 8.56240648518281 3.12056991000244 8.99761048705864 3.55577391187833 8.99761048705864 4.09084615556398 L 8.99761048705864 6.9963152370531 L 11.9152281203243 6.9963152370531 C 12.4503003640099 6.9963152370531 12.8855043658858 7.43151923892896 12.8855043658858 7.96659148261463 L 12.8855043658858 11.909153844436 Z M 8.35873958775323 8.35266531186494 L 8.35873958775323 11.5229013600125 L 11.5289756359008 11.5229013600125 L 11.5289756359008 8.35266531186494 L 8.35873958775323 8.35266531186494 Z M 4.47102436409921 4.4770986399875 L 4.47102436409921 7.64733468813506 L 7.64126041224677 7.64733468813506 L 7.64126041224677 4.4770986399875 L 4.47102436409921 4.4770986399875 Z M 16 14.3527993032448 C 16 15.2610822037116 15.2610822037116 16 14.3527993032449 16 L 1.64720069675519 16 C 0.738917796288433 16 0 15.2610822037116 0 14.3527993032448 L 0 1.64720069675516 C 0 0.738917796288433 0.738917796288433 0 1.64720069675519 0 L 14.3527993032449 0 C 15.2610822037116 0 16 0.738917796288433 16 1.64720069675516 L 16 14.3527993032448 Z M 14.3527993032449 1.35652872998503 L 1.64720069675519 1.35652872998503 C 1.48962683400703 1.35652872998503 1.35652872998503 1.48962683400703 1.35652872998503 1.64720069675516 L 1.35652872998503 14.3527993032448 C 1.35652872998503 14.510373165993 1.48962683400703 14.643471270015 1.64720069675519 14.643471270015 L 14.3527993032449 14.643471270015 C 14.510373165993 14.643471270015 14.643471270015 14.510373165993 14.643471270015 14.3527993032448 L 14.643471270015 1.64720069675516 C 14.643471270015 1.48962683400703 14.510373165993 1.35652872998503 14.3527993032449 1.35652872998503 Z " fill-rule="nonzero" fill="#f2f4f5" stroke="none" transform="matrix(1 0 0 1 203 82 )" />
</g>
</svg>

6
core/core-frontend/src/assets/svg/scatterpage.svg Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="16px" height="16px" xmlns="http://www.w3.org/2000/svg">
<g transform="matrix(1 0 0 1 -234 -82 )">
<path d="M 14.4305090731741 15.9918428409471 C 15.3450705629173 16.0864691372958 16.0864691372958 15.3450705629173 15.9918428409471 14.4305090731741 L 15.9918428409471 6.86040596409129 C 16.0864691372958 5.94584447434806 15.3450705629173 5.20444589996958 14.4305090731741 5.20444589996958 L 6.86040596409123 5.20444589996958 C 5.94584447434806 5.20444589996958 5.20444589996953 5.94584447434806 5.20444589996953 6.86040596409129 L 5.20444589996953 14.4305090731741 C 5.20444589996953 15.3450705629173 5.94584447434806 16.0864691372958 6.86040596409123 15.9918428409471 L 14.4305090731741 15.9918428409471 Z M 0.00393762755925309 1.54086156065512 C 0.0630394737495408 0.679995894374258 0.780088993426148 0 1.6559600641217 0 C 1.6559600641217 0 1.6559600641217 0 1.6559600641217 0.094626296348622 L 9.22606317320447 0.094626296348622 C 10.1406246629477 0 10.8820232373262 0.741398574378479 10.8820232373262 1.6559600641217 L 10.8820232373262 2.89319879961334 C 10.8820232373262 3.28515372203918 10.5642809925824 3.60289596678291 10.1723260701566 3.60289596678291 C 9.78037114773076 3.60289596678291 9.46262890298704 3.28515372203918 9.40585312961343 2.89319879961334 L 9.40585312961343 1.6559600641217 C 9.46262890298704 1.52530841923021 9.35671481809595 1.41939433433913 9.22606317320447 1.45724485731421 L 1.6559600641217 1.45724485731421 C 1.52530841923021 1.41939433433913 1.41939433433913 1.52530841923021 1.45724485731421 1.6559600641217 L 1.45724485731421 9.22606317320452 C 1.41939433433913 9.35671481809601 1.52530841923021 9.46262890298704 1.6559600641217 9.40585312961349 L 3.19978797583065 9.40585312961349 C 3.19978797583065 9.46262890298704 3.19978797583065 9.46262890298704 3.19978797583065 9.46262890298704 C 3.59174289825648 9.46262890298704 3.90948514300021 9.78037114773076 3.90948514300021 10.1723260701566 C 3.90948514300021 10.5642809925825 3.59174289825648 10.8820232373262 3.19978797583065 10.8820232373262 L 1.6559600641217 10.8820232373262 C 0.741398574378422 10.8820232373262 0 10.1406246629477 0.0946262963486788 9.22606317320452 L 0.0946262963486788 1.6559600641217 C 0.0327908575711717 2.01666676375339 0.0113630183336682 1.67024052352537 0.00393762755925309 1.54086156065512 Z M 0.0039376275954055 1.54086156177976 C 0 1.47225289349524 0 1.46468007571281 0 1.6559600641217 C 0 1.61726964507397 0.00132688349867749 1.57888913627278 0.0039376275954055 1.54086156177976 Z M 6.68061600768226 14.4305090731741 L 6.68061600768226 6.86040596409129 C 6.62384023430877 6.7297543191998 6.72975431919974 6.62384023430872 6.86040596409123 6.68061600768232 L 14.4305090731741 6.68061600768232 C 14.5611607180656 6.62384023430872 14.6670748029566 6.7297543191998 14.6292242799816 6.86040596409129 L 14.6292242799816 14.4305090731741 C 14.6670748029566 14.5611607180655 14.5611607180656 14.6670748029566 14.4305090731741 14.6292242799815 L 6.86040596409123 14.6292242799815 C 6.72975431919974 14.6670748029566 6.62384023430877 14.5611607180655 6.68061600768226 14.4305090731741 Z " fill-rule="nonzero" fill="#f2f4f5" stroke="none" transform="matrix(1 0 0 1 234 82 )" />
</g>
</svg>

2
core/core-frontend/src/views/chart/components/editor/filter/FilterTree.vue
View File

@ -95,7 +95,7 @@ defineExpose({
</div>
</div>
<template #footer>
<el-button class="cancelbtn" secondary @click="closeFilter">{{ $t('chart.cancel') }} </el-button>
<el-button secondary @click="closeFilter">{{ $t('chart.cancel') }} </el-button>
<el-button type="primary" @click="submit">{{ $t('chart.confirm') }} </el-button>
</template>
</el-dialog>

28
core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue
View File

@ -90,7 +90,7 @@ const del = (index, child) => {
<span style="color: #bfbfbf;" class="mrg-title" v-if="x">
{{ logic === 'or' ? 'OR' : 'AND' }}
</span>
<el-dropdown @command="handleCommand" trigger="click" v-else>
<el-dropdown class="te" @command="handleCommand" trigger="click" v-else>
<span style="color:#F2F4F5" class="mrg-title fir">
{{ logic === 'or' ? 'OR' : 'AND' }}
<el-icon>
@ -250,22 +250,30 @@ const del = (index, child) => {
}
.ed-dropdown__popper .ed-dropdown-menu{
background-color: #303133;
border: 1px solid #434343;
background-color: rgba(41, 41, 41, 1);
border: none;
}
:deep(.ed-dropdown-menu__item) {
color: #F2F4F5;
}
:deep(.ed-popper.is-light){
border:1px solid #434343;
background: rgba(41, 41, 41, 1);
}
:deep(.ed-dropdown__popper.ed-popper){
border-color: rgba(70, 70, 70, 1);
}
:deep(.ed-dropdown-menu__item:not(.is-disabled):hover){
background-color: rgba(61,61,61, 1);
}
</style>
<style>
.ed-dropdown__popper.ed-popper{
border-color: rgba(70, 70, 70, 1);
}
.ed-popper.is-light{
border:none;
background: transparent;
border:1px solid #434343;
background: rgba(41, 41, 41, 1);
}
.ed-dropdown-menu__item:not(.is-disabled):hover{
background-color: rgba(83, 83, 83, 1);
.ed-popper.is-light .ed-popper__arrow::before{
background:rgba(41, 41, 41, 1);
border: 1px solid rgba(70, 70, 70, 1);
}
</style>

5
core/core-frontend/src/viewsnew/application/index.vue
View File

@ -105,9 +105,9 @@ function delClick(row){
<div class="mask_box" v-if="mask == index">
<div class="mask_box_img">
<img src="@/assets/newimg/icon/edit.png" @click="updateClick(item)" title="编辑项目">
<img src="@/assets/newimg/icon/editpro.png" @click="updateClick(item)" title="编辑项目">
<img src="@/assets/newimg/icon/caidan.png" alt="" title="菜单配置">
<img src="@/assets/newimg/icon/edit.png" alt="" title="编辑数据集" @click="routerClick(item,'/datasetnew')">
<img src="@/assets/newimg/icon/dataset.png" alt="" title="编辑数据集" @click="routerClick(item,'/datasetnew')">
<img src="@/assets/newimg/icon/edit.png" alt="" title="编辑数据源" @click="routerClick(item,'/datasourcenew')">
<img src="@/assets/newimg/icon/fuwu.png" alt="" title="服务配置">
<img src="@/assets/newimg/icon/permission.png" alt="" title="权限设置">
@ -140,6 +140,7 @@ function delClick(row){
padding: 20px ;
padding-left: 40px ;
padding-right: 0px ;
background-color: rgb(21,21,21);
}
.keywordsClass{
width: 403px;

27
core/core-frontend/src/viewsnew/application/service/dataset/index.vue
View File

@ -651,7 +651,7 @@ const operation = (cmd: string, data: BusiTreeNode, nodeType: string) => {
creatDsFolder.value.createInit(nodeType, data, cmd)
}
}
const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)
const handleDatasetTree = (cmd: string, data?: BusiTreeNode) => {
data.appId = applicationId.value
if (cmd === 'dataset') {
@ -981,18 +981,18 @@ const proxyAllowDrop = debounce((arg1, arg2) => {
/></Icon> </template
>{{ t('data_set.new_data_screen') }}
</el-button> -->
<el-button v-if="exportPermissions[0]" secondary @click="exportDataset">
<template #icon>
<el-button class="export-btn" v-if="exportPermissions[0]" secondary @click="exportDataset">
<!-- <template #icon>
<Icon name="icon_download_outlined"
><icon_download_outlined class="svg-icon"
/></Icon>
</template>
</template> -->
数据集导出
</el-button>
<el-button type="primary" @click="editorDataset" v-if="nodeInfo.weight >= 7">
<template #icon>
<el-button class="edit-btn" type="primary" @click="editorDataset" v-if="nodeInfo.weight >= 7">
<!-- <template #icon>
<Icon name="icon_edit_outlined"><icon_edit_outlined class="svg-icon" /></Icon>
</template>
</template> -->
编辑
</el-button>
</div>
@ -1559,4 +1559,17 @@ border-right: 1px solid rgba(54, 54, 54, 1)
border-bottom: 1px solid rgba(54, 54, 54, 1);
flex: 1;
}
.export-btn.ed-button.is-secondary{
background-color:rgba(54, 55, 56, 1);
color: #F2F4F5;
border:none;
}
.edit-btn.ed-button{
background-color:rgba(0, 137, 255, 1);
color: #F2F4F5;
}
.edit-btn.ed-button:focus, .edit-btn.ed-button:hover{
background-color:rgba(0, 137, 255, 1);
color: #F2F4F5;
}
</style>