diff --git a/resources/java/app/yjearth.jar b/resources/java/app/yjearth.jar index 76fe8ea..900bbb6 100644 Binary files a/resources/java/app/yjearth.jar and b/resources/java/app/yjearth.jar differ diff --git a/src/main/index.ts b/src/main/index.ts index b84bfaa..ced3bbb 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -9,6 +9,7 @@ import dayjs from 'dayjs' import os from "os"; import { GetHomeDir } from './config' import { start, getServer } from "./app"; +const http = require("http"); const yaml = require("js-yaml"); @@ -208,7 +209,6 @@ function createWindow(): void { if (!files.canceled) { path = files.filePath.replace(/\\/g, "/"); function callBack(key) { - console.log("下载完成"); event.sender.send("saveNetFileRes", key); } function downloadFile(url, path) { @@ -226,19 +226,18 @@ function createWindow(): void { } } );*/ - http - .get(url, (response) => { - let contentLength = parseInt( - response.headers["content-length"] - ); - let downloadedLength = 0; - response.pipe(fs.createWriteStream(path)); - response.on("end", () => { - callBack("success"); - // Message.success('下载成功') - // dialog.showMessageBox(null,{type:'info',message:"下载完成"}) - }); - }) + http.get(url, (response) => { + let contentLength = parseInt( + response.headers["content-length"] + ); + let downloadedLength = 0; + response.pipe(fs.createWriteStream(path)); + response.on("end", () => { + callBack("success"); + // Message.success('下载成功') + // dialog.showMessageBox(null,{type:'info',message:"下载完成"}) + }); + }) .on("error", (err) => { console.log("完成"); callBack("error"); diff --git a/src/renderer/public/excel/imporTemp.et b/src/renderer/public/excel/imporTemp.et new file mode 100644 index 0000000..e2ee884 Binary files /dev/null and b/src/renderer/public/excel/imporTemp.et differ diff --git a/src/renderer/public/excel/imporTemp.xlsx b/src/renderer/public/excel/imporTemp.xlsx new file mode 100644 index 0000000..1f9e3a0 Binary files /dev/null and b/src/renderer/public/excel/imporTemp.xlsx differ diff --git a/src/renderer/public/excel/批量导入.et b/src/renderer/public/excel/import.et similarity index 100% rename from src/renderer/public/excel/批量导入.et rename to src/renderer/public/excel/import.et diff --git a/src/renderer/public/excel/批量导入.xlsx b/src/renderer/public/excel/import.xlsx similarity index 100% rename from src/renderer/public/excel/批量导入.xlsx rename to src/renderer/public/excel/import.xlsx diff --git a/src/renderer/public/excel/设备模板.et b/src/renderer/public/excel/设备模板.et deleted file mode 100644 index 02274e6..0000000 Binary files a/src/renderer/public/excel/设备模板.et and /dev/null differ diff --git a/src/renderer/public/excel/设备模板.xlsx b/src/renderer/public/excel/设备模板.xlsx deleted file mode 100644 index 02274e6..0000000 Binary files a/src/renderer/public/excel/设备模板.xlsx and /dev/null differ diff --git a/src/renderer/src/api/deviceManage/index.ts b/src/renderer/src/api/deviceManage/index.ts index c1c4ff0..3fcc87a 100644 --- a/src/renderer/src/api/deviceManage/index.ts +++ b/src/renderer/src/api/deviceManage/index.ts @@ -36,4 +36,13 @@ export const deviceApi = { url: `/device/import/template` }) }, + uploadSingle: async (data: any) => { + return await request.post({ + url: `/device/import`, + data, + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' + } + }) + }, } diff --git a/src/renderer/src/views/components/headers/components/setPup/components/equipment.vue b/src/renderer/src/views/components/headers/components/setPup/components/equipment.vue index 2826ba4..36fb159 100644 --- a/src/renderer/src/views/components/headers/components/setPup/components/equipment.vue +++ b/src/renderer/src/views/components/headers/components/setPup/components/equipment.vue @@ -21,7 +21,11 @@ 下载模板 - + @@ -33,13 +37,14 @@ placeholder="请输入设备名称进行搜索" class="input-with-select" :suffix-icon="Search" + @input="getTableList()" >
- +