diff --git a/build/builder-debug.yml b/build/builder-debug.yml
index 9cd3d8e..b64bc2e 100644
--- a/build/builder-debug.yml
+++ b/build/builder-debug.yml
@@ -96,8 +96,8 @@ nsis:
!addincludedir "D:\project\4.0qianduan\4.0\build"
!include "D:\project\4.0qianduan\4.0\installer.nsh"
!addplugindir /x86-unicode "C:\Users\MSI\AppData\Local\electron-builder\Cache\nsis\nsis-resources-3.4.1\plugins\x86-unicode"
- !include "C:\Users\MSI\AppData\Local\Temp\t-EFrMgE\0-messages.nsh"
- !include "C:\Users\MSI\AppData\Local\Temp\t-EFrMgE\1-messages.nsh"
+ !include "C:\Users\MSI\AppData\Local\Temp\t-BpPLoH\1-messages.nsh"
+ !include "C:\Users\MSI\AppData\Local\Temp\t-BpPLoH\0-messages.nsh"
Var newStartMenuLink
Var oldStartMenuLink
diff --git a/build/builder-effective-config.yaml b/build/builder-effective-config.yaml
index f6bd3ac..067e2b2 100644
--- a/build/builder-effective-config.yaml
+++ b/build/builder-effective-config.yaml
@@ -12,8 +12,8 @@ extraFiles:
to: ./ffplay
- from: ./build/icons/
to: ./icons
-productName: 建创实景三维电子沙盘系统
-appId: org.dzsp_shijingjianchuang_offline_Y_save
+productName: 实景三维电子沙盘系统
+appId: org.dzsp_yingjizhihuijunyong_offline_Y_save
files:
- filter:
- dist/electron/**/*
@@ -36,7 +36,7 @@ linux:
target: rpm
icon: build/icons/81.png
desktop:
- Icon: /opt/建创实景三维电子沙盘系统/icons/81.png
+ Icon: /opt/实景三维电子沙盘系统/icons/81.png
executableArgs:
- '--no-sandbox'
nsis:
diff --git a/build/建创实景三维电子沙盘系统 Setup 4.0.0.exe b/build/实景三维电子沙盘系统 Setup 4.0.0.exe
similarity index 96%
rename from build/建创实景三维电子沙盘系统 Setup 4.0.0.exe
rename to build/实景三维电子沙盘系统 Setup 4.0.0.exe
index d5df6b6..9101e43 100644
Binary files a/build/建创实景三维电子沙盘系统 Setup 4.0.0.exe and b/build/实景三维电子沙盘系统 Setup 4.0.0.exe differ
diff --git a/build/实景三维电子沙盘系统 Setup 4.0.0.exe.blockmap b/build/实景三维电子沙盘系统 Setup 4.0.0.exe.blockmap
new file mode 100644
index 0000000..e95c468
Binary files /dev/null and b/build/实景三维电子沙盘系统 Setup 4.0.0.exe.blockmap differ
diff --git a/build/建创实景三维电子沙盘系统 Setup 4.0.0.exe.blockmap b/build/建创实景三维电子沙盘系统 Setup 4.0.0.exe.blockmap
deleted file mode 100644
index 4a86cb0..0000000
Binary files a/build/建创实景三维电子沙盘系统 Setup 4.0.0.exe.blockmap and /dev/null differ
diff --git a/config/app_config.js b/config/app_config.js
index e54fc62..f87e624 100644
--- a/config/app_config.js
+++ b/config/app_config.js
@@ -1,6 +1,6 @@
-let name = 'dzsp_shijingjianchuang_offline_Y_save'; //dzsp_yingjizhihuibeidou_offline_Y_save //dzsp_shijingjiangjin_offline_Y_save // dzsp_shijinghaidong_offline_Y_save //cc ,dzsp_yingjizhihuijunyong_offline_Y_save,dzsp_yingjizhihui_offline_Y_save,dzsp_shijing_offline_Y_save,dzsp_mudanyuan_offline_Y_save,'dzsp_wujingqinwu_offline_Y_save','dzsp_jilingongan_offline_Y_save','dzsp_shijingjianchuang_offline_Y_save'
-let productName = '建创实景三维电子沙盘系统'; //便携式应急指挥电子沙盘系统北斗定位+ //实景三维无人机智能巡检系统 // 海东市自然灾害风险普查可视化分析平台 //便携式应急指挥电子沙盘系统 //便携式应急指挥电子沙盘系统(军用版) //新版4.0//"实景三维电子沙盘系统";//"作战目标数字孪生仿真系统", "实景三维电子沙盘系统" ’牡丹园智慧景区管理系统‘,"武警勤务指挥电子沙盘系统”,"吉林省公安厅三维模型展示平台", "建创实景三维电子沙盘系统"
-let productName_tw = '建创实景三维电子沙盘系统';
+let name = 'dzsp_yingjizhihuijunyong_offline_Y_save'; //dzsp_yingjizhihuibeidou_offline_Y_save //dzsp_shijingjiangjin_offline_Y_save // dzsp_shijinghaidong_offline_Y_save //cc ,dzsp_yingjizhihuijunyong_offline_Y_save,dzsp_yingjizhihui_offline_Y_save,dzsp_shijing_offline_Y_save,dzsp_mudanyuan_offline_Y_save,'dzsp_wujingqinwu_offline_Y_save','dzsp_jilingongan_offline_Y_save','dzsp_shijingjianchuang_offline_Y_save'
+let productName = '实景三维电子沙盘系统'; //便携式应急指挥电子沙盘系统北斗定位+ //实景三维无人机智能巡检系统 // 海东市自然灾害风险普查可视化分析平台 //便携式应急指挥电子沙盘系统 //便携式应急指挥电子沙盘系统(军用版) //新版4.0//"实景三维电子沙盘系统";//"作战目标数字孪生仿真系统", "实景三维电子沙盘系统" ’牡丹园智慧景区管理系统‘,"武警勤务指挥电子沙盘系统”,"吉林省公安厅三维模型展示平台", "建创实景三维电子沙盘系统"
+let productName_tw = '实景三维电子沙盘系统';
let productName_en = 'Realistic 3D electronic sand table system';
let obj = {
baseApi: "", // 本地api请求地址,注意:如果你使用了代理,请设置成'/'
diff --git a/dist/electron/main.js b/dist/electron/main.js
index d83d245..1457c4b 100644
--- a/dist/electron/main.js
+++ b/dist/electron/main.js
@@ -180,20 +180,14 @@ module.exports = function (it) {
/***/ }),
/* 5 */
-/***/ (function(module, exports) {
-
-module.exports = require("path");
-
-/***/ }),
-/* 6 */
/***/ (function(module, exports, __webpack_require__) {
-var anObject = __webpack_require__(7);
+var anObject = __webpack_require__(6);
var IE8_DOM_DEFINE = __webpack_require__(57);
var toPrimitive = __webpack_require__(38);
var dP = Object.defineProperty;
-exports.f = __webpack_require__(8) ? Object.defineProperty : function defineProperty(O, P, Attributes) {
+exports.f = __webpack_require__(7) ? Object.defineProperty : function defineProperty(O, P, Attributes) {
anObject(O);
P = toPrimitive(P, true);
anObject(Attributes);
@@ -207,7 +201,7 @@ exports.f = __webpack_require__(8) ? Object.defineProperty : function defineProp
/***/ }),
-/* 7 */
+/* 6 */
/***/ (function(module, exports, __webpack_require__) {
var isObject = __webpack_require__(4);
@@ -218,7 +212,7 @@ module.exports = function (it) {
/***/ }),
-/* 8 */
+/* 7 */
/***/ (function(module, exports, __webpack_require__) {
// Thank's IE8 for his funny defineProperty
@@ -227,6 +221,12 @@ module.exports = !__webpack_require__(16)(function () {
});
+/***/ }),
+/* 8 */
+/***/ (function(module, exports) {
+
+module.exports = require("path");
+
/***/ }),
/* 9 */
/***/ (function(module, exports) {
@@ -263,9 +263,9 @@ module.exports = function (fn, that, length) {
/* 11 */
/***/ (function(module, exports, __webpack_require__) {
-var dP = __webpack_require__(6);
+var dP = __webpack_require__(5);
var createDesc = __webpack_require__(27);
-module.exports = __webpack_require__(8) ? function (object, key, value) {
+module.exports = __webpack_require__(7) ? function (object, key, value) {
return dP.f(object, key, createDesc(1, value));
} : function (object, key, value) {
object[key] = value;
@@ -389,7 +389,7 @@ module.exports = function (it) {
/* 23 */
/***/ (function(module, exports, __webpack_require__) {
-var def = __webpack_require__(6).f;
+var def = __webpack_require__(5).f;
var has = __webpack_require__(13);
var TAG = __webpack_require__(2)('toStringTag');
@@ -430,7 +430,7 @@ for (var i = 0; i < DOMIterables.length; i++) {
var ctx = __webpack_require__(10);
var call = __webpack_require__(113);
var isArrayIter = __webpack_require__(114);
-var anObject = __webpack_require__(7);
+var anObject = __webpack_require__(6);
var toLength = __webpack_require__(40);
var getIterFn = __webpack_require__(68);
var BREAK = {};
@@ -502,7 +502,7 @@ module.exports = function (bitmap, value) {
/***/ (function(module, exports, __webpack_require__) {
// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
-var anObject = __webpack_require__(7);
+var anObject = __webpack_require__(6);
var dPs = __webpack_require__(97);
var enumBugKeys = __webpack_require__(43);
var IE_PROTO = __webpack_require__(41)('IE_PROTO');
@@ -612,12 +612,12 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__dbPath__ = __webpack_require__(91);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__dbPath___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4__dbPath__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__back_ipcMain__ = __webpack_require__(92);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__back_awesomeProject3_test__ = __webpack_require__(176);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__back_awesomeProject3_test__ = __webpack_require__(174);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__back_awesomeProject3_test___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_6__back_awesomeProject3_test__);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_path__ = __webpack_require__(5);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_path__ = __webpack_require__(8);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_path___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_7_path__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__back_sandTable_udpServer__ = __webpack_require__(75);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__tool__ = __webpack_require__(177);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__tool__ = __webpack_require__(175);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__back_config__ = __webpack_require__(26);
@@ -636,7 +636,7 @@ var sharedObject = {};
process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = true;
if (process.env.NODE_ENV !== "development") {
- global.__static = __webpack_require__(5).join(__dirname, "/static").replace(/\\/g, "\\\\");
+ global.__static = __webpack_require__(8).join(__dirname, "/static").replace(/\\/g, "\\\\");
}
var mainWindow = void 0;
@@ -1097,7 +1097,7 @@ exports.f = __webpack_require__(2);
var META = __webpack_require__(29)('meta');
var isObject = __webpack_require__(4);
var has = __webpack_require__(13);
-var setDesc = __webpack_require__(6).f;
+var setDesc = __webpack_require__(5).f;
var id = 0;
var isExtensible = Object.isExtensible || function () {
return true;
@@ -1157,7 +1157,7 @@ var global = __webpack_require__(1);
var core = __webpack_require__(0);
var LIBRARY = __webpack_require__(20);
var wksExt = __webpack_require__(44);
-var defineProperty = __webpack_require__(6).f;
+var defineProperty = __webpack_require__(5).f;
module.exports = function (name) {
var $Symbol = core.Symbol || (core.Symbol = LIBRARY ? {} : global.Symbol || {});
if (name.charAt(0) != '_' && !(name in $Symbol)) defineProperty($Symbol, name, { value: wksExt.f(name) });
@@ -1247,7 +1247,7 @@ var _require = __webpack_require__(14),
spawn = _require.spawn;
var os = __webpack_require__(9);
-var path = __webpack_require__(5);
+var path = __webpack_require__(8);
var fs = __webpack_require__(15);
var child = null;
@@ -1277,7 +1277,7 @@ function runProcess(execPath) {
stdio: "ignore"
}).on("exit", function (err) {
console.log("out");
- console.log(err);
+ console.log('err', err);
global.sharedObject.hasService = false;
}).on("stdio", function (err, s) {
console.log(err);
@@ -1319,7 +1319,7 @@ module.exports = { runProcess: runProcess, closeChild: closeChild };
var net = __webpack_require__(90);
var express = __webpack_require__(55);
-var path = __webpack_require__(5);
+var path = __webpack_require__(8);
@@ -1400,7 +1400,7 @@ module.exports = require("electron-store");
/* 57 */
/***/ (function(module, exports, __webpack_require__) {
-module.exports = !__webpack_require__(8) && !__webpack_require__(16)(function () {
+module.exports = !__webpack_require__(7) && !__webpack_require__(16)(function () {
return Object.defineProperty(__webpack_require__(37)('div'), 'a', { get: function () { return 7; } }).a != 7;
});
@@ -1526,7 +1526,7 @@ var has = __webpack_require__(13);
var IE8_DOM_DEFINE = __webpack_require__(57);
var gOPD = Object.getOwnPropertyDescriptor;
-exports.f = __webpack_require__(8) ? gOPD : function getOwnPropertyDescriptor(O, P) {
+exports.f = __webpack_require__(7) ? gOPD : function getOwnPropertyDescriptor(O, P) {
O = toIObject(O);
P = toPrimitive(P, true);
if (IE8_DOM_DEFINE) try {
@@ -1558,8 +1558,8 @@ module.exports = __webpack_require__(0).getIteratorMethod = function (it) {
var global = __webpack_require__(1);
var core = __webpack_require__(0);
-var dP = __webpack_require__(6);
-var DESCRIPTORS = __webpack_require__(8);
+var dP = __webpack_require__(5);
+var DESCRIPTORS = __webpack_require__(7);
var SPECIES = __webpack_require__(2)('species');
module.exports = function (KEY) {
@@ -1587,7 +1587,7 @@ module.exports = function (it, TYPE) {
/***/ (function(module, exports, __webpack_require__) {
// 7.3.20 SpeciesConstructor(O, defaultConstructor)
-var anObject = __webpack_require__(7);
+var anObject = __webpack_require__(6);
var aFunction = __webpack_require__(21);
var SPECIES = __webpack_require__(2)('species');
module.exports = function (O, D) {
@@ -1704,7 +1704,7 @@ module.exports = function (exec) {
/* 74 */
/***/ (function(module, exports, __webpack_require__) {
-var anObject = __webpack_require__(7);
+var anObject = __webpack_require__(6);
var isObject = __webpack_require__(4);
var newPromiseCapability = __webpack_require__(51);
@@ -1730,14 +1730,12 @@ module.exports = function (C, x) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_babel_runtime_helpers_slicedToArray__ = __webpack_require__(165);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_babel_runtime_helpers_slicedToArray___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_babel_runtime_helpers_slicedToArray__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__index__ = __webpack_require__(32);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__log__ = __webpack_require__(172);
var dgram = __webpack_require__(171);
var server = void 0;
var Store = __webpack_require__(56);
var store = new Store();
-
var sandTable_udp_server_port = "sandTable_udp_server_port";
function Init() {
if (server) {
@@ -1754,39 +1752,48 @@ function Init() {
server.on("message", function (msg, remoteInfo) {
console.log("udp server got " + msg + " from " + remoteInfo.address + ":" + remoteInfo.port);
+ var ModeIndex = 1;
try {
- var s = JSON.parse(msg.toString());
var positions = [];
+ var str = msg.toString();
var angle = 45;
- if (typeof s == "string") s = JSON.parse(s);
- console.log(s);
+ if (ModeIndex == 0) {
+ var s = JSON.parse(str);
+ if (typeof s == "string") s = JSON.parse(s);
+ console.log(s);
- if (s.Placemark.hasOwnProperty("Point")) {
- var arr = s.Placemark.Point.coordinates.split(",");
- var position = {
- lng: Number(arr[0]),
- lat: Number(arr[1]),
- alt: Number(arr[2]) || 0
- };
- if (arr.length > 2) position.alt = arr[2];
- if (arr.length > 3) angle = arr[3];
- positions.push(position);
- } else {
- var coordinates = s.Placemark.Polygon.outerBoundaryIs.LinearRing.coordinates;
- var parseCoordinates = function parseCoordinates(coords) {
- return coords.split(" ").map(function (pair) {
- var _pair$split$map = pair.split(",").map(Number),
- _pair$split$map2 = __WEBPACK_IMPORTED_MODULE_0_babel_runtime_helpers_slicedToArray___default()(_pair$split$map, 2),
- lng = _pair$split$map2[0],
- lat = _pair$split$map2[1];
+ if (s.Placemark.hasOwnProperty("Point")) {
+ var arr = s.Placemark.Point.coordinates.split(",");
+ var position = {
+ lng: Number(arr[0]),
+ lat: Number(arr[1]),
+ alt: Number(arr[2]) || 0
+ };
+ if (arr.length > 2) position.alt = arr[2];
+ if (arr.length > 3) angle = arr[3];
+ positions.push(position);
+ } else {
+ var coordinates = s.Placemark.Polygon.outerBoundaryIs.LinearRing.coordinates;
+ var parseCoordinates = function parseCoordinates(coords) {
+ return coords.split(" ").map(function (pair) {
+ var _pair$split$map = pair.split(",").map(Number),
+ _pair$split$map2 = __WEBPACK_IMPORTED_MODULE_0_babel_runtime_helpers_slicedToArray___default()(_pair$split$map, 2),
+ lng = _pair$split$map2[0],
+ lat = _pair$split$map2[1];
- return { lng: lng, lat: lat };
- });
- };
- positions = parseCoordinates(coordinates);
+ return { lng: lng, lat: lat };
+ });
+ };
+ positions = parseCoordinates(coordinates);
+ }
+ Object(__WEBPACK_IMPORTED_MODULE_1__index__["getmainWindow"])().webContents.send(sandTable_udp_server_port, positions, angle);
+ } else if (ModeIndex == 1) {
+ var key = str.slice(0, -1);
+
+ var status = str.split(key)[1];
+ Object(__WEBPACK_IMPORTED_MODULE_1__index__["getmainWindow"])().webContents.send(sandTable_udp_server_port + "_str", key, status);
}
- Object(__WEBPACK_IMPORTED_MODULE_1__index__["getmainWindow"])().webContents.send(sandTable_udp_server_port, positions, angle);
} catch (err) {
console.log(err);
}
@@ -1794,12 +1801,16 @@ function Init() {
server.on("error", function (err) {
console.log("server error", err);
});
+ console.log("port", port);
server.bind(port);
+ sendMsg("AFFG");
}
function sendMsg(val) {
var msg = void 0;
- var port = store.get("sandTable_udp_client_port");
+ var port = store.get("sandTable_udp_client_port") || 60000;
var ip = store.get("sandTable_udp_client_host");
+ server.send(val, port, ip);
+ return;
var num = val.toString().split("");
var swit = Number(num.pop());
if (swit == 1 || swit == 0) {
@@ -1814,6 +1825,7 @@ function sendMsg(val) {
var cntHex = cnt.toString(16);
var switHex = swit.toString(16);
var _message = Buffer.from([cntHex, switHex], "hex");
+ console.log("message", _message);
server.send(_message, port, ip);
msg = "发送成功";
} else {
@@ -1839,6 +1851,7 @@ function GetUdpServerPort() {
port = server_port;
}
var host = getHostIP();
+ console.log("GetUdpServerPort", port);
return { port: port, host: host };
}
function getHostIP() {
@@ -1988,7 +2001,7 @@ module.exports = opts => {
addExtensionIfInstalled('devtron', name => !(function webpackMissingModule() { var e = new Error("Cannot find module \".\""); e.code = 'MODULE_NOT_FOUND'; throw e; }()).path);
// TODO: Use this when https://github.com/firejune/electron-react-devtools/pull/6 is out
// addExtensionIfInstalled('electron-react-devtools', name => require(name).path);
- addExtensionIfInstalled('electron-react-devtools', name => __webpack_require__(5).dirname(/*require.resolve*/(!(function webpackMissingModule() { var e = new Error("Cannot find module \".\""); e.code = 'MODULE_NOT_FOUND'; throw e; }()))));
+ addExtensionIfInstalled('electron-react-devtools', name => __webpack_require__(8).dirname(/*require.resolve*/(!(function webpackMissingModule() { var e = new Error("Cannot find module \".\""); e.code = 'MODULE_NOT_FOUND'; throw e; }()))));
localShortcut.register('CmdOrCtrl+Shift+C', inspectElements);
localShortcut.register(isMacOS ? 'Cmd+Alt+I' : 'Ctrl+Shift+I', devTools);
@@ -2780,9 +2793,9 @@ module.exports = {
/* 89 */
/***/ (function(module, exports) {
-var name = 'dzsp_shijingjianchuang_offline_Y_save';
-var productName = '建创实景三维电子沙盘系统';
-var productName_tw = '建创实景三维电子沙盘系统';
+var name = 'dzsp_yingjizhihuijunyong_offline_Y_save';
+var productName = '实景三维电子沙盘系统';
+var productName_tw = '实景三维电子沙盘系统';
var productName_en = 'Realistic 3D electronic sand table system';
var obj = {
baseApi: "",
@@ -2891,11 +2904,11 @@ module.exports = { db_path: db_path, execPath: exePaths[exePaths.length - 2] };
var fs = __webpack_require__(15);
-var ini = __webpack_require__(174);
-var path = __webpack_require__(5);
+var ini = __webpack_require__(172);
+var path = __webpack_require__(8);
var express = __webpack_require__(55);
var cwd = path.join(Object(__WEBPACK_IMPORTED_MODULE_13__config__["a" /* GetHomeDir */])(), "/ffplay/");
-var http = __webpack_require__(175);
+var http = __webpack_require__(173);
var recorder = "";
var ffplayProcesses = new __WEBPACK_IMPORTED_MODULE_1_babel_runtime_core_js_map___default.a();
@@ -2985,11 +2998,13 @@ var ffplayProcesses = new __WEBPACK_IMPORTED_MODULE_1_babel_runtime_core_js_map_
return;
}
recorder.end(function () {
+ console.log('xxxxx');
var path = __WEBPACK_IMPORTED_MODULE_2_electron__["dialog"].showSaveDialogSync({
title: "保存视频文件",
defaultPath: __WEBPACK_IMPORTED_MODULE_10_dayjs___default()().format("YYYYMMDDHHmmss") + "视频录制.mp4",
filters: [{ name: "文件类型", extensions: ["mp4"] }]
});
+ console.log('path', path);
if (path != undefined) {
recorder.move(path, function () {
recorder = null;
@@ -3123,6 +3138,7 @@ var ffplayProcesses = new __WEBPACK_IMPORTED_MODULE_1_babel_runtime_core_js_map_
event.sender.send("submitPortRes", port);
});
__WEBPACK_IMPORTED_MODULE_2_electron__["ipcMain"].on("setNodes", function (event, val) {
+ console.log("接受到数据", val);
var msg = Object(__WEBPACK_IMPORTED_MODULE_11__back_sandTable_udpServer__["c" /* sendMsg */])(val);
event.sender.send("replayRenderer", msg);
});
@@ -3207,11 +3223,11 @@ module.exports = function (Constructor, NAME, next) {
/* 97 */
/***/ (function(module, exports, __webpack_require__) {
-var dP = __webpack_require__(6);
-var anObject = __webpack_require__(7);
+var dP = __webpack_require__(5);
+var anObject = __webpack_require__(6);
var getKeys = __webpack_require__(39);
-module.exports = __webpack_require__(8) ? Object.defineProperties : function defineProperties(O, Properties) {
+module.exports = __webpack_require__(7) ? Object.defineProperties : function defineProperties(O, Properties) {
anObject(O);
var keys = getKeys(Properties);
var length = keys.length;
@@ -3338,7 +3354,7 @@ module.exports = __webpack_require__(0).Symbol;
// ECMAScript 6 symbols shim
var global = __webpack_require__(1);
var has = __webpack_require__(13);
-var DESCRIPTORS = __webpack_require__(8);
+var DESCRIPTORS = __webpack_require__(7);
var $export = __webpack_require__(3);
var redefine = __webpack_require__(58);
var META = __webpack_require__(45).KEY;
@@ -3351,7 +3367,7 @@ var wksExt = __webpack_require__(44);
var wksDefine = __webpack_require__(46);
var enumKeys = __webpack_require__(105);
var isArray = __webpack_require__(65);
-var anObject = __webpack_require__(7);
+var anObject = __webpack_require__(6);
var isObject = __webpack_require__(4);
var toObject = __webpack_require__(30);
var toIObject = __webpack_require__(18);
@@ -3361,7 +3377,7 @@ var _create = __webpack_require__(28);
var gOPNExt = __webpack_require__(106);
var $GOPD = __webpack_require__(67);
var $GOPS = __webpack_require__(64);
-var $DP = __webpack_require__(6);
+var $DP = __webpack_require__(5);
var $keys = __webpack_require__(39);
var gOPD = $GOPD.f;
var dP = $DP.f;
@@ -3694,7 +3710,7 @@ module.exports = __webpack_require__(115)(MAP, function (get) {
"use strict";
-var dP = __webpack_require__(6).f;
+var dP = __webpack_require__(5).f;
var create = __webpack_require__(28);
var redefineAll = __webpack_require__(49);
var ctx = __webpack_require__(10);
@@ -3703,7 +3719,7 @@ var forOf = __webpack_require__(25);
var $iterDefine = __webpack_require__(36);
var step = __webpack_require__(63);
var setSpecies = __webpack_require__(69);
-var DESCRIPTORS = __webpack_require__(8);
+var DESCRIPTORS = __webpack_require__(7);
var fastKey = __webpack_require__(45).fastKey;
var validate = __webpack_require__(70);
var SIZE = DESCRIPTORS ? '_s' : 'size';
@@ -3844,7 +3860,7 @@ module.exports = {
/***/ (function(module, exports, __webpack_require__) {
// call something on iterator step with safe closing on error
-var anObject = __webpack_require__(7);
+var anObject = __webpack_require__(6);
module.exports = function (iterator, fn, value, entries) {
try {
return entries ? fn(anObject(value)[0], value[1]) : fn(value);
@@ -3887,9 +3903,9 @@ var forOf = __webpack_require__(25);
var anInstance = __webpack_require__(50);
var isObject = __webpack_require__(4);
var setToStringTag = __webpack_require__(23);
-var dP = __webpack_require__(6).f;
+var dP = __webpack_require__(5).f;
var each = __webpack_require__(116)(0);
-var DESCRIPTORS = __webpack_require__(8);
+var DESCRIPTORS = __webpack_require__(7);
module.exports = function (NAME, wrapper, methods, common, IS_MAP, IS_WEAK) {
var Base = global[NAME];
@@ -4139,7 +4155,7 @@ module.exports = function (COLLECTION) {
/* unused harmony export objToglb */
/* harmony export (immutable) */ __webpack_exports__["a"] = b3dmToglb;
/* harmony export (immutable) */ __webpack_exports__["b"] = daeTogltf;
-var path = __webpack_require__(5);
+var path = __webpack_require__(8);
var childProcess = __webpack_require__(14);
var _3dtilePath = path.join(process.cwd(), '/convert/_3dtile.exe');
@@ -4278,7 +4294,7 @@ module.exports = require("gltf-pipeline");
var childProcess = __webpack_require__(14);
var fs = __webpack_require__(15);
var os = __webpack_require__(9);
-var path = __webpack_require__(5);
+var path = __webpack_require__(8);
var rimraf = __webpack_require__(142);
console.log(path.join(process.cwd(), 'convert/FBX2glTF.exe'));
function Fbx2glb() {
@@ -4868,7 +4884,7 @@ module.exports = require("rimraf");
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_babel_runtime_helpers_possibleConstructorReturn___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3_babel_runtime_helpers_possibleConstructorReturn__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_babel_runtime_helpers_inherits__ = __webpack_require__(154);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_babel_runtime_helpers_inherits___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_babel_runtime_helpers_inherits__);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5_path__ = __webpack_require__(5);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5_path__ = __webpack_require__(8);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5_path___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_5_path__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6_fs__ = __webpack_require__(15);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6_fs___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_6_fs__);
@@ -4955,7 +4971,11 @@ var Recorder = function () {
}).on("exit", function (err) {
console.log("exit", err);
myEmitter.emit("process-exit");
- }).on("data", function (data) {}).on("data", function (data) {});
+ }).on("data", function (data) {});
+
+ this.shell.stdout.on('data', function (data) {});
+
+ this.shell.stderr.on('data', function (data) {});
this.shell.unref();
}
}, {
@@ -4963,7 +4983,7 @@ var Recorder = function () {
value: function end(cb) {
if (!this.shell.killed) {
console.log(this.shell);
- this.shell.stdin.write("q");
+ this.shell.stdin.write("q\n");
myEmitter.once("process-exit", function () {
cb();
});
@@ -5047,7 +5067,7 @@ module.exports = function defineProperty(it, key, desc) {
var $export = __webpack_require__(3);
// 19.1.2.4 / 15.2.3.6 Object.defineProperty(O, P, Attributes)
-$export($export.S + $export.F * !__webpack_require__(8), 'Object', { defineProperty: __webpack_require__(6).f });
+$export($export.S + $export.F * !__webpack_require__(7), 'Object', { defineProperty: __webpack_require__(5).f });
/***/ }),
@@ -5202,7 +5222,7 @@ $export($export.S, 'Object', { setPrototypeOf: __webpack_require__(158).set });
// Works with __proto__ only. Old v8 can't work with null proto objects.
/* eslint-disable no-proto */
var isObject = __webpack_require__(4);
-var anObject = __webpack_require__(7);
+var anObject = __webpack_require__(6);
var check = function (O, proto) {
anObject(O);
if (!isObject(proto) && proto !== null) throw TypeError(proto + ": can't set as prototype!");
@@ -5371,7 +5391,7 @@ module.exports = __webpack_require__(170);
/* 170 */
/***/ (function(module, exports, __webpack_require__) {
-var anObject = __webpack_require__(7);
+var anObject = __webpack_require__(6);
var get = __webpack_require__(68);
module.exports = __webpack_require__(0).getIterator = function (it) {
var iterFn = get(it);
@@ -5388,70 +5408,24 @@ module.exports = require("dgram");
/***/ }),
/* 172 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* unused harmony export logger */
-var log4js = __webpack_require__(173);
-var path = __webpack_require__(5);
-var p = process.cwd();
-if (process.env.NODE_ENV === "production") {
- p = process.execPath.replaceAll("\\", "/").split("/");
- p.pop();
- p = p.join("/");
-}
-console.log(path.join(p, "logs/access.log"));
-log4js.configure({
- appenders: {
- access: {
- type: "dateFile",
- filename: path.join(p, "logs/access.log"),
- pattern: "-yyyy-MM-dd-hh",
- alwaysIncludePattern: true,
- layout: {
- type: "pattern",
- pattern: "[%d{yyyy-MM-dd hh:mm:ss}] %m"
- }
- }
- },
- categories: {
- default: {
- appenders: ["access"],
- level: "debug"
- }
- }
-});
-
-var logger = log4js.getLogger();
-
-
-
-/***/ }),
-/* 173 */
-/***/ (function(module, exports) {
-
-module.exports = require("log4js");
-
-/***/ }),
-/* 174 */
/***/ (function(module, exports) {
module.exports = require("ini");
/***/ }),
-/* 175 */
+/* 173 */
/***/ (function(module, exports) {
module.exports = require("http");
/***/ }),
-/* 176 */
+/* 174 */
/***/ (function(module, exports) {
/***/ }),
-/* 177 */
+/* 175 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
diff --git a/installer.nsh b/installer.nsh
index 4139a03..08efefa 100644
--- a/installer.nsh
+++ b/installer.nsh
@@ -1,9 +1,9 @@
!macro preInit
SetRegView 64
- WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_shijingjianchuang_offline_Y_save"
- WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_shijingjianchuang_offline_Y_save"
+ WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_yingjizhihuijunyong_offline_Y_save"
+ WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_yingjizhihuijunyong_offline_Y_save"
#writeUninstaller $INSTDIR\uninstaller.exe
SetRegView 32
- WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_shijingjianchuang_offline_Y_save"
- WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_shijingjianchuang_offline_Y_save"
+ WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_yingjizhihuijunyong_offline_Y_save"
+ WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_yingjizhihuijunyong_offline_Y_save"
!macroend
\ No newline at end of file
diff --git a/package.json b/package.json
index 4a9ebac..10bc02a 100644
--- a/package.json
+++ b/package.json
@@ -1 +1,202 @@
-{"name":"dzsp_shijingjianchuang_offline_Y_save","version":"v4.0.0","author":{"email":"1114042468@qq.com","name":"1114042468@qq.com"},"maintainers":[],"license":"MIT","main":"./dist/electron/main.js","homepage":"./dist/electron/main.js","description":"","private":true,"scripts":{"dev":"cross-env TERGET_ENV=development node .electron-vue/dev-runner.js --no-sandbox","build":"cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder","build:win32":"cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --win --ia32","build:win64":"cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --win --x64","build:linux64":"cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --linux --x64","build:arm64":" cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --linux --arm64","build:mac":"cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --mac","build:dir":"cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --dir","build:clean":"cross-env BUILD_TARGET=clean node .electron-vue/build.js","build:web":"cross-env BUILD_TARGET=web node .electron-vue/build.js","pack":"npm run pack:main && npm run pack:renderer","pack:main":"cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js","pack:renderer":"cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js","update:serve":"node server/index.js","dep:upgrade":"yarn upgrade-interactive --latest","postinstall":"electron-builder install-app-deps"},"build":{"extraFiles":[{"from":"./collada2gltf/","to":"./collada2gltf"},{"from":"./convert/","to":"./convert"},{"from":"./yjearth4_0/","to":"./yjearth4_0"},{"from":"./ffplay/","to":"./ffplay"},{"from":"./build/icons/","to":"./icons"}],"productName":"建创实景三维电子沙盘系统","appId":"org.dzsp_shijingjianchuang_offline_Y_save","directories":{"output":"build"},"files":["dist/electron/**/*","node_modules/**/*","package.json"],"dmg":{"contents":[{"x":410,"y":150,"type":"link","path":"/Applications"},{"x":130,"y":150,"type":"file"}]},"mac":{"icon":"build/icons/icon.icns"},"win":{"icon":"build/icons/81.ico"},"linux":{"target":"rpm","icon":"build/icons/81.png","desktop":{"Icon":"/opt/建创实景三维电子沙盘系统/icons/81.png"},"executableArgs":["--no-sandbox"]},"nsis":{"include":"installer.nsh","oneClick":false,"perMachine":true,"allowToChangeInstallationDirectory":true,"language":"2052"}},"dependencies":{"@amap/amap-jsapi-loader":"^1.0.1","@smallwei/avue":"^2.10.10","archiver":"^5.3.0","axios":"0.17.1","body-parser":"^2.2.0","compressing":"^1.5.1","core-js":"^2.6.12","date-fns":"^3.6.0","dayjs":"^1.11.18","debug":"^4.4.1","ee-first":"^1.1.1","electron-store":"^8.1.0","electron-wpc":"^2.0.1","element-ui":"^2.15.13","encodeurl":"^1.0.2","escape-html":"^1.0.3","express":"^4.18.2","fbx2gltf":"^0.9.7-p1","file-saver":"^2.0.5","finalhandler":"^2.1.0","gltf-pipeline":"^4.1.0","ini":"^4.1.2","js-cookie":"^2.2.0","js-md5":"^0.7.3","jszip":"^3.10.1","lodash":"^4.17.21","log4js":"^6.9.1","merge-descriptors":"^2.0.0","moment":"^2.30.1","ms":"^2.1.3","normalize.css":"7.0.0","nprogress":"0.2.0","obj2gltf":"^3.1.6","on-finished":"^2.4.1","parseurl":"^1.3.3","polyfill-object.fromentries":"^1.0.1","regenerator-runtime":"^0.14.1","rimraf":"^2.7.1","svg-baker":"^1.7.0","svg-baker-runtime":"^1.4.7","svg-sprite-loader":"^3.5.2","three":"^0.158.0","viewerjs":"^1.11.6","vue":"2.5.17","vue-electron":"^1.0.6","vue-hot-reload-api":"^2.3.4","vue-i18n":"8.2.1","vue-router":"3.0.1","vue-style-loader":"^4.1.3","vuex":"^3.0.1","xlsx":"^0.18.5"},"devDependencies":{"@babel/core":"^7.24.7","@babel/preset-env":"^7.24.7","babel-core":"^6.25.0","babel-eslint":"^7.2.3","babel-loader":"^7.1.5","babel-plugin-transform-runtime":"^6.23.0","babel-preset-env":"^1.6.0","babel-preset-stage-0":"^6.24.1","babel-register":"^6.24.1","babili-webpack-plugin":"^0.1.2","cfonts":"^1.1.3","chalk":"^2.1.0","copy-webpack-plugin":"^4.0.1","cross-env":"^5.2.1","css-loader":"^0.28.4","del":"^3.0.0","devtron":"^1.4.0","electron":"^13.6.9","electron-builder":"^22.11.7","electron-debug":"^1.4.0","electron-devtools-installer":"^2.2.0","eslint":"^4.4.1","eslint-friendly-formatter":"^3.0.0","eslint-loader":"^1.9.0","eslint-plugin-html":"^3.1.1","extract-text-webpack-plugin":"^3.0.0","file-loader":"^0.11.2","html-webpack-plugin":"^2.30.1","multispinner":"^0.2.1","node-loader":"^0.6.0","sass":"^1.37.0","sass-loader":"^7.3.1","sass-resources-loader":"^2.2.4","style-loader":"^0.18.2","svg-sprite-loader":"3.5.2","url-loader":"^0.5.9","vue-html-loader":"^1.2.4","vue-loader":"^13.0.5","vue-style-loader":"^3.0.1","vue-template-compiler":"2.5.17","webpack":"^3.5.2","webpack-dev-server":"^2.7.1","webpack-hot-middleware":"^2.18.2"}}
\ No newline at end of file
+{
+ "name": "dzsp_yingjizhihuijunyong_offline_Y_save",
+ "version": "v4.0.0",
+ "author": {
+ "email": "1114042468@qq.com",
+ "name": "1114042468@qq.com"
+ },
+ "maintainers": [],
+ "license": "MIT",
+ "main": "./dist/electron/main.js",
+ "homepage": "./dist/electron/main.js",
+ "description": "",
+ "private": true,
+ "scripts": {
+ "dev": "cross-env TERGET_ENV=development node .electron-vue/dev-runner.js --no-sandbox",
+ "build": "cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder",
+ "build:win32": "cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --win --ia32",
+ "build:win64": "cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --win --x64",
+ "build:linux64": "cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --linux --x64",
+ "build:arm64": " cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --linux --arm64",
+ "build:mac": "cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --mac",
+ "build:dir": "cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --dir",
+ "build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",
+ "build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js",
+ "pack": "npm run pack:main && npm run pack:renderer",
+ "pack:main": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js",
+ "pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js",
+ "update:serve": "node server/index.js",
+ "dep:upgrade": "yarn upgrade-interactive --latest",
+ "postinstall": "electron-builder install-app-deps"
+ },
+ "build": {
+ "extraFiles": [
+ {
+ "from": "./collada2gltf/",
+ "to": "./collada2gltf"
+ },
+ {
+ "from": "./convert/",
+ "to": "./convert"
+ },
+ {
+ "from": "./yjearth4_0/",
+ "to": "./yjearth4_0"
+ },
+ {
+ "from": "./ffplay/",
+ "to": "./ffplay"
+ },
+ {
+ "from": "./build/icons/",
+ "to": "./icons"
+ }
+ ],
+ "productName": "实景三维电子沙盘系统",
+ "appId": "org.dzsp_yingjizhihuijunyong_offline_Y_save",
+ "directories": {
+ "output": "build"
+ },
+ "files": [
+ "dist/electron/**/*",
+ "node_modules/**/*",
+ "package.json"
+ ],
+ "dmg": {
+ "contents": [
+ {
+ "x": 410,
+ "y": 150,
+ "type": "link",
+ "path": "/Applications"
+ },
+ {
+ "x": 130,
+ "y": 150,
+ "type": "file"
+ }
+ ]
+ },
+ "mac": {
+ "icon": "build/icons/icon.icns"
+ },
+ "win": {
+ "icon": "build/icons/81.ico"
+ },
+ "linux": {
+ "target": "rpm",
+ "icon": "build/icons/81.png",
+ "desktop": {
+ "Icon": "/opt/实景三维电子沙盘系统/icons/81.png"
+ },
+ "executableArgs": [
+ "--no-sandbox"
+ ]
+ },
+ "nsis": {
+ "include": "installer.nsh",
+ "oneClick": false,
+ "perMachine": true,
+ "allowToChangeInstallationDirectory": true,
+ "language": "2052"
+ }
+ },
+ "dependencies": {
+ "@amap/amap-jsapi-loader": "^1.0.1",
+ "@smallwei/avue": "^2.10.10",
+ "archiver": "^5.3.0",
+ "axios": "0.17.1",
+ "body-parser": "^2.2.0",
+ "compressing": "^1.5.1",
+ "core-js": "^2.6.12",
+ "date-fns": "^3.6.0",
+ "dayjs": "^1.11.18",
+ "debug": "^4.4.1",
+ "ee-first": "^1.1.1",
+ "electron-store": "^8.1.0",
+ "electron-wpc": "^2.0.1",
+ "element-ui": "^2.15.13",
+ "encodeurl": "^1.0.2",
+ "escape-html": "^1.0.3",
+ "express": "^4.18.2",
+ "fbx2gltf": "^0.9.7-p1",
+ "file-saver": "^2.0.5",
+ "finalhandler": "^2.1.0",
+ "gltf-pipeline": "^4.1.0",
+ "ini": "^4.1.2",
+ "js-cookie": "^2.2.0",
+ "js-md5": "^0.7.3",
+ "jszip": "^3.10.1",
+ "lodash": "^4.17.21",
+ "log4js": "^6.9.1",
+ "merge-descriptors": "^2.0.0",
+ "moment": "^2.30.1",
+ "ms": "^2.1.3",
+ "normalize.css": "7.0.0",
+ "nprogress": "0.2.0",
+ "obj2gltf": "^3.1.6",
+ "on-finished": "^2.4.1",
+ "parseurl": "^1.3.3",
+ "polyfill-object.fromentries": "^1.0.1",
+ "regenerator-runtime": "^0.14.1",
+ "rimraf": "^2.7.1",
+ "svg-baker": "^1.7.0",
+ "svg-baker-runtime": "^1.4.7",
+ "svg-sprite-loader": "^3.5.2",
+ "three": "^0.158.0",
+ "viewerjs": "^1.11.6",
+ "vue": "2.5.17",
+ "vue-electron": "^1.0.6",
+ "vue-hot-reload-api": "^2.3.4",
+ "vue-i18n": "8.2.1",
+ "vue-router": "3.0.1",
+ "vue-style-loader": "^4.1.3",
+ "vuex": "^3.0.1",
+ "xlsx": "^0.18.5"
+ },
+ "devDependencies": {
+ "@babel/core": "^7.24.7",
+ "@babel/preset-env": "^7.24.7",
+ "babel-core": "^6.25.0",
+ "babel-eslint": "^7.2.3",
+ "babel-loader": "^7.1.5",
+ "babel-plugin-transform-runtime": "^6.23.0",
+ "babel-preset-env": "^1.6.0",
+ "babel-preset-stage-0": "^6.24.1",
+ "babel-register": "^6.24.1",
+ "babili-webpack-plugin": "^0.1.2",
+ "cfonts": "^1.1.3",
+ "chalk": "^2.1.0",
+ "copy-webpack-plugin": "^4.0.1",
+ "cross-env": "^5.2.1",
+ "css-loader": "^0.28.4",
+ "del": "^3.0.0",
+ "devtron": "^1.4.0",
+ "electron": "^13.6.9",
+ "electron-builder": "^22.11.7",
+ "electron-debug": "^1.4.0",
+ "electron-devtools-installer": "^2.2.0",
+ "eslint": "^4.4.1",
+ "eslint-friendly-formatter": "^3.0.0",
+ "eslint-loader": "^1.9.0",
+ "eslint-plugin-html": "^3.1.1",
+ "extract-text-webpack-plugin": "^3.0.0",
+ "file-loader": "^0.11.2",
+ "html-webpack-plugin": "^2.30.1",
+ "multispinner": "^0.2.1",
+ "node-loader": "^0.6.0",
+ "sass": "^1.37.0",
+ "sass-loader": "^7.3.1",
+ "sass-resources-loader": "^2.2.4",
+ "style-loader": "^0.18.2",
+ "svg-sprite-loader": "3.5.2",
+ "url-loader": "^0.5.9",
+ "vue-html-loader": "^1.2.4",
+ "vue-loader": "^13.0.5",
+ "vue-style-loader": "^3.0.1",
+ "vue-template-compiler": "2.5.17",
+ "webpack": "^3.5.2",
+ "webpack-dev-server": "^2.7.1",
+ "webpack-hot-middleware": "^2.18.2"
+ }
+}
\ No newline at end of file
diff --git a/src/main/back/ipcMain.js b/src/main/back/ipcMain.js
index 322c9b5..86305a8 100644
--- a/src/main/back/ipcMain.js
+++ b/src/main/back/ipcMain.js
@@ -134,11 +134,13 @@ export default {
return;
}
recorder.end(() => {
+ console.log('xxxxx')
let path = dialog.showSaveDialogSync({
title: "保存视频文件",
defaultPath: dayjs().format("YYYYMMDDHHmmss") + "视频录制.mp4",
filters: [{ name: "文件类型", extensions: ["mp4"] }],
});
+ console.log('path', path)
if (path != undefined) {
recorder.move(path, () => {
recorder = null;
@@ -313,7 +315,7 @@ export default {
event.sender.send("submitPortRes", port);
});
ipcMain.on("setNodes", (event, val) => {
- // console.log("接受到数据", name);
+ console.log("接受到数据", val);
let msg = sendMsg(val);
event.sender.send("replayRenderer", msg);
});
diff --git a/src/main/back/processGo.js b/src/main/back/processGo.js
index ced5015..516b3e9 100644
--- a/src/main/back/processGo.js
+++ b/src/main/back/processGo.js
@@ -45,7 +45,7 @@ function runProcess(
})
.on("exit", (err) => {
console.log("out");
- console.log(err);
+ console.log('err', err);
global.sharedObject.hasService = false;
})
.on("stdio", (err, s) => {
diff --git a/src/main/back/recorder.js b/src/main/back/recorder.js
index b98b9da..59edcac 100644
--- a/src/main/back/recorder.js
+++ b/src/main/back/recorder.js
@@ -60,14 +60,19 @@ class Recorder {
})
.on("data", function(data) {
// console.log(typeof data);
- })
- .on("data", function(data) {});
+ });
+
+ this.shell.stdout.on('data', (data) => {
+ });
+
+ this.shell.stderr.on('data', (data) => {
+ });
this.shell.unref();
}
end(cb) {
if (!this.shell.killed) {
console.log(this.shell);
- this.shell.stdin.write("q");
+ this.shell.stdin.write("q\n");
myEmitter.once("process-exit", () => {
cb();
});
diff --git a/src/main/back/sandTable/udpServer.js b/src/main/back/sandTable/udpServer.js
index b92eae2..9a63770 100644
--- a/src/main/back/sandTable/udpServer.js
+++ b/src/main/back/sandTable/udpServer.js
@@ -3,7 +3,6 @@ import { getmainWindow } from "../../index";
let server;
let Store = require("electron-store");
let store = new Store();
-import { logger } from "../log";
let sandTable_udp_server_port = "sandTable_udp_server_port";
function Init() {
if (server) {
@@ -23,41 +22,60 @@ function Init() {
);
// logger.info(msg.toString())
// server.send('world', remoteInfo.port, remoteInfo.address)
+ // ['json','string']
+ let ModeIndex=1
try {
- var s = JSON.parse(msg.toString());
let positions = [];
+ var str = msg.toString();
//角度
let angle = 45;
- if (typeof s == "string") s = JSON.parse(s);
- console.log(s);
+ if(ModeIndex==0){
+ let s=JSON.parse(str)
+ if (typeof s == "string") s = JSON.parse(s);
+ console.log(s);
+
+ // if(s.hasOwnProperty("Placemark")){
+ if (s.Placemark.hasOwnProperty("Point")) {
+ let arr = s.Placemark.Point.coordinates.split(",");
+ let position = {
+ lng: Number(arr[0]),
+ lat: Number(arr[1]),
+ alt: Number(arr[2]) || 0,
+ };
+ if (arr.length > 2) position.alt = arr[2];
+ if (arr.length > 3) angle = arr[3];
+ positions.push(position);
+ } else
+ {
+ let coordinates =
+ s.Placemark.Polygon.outerBoundaryIs.LinearRing.coordinates;
+ const parseCoordinates = (coords) => {
+ return coords.split(" ").map((pair) => {
+ const [lng, lat] = pair.split(",").map(Number);
+ return { lng, lat };
+ });
+ };
+ positions = parseCoordinates(coordinates);
+ }
+ getmainWindow().webContents.send(
+ sandTable_udp_server_port,
+ positions,
+ angle
+ );
+ }else if(ModeIndex==1){
+ // 点位码
+ let key=str.slice(0,-1)
+ // 反馈指令的后缀 K或G
+ let status=str.split(key)[1]
+ getmainWindow().webContents.send(
+ sandTable_udp_server_port+"_str",
+ key,
+ status
+ );
- // if(s.hasOwnProperty("Placemark")){
- if (s.Placemark.hasOwnProperty("Point")) {
- let arr = s.Placemark.Point.coordinates.split(",");
- let position = {
- lng: Number(arr[0]),
- lat: Number(arr[1]),
- alt: Number(arr[2]) || 0,
- };
- if (arr.length > 2) position.alt = arr[2];
- if (arr.length > 3) angle = arr[3];
- positions.push(position);
- } else {
- let coordinates =
- s.Placemark.Polygon.outerBoundaryIs.LinearRing.coordinates;
- const parseCoordinates = (coords) => {
- return coords.split(" ").map((pair) => {
- const [lng, lat] = pair.split(",").map(Number);
- return { lng, lat };
- });
- };
- positions = parseCoordinates(coordinates);
}
- getmainWindow().webContents.send(
- sandTable_udp_server_port,
- positions,
- angle
- );
+
+
// }else{
// console.log("内容不正确");
@@ -69,12 +87,16 @@ function Init() {
server.on("error", (err) => {
console.log("server error", err);
});
+ console.log("port",port)
server.bind(port);
+ sendMsg("AFFG")
}
function sendMsg(val) {
let msg;
- let port = store.get("sandTable_udp_client_port");
+ let port = store.get("sandTable_udp_client_port")||60000;
let ip = store.get("sandTable_udp_client_host");
+ server.send(val, port, ip);
+ return
let num = val.toString().split("");
let swit = Number(num.pop());
if (swit == 1 || swit == 0) {
@@ -89,6 +111,7 @@ function sendMsg(val) {
let cntHex = cnt.toString(16);
let switHex = swit.toString(16);
const message = Buffer.from([cntHex, switHex], "hex");
+ console.log("message",message)
server.send(message, port, ip);
msg = "发送成功";
} else {
@@ -117,6 +140,7 @@ function GetUdpServerPort() {
port = server_port;
}
let host = getHostIP();
+ console.log("GetUdpServerPort",port)
return { port, host };
}
function getHostIP() {
diff --git a/src/renderer/api/gisAPI.js b/src/renderer/api/gisAPI.js
index 367633d..d70e623 100644
--- a/src/renderer/api/gisAPI.js
+++ b/src/renderer/api/gisAPI.js
@@ -767,7 +767,7 @@ export function queryPOI(
cb
) {
request_get("/api/v1/poi/query", data).then((res) => {
- requestCallback(res, cb);
+ requestCallback(res, cb, false);
});
}
@@ -1227,3 +1227,13 @@ export function deleteHeader(data) {
data
});
}
+
+// 查询物资列表
+export function getGoodsList(
+ data = {
+ page: 1,
+ page_size: 5,
+ }
+) {
+ return request_get("/api/v1/goods/list", data);
+}
diff --git a/src/renderer/assets/i18n/lang/local_en.js b/src/renderer/assets/i18n/lang/local_en.js
index 5b1d119..2b18512 100644
--- a/src/renderer/assets/i18n/lang/local_en.js
+++ b/src/renderer/assets/i18n/lang/local_en.js
@@ -166,7 +166,13 @@ module.exports = {
ConcurrencyControl: "Concurrency Control",
localIP: "Local IP",
localPort: "Local Port",
+ remoteIP: "Remote IP",
+ allOpen: "allOpen",
+ allClose: "allClose",
+ remotePort: "Remote Port",
weather: "Weather",
+ Permitconnection: 'Permit connection',
+ save: 'save',
week: [
"Sunday",
"Monday",
diff --git a/src/renderer/assets/i18n/lang/local_tw.js b/src/renderer/assets/i18n/lang/local_tw.js
index 7d07787..8a110ed 100644
--- a/src/renderer/assets/i18n/lang/local_tw.js
+++ b/src/renderer/assets/i18n/lang/local_tw.js
@@ -136,11 +136,17 @@ module.exports = {
},
headerTitles: {
systemTitle: "係統面板",
- udp: "物理沙盘",
+ udp: "物理沙盤",
ConcurrencyControl: "並發量控制",
localIP: "本地IP",
localPort: "本地端口",
+ remoteIP: "遠程IP",
+ allOpen: "全開",
+ allClose: "全關",
+ remotePort: "遠程端口",
weather: "天气",
+ Permitconnection: '允许连接',
+ save: '保存',
week: [
"星期日",
"星期一",
diff --git a/src/renderer/assets/i18n/lang/local_zh.js b/src/renderer/assets/i18n/lang/local_zh.js
index 9fb583c..89ceb04 100644
--- a/src/renderer/assets/i18n/lang/local_zh.js
+++ b/src/renderer/assets/i18n/lang/local_zh.js
@@ -145,8 +145,12 @@ module.exports = {
localIP: "本地IP",
localPort: "本地端口",
remoteIP: "远程IP",
+ allOpen: "全开",
+ allClose: "全关",
remotePort: "远程端口",
weather: "天气",
+ Permitconnection: '允许连接',
+ save: '保存',
week: [
"星期日",
"星期一",
diff --git a/src/renderer/components/LeftMenu/secondMenu.vue b/src/renderer/components/LeftMenu/secondMenu.vue
index d47d59e..03f0392 100644
--- a/src/renderer/components/LeftMenu/secondMenu.vue
+++ b/src/renderer/components/LeftMenu/secondMenu.vue
@@ -620,11 +620,11 @@ export default {
svg: "goodsSearchPolygon",
},
// 战术计算
- // {
- // fun: this.tacticalCalculation,
- // name: "tacticalCalculation",
- // svg: "tacticalCalculation",
- // },
+ {
+ fun: this.tacticalCalculation,
+ name: "tacticalCalculation",
+ svg: "tacticalCalculation",
+ },
// 分屏
],
key: "tool",
diff --git a/src/renderer/components/LeftMenu/secondMenuFun.js b/src/renderer/components/LeftMenu/secondMenuFun.js
index 420c879..c6577e7 100644
--- a/src/renderer/components/LeftMenu/secondMenuFun.js
+++ b/src/renderer/components/LeftMenu/secondMenuFun.js
@@ -13,6 +13,7 @@ import {
queryRoute,
addPicture,
addSituation,
+ getGoodsList
} from "@/api/gisAPI";
import { getNamefromPath, getIP } from "../../utils";
import {
@@ -46,6 +47,9 @@ import {
renderFlyLine,
} from "../Tree/renderNode";
import { shpTotalDict } from "../../api/shpTotalDict";
+import { format } from "date-fns";
+const FileSaver = require('file-saver')
+const XLSX = require('xlsx')
const secondMenuFun = {
data() {
return {
@@ -140,9 +144,6 @@ const secondMenuFun = {
}
});
- console.log("x,y");
- console.log(x);
- console.log(y);
let notZeroX = [];
let notZeroY = [];
for (let i = 0; i < y.length; i++) {
@@ -151,8 +152,6 @@ const secondMenuFun = {
notZeroY.push(y[i]);
}
}
- console.log(notZeroX);
- console.log(notZeroY);
x = notZeroX;
y = notZeroY;
if (!x.length) $root_home_index.goodSearchDialog = false;
@@ -292,6 +291,52 @@ const secondMenuFun = {
option.xAxis.data = x;
option.series[0].data = y;
myChart.setOption(option);
+
+ let goodSearchDom = document.getElementsByClassName("goodSearch")[0];
+ if (goodSearchDom) {
+ let btn = goodSearchDom.getElementsByClassName("export-btn")[0];
+ btn.onclick = async () => {
+ let excelData = [
+ ['序号', 'ID', '名称', '经度', '纬度', '高度'],
+ ]
+ let params = {
+ page: 1,
+ page_size: 999999,
+ }
+ let res = await getGoodsList(params)
+ if ([0, 200].includes(res.code)) {
+ res.data.list
+ for (let j = 0; j < res.data.list.length; j++) {
+ excelData[0].push(res.data.list[j].name)
+ }
+ for (let i = 0; i < nodes.length; i++) {
+ let item = [i + 1, nodes[i].detail.id, nodes[i].detail.label.text, nodes[i].detail.positions.lng, nodes[i].detail.positions.lat, nodes[i].detail.positions.alt]
+ // excelData.push()
+ for (let j = 0; j < res.data.list.length; j++) {
+ let cnt = 0
+ if(nodes[i].detail.attribute && nodes[i].detail.attribute.goods) {
+ for (let k = 0; k < nodes[i].detail.attribute.goods.content.length; k++) {
+ if (nodes[i].detail.attribute.goods.content[k].ID == res.data.list[j].ID) {
+ cnt = nodes[i].detail.attribute.goods.content[k].cnt
+ break
+ }
+ }
+ }
+ item.push(cnt)
+ }
+ excelData.push([...item])
+ }
+ const worksheet = XLSX.utils.aoa_to_sheet(excelData)
+ const workbook = XLSX.utils.book_new()
+ XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1')
+ const excelBuffer = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' })
+ const data = new Blob([excelBuffer], { type: 'application/octet-stream' })
+ const date = new Date();
+ const formattedDate = format(date, "yyyyMMddHHmmssSSS");
+ FileSaver.saveAs(data, `物资统计_${formattedDate}.xlsx`)
+ }
+ }
+ }
});
} else {
this.$message.warning("该区域没有物资");
@@ -894,7 +939,7 @@ const secondMenuFun = {
editTs(item) {
this.$sendChanel("initTasks", item);
},
- tsOnclick(item) {},
+ tsOnclick(item) { },
newTs(item) {
this.$prompt("请输入态势方案名称", "提示", {
confirmButtonText: "确定",
@@ -1192,9 +1237,9 @@ const secondMenuFun = {
{},
{
clickSavePath: (data) => {
- console.log(1232,data);
+ console.log(1232, data);
let is_show = data.repeat == "Infinity" ? true : false;
- let source_name = data.name;
+ let source_name = data.name;
let source_id = this.$md5(new Date().getTime() + "漫游路径");
let DbOption = {
source_id,
@@ -1416,7 +1461,7 @@ const secondMenuFun = {
window.clicknum = 0;
let host = new URL(getIP()).host;
let routePlanning = new YJ.Obj.RoutePlanning(window.Earth1, {
- gps: false,
+ gps: true,
host,
});
routePlanning.Dialog.queryCallBack = async (v) => {
@@ -1471,6 +1516,10 @@ const secondMenuFun = {
},
//视频录制
videoRecording(item) {
+ window.endRecoder = () => {
+ console.log('结束')
+ $sendElectronChanel("endRecoder");
+ }
item.status = !item.status;
let time = 3;
this.$changeComponentShow("#secondMenu", false);
@@ -1507,6 +1556,7 @@ const secondMenuFun = {
func();
timer = setInterval(func, 1000);
} else {
+ console.log('结束')
$sendElectronChanel("endRecoder");
// document.removeEventListener("keydown", onKeyDown);
}
@@ -1843,7 +1893,7 @@ const secondMenuFun = {
// console.log('layer2',layer2)
let Draw = new YJ.Draw.DrawPolygon(window.Earth1);
Draw.start((err, positions) => {
- if(!positions || positions.length < 3) {
+ if (!positions || positions.length < 3) {
return
}
let source_id = this.$md5(new Date().getTime() + "飞线");
diff --git a/src/renderer/components/PLTraffic/components/manager/equipment/equipment.vue b/src/renderer/components/PLTraffic/components/manager/equipment/equipment.vue
index ae9c64d..01e025e 100644
--- a/src/renderer/components/PLTraffic/components/manager/equipment/equipment.vue
+++ b/src/renderer/components/PLTraffic/components/manager/equipment/equipment.vue
@@ -175,6 +175,8 @@ import {
} from "../../../api";
import { debounce } from "../../../utils";
import fs from "fs";
+const os = require("os");
+const arch = os.arch();
export default {
name: "equipment",
@@ -217,8 +219,10 @@ export default {
download() {
let serve = localStorage.getItem("service");
let p = "xlsx";
+ let filename = '模板'
if (process.platform == "linux") {
- p = "et";
+ // p = "et";
+ filename = '模板.xlsx'
}else{
p = "xlsx";
}
@@ -227,7 +231,7 @@ export default {
serve + "/static/excel/%E8%AE%BE%E5%A4%87%E6%A8%A1%E6%9D%BF." + p;
this.$sendElectronChanel("saveNetFile", {
title: "保存文件",
- filename: "模板",
+ filename: filename,
filters: [{ name: "保存文件", extensions: [p] }],
url,
});
diff --git a/src/renderer/components/Tree/components/rightMenuOption.js b/src/renderer/components/Tree/components/rightMenuOption.js
index 4abcb80..ba26a5b 100644
--- a/src/renderer/components/Tree/components/rightMenuOption.js
+++ b/src/renderer/components/Tree/components/rightMenuOption.js
@@ -500,7 +500,6 @@ const rightMenuOption = {
node.source_path = res.data[key].url;
}
source_type = node.source_type;
- cusAddNodes(this.$parent.treeObj, p_id, [node]);
if (source_type == "shp") {
renderShp(node);
} else if (source_type == "mif") {
@@ -525,6 +524,7 @@ const rightMenuOption = {
} else {
renderTerrain(node);
}
+ cusAddNodes(this.$parent.treeObj, p_id, [node]);
},
(err) => {
console.log(err);
@@ -573,6 +573,8 @@ const rightMenuOption = {
entity.source.remove();
else entity.remove();
}
+ window._entityMap.delete(item);
+ window.udp_pointMap.delete(item);
});
//删除的id集合中如果存在已打开的编辑框的id则关闭编辑框
if (
@@ -672,7 +674,7 @@ const rightMenuOption = {
// 更新节点的勾选状态
this.$parent.treeObj.checkNode(node, data, isShow);
-
+
// 触发check事件来更新数据库
let source_ids = [node.source_id];
if (isShow) {
@@ -768,6 +770,9 @@ const rightMenuOption = {
//编辑框的确认回调
//关闭回调是Dialog.closecallBack
editNode.Dialog.confirmCallBack = (v) => {
+ if(v.instruct){
+ udp_pointMap.set(v.instruct,{source_id:v.id})
+ }
console.log("vvvvvvvvvvvvvv1111", v);
this.$offChanel("selectedImg");
if (v.hasOwnProperty("text") && typeof v.text == "string")
@@ -791,9 +796,11 @@ const rightMenuOption = {
this.rightClickTreeNode.source_type
)
) {
- v.center.lng = v.lng;
- v.center.lat = v.lat;
- v.center.alt = v.alt;
+ if(v.center) {
+ v.center.lng = v.lng;
+ v.center.lat = v.lat;
+ v.center.alt = v.alt;
+ }
}
const obj = {
@@ -1022,7 +1029,7 @@ const rightMenuOption = {
let detail = JSON.parse(JSON.stringify(node.detail));
// console.log("detail111111111111111111", );
if (typeof detail==='string') {
- detail = JSON.parse(detail);
+ detail = JSON.parse(detail);
}
if (flag) {
await _entityMap.get(node.source_id).setCustomView();
@@ -1317,6 +1324,10 @@ const rightMenuOption = {
formData.append("source_id", this.rightClickTreeNode.source_id);
importTablehead(formData).then((res) => {
if (res.code == 0) {
+ let entityObject = window.Earth1.entityMap.get(this.rightClickTreeNode.source_id);
+ if(entityObject && entityObject.type === 'vector') {
+ entityObject.options.head_tables = res.data.list;
+ }
this.rightClickTreeNode.head_tables = JSON.stringify(
res.data.list
);
@@ -1388,7 +1399,7 @@ const rightMenuOption = {
window._entityMap.set(node.source_id, tileset);
if (!flag)
tileset.flyTo();
-
+
});*/
this.$message.success("操作成功");
diff --git a/src/renderer/components/Tree/index.vue b/src/renderer/components/Tree/index.vue
index c06d1d5..098957f 100644
--- a/src/renderer/components/Tree/index.vue
+++ b/src/renderer/components/Tree/index.vue
@@ -25,14 +25,14 @@
'.concat(i,'
\n ✕\n暂无数据
\n暂无数据
\n暂无数据
\n暂无数据
\n暂无数据
\nWGS84坐标
\n暂无属性信息
',i.innerHTML=l,i.getElementsByClassName("tabs")[0])new kn(i.getElementsByClassName("tabs")[0],void 0,this.sdk);for(var c=i.getElementsByTagName("img"),u=0;u暂无数据
\n暂无数据
\nBIM属性导出选项
\n \n自定义属性
\n \n旋转
\n高度
\n\n 度\n 例如116.6°, 39.9°\n
\n\n 度分\n 例如95°10.1702\', 49°12.4015\'\n
\n\n 度分秒\n 例如11°18\'54.37", 39°13\'46.57"\n
\n