diff --git a/core/core-frontend/src/assets/svg/icon_more-vertical_outlined_white.svg b/core/core-frontend/src/assets/svg/icon_more-vertical_outlined_white.svg
new file mode 100644
index 0000000..f6cd13c
--- /dev/null
+++ b/core/core-frontend/src/assets/svg/icon_more-vertical_outlined_white.svg
@@ -0,0 +1,5 @@
+
diff --git a/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue b/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue
index 9824050..e6755be 100644
--- a/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue
+++ b/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue
@@ -153,7 +153,7 @@ onUnmounted(() => {
-
+
@@ -231,5 +231,6 @@ onUnmounted(() => {
&:active {
background: rgba(31, 35, 41, 1);
}
+
}
diff --git a/core/core-frontend/src/components/visualization/OuterParamsSet.vue b/core/core-frontend/src/components/visualization/OuterParamsSet.vue
index 439c146..e85edba 100644
--- a/core/core-frontend/src/components/visualization/OuterParamsSet.vue
+++ b/core/core-frontend/src/components/visualization/OuterParamsSet.vue
@@ -62,7 +62,8 @@
import _delete from '@/assets/svg/icon_delete-trash_outlined.svg'
import edit from '@/assets/svg/icon_rename_outlined.svg'
-import icon_more_vertical_outlined from '@/assets/svg/icon_more-vertical_outlined.svg'
+import icon_more_vertical_outlined from '@/assets/svg/icon_more-vertical_outlined_white.svg'
import filterParams from '@/assets/svg/filter-params.svg'
import icon_dataset from '@/assets/svg/icon_dataset.svg'
import { ref, reactive, computed, nextTick } from 'vue'
@@ -808,11 +809,20 @@ defineExpose({
.root-class {
margin: 15px 0px 5px;
justify-content: right;
+ .ed-button{
+ color: #F2F4F5;
+ background-color: #212121;
+ border: 1px solid #434343;
+ }
+ .ed-button--primary{
+ background-color:#0089FF;
+ border: 1px solid #0089FF;
+ }
}
.preview {
margin-top: 5px;
- border: 1px solid #e6e6e6;
+ border: 1px solid #434343;
border-radius: 4px;
height: 470px !important;
overflow: hidden;
@@ -824,12 +834,12 @@ defineExpose({
line-height: 40px;
font-size: 12px;
color: #3d4d66;
- border-bottom: 1px solid #e6e6e6;
+ border-bottom: 1px solid #434343;
.head-text {
margin-left: 16px;
font-weight: 500;
font-size: 14px;
- color: #1f2329;
+ color: #ffffff;
}
.head-filter {
flex: 1;
@@ -837,7 +847,16 @@ defineExpose({
margin-right: 16px;
font-weight: 400;
font-size: 12px;
- color: #646a73;
+ // color: #646a73;
+ .ed-button.is-text{
+ color: #0089FF !important;
+ border: 1 solid #0089FF;
+ background-color: transparent;
+ }
+ .ed-button.is-text:hover{
+ background-color: transparent;
+ border: 1px solid #0156a0;
+ }
}
}
@@ -870,7 +889,7 @@ defineExpose({
align-items: center;
}
.preview-show {
- border-left: 1px solid #e6e6e6;
+ border-left: 1px solid #434343;
background-size: 100% 100% !important;
height: 100%;
overflow-y: auto;
@@ -903,13 +922,18 @@ defineExpose({
margin-left: auto;
display: none;
}
-
- &:hover .icon-more {
- margin-left: auto;
- display: unset;
+ &:hover {
+ .icon-more {
+ margin-left: auto;
+ display: unset;
+ }
}
+ .icon-more-box:hover{
+ border-radius: 4px;
+ background: #434343;
+ }
}
-
+rgb(2, 1, 1)
.link-icon-join {
font-size: 20px;
margin-top: 7px;
@@ -1088,13 +1112,13 @@ defineExpose({
border-radius: 4px;
margin: 8px 16px 0 16px;
padding: 12px;
- background: rgba(245, 246, 247, 1);
+ background: #2d2d2d;
}
.ds-content-title {
font-size: 14px;
font-weight: 500;
- color: rgba(100, 106, 115, 1);
+ color: #fff;
}
.custom-view-diver {
@@ -1105,7 +1129,7 @@ defineExpose({
}
.preview-left {
- background: rgba(245, 246, 247, 1);
+ // background: rgb(33,33,33);
height: 100%;
overflow-y: hidden;
}
@@ -1132,7 +1156,7 @@ defineExpose({
}
.params-attach-setting {
- border-left: 1px solid #e6e6e6;
+ border-left: 1px solid #434343;
}
.params-attach-content {
@@ -1155,4 +1179,25 @@ defineExpose({
color: #646a73;
margin: 10px 0 0 4px;
}
+:deep(.ed-tree--highlight-current .ed-tree-node.is-current > .ed-tree-node__content){
+ background: rgb(47,47,47) !important;
+}
+:deep(.ed-textarea__inner){
+background: #212121;
+color: #ffffff;
+box-shadow: 0 0 0 1px #5f5f5f inset;
+}
+:deep(.ed-checkbox__inner){
+ background:transparent;
+}
+:deep(.ed-checkbox__input.is-disabled .ed-checkbox__inner){
+ background:transparent;
+ border-color:#5f5f5f;
+}
+:deep(.ed-tabs__item){
+ color: #fff;
+}
+:deep(.ed-tabs__item.is-active){
+ color: #3370ff;
+}
diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
index b26b140..9fb261f 100644
--- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
+++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
@@ -34,7 +34,7 @@
size="middle"
@click="downloadViewImage"
>
-
{{ t('chart.export_img') }}
@@ -471,7 +471,7 @@ defineExpose({
flex-direction: row;
align-items: center;
justify-content: space-between;
-
+ color: #fff;
font-size: 16px;
font-weight: 500;
line-height: 24px;
@@ -486,7 +486,7 @@ defineExpose({
}
.m-button {
- color: #1f2329;
+ color: #fff;
font-size: 14px;
font-style: normal;
font-weight: 400;
@@ -499,14 +499,14 @@ defineExpose({
&:not(.is-disabled):focus,
&:not(.is-disabled):hover {
- color: #1f2329;
+ color: #ffffff;
border-color: transparent;
- background-color: rgba(31, 35, 41, 0.1);
+ background-color: rgb(61,61,61);
}
&:not(.is-disabled):active {
- color: #1f2329;
+ color: #ffffff;
border-color: transparent;
- background-color: rgba(31, 35, 41, 0.2);
+ background-color: rgb(61,61,61);
}
}
}
@@ -572,4 +572,16 @@ defineExpose({
overflow-x: hidden;
}
}
+:deep(.ed-input__wrapper){
+ background: rgba(41, 41, 41, 1);
+ box-shadow: 0 0 0 1px #434343;
+}
+:deep(.ed-input__inner){
+ color: #fff;
+}
+
+
diff --git a/core/core-frontend/src/custom-component/common/CommonBorderSetting.vue b/core/core-frontend/src/custom-component/common/CommonBorderSetting.vue
index 8772416..88c3707 100644
--- a/core/core-frontend/src/custom-component/common/CommonBorderSetting.vue
+++ b/core/core-frontend/src/custom-component/common/CommonBorderSetting.vue
@@ -93,7 +93,7 @@ watch(
:class="'form-item-' + themes"
>
+ >{{visualization.color}}
-
-
+
+
@@ -685,7 +685,7 @@ watch(
border-radius: 4px;
padding-top: 1px;
- color: #1f2329;
+ color: #a6a6a6;
cursor: pointer;
@@ -727,7 +727,7 @@ watch(
margin-bottom: 0 !important;
}
}
-.custom-row-inner {
+.custom-row-inner {
margin: 0 0 16px;
}
@@ -753,7 +753,7 @@ watch(
border-radius: 4px;
padding-top: 4px;
- color: #1f2329;
+ color: #a6a6a6;
cursor: pointer;
diff --git a/core/core-frontend/src/custom-component/de-tabs/CustomTabsSort.vue b/core/core-frontend/src/custom-component/de-tabs/CustomTabsSort.vue
index 6d93ef0..39c8b35 100644
--- a/core/core-frontend/src/custom-component/de-tabs/CustomTabsSort.vue
+++ b/core/core-frontend/src/custom-component/de-tabs/CustomTabsSort.vue
@@ -80,11 +80,11 @@ defineExpose({
.item-dimension {
padding: 2px;
margin: 2px;
- border: solid 1px #eee;
+ border: solid 1px #5f5f5f;
text-align: left;
- color: #606266;
- /*background-color: rgba(35,46,64,.05);*/
- background-color: white;
+ color: #fff;
+ background-color: rgba(35,46,64,.05);
+ // background-color: white;
display: flex;
align-items: center;
}
@@ -114,9 +114,9 @@ defineExpose({
}
.item-dimension:hover {
- color: #1890ff;
- background: #e8f4ff;
- border-color: #a3d3ff;
+ color: #0089ff;
+ background: rgb(61,61,61);
+ border-color: #0089ff;
cursor: pointer;
}
diff --git a/core/core-frontend/src/custom-component/de-tabs/TabBackgroundOverall.vue b/core/core-frontend/src/custom-component/de-tabs/TabBackgroundOverall.vue
index ddcbcd2..53d879a 100644
--- a/core/core-frontend/src/custom-component/de-tabs/TabBackgroundOverall.vue
+++ b/core/core-frontend/src/custom-component/de-tabs/TabBackgroundOverall.vue
@@ -88,10 +88,21 @@ const onTitleBackgroundChange = (params, paramsName) => {
:deep(.ed-tabs__item) {
font-size: 12px;
+ color: #a6a6a6;
+ }
+ :deep(.ed-tabs__item.is-active){
+ color: #3370ff;
}
-
:deep(.ed-tabs__content) {
padding: 12px 0;
}
}
+
diff --git a/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue b/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue
index f7fc951..dc72f13 100644
--- a/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue
+++ b/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue
@@ -22,6 +22,9 @@ const typeList:any = ref([{
},{
code:'03',
name:'GIS大屏页面'
+},{
+ code:'0301',
+ name:'数据看板页面'
},{
code:'04',
name:'二级弹窗页面'
@@ -124,7 +127,11 @@ function moreClic(event:any ,data:any){ // 更多操作
isTreeDrag.value = true
}
function editClic(data:any){
- window.open('/#/dvsCanvas?dvId=' +data.id, '_blank');
+ if(data.type == '03'){
+ window.open('/#/dvsCanvas?dvId=' +data.id, '_blank');
+ }else if(data.type == '0301'){
+ window.open('/#/dashboard?resourceId=' +data.id, ' blank');
+ }
// window.open('/#/dvCanvas?dvId=' + "1097641013486424064", '_blank');
}
function addTreeChildNode(event:any,level:any,data:any){ // // 添加子节点
diff --git a/core/core-frontend/src/viewsnew/application/module/index.vue b/core/core-frontend/src/viewsnew/application/module/index.vue
index d3631ba..b6386ed 100644
--- a/core/core-frontend/src/viewsnew/application/module/index.vue
+++ b/core/core-frontend/src/viewsnew/application/module/index.vue
@@ -55,6 +55,7 @@ const {
const route = useRoute()
const projectInfo:any = ref({})
const applicationId:any = ref('')
+const busiFlag = ref('dataV')
onMounted(() => {
applicationId.value = route.query.id
getInit()
@@ -71,7 +72,7 @@ const loadCanvasData = (dvId, weight?, ext?) => {
dataInitState.value = false
initMethod(
dvId,
- 'dataV',
+ busiFlag.value,
function ({
canvasDataResult,
canvasStyleResult,
@@ -99,6 +100,12 @@ const loadCanvasData = (dvId, weight?, ext?) => {
}
function handleNodeClick(e){
+ console.log(e,'加载')
+ if(e.type == '0301'){
+ busiFlag.value = 'dashboard'
+ }else if(e.type == '03'){
+ busiFlag.value = 'dataV'
+ }
loadCanvasData(e.id,9,0)
}
onBeforeMount(() => {