fengsen/4.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改了表格中10月份的第2,3,4,6个问题

Browse Source
This commit is contained in:
zyl
2025-11-03 15:40:49 +08:00
parent f4e1149121
commit 9e52728271
12 changed files with 147 additions and 5148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.idea/workspace.xml generated
View File

@ -6,8 +6,15 @@
<component name="ChangeListManager">
<list default="true" id="84ab0b82-0020-4fff-b2b2-e16882dec538" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/renderer/components/TS/deduction.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/TS/deduction.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/yjearth4_0/static/config/config.ini" beforeDir="false" afterPath="$PROJECT_DIR$/yjearth4_0/static/config/config.ini" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/renderer/components/LeftMenu/firstMenu.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/LeftMenu/firstMenu.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/renderer/components/situationEdit/rightMenu.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/situationEdit/rightMenu.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/renderer/components/situationList/components/newSituation.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/situationList/components/newSituation.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/renderer/components/situationList/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/situationList/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/renderer/views/dashboard/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/views/dashboard/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/yjearth4_0/static/log/2025-10-17.20251020093035944567.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/yjearth4_0/static/log/2025-10-20.log" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/yjearth4_0/static/log/2025-10-21.log" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/yjearth4_0/static/log/2025-10-30.log" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -116,7 +123,9 @@
<workItem from="1752724078704" duration="45000" />
<workItem from="1754720685670" duration="359000" />
<workItem from="1754893244968" duration="60000" />
<workItem from="1761796876451" duration="62000" />
<workItem from="1761796876451" duration="719000" />
<workItem from="1762145694194" duration="740000" />
<workItem from="1762148475123" duration="5333000" />
</task>
<servers />
</component>

0
logs/access.log.-2025-11-03-13 Normal file
View File

12
src/renderer/components/situationEdit/rightMenu.vue
View File

@ -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);

3
src/renderer/components/situationList/components/newSituation.vue
View File

@ -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,

13
src/renderer/components/situationList/index.vue
View File

@ -26,7 +26,7 @@
/>
</div>
<div>
<span class="label">仿真时间</span>
<span class="label">创建时间</span>
<el-date-picker
class="datepicker"
v-model="value2"
@ -259,11 +259,12 @@ export default {
let params = JSON.parse(JSON.stringify(this.searchForm));
params.startTime == 0 && delete params.startTime;
params.endTime == 0 && delete params.endTime;
this.getList(params,()=>{
setTimeout(() => {
this.searching = false;
}, 500);
})
console.log(params)
// this.getList(params,()=>{
// setTimeout(() => {
// this.searching = false;
// }, 500);
// })
/* planList(params, (res) => {
// if()
this.formatTime(res.list);

24
src/renderer/views/dashboard/index.vue
View File

@ -693,28 +693,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是唯一的
@ -817,7 +819,7 @@ export default {
this.createEarth("earthContainers");
/*
console.log("eventList", res);
// obj.tasks = res.list;
let arr = [];
@ -830,7 +832,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");
@ -1115,7 +1117,7 @@ export default {
}
.selectImgBox{
z-index: 9999999;
}
}
.ModelSetBox{
z-index: 10000;
}

BIN
yjearth4_0/static/log/2025-10-17.20251020093035944567.log.gz
View File

Binary file not shown.

5062
yjearth4_0/static/log/2025-10-20.log
View File

File diff suppressed because it is too large Load Diff

12
yjearth4_0/static/log/2025-10-21.log
View File

@ -1,12 +0,0 @@
2025-10-21 09:48:34.420 [INFO] {1c2e4ccb755e70186ac5716c2bfa2712} gps.go:101: 查询串口数据
2025-10-21 09:48:34.525 [INFO] {2409b2d7755e70186bc5716c30f8f5d6} gps.go:105: 没有查询到串口数据
2025-10-21 09:49:48.565 [INFO] {7486dc14875e701833f63c3ad2bfca7a} gps.go:101: 查询串口数据
2025-10-21 09:49:48.566 [INFO] {c421ec14875e701834f63c3a77b2057a} gps.go:105: 没有查询到串口数据
2025-10-21 09:53:23.866 [INFO] {186cbe35b95e70180f385a2da7d341c8} gps.go:101: 查询串口数据
2025-10-21 09:53:23.867 [INFO] {0c76de35b95e701810385a2de2747f09} gps.go:105: 没有查询到串口数据
2025-10-21 09:56:21.286 [INFO] {fc91d784e25e70188782cf15db901ba7} gps.go:101: 查询串口数据
2025-10-21 09:56:21.287 [INFO] {344ae784e25e70188882cf1576f0266a} gps.go:105: 没有查询到串口数据
2025-10-21 09:57:06.153 [INFO] {a01718f7ec5e70183f614d73d69a5abf} gps.go:101: 查询串口数据
2025-10-21 09:57:06.154 [INFO] {90c42ff7ec5e701840614d730705d6f2} gps.go:105: 没有查询到串口数据
2025-10-21 09:58:03.458 [INFO] {b8f5bc4efa5e70189f2f5a36d14cf3cd} gps.go:101: 查询串口数据
2025-10-21 09:58:03.459 [INFO] {14ebde4efa5e7018a02f5a36acb4a5ef} gps.go:105: 没有查询到串口数据

BIN
yjearth4_0/static/log/2025-10-30.20251103134502575760.log.gz Normal file
View File

Binary file not shown.

50
yjearth4_0/static/log/2025-10-30.log
View File

@ -1,50 +0,0 @@
2025-10-30 12:00:31.012 [INFO] {2045dd26e22873185543342eeac10b2e} gps.go:101: 查询串口数据
2025-10-30 12:00:31.013 [INFO] {9ca5f626e22873185643342eac468f17} gps.go:105: 没有查询到串口数据
2025-10-30 12:00:31.039 [ERRO] {b87f8628e22873185743342e241d84a1} 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-10-30 12:00:31.039 [ERRO] {b87f8628e22873185843342e486542d9} 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-10-30 12:00:31.040 [ERRO] {70428e28e22873185943342efd2f487e} 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-10-30 12:00:31.040 [ERRO] {70428e28e22873185a43342ea4f9a592} 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-10-30 12:00:31.041 [ERRO] {988d9828e22873185b43342eac7e2519} 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-10-30 12:00:31.041 [ERRO] {5460a028e22873185c43342e0cd4f588} 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

104
yjearth4_0/static/log/2025-11-03.log Normal file
View File

@ -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