选中事件调整属性
@@ -10,8 +15,14 @@ diff --git a/src/renderer/src/views/TS/components/grid.vue b/src/renderer/src/views/TS/components/grid.vue index 1f8b622..f1d62d3 100644 --- a/src/renderer/src/views/TS/components/grid.vue +++ b/src/renderer/src/views/TS/components/grid.vue @@ -23,14 +23,14 @@ import {computed, onMounted, ref} from "vue" const props = defineProps(['eventList',]) let columns = ref([{name: '事件名称', key: "name", style: "flex:auto"}, - {name: '开始时间', key: "start_time", style: "width:120px"}, + {name: '开始时间', key: "startTime", style: "width:120px"}, {name: '持续时间', key: "duration_time", style: "width:70px"}]) // let eventList = ref([]) let style = ref({}) // eventList.value = window['tsObj']._Store._tasks // 格式化时间 let format = (key, val) => { - if ('start_time' == key) { + if ('startTime' == key) { return window['tsObj'].parseTime(val, "{m}-{d} {h}:{i}:{s}") } return val diff --git a/src/renderer/src/views/TS/components/rightMenuTs.vue b/src/renderer/src/views/TS/components/rightMenuTs.vue index bc11374..854fe2b 100644 --- a/src/renderer/src/views/TS/components/rightMenuTs.vue +++ b/src/renderer/src/views/TS/components/rightMenuTs.vue @@ -40,7 +40,7 @@ const rightClickTreeNode: any = ref() const {itemClick} = useRightMenu() const eventBus: any = inject('bus') const itemClicks = (item) => { - itemClick(item, eventBus) + itemClick(item, rightClickTreeNode.value, eventBus) $changeComponentShow('.rightMenuTs', false) } diff --git a/src/renderer/src/views/TS/components/rightOperate.ts b/src/renderer/src/views/TS/components/rightOperate.ts index 7153dbe..415b9a1 100644 --- a/src/renderer/src/views/TS/components/rightOperate.ts +++ b/src/renderer/src/views/TS/components/rightOperate.ts @@ -139,8 +139,14 @@ export const useRightOperate = () => { } }) } - const addEvent = (eventBus) => { - eventBus.emit('openAddEvent', true) + const delNode = () => { + console.log("删除节点") + } + const editNode = () => { + console.log("编辑节点") + } + const addEvent = (node, eventBus) => { + eventBus.emit('openAddEvent', node) } const rightMenus: any = reactive({ addDirectory: { @@ -153,11 +159,11 @@ export const useRightOperate = () => { }, edit: { key: 'edit', - callback: addResource + callback: editNode }, del: { key: 'del', - callback: addResource + callback: delNode }, addEvent: { key: 'addEvent', diff --git a/src/renderer/src/views/TS/deduction.vue b/src/renderer/src/views/TS/deduction.vue index c98a913..c9066c5 100644 --- a/src/renderer/src/views/TS/deduction.vue +++ b/src/renderer/src/views/TS/deduction.vue @@ -122,9 +122,8 @@ function todoEvent(timeId: number, res: any, isEnd: boolean) { window['did_ts_Arr'].push(res.id) switch (res.callback) { case 'flicker': - let tsEntity = window['earth_ts'].entityMap.get(res.source_id); - tsEntity.flyTo() - tsEntity.flicker(1000, 10) + let tsEntity = window['earth_ts'].entityMap.get(res.sourceId); + tsEntity.flicker(Number(res.detail.times) * 1000, Number(res.detail.numbers)) break; } } @@ -137,7 +136,7 @@ let eventCallback = () => { timeId *= 1000; // console.log(timeId) let taskIds = []; - let dataMap = props.TSOBJ._Store.dealData("start_time"); + let dataMap = props.TSOBJ._Store.dealData("startTime"); console.log(dataMap) let fun = (map, isEnd = false) => { diff --git a/src/renderer/src/views/TS/edit.vue b/src/renderer/src/views/TS/edit.vue index a355b7b..40a9d2f 100644 --- a/src/renderer/src/views/TS/edit.vue +++ b/src/renderer/src/views/TS/edit.vue @@ -56,6 +56,9 @@ let getEventList = () => { let formData = {planId: window['planId']} TsApi.queryTsEvent(formData).then(res => { if (res.code == 200) { + res.data.forEach(item => { + item.duration_time = (item.endTime - item.startTime) / 1000 + }) tsOBJ.value._Store._tasks = res.data } }) diff --git a/src/renderer/src/views/TS/newEvent.vue b/src/renderer/src/views/TS/newEvent.vue index 1db9232..1e18145 100644 --- a/src/renderer/src/views/TS/newEvent.vue +++ b/src/renderer/src/views/TS/newEvent.vue @@ -35,6 +35,7 @@ v-model="form.datetime" type="datetime" placeholder="选择触发时间" + value-format="x" />