diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 570a5ee..1dc652e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,50 +5,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - + + + + diff --git a/logs/access.log.-2025-10-30-12 b/logs/access.log.-2025-10-30-12 new file mode 100644 index 0000000..e69de29 diff --git a/logs/access.log.-2025-11-03-13 b/logs/access.log.-2025-11-03-13 new file mode 100644 index 0000000..e69de29 diff --git a/src/renderer/components/TS/deduction.vue b/src/renderer/components/TS/deduction.vue index e34c050..e4472b7 100644 --- a/src/renderer/components/TS/deduction.vue +++ b/src/renderer/components/TS/deduction.vue @@ -35,7 +35,7 @@ :class="[(TSTYOBJ.clock.status==TSTYOBJ.timeStatus.PLAY&&TSTYOBJ.store.editorMode==TSTYOBJ.editorMode.PLAYING)?'disabledBtn':'','multiple']" @click="openMultiple"> - 倍数×{{ TSTYOBJ.store.multiplier }} + 倍数11×{{ TSTYOBJ.store.multiplier }}
diff --git a/src/renderer/components/situationEdit/rightMenu.vue b/src/renderer/components/situationEdit/rightMenu.vue index a060e4d..4537f8d 100644 --- a/src/renderer/components/situationEdit/rightMenu.vue +++ b/src/renderer/components/situationEdit/rightMenu.vue @@ -157,8 +157,14 @@ export default { this.$prompt("请输入名称", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", - // inputPattern: /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/, - // inputErrorMessage: "邮箱格式不正确" + inputValidator: (value) => { + // 可选：同时限制不能为空 + if (!value.trim()) { + return '输入内容不能为空！'; + } + // 验证通过返回 true（或不返回内容） + return true; + } }) .then(({value}) => { /* const newChild = { id: id++, label: 'testtest', children: [] }; @@ -167,7 +173,7 @@ export default { } data.children.push(newChild); */ - console.log(this.$parent); + console.log("value",value); addDirectory( (res) => { // console.log(res); diff --git a/src/renderer/components/situationList/components/newSituation.vue b/src/renderer/components/situationList/components/newSituation.vue index 7246f5e..270b03f 100644 --- a/src/renderer/components/situationList/components/newSituation.vue +++ b/src/renderer/components/situationList/components/newSituation.vue @@ -72,7 +72,7 @@ export default { mounted() {}, methods: { submit() { - if (this.form.name==""){ + if (this.form.name=="" ||(this.form.name.trim()=='')){ this.$message.warning("请输入名称") return } @@ -83,6 +83,7 @@ export default { this.form.plan_create_time = new TSTY.Util().timeToStamp( this.form.plan_create_time ); + console.log("新疆") addPlan(this.form, (res) => { res.create_time_format = new TSTY.Util().parseTime( res.create_time, diff --git a/src/renderer/components/situationList/index.vue b/src/renderer/components/situationList/index.vue index 3229a58..e44fde2 100644 --- a/src/renderer/components/situationList/index.vue +++ b/src/renderer/components/situationList/index.vue @@ -26,7 +26,7 @@ />
- 仿真时间 + 创建时间 { - setTimeout(() => { - this.searching = false; - }, 500); - }) + console.log(params) + // this.getList(params,()=>{ + // setTimeout(() => { + // this.searching = false; + // }, 500); + // }) /* planList(params, (res) => { // if() this.formatTime(res.list); diff --git a/src/renderer/views/dashboard/index.vue b/src/renderer/views/dashboard/index.vue index dc8fa55..a095a21 100644 --- a/src/renderer/views/dashboard/index.vue +++ b/src/renderer/views/dashboard/index.vue @@ -704,28 +704,30 @@ export default { }, closeSituationEdit() { // 新增态势0906 - window.draw && window.draw.end(); - Array.from(ts_Map.values()).forEach((entity) => entity.remove()); - ts_Map.clear(); - // setTimeout(() => { if (window.Earth1) { + window.draw && window.draw.end(); + Array.from(ts_Map.values()).forEach((entity) => entity.remove()); + + ts_Map.clear(); window.Earth1.destroy(); window.Earth1 = null; } + this.$refs.Deduction.stop(); this.editSituation = !this.editSituation; this.eventsList = false; this.showList = !this.showList; - //新增态势0824 + // //新增态势0824 this.showElementBtn = ""; + this.showCabinBtn = ""; + this.showCabin = ""; this.showElement = ""; + // + // this.eventBox = false; - this.eventBox = false; - this.$refs.Deduction.stop(); this.$nextTick(() => { this.$refs.situation.getList(); }); - // }, 10); }, getRowKey(row) { // 需要为每一行设置一个唯一标识，这里假设每行的id是唯一的 @@ -828,7 +830,7 @@ export default { this.createEarth("earthContainers"); /* - + console.log("eventList", res); // obj.tasks = res.list; let arr = []; @@ -841,7 +843,7 @@ export default { // window.Clock = new TSTY.clock(); this.scales = Store.scales; this.tasks = Store.tasks; - + this.showList = !this.showList; this.editSituation = !this.editSituation; this.createEarth("earthContainers"); @@ -1128,8 +1130,7 @@ export default { .selectImgBox { z-index: 9999999; } - - .ModelSetBox { + .ModelSetBox{ z-index: 10000; } diff --git a/yjearth4_0/static/log/2025-10-30.20251103134502575760.log.gz b/yjearth4_0/static/log/2025-10-30.20251103134502575760.log.gz new file mode 100644 index 0000000..c64e911 Binary files /dev/null and b/yjearth4_0/static/log/2025-10-30.20251103134502575760.log.gz differ diff --git a/yjearth4_0/static/log/2025-11-03.log b/yjearth4_0/static/log/2025-11-03.log new file mode 100644 index 0000000..12e4366 --- /dev/null +++ b/yjearth4_0/static/log/2025-11-03.log @@ -0,0 +1,104 @@ +2025-11-03 13:45:03.226 [INFO] {4c3d69a2e86874181a57045d04d8c678} gps.go:101: 查询串口数据 +2025-11-03 13:45:03.227 [INFO] {60e549c9e86874181b57045d8fd7a65e} gps.go:105: 没有查询到串口数据 +2025-11-03 13:45:03.254 [ERRO] {6c24e4cae86874181c57045d90fa6869} globe.go:279: 资源不存在:Z:/00_4.0测试数据/渝中区.mbtiles +Stack: +1. yjearth4.0/globe.SaveError + E:/sourceCode/单机版-网络版共享后台/yjearth4/globe/globe.go:279 +2. yjearth4.0/api/v1/source/mbt.OpenMbt + E:/sourceCode/单机版-网络版共享后台/yjearth4/api/v1/source/mbt/mbt.go:217 +3. yjearth4.0/api/v1/source.opendata + E:/sourceCode/单机版-网络版共享后台/yjearth4/api/v1/source/source.go:197 + +2025-11-03 13:45:03.254 [ERRO] {6c24e4cae86874181d57045d5f8115a2} globe.go:279: 资源不存在:Z:/00_4.0测试数据/工业园区.clt +Stack: +1. yjearth4.0/globe.SaveError + E:/sourceCode/单机版-网络版共享后台/yjearth4/globe/globe.go:279 +2. yjearth4.0/api/v1/source/clt.OpenClt + E:/sourceCode/单机版-网络版共享后台/yjearth4/api/v1/source/clt/clt.go:199 +3. yjearth4.0/api/v1/source.opendata + E:/sourceCode/单机版-网络版共享后台/yjearth4/api/v1/source/source.go:187 + +2025-11-03 13:45:03.255 [ERRO] {40dcf3cae86874181e57045da06e71e2} globe.go:279: 资源不存在:Z:/00_4.0测试数据/渝中区.mbtiles +Stack: +1. yjearth4.0/globe.SaveError + E:/sourceCode/单机版-网络版共享后台/yjearth4/globe/globe.go:279 +2. yjearth4.0/api/v1/source.opendata + E:/sourceCode/单机版-网络版共享后台/yjearth4/api/v1/source/source.go:198 + +2025-11-03 13:45:03.255 [ERRO] {40dcf3cae86874181f57045d0a62b5da} globe.go:279: 资源不存在:Z:/00_4.0测试数据/工业园区.clt +Stack: +1. yjearth4.0/globe.SaveError + E:/sourceCode/单机版-网络版共享后台/yjearth4/globe/globe.go:279 +2. yjearth4.0/api/v1/source.opendata + E:/sourceCode/单机版-网络版共享后台/yjearth4/api/v1/source/source.go:188 + +2025-11-03 13:45:03.255 [ERRO] {40dcf3cae86874182057045d1b3ebf72} globe.go:279: 资源文件异常：Z:/00_4.0测试数据/地形.pak +Stack: +1. yjearth4.0/globe.SaveError + E:/sourceCode/单机版-网络版共享后台/yjearth4/globe/globe.go:279 +2. yjearth4.0/api/v1/source/pak.OpenPak + E:/sourceCode/单机版-网络版共享后台/yjearth4/api/v1/source/pak/pak.go:154 +3. yjearth4.0/api/v1/source.opendata + E:/sourceCode/单机版-网络版共享后台/yjearth4/api/v1/source/source.go:206 + +2025-11-03 13:45:03.255 [ERRO] {eca0fbcae86874182157045d0b2e2101} globe.go:279: 资源文件异常：Z:/00_4.0测试数据/地形.pak +Stack: +1. yjearth4.0/globe.SaveError + E:/sourceCode/单机版-网络版共享后台/yjearth4/globe/globe.go:279 +2. yjearth4.0/api/v1/source.opendata + E:/sourceCode/单机版-网络版共享后台/yjearth4/api/v1/source/source.go:207 + +2025-11-03 13:45:24.096 [ERRO] {3c8826a5ed6874182b57045da7185477} globe.go:279: 资源不存在:Z:/00_4.0测试数据/工业园区.clt +Stack: +1. yjearth4.0/globe.SaveError + E:/sourceCode/单机版-网络版共享后台/yjearth4/globe/globe.go:279 +2. yjearth4.0/api/v1/source.LoadSource.LoadCompactService + E:/sourceCode/单机版-网络版共享后台/yjearth4/api/v1/source/source.go:118 +3. yjearth4.0/midware.CheckAuth + E:/sourceCode/单机版-网络版共享后台/yjearth4/midware/midware.go:64 + +2025-11-03 14:08:47.465 [ERRO] {b8ad7864346a74187858045d4c3ce9a2} globe.go:279: 资源不存在:Z:/00_4.0测试数据/工业园区.clt +Stack: +1. yjearth4.0/globe.SaveError + E:/sourceCode/单机版-网络版共享后台/yjearth4/globe/globe.go:279 +2. yjearth4.0/api/v1/source.LoadSource.LoadCompactService + E:/sourceCode/单机版-网络版共享后台/yjearth4/api/v1/source/source.go:118 +3. yjearth4.0/midware.CheckAuth + E:/sourceCode/单机版-网络版共享后台/yjearth4/midware/midware.go:64 + +2025-11-03 14:27:08.212 [ERRO] {7cab25ae346b74188658045de1e40565} globe.go:279: 资源不存在:Z:/00_4.0测试数据/工业园区.clt +Stack: +1. yjearth4.0/globe.SaveError + E:/sourceCode/单机版-网络版共享后台/yjearth4/globe/globe.go:279 +2. yjearth4.0/api/v1/source.LoadSource.LoadCompactService + E:/sourceCode/单机版-网络版共享后台/yjearth4/api/v1/source/source.go:118 +3. yjearth4.0/midware.CheckAuth + E:/sourceCode/单机版-网络版共享后台/yjearth4/midware/midware.go:64 + +2025-11-03 14:28:03.437 [ERRO] {08e9c389416b74189458045dcf11718b} globe.go:279: 资源不存在:Z:/00_4.0测试数据/工业园区.clt +Stack: +1. yjearth4.0/globe.SaveError + E:/sourceCode/单机版-网络版共享后台/yjearth4/globe/globe.go:279 +2. yjearth4.0/api/v1/source.LoadSource.LoadCompactService + E:/sourceCode/单机版-网络版共享后台/yjearth4/api/v1/source/source.go:118 +3. yjearth4.0/midware.CheckAuth + E:/sourceCode/单机版-网络版共享后台/yjearth4/midware/midware.go:64 + +2025-11-03 14:29:15.335 [ERRO] {3c194147526b7418a258045de4fec137} globe.go:279: 资源不存在:Z:/00_4.0测试数据/工业园区.clt +Stack: +1. yjearth4.0/globe.SaveError + E:/sourceCode/单机版-网络版共享后台/yjearth4/globe/globe.go:279 +2. yjearth4.0/api/v1/source.LoadSource.LoadCompactService + E:/sourceCode/单机版-网络版共享后台/yjearth4/api/v1/source/source.go:118 +3. yjearth4.0/midware.CheckAuth + E:/sourceCode/单机版-网络版共享后台/yjearth4/midware/midware.go:64 + +2025-11-03 14:30:14.511 [ERRO] {0c185c0e606b7418b058045d23de14b8} globe.go:279: 资源不存在:Z:/00_4.0测试数据/工业园区.clt +Stack: +1. yjearth4.0/globe.SaveError + E:/sourceCode/单机版-网络版共享后台/yjearth4/globe/globe.go:279 +2. yjearth4.0/api/v1/source.LoadSource.LoadCompactService + E:/sourceCode/单机版-网络版共享后台/yjearth4/api/v1/source/source.go:118 +3. yjearth4.0/midware.CheckAuth + E:/sourceCode/单机版-网络版共享后台/yjearth4/midware/midware.go:64 + diff --git a/yjearth4_0/yjearth4.exe b/yjearth4_0/yjearth4.exe index f37ccdb..a1f73de 100644 Binary files a/yjearth4_0/yjearth4.exe and b/yjearth4_0/yjearth4.exe differ