修改样式

core/core-frontend/src/assets/svg/icon_more-vertical_outlined_white.svg

@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="icon_more-vertical_outlined">
+<path id="Vector" d="M9 12.0002V13.3335C9 13.3773 8.99138 13.4206 8.97463 13.4611C8.95788 13.5015 8.93332 13.5382 8.90237 13.5692C8.87142 13.6002 8.83467 13.6247 8.79423 13.6415C8.75379 13.6582 8.71044 13.6668 8.66667 13.6668H7.33333C7.28956 13.6668 7.24621 13.6582 7.20577 13.6415C7.16533 13.6247 7.12858 13.6002 7.09763 13.5692C7.06668 13.5382 7.04213 13.5015 7.02537 13.4611C7.00862 13.4206 7 13.3773 7 13.3335V12.0002C7 11.9118 7.03512 11.827 7.09763 11.7645C7.16014 11.7019 7.24493 11.6668 7.33333 11.6668H8.66667C8.71044 11.6668 8.75379 11.6755 8.79423 11.6922C8.83467 11.709 8.87142 11.7335 8.90237 11.7645C8.93332 11.7954 8.95788 11.8322 8.97463 11.8726C8.99138 11.913 9 11.9564 9 12.0002ZM9 2.66683V4.00016C9 4.04394 8.99138 4.08728 8.97463 4.12772C8.95788 4.16817 8.93332 4.20491 8.90237 4.23587C8.87142 4.26682 8.83467 4.29137 8.79423 4.30812C8.75379 4.32487 8.71044 4.3335 8.66667 4.3335H7.33333C7.24493 4.3335 7.16014 4.29838 7.09763 4.23587C7.03512 4.17335 7 4.08857 7 4.00016V2.66683C7 2.62306 7.00862 2.57971 7.02537 2.53927C7.04213 2.49883 7.06668 2.46208 7.09763 2.43113C7.12858 2.40017 7.16533 2.37562 7.20577 2.35887C7.24621 2.34212 7.28956 2.3335 7.33333 2.3335H8.66667C8.71044 2.3335 8.75379 2.34212 8.79423 2.35887C8.83467 2.37562 8.87142 2.40017 8.90237 2.43113C8.93332 2.46208 8.95788 2.49883 8.97463 2.53927C8.99138 2.57971 9 2.62306 9 2.66683ZM9 7.3335V8.66683C9 8.7106 8.99138 8.75395 8.97463 8.79439C8.95788 8.83483 8.93332 8.87158 8.90237 8.90253C8.87142 8.93349 8.83467 8.95804 8.79423 8.97479C8.75379 8.99154 8.71044 9.00016 8.66667 9.00016H7.33333C7.28956 9.00016 7.24621 8.99154 7.20577 8.97479C7.16533 8.95804 7.12858 8.93349 7.09763 8.90253C7.06668 8.87158 7.04213 8.83483 7.02537 8.79439C7.00862 8.75395 7 8.7106 7 8.66683V7.3335C7 7.24509 7.03512 7.16031 7.09763 7.09779C7.16014 7.03528 7.24493 7.00016 7.33333 7.00016H8.66667C8.71044 7.00016 8.75379 7.00879 8.79423 7.02554C8.83467 7.04229 8.87142 7.06684 8.90237 7.09779C8.93332 7.12875 8.95788 7.16549 8.97463 7.20594C8.99138 7.24638 9 7.28972 9 7.3335Z" fill="#FFFFFF"/>
+</g>
+</svg>

core/core-frontend/src/components/data-visualization/ComponentToolBar.vue

@@ -153,7 +153,7 @@ onUnmounted(() => {
         <Icon name="dv-max"><dvMax class="svg-icon"></dvMax></Icon
       ></el-icon>
       <el-divider direction="vertical" class="custom-divider_scale" />
-      <el-tooltip effect="ndark" :content="t('visualization.locate_tips')" placement="top">
+      <el-tooltip effect="dark" :content="t('visualization.locate_tips')" placement="top">
         <el-icon @click="reposition" class="hover-icon-custom" style="margin-right: 12px">
           <Icon name="dv-reposition"><dvReposition class="svg-icon"></dvReposition></Icon
         ></el-icon>
@@ -231,5 +231,6 @@ onUnmounted(() => {
   &:active {
     background: rgba(31, 35, 41, 1);
   }
+  
 }
 </style>

core/core-frontend/src/components/visualization/OuterParamsSet.vue

@@ -62,7 +62,8 @@
                     </span>
                     <span class="icon-more" v-if="!(curEditDataId === data.paramsInfoId)">
                       <handle-more
-                        style="margin-right: 15px"
+                        style="margin-right: 15px;"
+                        class="icon-more-box"
                         @handle-command="cmd => outerParamsOperation(cmd, node, data)"
                         :menu-list="state.optMenu"
                         :icon-name="icon_more_vertical_outlined"
@@ -323,7 +324,7 @@
 <script setup lang="ts">
 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 {
-  &:hover .icon-more {
+    .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;
+}
 </style>

core/core-frontend/src/components/visualization/UserViewEnlarge.vue

@@ -34,7 +34,7 @@
             size="middle"
             @click="downloadViewImage"
           >
-            <el-icon color="#1F2329" size="16" style="margin-right: 3px"
+            <el-icon color="#ffffff" size="16" style="margin-right: 3px"
               ><icon_download_outlined
             /></el-icon>
             {{ 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;
+}
+</style>
+<style>
+.ed-select-group__wrap:not(:last-of-type)::after{
+  background: #434343 !important;
+ }
 </style>

core/core-frontend/src/custom-component/common/CommonBorderSetting.vue

@@ -93,7 +93,7 @@ watch(
             :class="'form-item-' + themes"
           >
             <el-color-picker
-              :title="t('visualization.color')"
+              :label="t('visualization.color')"
               :disabled="!styleForm.borderActive"
               v-model="styleForm.borderColor"
               class="color-picker-style"
@@ -102,7 +102,7 @@ watch(
               show-alpha
               :predefine="state.predefineColors"
               @change="changeStylePre('borderColor')"
-            >
+            >{{visualization.color}}
             </el-color-picker>
           </el-form-item>
           <el-form-item

core/core-frontend/src/custom-component/common/CommonStyleSet.vue

@@ -175,7 +175,7 @@
             :class="{ dark: themes === 'dark', active: styleForm.textDecoration === 'underline' }"
             @click="checkTextDecoration"
           >
-            <el-icon>
+            <el-icon style="color: red;">
               <Icon name="style-underline"><styleUnderline class="svg-icon"/></Icon>
             </el-icon>
           </div>
@@ -685,7 +685,7 @@ watch(
   border-radius: 4px;
   padding-top: 1px;
 
-  color: #1f2329;
+  color: #a6a6a6;
 
   cursor: pointer;
 
@@ -753,7 +753,7 @@ watch(
   border-radius: 4px;
   padding-top: 4px;
 
-  color: #1f2329;
+  color: #a6a6a6;
 
   cursor: pointer;
 

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;
+  color: #fff;
-  /*background-color: rgba(35,46,64,.05);*/
+  background-color: rgba(35,46,64,.05);
-  background-color: white;
+  // background-color: white;
   display: flex;
   align-items: center;
 }
@@ -114,9 +114,9 @@ defineExpose({
 }
 
 .item-dimension:hover {
-  color: #1890ff;
+  color: #0089ff;
-  background: #e8f4ff;
+  background: rgb(61,61,61);
-  border-color: #a3d3ff;
+  border-color: #0089ff;
   cursor: pointer;
 }
 

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;
   }
 }
 </style>
+<style>
+.ed-color-picker__trigger{
+    border: 1px solid #5f5f5f;
+  }
+  .ed-color-picker__trigger-with-icon .ed-color-picker__custom-icon::after{
+    background-color: #5f5f5f;
+  }
+</style>

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){
+  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){ // // 添加子节点

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(() => {