修改指令格式,增加udp创建反馈
This commit is contained in:
@ -1,3 +1,5 @@
|
||||
import {ipcRenderer} from "electron";
|
||||
|
||||
const dgram = require("dgram");
|
||||
import { getmainWindow } from "../../index";
|
||||
let server;
|
||||
@ -10,10 +12,16 @@ function Init() {
|
||||
server = null;
|
||||
}
|
||||
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", () => {
|
||||
const address = server.address();
|
||||
console.log(`server running ${address.address}:${address.port}`);
|
||||
|
||||
getmainWindow().webContents.send('udpServerSuccess',"udp服务创建成功")
|
||||
|
||||
});
|
||||
|
||||
server.on("message", (msg, remoteInfo) => {
|
||||
@ -63,10 +71,19 @@ function Init() {
|
||||
angle
|
||||
);
|
||||
}else if(ModeIndex==1){
|
||||
// 点位码
|
||||
let key=str.slice(0,-1)
|
||||
// 点位码 001K
|
||||
/* let key=str.slice(0,-1)
|
||||
// 反馈指令的后缀 K或G
|
||||
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(
|
||||
sandTable_udp_server_port+"_str",
|
||||
key,
|
||||
@ -86,10 +103,12 @@ function Init() {
|
||||
});
|
||||
server.on("error", (err) => {
|
||||
console.log("server error", err);
|
||||
getmainWindow().webContents.send('udpServerError',"udp服务创建失败,尝试更换端口")
|
||||
});
|
||||
console.log("port",port)
|
||||
server.bind(port);
|
||||
sendMsg("AFFG")
|
||||
// sendMsg("AFFG")
|
||||
sendMsg("A000k #")
|
||||
}
|
||||
function sendMsg(val) {
|
||||
let msg;
|
||||
|
||||
@ -580,9 +580,12 @@ const tree = {
|
||||
let obj = udp_pointMap.get(key)
|
||||
if (obj && (obj.source_id == treeNode.source_id)) {
|
||||
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) => {
|
||||
// this.$message.success(data)
|
||||
obj.command = cmd
|
||||
@ -737,7 +740,7 @@ const tree = {
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
// YJ.Global.splitScreen.setActiveId([]);
|
||||
|
||||
let hidden_p_ids = []
|
||||
|
||||
@ -701,7 +701,7 @@
|
||||
</el-tab-pane>
|
||||
<!-- 物理沙盘 -->
|
||||
<!-- v-if="false"-->
|
||||
<!-- <el-tab-pane :label="$t('headerTitles.udp')">
|
||||
<el-tab-pane :label="$t('headerTitles.udp')">
|
||||
<div class="udp_auth">
|
||||
<div>
|
||||
<span class="fankuai"></span>
|
||||
@ -756,12 +756,14 @@
|
||||
|
||||
</div>
|
||||
<div class="">
|
||||
<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('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('A000k #','k #')">{{ $t("headerTitles.allOpen") }}</el-button>
|
||||
<el-button size="small" @click="sendGlobalMsg('A000g #','g #')">{{ $t("headerTitles.allClose") }}</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-tab-pane> -->
|
||||
</el-tab-pane>
|
||||
<!-- 版本信息 -->
|
||||
<el-tab-pane :label="$t('headerTitles.Version')">
|
||||
<div class="auth_info content_h">
|
||||
|
||||
@ -275,7 +275,7 @@
|
||||
|
||||
<script>
|
||||
// 新增态势0910
|
||||
import { remote } from "electron";
|
||||
import {ipcRenderer, remote} from "electron";
|
||||
import { mapGetters } from "vuex";
|
||||
import Tree from "@/components/Tree/index";
|
||||
import bottomMenu from "@/components/bottomMenus/bottomMenu.vue";
|
||||
@ -496,6 +496,12 @@ export default {
|
||||
// window.Clock = new TSTY.clock();
|
||||
},
|
||||
mounted() {
|
||||
ipcRenderer.on("udpServerError",(e,msg)=>{
|
||||
this.$message.error(msg);
|
||||
})
|
||||
ipcRenderer.on("udpServerSuccess",(e,msg)=>{
|
||||
this.$message.success(msg);
|
||||
})
|
||||
// new Notification("这是标题", {
|
||||
// body: "这是正文",
|
||||
// icon:
|
||||
|
||||
@ -513,7 +513,8 @@ export default {
|
||||
if (JSON.parse(sandTable_udp_client_status)) {
|
||||
// 如果status为“K”,那么双击的时候就发出关灯指令
|
||||
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) {
|
||||
_entityMap.get(val.source_id).flyTo()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user