-
+
{{ t('ts.unfoldCabin') }}
- {{ t('ts.layerCabin') }}
+ {{ t('ts.layerCabin') }}
= ['directory', 'gdslImagery', 'terrain', 'tileset', 'arcgisWximagery', 'arcgisBlueImagery', 'gdlwImagery']
+let canCheckType: Array = ['layer', 'directory', 'gdslImagery', 'terrain', 'tileset', 'arcgisWximagery', 'arcgisBlueImagery', 'gdlwImagery']
const {getSelectedNodes, cusSelectNode, getSameLevel, cusNodeIcon, nodeType} = useTreeNode()
import {showRightMenuTs} from "./tree"
import {TsApi} from "../../api/ts";
@@ -284,6 +284,7 @@ const onClick = (event: MouseEvent, treeId: string, treeNode: any) => {
*/
const onCheck = async (event: any, treeId: any, treeNode: any) => {
console.log(treeNode, 'treeNode')
+
let p_ids: any = []
let parentNode = treeNode.getParentNode();
if (parentNode) {
@@ -358,6 +359,7 @@ const onCheck = async (event: any, treeId: any, treeNode: any) => {
sourceStatus(treeNode)
console.log("ids", ids)
+ return
const res = await TsApi.updateTreeShow(ids)
if (res.code == 0 || res.code == 200) {
ElMessage({
@@ -521,7 +523,7 @@ defineExpose({
.close {
&:hover {
- color: #0ff;
+ color: rgb(var(--color-base1));
cursor: pointer;
}
}
@@ -580,7 +582,7 @@ defineExpose({
//clip-path: polygon(0% 0%, 100% 33px, 100% calc(100% - 33px), 0% 100%);
padding: calc(3px * 1.42) 3px;
//padding: 4.6px 3px;
- background: #0ff;
+ background: rgb(var(--color-base1));
.switch-node-inner {
clip-path: polygon(0% 30px,
@@ -593,8 +595,8 @@ defineExpose({
padding: calc(30px * 1.1) 0;
width: 30px;
line-height: 30px;
- background: linear-gradient(to right, rgba(0, 255, 255, 0.3) 0%, rgba(0, 255, 255, 0) 100%), rgba(0, 0, 0, 0.8);
- color: #0ff;
+ background: linear-gradient(to right, rgba(var(--color-base1), 0.2) 0%, rgba(0, 255, 255, 0) 100%), rgba(0, 0, 0, 0.8);
+ color: rgb(var(--color-base1));
letter-spacing: 2.5px;
/* border: 1.5px solid rgba(0, 255, 255, 1); */
position: relative;
diff --git a/src/renderer/src/views/TS/components/chart.vue b/src/renderer/src/views/TS/components/chart.vue
index c192b65..bf24c01 100644
--- a/src/renderer/src/views/TS/components/chart.vue
+++ b/src/renderer/src/views/TS/components/chart.vue
@@ -8,7 +8,7 @@
@@ -54,7 +54,6 @@ const refresh = () => {
window['refreshChart'] = refresh
let scroll = (e) => {
- console.log("ssss")
let scrollLeft = e.srcElement.scrollLeft
let scrollTop = e.srcElement.scrollTop
window['tsAction']({
@@ -121,7 +120,7 @@ let progressStyle = (task) => {
.bar {
position: absolute;
- background: rgba(0, 255, 255, 0.5);
+ background: rgba(var(--color-base1), 0.5);
color: #FFF;
height: calc(100% - 1.1px);
overflow: hidden;
diff --git a/src/renderer/src/views/TS/components/rightMenuTs.vue b/src/renderer/src/views/TS/components/rightMenuTs.vue
index 9d4a8ae..11050ae 100644
--- a/src/renderer/src/views/TS/components/rightMenuTs.vue
+++ b/src/renderer/src/views/TS/components/rightMenuTs.vue
@@ -111,9 +111,9 @@ defineExpose({
.itemBox:hover {
width: 100%;
- background: rgba(0, 255, 255, 0.2);
+ background: rgba(var(--color-base1), 0.2);
/* 悬停时的文字颜色 */
- color: rgba(0, 255, 255, 1);
+ color: rgb(var(--color-base1));
}
.itemText {
diff --git a/src/renderer/src/views/TS/components/rightOperate.ts b/src/renderer/src/views/TS/components/rightOperate.ts
index 3d7cfe3..307097d 100644
--- a/src/renderer/src/views/TS/components/rightOperate.ts
+++ b/src/renderer/src/views/TS/components/rightOperate.ts
@@ -136,7 +136,10 @@ export const useRightOperate = () => {
let selectedNode = window.treeObj.getNodeByParam('id', parentId)
//
console.log("添加到树上")
- cusAddNodes(window.treeObj, selectedNode, [res.data], true)
+ cusAddNodes(window.treeObj, selectedNode, [res.data], true).then((addNodes) => {
+ console.log("addNodes", addNodes)
+ addNodes.length && window['treeObj'].selectNode(addNodes[0])
+ })
})
}
}
diff --git a/src/renderer/src/views/TS/deduction.vue b/src/renderer/src/views/TS/deduction.vue
index c5e3154..d536ce3 100644
--- a/src/renderer/src/views/TS/deduction.vue
+++ b/src/renderer/src/views/TS/deduction.vue
@@ -26,7 +26,7 @@
trigger="manual"
:teleported="false"
v-model:visible="isPopoverShow"
- popper-style="background: transparent !important;color:#fff;padding:0;min-width:50px"
+ popper-style="background: transparent !important;color:#fff;padding:0;min-width:50px;border:none"
>
{{ TSOBJ._Store._multiplier }}×
@@ -154,6 +154,7 @@ window['updateProp'] = (key: string, val: any) => {
const level = ref(20)
const props = defineProps(['TSOBJ'])
console.log(props.TSOBJ)
+level.value = props.TSOBJ.wheel
let handleMultiplierChange = (multiplier) => {
props.TSOBJ._Store._multiplier = multiplier
multiplierPopover.value?.hide();
@@ -402,7 +403,7 @@ eventBus.on('wheel-time', (num) => {
left: 0;
height: 24.5vh;
display: flex;
- background: linear-gradient(180deg, rgba(0, 255, 255, 0.2) 0%, rgba(0, 255, 255, 0) 100%), rgba(0, 0, 0, 0.6);
+ background: linear-gradient(180deg, rgba(var(--color-base1), 0.2) 0%, rgba(0, 255, 255, 0) 100%), rgba(0, 0, 0, 0.5);
backdrop-filter: blur(3.47px);
.layoutBox {
@@ -462,7 +463,7 @@ eventBus.on('wheel-time', (num) => {
.timelineCursorBox {
position: absolute;
- border-right: 0.5px #0ff solid;
+ border-right: 0.5px solid rgb(var(--color-base1));
height: calc(100% - 16px);
z-index: 9;
//left: 10px;
@@ -495,7 +496,7 @@ eventBus.on('wheel-time', (num) => {
background: rgba(0, 0, 0, 0.5);
box-sizing: border-box;
- border: 1.5px solid rgba(0, 255, 255, 1);
+ border: 1.5px solid rgb(var(--color-base1));
span {
line-height: 25px;
@@ -503,14 +504,14 @@ eventBus.on('wheel-time', (num) => {
.multiplier-item {
&:hover {
- background: rgba(0, 255, 255, 0.5); /* 高亮背景色 */
+ background: rgba(var(--color-base1), 0.5); /* 高亮背景色 */
}
}
.active {
//background: rgba(0, 255, 255, 0.5); /* 高亮背景色 */
font-weight: 600; /* 加粗 */
- color: #0ff;
+ color: rgb(var(--color-base1));
}
}
@@ -524,7 +525,7 @@ eventBus.on('wheel-time', (num) => {
&::-webkit-scrollbar-thumb {
border-radius: 1em;
- background-color: rgba(0, 255, 255, 0.5);
+ background-color: rgb(var(--color-base1));
}
&::-webkit-scrollbar-track {
@@ -535,4 +536,3 @@ eventBus.on('wheel-time', (num) => {
}
-
diff --git a/src/renderer/src/views/TS/edit.vue b/src/renderer/src/views/TS/edit.vue
index 7b8eef2..f20d264 100644
--- a/src/renderer/src/views/TS/edit.vue
+++ b/src/renderer/src/views/TS/edit.vue
@@ -533,7 +533,7 @@ eventBus.on('destroyComponent', (id) => {
}
:deep(.el-slider__bar) {
- background-color: #0ff;
+ background-color: rgb(var(--color-base1));
}
//}
@@ -613,4 +613,24 @@ eventBus.on('destroyComponent', (id) => {
}
}
+
+
diff --git a/src/renderer/src/views/TS/element.vue b/src/renderer/src/views/TS/element.vue
index 3d5f8c3..b5936f9 100644
--- a/src/renderer/src/views/TS/element.vue
+++ b/src/renderer/src/views/TS/element.vue
@@ -2,14 +2,14 @@
-
+
{{ t('ts.unfoldElement') }}
- {{ t("ts.element") }}
+ {{ t("ts.element") }}
+ :class="[index==activIndex?'active':'','oneLine siyuanheitibold']">
{{ t('ts.' + item.name) }}
-
+
+
![]()
-
-
{{ item.modelName || item.militaryName }}
@@ -303,6 +392,7 @@ let addMarker = (item, needSendEvent = true) => {
+
diff --git a/src/renderer/src/views/TS/newEvent.vue b/src/renderer/src/views/TS/newEvent.vue
index 301ef85..5cbb455 100644
--- a/src/renderer/src/views/TS/newEvent.vue
+++ b/src/renderer/src/views/TS/newEvent.vue
@@ -3,8 +3,58 @@
+ {{ t("ts.situationEvent") }}
+
- {{ t("ts.situationEvent") }}
@@ -41,9 +91,18 @@
@@ -167,7 +226,8 @@ const addEvent = () => {
console.log(zNode.value)
let startTime = form.datetime.getTime()
let obj: any = {}
- let duration_S = (hour.value * 3600 + minute.value * 60 + second.value) * 1
+
+ let duration_S = Number(hour.value * 3600) + Number(minute.value * 60) + Number(second.value)
// 数据是否合法有效
let isRight = true
let errorFields = []//数据错误的字段
@@ -345,9 +405,10 @@ eventBus.on('event-startTime', (data) => {
transform: translate(-50%, -50%);
width: 570px;
height: 320px;
- border: 1px solid #0ff;
+ border: 1px solid rgb(var(--color-base1));
border-radius: 3px;
- background: rgba(0, 0, 0, 0.5);
+ background: linear-gradient(180deg, rgba(var(--color-base1), 0.2) 0%, rgba(241, 108, 85, 0) 100%), rgba(0, 0, 0, 0.5);;
+ backdrop-filter: blur(20px);
.set_pup_header {
@@ -359,8 +420,6 @@ eventBus.on('event-startTime', (data) => {
padding-bottom: 20px;
.system_title {
- background: url('@/assets/images/titlebg.png') no-repeat;
- background-size: 100% 100%;
width: 229px;
height: 34px;
line-height: 34px;
@@ -446,8 +505,6 @@ eventBus.on('event-startTime', (data) => {
width: 20px;
}
}
-
-
}
@@ -465,9 +522,12 @@ eventBus.on('event-startTime', (data) => {
&:deep(.el-tree-node.is-current > .el-tree-node__content>.el-tree-node__label ) {
//background-color: #e6f7ff; /* 浅蓝色高亮，可自定义 */
- --el-text-color: #0ff !important;
+ --el-text-color: rgb(var(--color-base1)) !important;
}
+ &:deep(.el-tree-node__content > .el-tree-node__expand-icon) {
+ display: block !important;
+ }
}
:deep(.el-text ) {
diff --git a/src/renderer/src/views/TS/newPlan.vue b/src/renderer/src/views/TS/newPlan.vue
index 20a8819..787c0d8 100644
--- a/src/renderer/src/views/TS/newPlan.vue
+++ b/src/renderer/src/views/TS/newPlan.vue
@@ -4,10 +4,61 @@
-
-
+
+
{{ t('ts.createPlan') }}
+
+
@@ -31,6 +82,7 @@
@@ -128,6 +182,11 @@ const rules = reactive>({
],
})
+const handleInput = (e) => {
+ console.log("sssssssss")
+ // 强制清空手动输入的内容，只保留选择器选择的值
+ e.target.value = sizeForm.simulationStartTime || ''
+}
const submitForm = async (formEl: FormInstance | undefined) => {
if (!formEl) return
await formEl.validate((valid, fields) => {
@@ -216,14 +275,21 @@ defineExpose({