Commit 3b88bd94 by linjinhong

fix:修改问题

parent 443d230e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"name": "JomallProductionAssistant", "name": "JomallProductionAssistant",
"productName": "JomallProductionAssistant", "productName": "JomallProductionAssistant",
"description": "", "description": "",
"version": "1.0.13", "version": "1.0.14",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
......
...@@ -30,6 +30,30 @@ export default new Vuex.Store({ ...@@ -30,6 +30,30 @@ export default new Vuex.Store({
gridSpacing: 10, gridSpacing: 10,
}, },
grid: [ grid: [
// {
// label: "7×8",
// value: 4,
// row: 7,
// col: 8,
// h: 0,
// w: 0,
// },
// {
// label: "10×12",
// row: 10,
// value: 3,
// col: 12,
// h: 0,
// w: 0,
// },
// {
// label: "14×16",
// row: 14,
// value: 2,
// col: 16,
// h: 0,
// w: 0,
// },
{ {
label: "16×18", label: "16×18",
value: 1, value: 1,
...@@ -38,14 +62,14 @@ export default new Vuex.Store({ ...@@ -38,14 +62,14 @@ export default new Vuex.Store({
h: 0, h: 0,
w: 0, w: 0,
}, },
{ // {
label: "18×22", // label: "16×21",
value: 1, // value: 0,
row: 18, // row: 16,
col: 22, // col: 21,
h: 0, // h: 0,
w: 0, // w: 0,
}, // },
], ],
}, },
mutations: { mutations: {
...@@ -83,12 +107,21 @@ export default new Vuex.Store({ ...@@ -83,12 +107,21 @@ export default new Vuex.Store({
// state.grid[0].h = h; // state.grid[0].h = h;
// state.grid[0].w = w; // state.grid[0].w = w;
state.grid.forEach((el) => { state.grid.forEach((el) => {
if (el.value == 1) { if (el.value == 0) {
el.h = 630 * (state.WHproportion - 0.3);
el.w = 480 * (state.WHproportion - 0.3);
} else if (el.value == 1) {
el.h = 540 * state.WHproportion; el.h = 540 * state.WHproportion;
el.w = 480 * state.WHproportion; el.w = 480 * state.WHproportion;
} else { } else if (el.value == 2) {
el.h = 660 * state.WHproportion; el.h = 480 * state.WHproportion;
el.w = 540 * state.WHproportion; el.w = 420 * state.WHproportion;
} else if (el.value == 3) {
el.h = 360 * (state.WHproportion + 1);
el.w = 300 * (state.WHproportion + 1);
} else if (el.value == 4) {
el.h = 240 * (state.WHproportion + 1.8);
el.w = 210 * (state.WHproportion + 1.8);
} }
}); });
}, },
......
export const grid = [ export const grid = [
// { {
// label: '7×8', label: "7×8",
// value: 4, value: 4,
// col: 7, col: 7,
// row: 8 row: 8,
// }, h: 0,
// { w: 0,
// label: '10×12', },
// col: 10, {
// value: 3, label: "10×12",
// row: 12 col: 10,
// }, value: 3,
// { row: 12,
// label: '14×16', h: 0,
// col: 14, w: 0,
// value: 2, },
// row: 16 {
// }, label: "14×16",
col: 14,
value: 2,
row: 16,
h: 0,
w: 0,
},
{ {
label: "16×18", label: "16×18",
value: 1, value: 1,
...@@ -27,10 +33,12 @@ export const grid = [ ...@@ -27,10 +33,12 @@ export const grid = [
h: 0, h: 0,
w: 0, w: 0,
}, },
// { {
// label: '16×21',#77797a label: "16×21",
// value: 0, value: 0,
// col: 16, col: 16,
// row: 21 row: 21,
// } h: 0,
w: 0,
},
]; ];
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