Commit da2acf9d by linjinhong

测试提交

parent a92c991d
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -4,6 +4,7 @@ import { app, protocol, BrowserWindow, screen, globalShortcut } from "electron"; ...@@ -4,6 +4,7 @@ import { app, protocol, BrowserWindow, screen, globalShortcut } from "electron";
import { createProtocol } from "vue-cli-plugin-electron-builder/lib"; import { createProtocol } from "vue-cli-plugin-electron-builder/lib";
import { createServer } from "@/server/index.js"; import { createServer } from "@/server/index.js";
import { autoUpdater } from "electron-updater"; import { autoUpdater } from "electron-updater";
import path from "path"; // 引入 path 模块 import path from "path"; // 引入 path 模块
const { exec } = require("child_process"); const { exec } = require("child_process");
......
...@@ -4,12 +4,18 @@ import { ...@@ -4,12 +4,18 @@ import {
toSend, toSend,
writeProfileXml, writeProfileXml,
} from "@/server/utils"; } from "@/server/utils";
const {
cropImageTransparentEdges,
cropTransparentEdges,
processImages,
} = require("../utils/setImage");
import axios from "axios"; import axios from "axios";
import { returnLogFilePath } from "../utils/log"; import { returnLogFilePath } from "../utils/log";
var request = require("request"); var request = require("request");
const compressing = require("compressing"); const compressing = require("compressing");
const uuid = require("uuid"); const uuid = require("uuid");
const path = require("path"); const path = require("path");
const fs = require("fs"); const fs = require("fs");
const os = require("os"); const os = require("os");
const { app } = require("electron"); const { app } = require("electron");
...@@ -318,4 +324,13 @@ export default { ...@@ -318,4 +324,13 @@ export default {
res.json({ code: 500, msg: err.message }); res.json({ code: 500, msg: err.message });
} }
}, },
cropImageTransparentEdges: async (req, res) => {
res.json({ code: 200, msg: 1 });
},
cropTransparentEdges: async (req, res) => {
res.json({ code: 200, msg: 1 });
},
processImages: async (req, res) => {
res.json({ code: 200, msg: 1 });
},
}; };
...@@ -2,10 +2,8 @@ import express from "express"; ...@@ -2,10 +2,8 @@ import express from "express";
import fn from "../entity/function.js"; import fn from "../entity/function.js";
let router = express.Router(); let router = express.Router();
// 执行打印命令 // 执行打印命令
router.post("/toPrint", fn.toPrint); router.post("/toPrint", fn.toPrint);
// 打印日志添加 // 打印日志添加
...@@ -32,6 +30,11 @@ router.post("/findByPodProductionNo", fn.findByPodProductionNo); ...@@ -32,6 +30,11 @@ router.post("/findByPodProductionNo", fn.findByPodProductionNo);
router.get("/checkUpdate", fn.checkUpdate); router.get("/checkUpdate", fn.checkUpdate);
// 增量更新 // 增量更新
router.post("/incrementalUpdates", fn.incrementalUpdates); router.post("/incrementalUpdates", fn.incrementalUpdates);
// 裁切单个图片的透明白边
router.post("/cropImageTransparentEdges", fn.cropImageTransparentEdges);
// 裁切图片目录中的所有图片的透明白边
router.post("/cropTransparentEdges", fn.cropTransparentEdges);
// 处理图片并输出结果
router.post("/processImages", fn.processImages);
export { router as default }; export { router as default };
const fs = require("fs"); const fs = require("fs");
const path = require("path"); const path = require("path");
// const sharp = require("sharp"); const sharp = require("sharp");
const sharp = 1;
/** /**
* 裁切单个图片的透明白边 * 裁切单个图片的透明白边
......
...@@ -6,7 +6,7 @@ import html2canvas from "html2canvas"; ...@@ -6,7 +6,7 @@ import html2canvas from "html2canvas";
import moment from "moment"; import moment from "moment";
import pkg from "../../../../package.json"; import pkg from "../../../../package.json";
import { pxToUnit } from "../../../utils/index"; import { pxToUnit } from "../../../utils/index";
import { cropImageTransparentEdges } from "@/utils/setImage.js";
export default { export default {
data() { data() {
return { return {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment