Skip to content

E
electron-printer
Commit a65d4912 by linjinhong
Options

feat:【生产软件】(新)生产软件新增烫画智能排版管理模块

parent a29c51e3
Showing with 303 additions and 498 deletions
src/background.js
......@@ -388,6 +388,13 @@ async function createWindow() {
win.webContents.send("sendWebsockt", obj);
});
ipcMain.on("open-folder-only", async (event, dirPath) => {
console.log(938, dirPath);
const result = shell.showItemInFolder(dirPath);
return result;
});
win.on("closed", () => {
// win && win.removeAllListeners();
// win = null;
......
src/components/BaseTable.vue
......@@ -222,8 +222,8 @@ export default {
}
},
mounted() {
console.log("tableConfig", this.tableConfig);
console.log("tableData", this.tableData);
// console.log("tableConfig", this.tableConfig);
// console.log("tableData", this.tableData);
}
};
</script>
......
src/router/index.js
......@@ -18,42 +18,42 @@ const routes = [
meta: {
title: "设计页面"
},
component: resolve => require(["../views/design/index.vue"], resolve)
},
// {
// path: "/design-detail",
// name: "design",
// meta: {
// title: "设计详情页面"
// },
// component: resolve => require(["../views/design/detail/index.vue"], resolve)
// },
{
path: "/dtf-setting",
name: "dtfSetting",
meta: {
title: "DTF排版设置"
},
component: resolve => require(["@/views/dtf-setting/index.vue"], resolve)
},
{
path: "/dtf-batch-detail",
name: "dtfBatchDetail",
meta: {
title: "DTF批次详情"
},
component: resolve =>
require(["@/views/dtf-batch-detail/detail.vue"], resolve)
},
{
path: "/dtf-file",
name: "dtfFileDownLoad",
meta: {
title: "DTF下载文件详情"
},
component: resolve => require(["@/views/dtf-file/index.vue"], resolve)
component: resolve => require(["../views/design/tabIndex.vue"], resolve),
redirect: "/design/dtg",
children: [
// DTG
{
path: "dtg",
name: "design-dtg",
meta: { title: "DTG生产" },
component: resolve => require(["../views/design/index.vue"], resolve)
},
// DTF 列表
{
path: "dtf",
name: "design-dtf",
meta: { title: "DTF生产" },
component: resolve => require(["@/views/dtf-list/index.vue"], resolve)
},
// DTF 排版设置
{
path: "dtf/setting",
name: "dtf-setting",
meta: { title: "DTF排版设置" },
component: resolve =>
require(["@/views/dtf-setting/index.vue"], resolve)
},
// DTF 批次详情
{
path: "dtf/batch-detail",
name: "dtf-batch-detail",
meta: { title: "DTF批次详情" },
component: resolve =>
require(["@/views/dtf-batch-detail/detail.vue"], resolve)
}
]
},
// 删掉原来独立的 /dtf-setting、/dtf-batch-detail、/dtf-file
{
path: "*",
redirect: "/"
......
src/server/entity/function.js
......@@ -652,5 +652,15 @@ export default {
console.log("checkInventory", error);
res.json({ code: 500, msg: error });
}
},
getFileList: async (req, res) => {
try {
const { downloadDir } = req.body;
res.send();
} catch (error) {
console.log("getFileList", error);
res.json({ code: 500, msg: error });
}
}
};
src/server/routes/index.js
......@@ -51,6 +51,8 @@ router.post("/getAllCountry", fn.getAllCountry);
//根据图片地址保存文件到本地
router.post("/saveImgByUrl", fn.saveImgByUrl);
//获取目标路径文件夹下所以文件
router.post("/getFileList", fn.getFileList);
//复制文件夹下文件
router.post("/copySingleImageFn", fn.copySingleImageFn);
......
src/server/utils/store.js
......@@ -202,11 +202,29 @@ module.exports = {
},
getIsOver: () => store.get("isOver") || false,
//本地储存 DTG、DTF生产
//本地储存 DTG、DTF生产类型
setProductType: value => {
store.set("productType", value);
},
getProductType: () => store.get("productType") || "DTG",
//DTF生产设置
setDTFSetting: value => {
console.log("DTFSetting", value);
store.set("DTFSetting", value);
},
getDTFSetting: () =>
store.get("DTFSetting") || {
overWidthMode: "autoScale",
// 最大素材数模式：batch / custom
maxPicMode: "batch",
// 自定义素材数量
customPicNum: 30,
// 自动排版规格 40+2 / 60 / none
autoLayoutType: "none",
// 默认下载目录
downloadDir: ""
},
setLocation: (version, locationKey) => {
if (!locationKey) return;
......
src/views/design/index.vue
<script>
import PHead from "./head/index.vue";
import PMain from "./main/index.vue";
import DTFproduct from "@/views/dtf-list/index.vue";
import UpdateDialog from "@/views/design/updateDialog.vue";
const { getProductType, setProductType } = require("@/server/utils/store");
export default {
components: { PHead, PMain, UpdateDialog, DTFproduct },
name: "design-dtg",
components: { PHead, PMain },
data() {
return {
user: {},
factoryType: "CN",
activeName: getProductType()
factoryType: "CN"
};
},
mounted() {
console.log(18, getProductType());
this.user = this.$dataStore.get("user");
if (this.user.factory && this.user.factory.countryCode) {
this.factoryType = this.user.factory.countryCode;
}
// console.log(17, this.user);
this.$refs.updateDialog.checkUpdate().then(data => {
// console.log(17, data);
if (data) {
// 有新版本更新
this.$refs.updateDialog.open(data);
}
});
},
methods: {
tabClick(tab) {
console.log(34, tab);
setProductType(tab.name);
}
}
mounted() {},
methods: {}
};
</script>
<template>
<div class="page">
<el-tabs type="border-card" v-model="activeName" @tab-click="tabClick">
<el-tab-pane label="DTG生产" name="DTG">
<p-head :user="user" :factoryType="factoryType"/>
<p-main :factoryType="factoryType"/>
<update-dialog ref="updateDialog"
/></el-tab-pane>
<el-tab-pane label="DTF生产" name="DTF">
<DTFproduct :user="user" :factoryType="factoryType"></DTFproduct>
</el-tab-pane>
</el-tabs>
<p-head :user="user" :factoryType="factoryType" />
<p-main :factoryType="factoryType" />
</div>
</template>
......@@ -64,42 +30,4 @@ export default {
flex-direction: column;
// border-top: 1px solid #dcdfe6;
}
::v-deep {
.el-tabs {
height: 100%;
border-bottom: none;
}
.el-tabs__header {
margin: 0;
background-color: #c6c6c6;
// height: 20px;
}
.el-tabs__header .el-tabs__item {
font-size: 12px;
line-height: 25px;
height: 25px;
// border-bottom: none;
}
.el-tabs--border-card > .el-tabs__content {
padding: 0;
height: 100%;
}
.el-tab-pane {
height: 100%;
}
.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
border: none;
background-color: #243151;
color: #fff;
}
.el-tabs--border-card > .el-tabs__header .el-tabs__item {
border: none;
}
.el-tabs--border-card
> .el-tabs__header
.el-tabs__item:not(.is-disabled):hover {
color: #fff;
// background-color: #5b647c;
}
}
</style>
src/views/design/main/index.vue
......@@ -38,22 +38,18 @@ export default {
},
created() {
this.$store.commit("getNewGrid");
let proportion;
ipcRenderer.on("window-size", (event, size) => {
const { width, height } = size;
console.log(`接收到窗口尺寸：${width}x${height}`);
let proportion;
proportion = 1.4;
// } else {
// proportion = 1.5;
// }
this.$store.commit("setWHproportion", proportion);
this.$store.commit("setWindows", { width, height });
this.$store.commit("setDefaultproportion", proportion);
this.$store.commit("setGrid");
});
this.$store.commit("setDefaultproportion", proportion);
this.$store.commit("setGrid");
if (!this.countryList.length) {
this.getAllCountryFn();
}
......
src/views/design/tabIndex.vue 0 → 100644
<script>
import UpdateDialog from "@/views/design/updateDialog.vue";
import { Loading } from "element-ui";
const { getProductType, setProductType } = require("@/server/utils/store");
export default {
components: { UpdateDialog },
data() {
return {
user: {},
factoryType: "CN",
activeName: getProductType(),
loading: null
};
},
mounted() {
this.user = this.$dataStore.get("user");
if (this.user.factory && this.user.factory.countryCode) {
this.factoryType = this.user.factory.countryCode;
}
this.$refs.updateDialog?.checkUpdate().then(data => {
if (data) {
// 有新版本更新
this.$refs.updateDialog?.open(data);
}
});
const routerName = this.$router.currentRoute.name;
const routerMap = { DTG: "design-dtf", DTF: "design-dtf" };
if (routerName !== routerMap[getProductType()]) {
if (getProductType() === "DTG") {
this.$router.push({ name: "design-dtg" });
} else if (getProductType() === "DTF") {
this.$router.push({ name: "design-dtf" });
}
}
},
methods: {
tabClick(tab) {
const targetName = tab.name === "DTG" ? "design-dtg" : "design-dtf";
// 如果已经在目标路由，直接返回，不跳转
if (this.$route.name === targetName) {
return;
}
this.startLoading();
try {
setProductType(tab.name);
if (tab.name === "DTG") {
this.$router.push({ name: "design-dtg" });
} else if (tab.name === "DTF") {
this.$router.push({ name: "design-dtf" });
}
} catch (error) {
console.log(error);
} finally {
this.endLoading();
}
},
startLoading() {
this.loading = Loading.service({
lock: true,
text: "拼命加载中...",
spinner: "el-icon-loading",
background: "rgba(0,0,0,.7)"
});
},
endLoading() {
this.loading.close();
}
}
};
</script>
<template>
<div class="page">
<el-tabs type="border-card" v-model="activeName" @tab-click="tabClick">
<el-tab-pane label="DTG生产" name="DTG">
<router-view v-if="activeName === 'DTG'"></router-view>
</el-tab-pane>
<el-tab-pane label="DTF生产" name="DTF">
<router-view v-if="activeName === 'DTF'"></router-view>
</el-tab-pane>
</el-tabs>
<update-dialog ref="updateDialog" />
</div>
</template>
<style scoped lang="less">
.page {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
// border-top: 1px solid #dcdfe6;
}
::v-deep {
.el-tabs {
height: 100%;
border: none;
}
.el-tabs__header {
margin: 0;
background-color: #c6c6c6;
// height: 20px;
}
.el-tabs__header .el-tabs__item {
font-size: 12px;
line-height: 25px;
height: 25px;
// border-bottom: none;
}
.el-tabs--border-card > .el-tabs__content {
padding: 0;
height: 100%;
}
.el-tab-pane {
height: 100%;
}
.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
border: none;
background-color: #243151;
color: #fff;
}
.el-tabs--border-card > .el-tabs__header .el-tabs__item {
border: none;
}
.el-tabs--border-card
> .el-tabs__header
.el-tabs__item:not(.is-disabled):hover {
color: #fff;
// background-color: #5b647c;
}
}
</style>
src/views/dtf-batch-detail/components/detailHead.vue
......@@ -79,10 +79,7 @@ export default {
return "";
},
goBack() {
// Vue路由返回
this.$router.back();
// 如果需要关闭当前弹窗/子窗口，搭配：
// ipcRenderer.send("close-current-win");
this.$router.push({ name: "design-dtf" });
},
goSetting() {
this.$router.push({
......
src/views/dtf-file/index.vue deleted 100644 → 0
<template>
<div style="height:100%">
<el-tabs type="border-card" v-model="activeName" @tab-click="tabClick">
<el-tab-pane label="DTG生产" name="DTG"> /></el-tab-pane>
<el-tab-pane label="DTF生产" name="DTF">
<div class="dtf-file-page">
<!-- 返回按钮 -->
<div class="page-top">
<el-button icon="el-icon-arrow-left" text @click="goBack">
返回
</el-button>
</div>
<el-card class="file-card">
<template #header>
<div class="card-header">
<span>下载文件夹</span>
</div>
</template>
<div class="file-breadcrumb">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item
><a style="vertical-align: middle;"
><img src="../../assets/computer.png" alt="" width="18"/></a
></el-breadcrumb-item>
<el-breadcrumb-item><a>活动管理</a></el-breadcrumb-item>
<el-breadcrumb-item>活动列表</el-breadcrumb-item>
<el-breadcrumb-item>活动详情</el-breadcrumb-item>
</el-breadcrumb>
</div>
<div class="file-content">
<div v-for="value in 100" :key="value" class="imgBox">
<img
src="../../assets/file.png"
alt=""
width="80"
height="80"
/>
<div>test</div>
</div>
</div>
</el-card>
</div>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
const { ipcRenderer } = require("electron");
const { getProductType, setProductType } = require("@/server/utils/store");
export default {
name: "dtfFileDownLoad",
data() {
return {
// 表单配置，可从本地配置文件读取初始化
form: {
// 素材超宽处理：autoScale / skip / biggerSize
overWidthMode: "autoScale",
// 最大素材数模式：batch / custom
maxPicMode: "batch",
// 自定义素材数量
customPicNum: 30,
// 自动排版规格 40+2 / 60 / none
autoLayoutType: "none",
// 默认下载目录
downloadDir: "C:\\Users\\95487\\Desktop\\Test_JMGZ_260530021.png"
},
activeName: getProductType()
};
},
mounted() {
// 页面加载读取本地配置回填表单
this.loadLocalConfig();
},
methods: {
// 返回上一页
goBack() {
this.$router.push({
name: "design"
});
},
// 读取本地配置
async loadLocalConfig() {
ipcRenderer.send("read-layout-config");
ipcRenderer.once("layout-config-data", (_, cfg) => {
if (cfg) {
this.form = Object.assign({}, this.form, cfg);
}
});
},
// 选择文件夹弹窗
selectFolder() {
ipcRenderer.send("request-select-folder");
ipcRenderer.once("select-folder-result", (_, path) => {
if (path) this.form.downloadDir = path;
});
},
// 保存配置到本地文件
saveConfig() {
ipcRenderer.send("save-layout-config", this.form);
this.$message.success("排版设置保存成功！");
},
tabClick(tab) {
if (tab.name == "DTG") this.goBack();
setProductType(tab.name);
}
}
};
</script>
<style lang="less" scoped>
.dtf-file-page {
padding: 16px;
width: 100%;
height: 100%;
box-sizing: border-box;
}
.page-top {
margin-bottom: 12px;
}
::v-deep.file-card {
width: 100%;
height: calc(100% - 90px);
.file-breadcrumb {
padding: 10px 20px;
background-color: #f3f3f3;
}
.el-card__body {
padding: 0;
height: 100%;
}
}
.card-header {
display: flex;
align-items: center;
gap: 8px;
font-size: 20px;
font-weight: 700;
}
.file-group {
margin-bottom: 24px;
}
.group-title {
font-size: 20px;
color: #303133;
margin-bottom: 10px;
}
.el-radio-group {
display: flex;
flex-direction: column;
gap: 10px;
padding: 12px 16px;
border: 1px solid #e4e7ed;
border-radius: 4px;
}
.custom-num-row {
display: flex;
align-items: center;
}
.dir-input-row {
display: flex;
align-items: center;
gap: 8px;
}
.btn-wrap {
margin-top: 30px;
text-align: left;
}
.el-radio-group {
.el-radio {
padding: 10px 0;
font-size: 18px;
}
}
::v-deep {
.el-tabs {
height: 100%;
border-bottom: none;
}
.el-tabs__header {
margin: 0;
background-color: #c6c6c6;
// height: 20px;
}
.el-tabs__header .el-tabs__item {
font-size: 12px;
line-height: 25px;
height: 25px;
// border-bottom: none;
}
.el-tabs--border-card > .el-tabs__content {
padding: 0;
height: 100%;
}
.el-tab-pane {
height: 100%;
}
.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
border: none;
background-color: #243151;
color: #fff;
}
.el-tabs--border-card > .el-tabs__header .el-tabs__item {
border: none;
}
.el-tabs--border-card
> .el-tabs__header
.el-tabs__item:not(.is-disabled):hover {
color: #fff;
// background-color: #5b647c;
}
}
.file-content {
display: grid;
grid-template-columns: repeat(10, minmax(0, 1fr));
grid-template-rows: max-content;
gap: 10px;
padding: 20px;
overflow-y: auto;
height: calc(100% - 150px);
.imgBox {
text-align: center;
}
}
.el-breadcrumb {
font-size: 18px;
}
</style>
src/views/dtf-list/components/head.vue
......@@ -88,12 +88,12 @@ export default {
},
goSetting() {
this.$router.push({
name: "dtfSetting"
name: "dtf-setting"
});
},
goSetting1() {
this.$router.push({
name: "dtfBatchDetail"
name: "dtf-batch-detail"
});
},
getDataInfo() {}
......
src/views/dtf-list/index.vue
......@@ -3,7 +3,7 @@ import BaseTable from "../../components/BaseTable.vue";
import DTFhead from "./components/head.vue";
export default {
name: "DtfFile",
name: "design-dtf",
components: { BaseTable, DTFhead },
props: {
user: {
......@@ -101,9 +101,7 @@ export default {
]
};
},
mounted() {
console.log(this.tableList);
},
mounted() {},
methods: {
loadData() {
// 请求列表接口
......@@ -122,7 +120,7 @@ export default {
},
goFliePage() {
this.$router.push({
name: "dtfFileDownLoad"
name: "dtf-file-download"
});
}
}
......
src/views/dtf-setting/index.vue
<template>
<div style="height:100%">
<el-tabs type="border-card" v-model="activeName" @tab-click="tabClick">
<el-tab-pane label="DTG生产" name="DTG"> /></el-tab-pane>
<el-tab-pane label="DTF生产" name="DTF">
<div class="dtf-setting-page">
<!-- 返回按钮 -->
<div class="page-top">
<el-button icon="el-icon-arrow-left" text @click="goBack">
返回
</el-button>
</div>
<div class="dtf-setting-page">
<!-- 返回按钮 -->
<div class="page-top">
<el-button icon="el-icon-arrow-left" text @click="goBack">
返回
</el-button>
</div>
<el-card class="setting-card">
<template #header>
<div class="card-header">
<i
class="el-icon-setting"
style="color: #568cf9;font-size: 24px;margin-right: 8px;"
></i>
<span>DTF排版设置</span>
</div>
</template>
<el-card class="setting-card">
<template #header>
<div class="card-header">
<i
class="el-icon-setting"
style="color: #568cf9;font-size: 24px;margin-right: 8px;"
></i>
<span>DTF排版设置</span>
</div>
</template>
<div class="setting-group">
<div class="group-title">素材超排版宽度时:</div>
<el-radio-group v-model="form.overWidthMode">
<el-radio label="autoScale"
>自动缩小素材，适配烫画模宽度</el-radio
>
<el-radio label="skip">超出排版宽度不排版</el-radio>
<el-radio label="biggerSize"
>超出排版宽度，使用更大规格排版</el-radio
>
</el-radio-group>
</div>
<div class="setting-group">
<div class="group-title">素材超排版宽度时:</div>
<el-radio-group v-model="form.overWidthMode">
<el-radio label="autoScale">自动缩小素材，适配烫画模宽度</el-radio>
<el-radio label="skip">超出排版宽度不排版</el-radio>
<el-radio label="biggerSize"
>超出排版宽度，使用更大规格排版</el-radio
>
</el-radio-group>
</div>
<div class="setting-group">
<div class="group-title">单张排版最大素材数:</div>
<el-radio-group v-model="form.maxPicMode">
<el-radio label="batch">批次素材数</el-radio>
<div class="custom-num-row">
<el-radio label="custom">自定义素材数(建议数量30):</el-radio>
<el-input
v-model.number="form.customPicNum"
placeholder="请输入素材数"
style="width: 180px; margin-left: 8px"
:disabled="form.maxPicMode !== 'custom'"
/>
</div>
</el-radio-group>
<div class="setting-group">
<div class="group-title">单张排版最大素材数:</div>
<el-radio-group v-model="form.maxPicMode">
<el-radio label="batch">批次素材数</el-radio>
<div class="custom-num-row">
<el-radio label="custom">自定义素材数(建议数量30):</el-radio>
<el-input
v-model.number="form.customPicNum"
placeholder="请输入素材数"
style="width: 180px; margin-left: 8px"
:disabled="form.maxPicMode !== 'custom'"
/>
</div>
</el-radio-group>
</div>
<div class="setting-group">
<div class="group-title">自动排版设置</div>
<el-radio-group v-model="form.autoLayoutType">
<el-radio label="40+2">40+2</el-radio>
<el-radio label="60">60</el-radio>
<el-radio label="none">不执行自动排版</el-radio>
</el-radio-group>
</div>
<div class="setting-group">
<div class="group-title">自动排版设置</div>
<el-radio-group v-model="form.autoLayoutType">
<el-radio label="40+2">40+2</el-radio>
<el-radio label="60">60</el-radio>
<el-radio label="none">不执行自动排版</el-radio>
</el-radio-group>
</div>
<div class="setting-group">
<div class="group-title">下载文件目录</div>
<div class="dir-input-row">
<el-input v-model="form.downloadDir" readonly style="flex: 1">
<template slot="prepend">素材默认下载位置:</template>
</el-input>
<el-button
icon="el-icon-folder-opened"
@click="selectFolder"
></el-button>
</div>
</div>
<div class="setting-group">
<div class="group-title">下载文件目录</div>
<div class="dir-input-row">
<el-input v-model="form.downloadDir" readonly style="flex: 1">
<template slot="prepend">素材默认下载位置:</template>
</el-input>
<el-button
icon="el-icon-folder-opened"
@click="selectFolder"
></el-button>
</div>
</div>
<div class="btn-wrap">
<el-button type="primary" @click="saveConfig">保存设置</el-button>
</div>
</el-card>
<div class="btn-wrap">
<el-button type="primary" @click="saveConfig">保存设置</el-button>
</div>
</el-tab-pane>
</el-tabs>
</el-card>
</div>
</div>
</template>
<script>
const { ipcRenderer } = require("electron");
const { getProductType, setProductType } = require("@/server/utils/store");
const {
getProductType,
setProductType,
setDTFSetting,
getDTFSetting
} = require("@/server/utils/store");
export default {
name: "dtfSetting",
name: "dtf-setting",
data() {
return {
// 表单配置，可从本地配置文件读取初始化
form: {
// 素材超宽处理：autoScale / skip / biggerSize
overWidthMode: "autoScale",
// 最大素材数模式：batch / custom
maxPicMode: "batch",
// 自定义素材数量
customPicNum: 30,
// 自动排版规格 40+2 / 60 / none
autoLayoutType: "none",
// 默认下载目录
downloadDir: "C:\\Users\\95487\\Desktop\\Test_JMGZ_260530021.png"
},
form: { ...getDTFSetting() },
activeName: getProductType()
};
},
......@@ -114,9 +101,7 @@ export default {
methods: {
// 返回上一页
goBack() {
this.$router.push({
name: "design"
});
this.$router.push({ name: "design-dtf" });
},
// 读取本地配置
async loadLocalConfig() {
......@@ -136,8 +121,8 @@ export default {
},
// 保存配置到本地文件
saveConfig() {
ipcRenderer.send("save-layout-config", this.form);
this.$message.success("排版设置保存成功！");
setDTFSetting({ ...this.form });
},
tabClick(tab) {
if (tab.name == "DTG") this.goBack();
......@@ -212,42 +197,4 @@ export default {
font-size: 18px;
}
}
::v-deep {
.el-tabs {
height: 100%;
border-bottom: none;
}
.el-tabs__header {
margin: 0;
background-color: #c6c6c6;
// height: 20px;
}
.el-tabs__header .el-tabs__item {
font-size: 12px;
line-height: 25px;
height: 25px;
// border-bottom: none;
}
.el-tabs--border-card > .el-tabs__content {
padding: 0;
height: 100%;
}
.el-tab-pane {
height: 100%;
}
.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
border: none;
background-color: #243151;
color: #fff;
}
.el-tabs--border-card > .el-tabs__header .el-tabs__item {
border: none;
}
.el-tabs--border-card
> .el-tabs__header
.el-tabs__item:not(.is-disabled):hover {
color: #fff;
// background-color: #5b647c;
}
}
</style>
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