Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl

src/renderer/src/api/ts/index.ts

@@ -53,4 +53,17 @@ export const TsApi = {
       data
     })
   },
+// /tsEvent/update
+  updateTsEvent: async (data: any) => {
+    return await request.post({
+      url: '/tsEvent/update',
+      data
+    })
+  },
+  delEvent: async (data: any) => {
+    return await request.post({
+      url: '/tsEvent/delete',
+      data
+    })
+  }
 }

src/renderer/src/views/TS/cabin.vue

@@ -49,7 +49,7 @@ const initTreeCallBack = () => {
     console.log('queryTsSource', res)
     if (res.code == 200) {
       for (let i = res.data.length - 1; i >= 0; i--) {
-        res.data[i].icon = await cusNodeIcon(res.data[i]);
+        res.data[i].svg = await cusNodeIcon(res.data[i]);
       }
       zNodes.value = res.data
       console.log("data", zNodes.value)
@@ -96,7 +96,7 @@ const initTreeCallBack = () => {
     layers.sort((obj1, obj2) => {
       return obj1.detail.layerIndex - obj2.detail.layerIndex;
     });
-    if (window.earth_ts) {
+    if ((window as any).earth_ts) {
       for (let i = 0; i < layers.length; i++) {
         // initMapData(layers[i].sourceType, layers[i].detail, null)
       }

src/renderer/src/views/TS/components/chart.vue

@@ -24,10 +24,14 @@ const selectedEventId = ref(null)
 const eventBus: any = inject('bus')
 const props = defineProps(['eventList', 'hr', 'originHrOffset', 'scrollLeft'])
 let clickEventBar = (event) => {
-  console.log("点击事件块")
+  console.log("点击事件块", selectedEventId.value, event.id)
   selectedEventId.value = (selectedEventId.value == null || selectedEventId.value != event.id) ? event.id : null
-  eventBus.emit('click-event-show-plane', event)
+  eventBus.emit('click-event-show-plane', selectedEventId.value ? event : null)
 }
+// 点击事件属性编辑面板的取消按钮，取消选中时间块
+eventBus.on("click-cancel-hide-plane", () => {
+  selectedEventId.value = null
+})
 // 1. 定义响应式变量，用于强制更新
 const refreshKey = ref(0)
 
@@ -85,7 +89,7 @@ let getWidth = (durationTime) => {
 // 6. 让 progressStyle 间接依赖 refreshKey（通过 getWidth）
 let progressStyle = (task) => {
   let taskLeft = task.startTime - window['tsObj']._Store._startTimestamp;
-  let style = {
+  let style:any = {
     width: getWidth(task.duration_time) * 1000 + "px",
     left: getWidth(taskLeft) + "px",
   };

src/renderer/src/views/TS/components/eventParams.vue

@@ -1,8 +1,26 @@
 <template>
   <div class="eventParams">
     <template v-if="eventObj">
-      <div>
-        <span>{{ eventObj.name }}</span>
+      <div class="eventPanel">
+        <span class="title">{{ eventObj.name }}</span>
+        <div class="eventDetail">
+          <template v-if="eventObj.callback&&eventObj.callback=='flicker'">
+            <div>
+              闪烁间隔
+              <el-input v-model="detail.times" style="width: 50%" placeholder="Please input"/>
+              秒
+            </div>
+            <div>
+              闪烁次数
+              <el-input v-model="detail.numbers" style="width: 50%" placeholder="Please input"/>
+              次
+            </div>
+          </template>
+        </div>
+        <div class="optBtn">
+          <el-button @click="updateEvent">确定</el-button>
+          <el-button @click="cancel">取消</el-button>
+        </div>
       </div>
     </template>
     <template v-else>
@@ -16,19 +34,67 @@
 
 <script lang="ts" setup>
 import {inject, ref} from 'vue'
+import {TsApi} from "../../../api/ts";
+
+const times = ref(0)
+const numbers = ref(0)
+
+const detail = ref({})
 
 const eventBus: any = inject('bus')
-let eventObj = ref(null)
+let eventObj:any = ref(null)
 eventBus.on('click-event-show-plane', (params) => {
   console.log('兄弟 B 的方法被触发了！', params)
-  eventObj.value = (eventObj.value == null ? params : null)
+  eventObj.value = (params ? params : null)
+  if (eventObj.value) {
+    let details = JSON.parse(eventObj.value.detail)
+    switch (params.callback) {
+      case 'flicker':
+        // times.value = detail.times
+        // numbers.value = detail.numbers
+        detail.value = details
+        break
+    }
+  }
 })
-let isNoEvent = ref(true)
+const updateEvent = () => {
+  // console.log(detail.value)
+  let obj = eventObj.value
+  obj.detail = JSON.stringify(detail.value)
+  console.log(obj)
+  delete obj.createdAt
+  delete obj.updatedAt
+  delete obj.duration_time
+  TsApi.updateTsEvent(obj).then(res => {
+    console.log(res)
+  })
+}
+const cancel = () => {
+  eventObj.value = null
+  detail.value = {}
+  eventBus.emit('click-cancel-hide-plane',)
+}
 </script>
 
 <style lang="scss" scoped>
 .eventParams {
   width: 20%;
+  padding: 0 10px;
+
+  .eventPanel {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+
+    .title {
+      line-height: 30px;
+    }
+
+    .eventDetail {
+      overflow-y: auto;
+      height: calc(100% - 62px);
+    }
+  }
 
   .tourBox {
     width: 100%;
@@ -44,4 +110,11 @@ let isNoEvent = ref(true)
     }
   }
 }
+
+:deep(.el-input__wrapper), :deep(.el-input__inner ) {
+  background: transparent;
+  --el-input-placeholder-color: #fff;
+  color: #fff;
+  //border: 1px solid #0ff;
+}
 </style>

src/renderer/src/views/TS/components/grid.vue

@@ -1,10 +1,11 @@
 <template>
-  <div class="grid">
+  <div class="grid" @click="hideRightMenu">
     <div class="grid-header row">
       <div v-for="item in columns" :style="item.style">{{ item.name }}</div>
     </div>
     <div class="grid-body">
-      <div class="row" :style="getStyle" v-for="(event) in eventList">
+      <div :class="['row',(eventObj&&event.id==eventObj.id)?'selectedRow':'']" :style="getStyle"
+           v-for="(event) in eventList" @click.right="(e)=>{rightClick(e,event)}">
         <span v-for="item in columns" :class="item.key" :style="item.style">{{
             format(item.key, event[item.key])
           }}</span>
@@ -14,15 +15,75 @@
       </div>
 
     </div>
+    <div class="gridRightMenu" v-if="rightClickEvent">
+      <template v-for="item in menus">
+        <template v-if="item.name=='删除'">
+          <el-popconfirm
+            width="220"
+            icon-color="#626AEF"
+            title="确定要删除吗?"
+            @cancel="onCancel"
+          >
+            <template #reference>
+              <span @click="">删除</span>
+            </template>
+            <template #actions="{ confirm, cancel }">
+              <el-button size="small" @click="cancel">取消</el-button>
+              <el-button
+                type="danger"
+                size="small"
+                @click="()=>{item.fun(); confirm()}"
+              >
+                确定
+              </el-button>
+            </template>
+          </el-popconfirm>
+        </template>
+        <span v-else @click="item.fun()">
+          {{ item.name }}
+        </span>
+      </template>
+    </div>
   </div>
 </template>
 
 <script lang="ts" setup>
 //@ts-nocheck
-import {computed, onMounted, ref} from "vue"
+import {computed, onMounted, ref, nextTick} from "vue"
+import {TsApi} from "../../../api/ts";
+import {ElMessage} from "element-plus";
 
+const eventBus: any = inject('bus')
 const props = defineProps(['eventList',])
+const menus = ref([
+  {
+    name: "删除",
+    fun: () => {
+      let param = new FormData
+      param.append("id", rightClickEvent.value.id)
+      TsApi.delEvent(param).then(res => {
+        if (res.code == 200) {
+          eventBus.emit('delete-event', rightClickEvent.value.id)
+          ElMessage({message: "操作成功", type: "success"})
+          rightClickEvent.value = null
+        }
+      })
+    }
+  }, {
+    name: '定位', fun: () => {
+      let entity = window['earth_ts'].entityMap.get(rightClickEvent.value.sourceId)
+      entity && entity.flyTo()
+    }
+  },])
+const clicked = ref(false)
 
+function onCancel() {
+  clicked.value = true
+}
+
+
+let eventObj = ref(null)
+let rightClickEvent = ref(null)
 let columns = ref([{name: '事件名称', key: "name", style: "flex:auto"},
   {name: '开始时间', key: "startTime", style: "width:120px"},
   {name: '持续时间', key: "duration_time", style: "width:70px"}])
@@ -37,7 +98,28 @@ let format = (key, val) => {
   return val
 }
 let getStyle = computed(() => {
-  return "height:" + window['tsObj']._Store._scales.cellHeight + "px"
+  let style = "height:" + window['tsObj']._Store._scales.cellHeight + "px"
+  return style
+})
+const rightClick = (e, eventObj) => {
+  console.log("右键点击", e)
+  rightClickEvent.value = eventObj
+  nextTick(() => {
+    $(".gridRightMenu")[0].style.top = e.layerY + "px"
+    $(".gridRightMenu")[0].style.left = e.layerX + "px"
+  })
+
+}
+const hideRightMenu = (e) => {
+  console.log("hideRightMenu", e)
+  if (e.target.innerHTML != "删除")
+    rightClickEvent.value = null
+}
+eventBus.on('click-event-show-plane', (params) => {
+  eventObj.value = (params ? params : null)
+})
+eventBus.on("click-cancel-hide-plane", () => {
+  eventObj.value = null
 })
 onMounted(() => {
   /* let doms = document.getElementsByClassName("start_time")
@@ -89,6 +171,30 @@ onMounted(() => {
     position: relative;
     overflow-y: inherit;
     font-size: 14px;
+
+    .selectedRow {
+      background-color: rgba(0, 255, 255, 0.2);
+    }
+  }
+
+  .gridRightMenu {
+    position: absolute;
+    z-index: 99;
+    background: rgba(0, 0, 0, 0.8);
+    transform: translateY(50%);
+    width: 80px;
+    display: flex;
+    flex-direction: column;
+    border: 1.5px solid;
+    border-image: linear-gradient(137.95deg, rgba(var(--color-base1), 1) 6.25%, var(--color-border1) 100%) 1.5;
+
+    span {
+      padding: 5px 0;
+      cursor: pointer;
+      display: inline-block;
+      width: 100%;
+      text-align: center;
+    }
   }
 }
 </style>

src/renderer/src/views/TS/deduction.vue

@@ -130,7 +130,7 @@ let eventCallback = () => {
   let timeId = Math.round(props.TSOBJ._Store._currentTimestamp / 1000);
   timeId *= 1000;
   // console.log(timeId)
-  let taskIds = [];
+  let taskIds:any = [];
   let dataMap = props.TSOBJ._Store.dealData("startTime");
   console.log(dataMap)
 

src/renderer/src/views/TS/edit.vue

@@ -13,6 +13,7 @@
 </template>
 
 <script setup lang="ts">
+//@ts-nocheck
 import {ref, reactive, onMounted, nextTick} from "vue";
 import {useRouter, useRoute} from "vue-router";
 import Cabin from "./cabin.vue"
@@ -28,7 +29,7 @@ let cabin = ref()
 let tsOBJ = ref({})
 const router = useRouter()
 const route = useRoute()
-let params:any = {}
+let params: any = {}
 // 将由列表页面传递过来的参数，数字化
 for (const routeQueryKey in route.query) {
   params[routeQueryKey] = route.query[routeQueryKey]
@@ -38,10 +39,11 @@ for (const routeQueryKey in route.query) {
 }
 console.log("params", params)
 window.planId = params.id
+const eventBus: any = inject('bus')
 
 // 通过planID获取方案包含的所有事件
 let getEventList = () => {
-  let events:any = []
+  let events: any = []
   for (let i = 0; i < 1; i++) {
     events.push({
       id: "task" + i,
@@ -64,6 +66,10 @@ let getEventList = () => {
   })
   newTS(params, events)
 }
+eventBus.on('delete-event', (id) => {
+  console.log(id)
+  tsOBJ.value._Store._tasks = tsOBJ.value._Store._tasks.filter(item => item.id != id)
+})
 // 新建态势推演对象
 let newTS = (params, events) => {
 

src/renderer/src/views/TS/newEvent.vue

@@ -35,7 +35,6 @@
                   v-model="form.datetime"
                   type="datetime"
                   placeholder="选择触发时间"
-                  value-format="x"
                 />
               </el-form-item>
               <el-form-item label="持续时间">
@@ -98,6 +97,7 @@
 import {ref, reactive} from "vue";
 import type {RenderContentContext, TreeInstance} from 'element-plus'
 import {TsApi} from "../../api/ts";
+import {ElMessage} from "element-plus";
 
 const treeRef = ref<TreeInstance>()
 // 存储当前需要高亮的节点 key（初始为空）
@@ -108,7 +108,7 @@ interface Tree {
   children?: Tree[]
 }
 
-const form = reactive({
+let form = reactive({
   name: '闪烁-',
   // datetime: '',
 })
@@ -121,7 +121,7 @@ const numbers = ref(0)//闪烁次数
 const isContainModelPosition = ref(true)
 const eventBus: any = inject('bus')
 
-form['datetime'] = new Date(2025, 10, 5, 18, 8, 43)
+form['datetime'] = new Date(window['tsObj']._Store._currentTimestamp)
 const isShowPup = ref(false)
 const eventTree: { children: ({ label: string } | { label: string })[]; id: string; label: string }[] = [
   {
@@ -172,10 +172,32 @@ const addEvent = () => {
     "detail": JSON.stringify(obj)
   }
   TsApi.addTsEvent(dbParams).then(res => {
+    if (res.code == 200) {
+      ElMessage({
+        message: "操作成功",
+        type: "success"
+      })
 
+    }
+    isShowPup.value = false
+
+    reset()
   })
   console.log(dbParams)
 }
+const reset = () => {
+  hour.value = 0
+  minute.value = 0
+  second.value = 0
+  numbers.value = 0
+  times.value = 0
+  form = {
+    name: '闪烁-',
+    // datetime: '',
+  }
+  currentKey.value = "flicker"
+
+}
 eventBus.on('openAddEvent', (data, cb, type) => {
   console.log("openAddEvent", data)
   // selectCallback = cb

src/renderer/src/views/components/headers/components/weather/index.vue

@@ -163,6 +163,7 @@
 </template>
 
 <script setup lang="ts">
+//@ts-nocheck
 import { reactive, onMounted, onBeforeUnmount, watch } from 'vue'
 import { Decimal } from 'decimal.js'
 import { ElMessage } from 'element-plus'

src/renderer/src/views/components/headers/index.vue

@@ -3,12 +3,7 @@
     <div class="head_box">
       <!-- <span class="head_title">实景三维电子沙盘系统</span> -->
       <!-- <headSvg style="width: 100%;height: 100%;"></headSvg> -->
-      <img
-        width="100%"
-        height="100%"
-        :src="`../../../src/assets/images/theme/${skinInfo}/head.png`"
-        alt=""
-      />
+      <img width="100%" height="100%" :src="headImg" alt="" />
     </div>
     <div class="dateTime">
       <span>{{ date.hms }}</span>
@@ -17,12 +12,7 @@
         <span>{{ t(`week.4`) }}</span>
       </div>
       <div class="weather">
-        <svg-icon
-          name="weatherBase"
-          :class="weatherClick ? 'weatherIcon' : ''"
-          :size="40"
-          @click="clickFun"
-        ></svg-icon>
+        <svg-icon name="weather" :size="40" @click="clickFun"></svg-icon>
       </div>
     </div>
     <setTool ref="setToolRef"></setTool>
@@ -63,7 +53,8 @@ const headImg = computed(() => {
   }
 })
 
-const skinInfo = ref(JSON.parse(localStorage.getItem('systemSetting') || '{}').skinInfo || 'color1')
+
+const skinInfo = ref(JSON.parse(localStorage.getItem("systemSetting") || '{}').skinInfo || 'color1')
 
 const { t } = useI18n()
 const date = ref({
@@ -71,25 +62,26 @@ const date = ref({
   hms: '',
   week: 0
 })
-window.addEventListener('setItemEvent', (e: any) => {
+window.addEventListener("setItemEvent", (e: any) => {
   console.log('e', e)
-  if (e.key == 'systemSetting') {
-    let obj = JSON.parse(e.newValue)
-    skinInfo.value = obj.skinInfo
+  if (e.key == "systemSetting") {
+    let obj = JSON.parse(e.newValue);
+    skinInfo.value = obj.skinInfo;
 
     let setting = JSON.parse(e.newValue)
     let dialogElm: any = document.getElementsByClassName('YJ-custom-base-dialog')
     if (setting.language === 'zh-EN') {
       for (let i = 0; i < dialogElm.length; i++) {
-        dialogElm[i].classList.add('dialog-en')
+        dialogElm[i].classList.add('dialog-en');
       }
-    } else {
+    }
+    else {
       for (let i = 0; i < dialogElm.length; i++) {
-        dialogElm[i].classList.remove('dialog-en')
+        dialogElm[i].classList.remove('dialog-en');
       }
     }
   }
-})
+});
 var weatherClick = ref(false)
 const setTime = () => {
   let date1 = new Date()
@@ -140,7 +132,7 @@ var clickFun = () => {
   z-index: 999;
   pointer-events: none;
 
-  > * {
+  >* {
     pointer-events: all;
   }
 
@@ -185,7 +177,7 @@ var clickFun = () => {
     align-items: center;
     font-family: 'alimamashuheiti';
 
-    & > span:first-child {
+    &>span:first-child {
       letter-spacing: 1px;
       font-size: 2rem;
       font-family: 'alimamashuheiti';
@@ -197,23 +189,20 @@ var clickFun = () => {
       display: flex;
       flex-direction: column;
 
-      & > span:first-child {
+      &>span:first-child {
         font-size: 0.9rem;
       }
 
-      & > span:last-child {
+      &>span:last-child {
         font-size: 0.8rem;
       }
     }
 
     .weather {
       margin-left: 15px;
-      .weatherIcon {
-        fill: rgba(var(--color-base1), 1) !important;
-      }
 
       svg {
-        // fill: rgba(var(--color-base1), 1) !important;
+        fill: rgba(var(--color-base1), 1) !important;
         cursor: pointer;
       }
     }

src/renderer/src/views/components/tree/components/rightMenu.vue

@@ -26,6 +26,7 @@
 </template>
 
 <script setup lang="ts">
+//@ts-nocheck
 import { useI18n } from 'vue-i18n'
 import { $changeComponentShow } from '@/utils/communication'
 import { useRightOperate } from './hooks/rightOperate'

src/renderer/src/views/components/tree/hooks/tree.ts

@@ -607,7 +607,7 @@ export const useTree = () => {
             brightness: 1
           })
         }
-        res.data.list[i].icon = await cusNodeIcon(res.data.list[i]);
+        res.data.list[i].svg = await cusNodeIcon(res.data.list[i]);
       }
     }
     zNodes.value = res.data.list

src/renderer/src/views/login/index.vue

@@ -193,28 +193,29 @@ onMounted(() => {
 
 .content {
   .el-input__wrapper {
-    background-color: transparent;
+    // background-color: transparent;
     border: 0.2px solid rgba(var(--color-base1), 1);
     box-shadow: 0 0 0 0.2px rgba(var(--color-base1), 1) inset !important;
-    /* 新增此行 */
+    border-radius: 0;
+    padding: 3px 11px;
   }
 
   .el-input__inner {
-    color: #fff;
+    color: rgb(0, 66, 66);
   }
 
   /* 新增图标颜色控制 */
   .el-input__prefix,
   .el-input__suffix {
     .el-icon {
-      color: rgba(var(--color-base1), 1);
+      color: rgb(0, 66, 66);
       /* 将#00ffff替换为你想用的颜色 */
       font-size: 18px;
       /* 可选：调整图标大小 */
     }
 
     &:hover .el-icon {
-      color: rgba(var(--color-base1), 1);
+      color: rgb(0, 66, 66);
       /* 悬停颜色保持一致 */
     }
   }
@@ -300,13 +301,13 @@ onMounted(() => {
             color: #eee;
             text-align: center;
             text-shadow: 0px 0px 4px rgba(80, 227, 230, 0.2);
-            font-style: italic;
+            // font-style: italic;
             letter-spacing: 5px;
             margin-bottom: 6px;
           }
 
           .title2 {
-            font-size: 3rem;
+            font-size: 2rem;
             font-weight: 500;
             color: #eee;
             text-align: center;
@@ -337,7 +338,7 @@ onMounted(() => {
           text-align: center;
           cursor: pointer;
           margin-bottom: 1.5vw;
-          padding: 0.6vw 0;
+          padding: 19px 0;
           letter-spacing: 0.2vw;
           font-size: 14px;
           color: rgba(0, 66, 66, 1);