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

修改指令格式，增加udp创建反馈

Browse Source
This commit is contained in:
zyl
2025-11-20 16:06:44 +08:00
parent 1e1725bf82
commit f965849bba
10 changed files with 5669 additions and 3422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.idea/workspace.xml generated
View File

@ -6,15 +6,14 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="84ab0b82-0020-4fff-b2b2-e16882dec538" name="Changes" comment=""> <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/dist/electron/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/dist/electron/main.js" 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/main/back/sandTable/udpServer.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/back/sandTable/udpServer.js" 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/Tree/treeSetting.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/Tree/treeSetting.js" 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/components/myHeaderAll/systemPopup/systemPopup.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/myHeaderAll/systemPopup/systemPopup.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$/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$/src/renderer/views/login/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/views/login/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/yjearth4_0/static/log/2025-10-20.log" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/static/sdk/YJEarth.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/sdk/YJEarth.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/yjearth4_0/static/log/2025-10-21.log" beforeDir="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$/yjearth4_0/static/log/2025-10-30.log" beforeDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

5562
dist/electron/main.js vendored
View File

File diff suppressed because one or more lines are too long

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

27
src/main/back/sandTable/udpServer.js
View File

@ -1,3 +1,5 @@
import {ipcRenderer} from "electron";
const dgram = require("dgram"); const dgram = require("dgram");
import { getmainWindow } from "../../index"; import { getmainWindow } from "../../index";
let server; let server;
@ -10,10 +12,16 @@ function Init() {
server = null; server = null;
} }
let port = GetUdpServerPort().port; //获取本地存储的udp端口 let port = GetUdpServerPort().port; //获取本地存储的udp端口
server = dgram.createSocket("udp4"); server = dgram.createSocket("udp4");
console.log("udp的port",port)
console.log("udp的server",server)
server.on("listening", () => { server.on("listening", () => {
const address = server.address(); const address = server.address();
console.log(`server running ${address.address}:${address.port}`); console.log(`server running ${address.address}:${address.port}`);
getmainWindow().webContents.send('udpServerSuccess',"udp服务创建成功")
}); });
server.on("message", (msg, remoteInfo) => { server.on("message", (msg, remoteInfo) => {
@ -63,10 +71,19 @@ function Init() {
angle angle
); );
}else if(ModeIndex==1){ }else if(ModeIndex==1){
// 点位码 // 点位码 001K
let key=str.slice(0,-1) /* let key=str.slice(0,-1)
// 反馈指令的后缀 K或G // 反馈指令的后缀 K或G
let status=str.split(key)[1] let status=str.split(key)[1]
getmainWindow().webContents.send(
sandTable_udp_server_port+"_str",
key,
status
);*/
// 点位码 A001g #
let key=str.slice(0,-3)
// 反馈指令的后缀 g #或k #
let status=str.split(key)[1];
getmainWindow().webContents.send( getmainWindow().webContents.send(
sandTable_udp_server_port+"_str", sandTable_udp_server_port+"_str",
key, key,
@ -86,10 +103,12 @@ function Init() {
}); });
server.on("error", (err) => { server.on("error", (err) => {
console.log("server error", err); console.log("server error", err);
getmainWindow().webContents.send('udpServerError',"udp服务创建失败，尝试更换端口")
}); });
console.log("port",port) console.log("port",port)
server.bind(port); server.bind(port);
sendMsg("AFFG") // sendMsg("AFFG")
sendMsg("A000k #")
} }
function sendMsg(val) { function sendMsg(val) {
let msg; let msg;

9
src/renderer/components/Tree/treeSetting.js
View File

@ -580,9 +580,12 @@ const tree = {
let obj = udp_pointMap.get(key) let obj = udp_pointMap.get(key)
if (obj && (obj.source_id == treeNode.source_id)) { if (obj && (obj.source_id == treeNode.source_id)) {
let cmd let cmd
cmd = ['B', undefined].includes(obj.command) ? "A" : "B" /*cmd = ['B', undefined].includes(obj.command) ? "A" : "B"
ipcRenderer.send('setNodes', cmd + key);*/
cmd = ['g #', undefined].includes(obj.command) ? "k #" : "g #"
ipcRenderer.send('setNodes', key+cmd );
ipcRenderer.send('setNodes', cmd + key);
ipcRenderer.on("replayRenderer", (event, data) => { ipcRenderer.on("replayRenderer", (event, data) => {
// this.$message.success(data) // this.$message.success(data)
obj.command = cmd obj.command = cmd
@ -737,7 +740,7 @@ const tree = {
} }
}); });
}; };
// YJ.Global.splitScreen.setActiveId([]); // YJ.Global.splitScreen.setActiveId([]);
let hidden_p_ids = [] let hidden_p_ids = []

10
src/renderer/components/myHeaderAll/systemPopup/systemPopup.vue
View File

@ -701,7 +701,7 @@
</el-tab-pane> </el-tab-pane>
<!-- 物理沙盘 --> <!-- 物理沙盘 -->
<!-- v-if="false"--> <!-- v-if="false"-->
<!-- <el-tab-pane :label="$t('headerTitles.udp')"> <el-tab-pane :label="$t('headerTitles.udp')">
<div class="udp_auth"> <div class="udp_auth">
<div> <div>
<span class="fankuai"></span> <span class="fankuai"></span>
@ -756,12 +756,14 @@
</div> </div>
<div class=""> <div class="">
<el-button size="small" @click="sendGlobalMsg('AFFK','A')">{{ $t("headerTitles.allOpen") }}</el-button> <!-- <el-button size="small" @click="sendGlobalMsg('AFFK','A')">{{ $t("headerTitles.allOpen") }}</el-button>
<el-button size="small" @click="sendGlobalMsg('AFFG','B')">{{ $t("headerTitles.allClose") }}</el-button> <el-button size="small" @click="sendGlobalMsg('AFFG','B')">{{ $t("headerTitles.allClose") }}</el-button>-->
<el-button size="small" @click="sendGlobalMsg('A000k #','k #')">{{ $t("headerTitles.allOpen") }}</el-button>
<el-button size="small" @click="sendGlobalMsg('A000g #','g #')">{{ $t("headerTitles.allClose") }}</el-button>
</div> </div>
</div> </div>
</div> </div>
</el-tab-pane> --> </el-tab-pane>
<!-- 版本信息 --> <!-- 版本信息 -->
<el-tab-pane :label="$t('headerTitles.Version')"> <el-tab-pane :label="$t('headerTitles.Version')">
<div class="auth_info content_h"> <div class="auth_info content_h">

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

@ -275,7 +275,7 @@
<script> <script>
// 新增态势0910 // 新增态势0910
import { remote } from "electron"; import {ipcRenderer, remote} from "electron";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import Tree from "@/components/Tree/index"; import Tree from "@/components/Tree/index";
import bottomMenu from "@/components/bottomMenus/bottomMenu.vue"; import bottomMenu from "@/components/bottomMenus/bottomMenu.vue";
@ -496,6 +496,12 @@ export default {
// window.Clock = new TSTY.clock(); // window.Clock = new TSTY.clock();
}, },
mounted() { mounted() {
ipcRenderer.on("udpServerError",(e,msg)=>{
this.$message.error(msg);
})
ipcRenderer.on("udpServerSuccess",(e,msg)=>{
this.$message.success(msg);
})
// new Notification("这是标题", { // new Notification("这是标题", {
// body: "这是正文", // body: "这是正文",
// icon: // icon:

3
src/renderer/views/login/index.vue
View File

@ -513,7 +513,8 @@ export default {
if (JSON.parse(sandTable_udp_client_status)) { if (JSON.parse(sandTable_udp_client_status)) {
// 如果status为“K”，那么双击的时候就发出关灯指令 // 如果status为“K”，那么双击的时候就发出关灯指令
let val = udp_pointMap.get(key) let val = udp_pointMap.get(key)
val.command = (status == 'G' ? "B" : "A") // val.command = (status == 'G' ? "B" : "A")
val.command = (status == 'g #' ? "g #" : "k #")
if (val) { if (val) {
_entityMap.get(val.source_id).flyTo() _entityMap.get(val.source_id).flyTo()
} }

3419
static/sdk/YJEarth.min.js vendored
View File

File diff suppressed because one or more lines are too long

38
yjearth4_0/static/log/2025-11-20.log Normal file
View File

@ -0,0 +1,38 @@
2025-11-20 14:39:23.906 [INFO] {d82a1f9fbda3791883fe9f09ecb49d96} gps.go:101: 查询串口数据
2025-11-20 14:39:23.907 [INFO] {28c62e9fbda3791884fe9f09a85e29ff} gps.go:105: 没有查询到串口数据
2025-11-20 14:43:38.684 [INFO] {1c0519f1f8a37918ce2c2e5221842716} gps.go:101: 查询串口数据
2025-11-20 14:43:38.684 [INFO] {6cd020f1f8a37918cf2c2e5295d7bf15} gps.go:105: 没有查询到串口数据
2025-11-20 14:44:30.716 [INFO] {889a700e05a47918c01f95745edf716f} gps.go:101: 查询串口数据
2025-11-20 14:44:30.717 [INFO] {3051800e05a47918c11f95747060be96} gps.go:105: 没有查询到串口数据
2025-11-20 14:46:03.242 [INFO] {24d85f991aa479188a33fe17e094cd74} gps.go:101: 查询串口数据
2025-11-20 14:46:03.242 [INFO] {fc9f6f991aa479188b33fe170a5d59a0} gps.go:105: 没有查询到串口数据
2025-11-20 15:03:35.924 [INFO] {306120b20fa579183fbd6b2412201309} gps.go:101: 查询串口数据
2025-11-20 15:03:35.941 [INFO] {e0062eb30fa5791840bd6b24c8214d73} gps.go:105: 没有查询到串口数据
2025-11-20 15:05:00.437 [INFO] {94698e5f23a57918eb968f15fe625e9d} gps.go:101: 查询串口数据
2025-11-20 15:05:00.438 [INFO] {7c3d965f23a57918ec968f15ef4b8a6e} gps.go:105: 没有查询到串口数据
2025-11-20 15:06:32.175 [INFO] {9c617cbb38a579182a310348b05958d8} gps.go:101: 查询串口数据
2025-11-20 15:06:32.185 [INFO] {809720bc38a579182b310348a629ff7f} gps.go:105: 没有查询到串口数据
2025-11-20 15:06:56.275 [INFO] {144803583ea57918e336f2436ea702f1} gps.go:101: 查询串口数据
2025-11-20 15:06:56.276 [INFO] {f4fd12583ea57918e436f243177ef49d} gps.go:105: 没有查询到串口数据
2025-11-20 15:08:06.589 [INFO] {407efab64ea57918242e7f260b365b2e} gps.go:101: 查询串口数据
2025-11-20 15:08:06.589 [INFO] {a8b109b74ea57918252e7f26531de4ca} gps.go:105: 没有查询到串口数据
2025-11-20 15:09:37.625 [INFO] {5c662ce963a57918f4af3c78e5b93339} gps.go:101: 查询串口数据
2025-11-20 15:09:37.625 [INFO] {e0093ce963a57918f5af3c783ca59d09} gps.go:105: 没有查询到串口数据
2025-11-20 15:16:01.423 [INFO] {e4865a45bda579181ef1d51698a7c641} gps.go:101: 查询串口数据
2025-11-20 15:16:01.423 [INFO] {cc736245bda579181ff1d51610fd34c0} gps.go:105: 没有查询到串口数据
2025-11-20 15:16:17.422 [INFO] {d029f5fec0a579183c69e17626eeae33} gps.go:101: 查询串口数据
2025-11-20 15:16:17.422 [INFO] {4408fdfec0a579183d69e17699bd8bd6} gps.go:105: 没有查询到串口数据
2025-11-20 15:51:52.921 [INFO] {0408a134b2a779187b2ad901a0f5a87e} gps.go:101: 查询串口数据
2025-11-20 15:51:52.921 [INFO] {bccaa834b2a779187c2ad901fff40890} gps.go:105: 没有查询到串口数据
2025-11-20 15:56:32.313 [INFO] {0ca1b141f3a779188048a70e98e713ac} gps.go:101: 查询串口数据
2025-11-20 15:56:32.314 [INFO] {9486c141f3a779188148a70e09e48b19} gps.go:105: 没有查询到串口数据
2025-11-20 15:56:36.698 [INFO] {b4891547f4a77918829a8a0bca2c14bc} gps.go:101: 查询串口数据
2025-11-20 15:56:36.699 [INFO] {10bf2447f4a77918839a8a0b178a64a1} gps.go:105: 没有查询到串口数据
2025-11-20 15:57:00.056 [INFO] {d85744b7f9a77918d6697848a7e2c3f5} gps.go:101: 查询串口数据
2025-11-20 15:57:00.056 [INFO] {941354b7f9a77918d769784893bb2aa8} gps.go:105: 没有查询到串口数据
2025-11-20 16:00:26.047 [INFO] {703a49ad29a8791841faf40c502ac917} gps.go:101: 查询串口数据
2025-11-20 16:00:26.048 [INFO] {2cad60ad29a8791842faf40cf84cad9d} gps.go:105: 没有查询到串口数据
2025-11-20 16:01:26.099 [INFO] {3c2cafa837a8791872f2c70c2ddda4ad} gps.go:101: 查询串口数据
2025-11-20 16:01:26.100 [INFO] {34debea837a8791873f2c70c35d61666} gps.go:105: 没有查询到串口数据
2025-11-20 16:04:38.355 [INFO] {e4d6076c64a879188ba11a4937fc0579} gps.go:101: 查询串口数据
2025-11-20 16:04:38.355 [INFO] {5802186c64a879188ca11a495b6d8d9d} gps.go:105: 没有查询到串口数据