Commit 8c720a42 by wusiyi

Merge remote-tracking branch 'origin/dev_600sc'

parents e8bce74e 8f51f72e
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>5</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>5</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>5</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>5</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>5</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>5</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>5</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>0</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>5</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>4</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>5</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>5</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>5</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>4</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>5</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>5</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>4</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>5</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>4</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>5</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
GTX6SPCMD.exe print -X "Profile\CO12.xml" -I "Input\sample.png" -A "Output\pO12.arxp" -S 01000200 -L 02540254
echo %errorlevel%
\ No newline at end of file
GTX6SPCMD.exe print -X "Profile\CO12.xml" -I "Input\sample.png" -A "Output\pO12.arxp" -S 01000200 -L 02540254
echo %errorlevel%
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bMultiple>1</bMultiple>
<byResolution>1</byResolution>
<byInk>1</byInk>
<byInkVolume>1</byInkVolume>
<byDoublePrint>1</byDoublePrint>
<bySaturation>1</bySaturation>
<byBrightness>1</byBrightness>
<byContrast>1</byContrast>
<iCyanBalance>1</iCyanBalance>
<iMagentaBalance>1</iMagentaBalance>
<iYellowBalance>1</iYellowBalance>
<iBlackBalance>1</iBlackBalance>
<bUniPrint>1</bUniPrint>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<byHighlight>1</byHighlight>
<byMask>1</byMask>
<bDivide>1</bDivide>
<bTransColor>1</bTransColor>
<bySaturation>1</bySaturation>
<byBrightness>1</byBrightness>
<byContrast>1</byContrast>
<bUniPrint>1</bUniPrint>
<byResolution>1</byResolution>
<byInk>1</byInk>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>1</bEcoMode>
<byInk>1</byInk>
<bMaterialBlack>1</bMaterialBlack>
<bMultiple>1</bMultiple>
<byHighlight>1</byHighlight>
<byMask>1</byMask>
<bFastMode>1</bFastMode>
<bDivide>1</bDivide>
<bPause>1</bPause>
<bTransColor>1</bTransColor>
<byChoke>1</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>1</bySaturation>
<byBrightness>1</byBrightness>
<byContrast>1</byContrast>
<iCyanBalance>1</iCyanBalance>
<bUniPrint>1</bUniPrint>
<iMagentaBalance>1</iMagentaBalance>
<iYellowBalance>1</iYellowBalance>
<iBlackBalance>1</iBlackBalance>
<byResolution>1</byResolution>
<bySubInk>0</bySubInk>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<byResolution>1</byResolution>
<byInk>1</byInk>
<bMultiple>1</bMultiple>
<byInkVolume>1</byInkVolume>
<byDoublePrint>1</byDoublePrint>
<bySaturation>1</bySaturation>
<byBrightness>1</byBrightness>
<byContrast>1</byContrast>
<iBlackBalance>1</iBlackBalance>
<bUniPrint>1</bUniPrint>
</GTOPTION>
\ No newline at end of file
GTX6SPCMD.exe print -X "Profile\CO12.xml" -I "Input\sample.png" -A "Output\pO12.arxp" -S 01000200 -L 02540254
echo %errorlevel%
\ No newline at end of file
GTX6SPCMD.exe send -A "D:\sample\Output\pO12.arxp" -P "Brother GTX pro" -D 1
echo %errorlevel%
\ No newline at end of file
......@@ -7,7 +7,7 @@ const defaultSetting = {
language: "cn",
gridValue: 0,
autoPrint: false,
gridSpacing: "10mm",
gridSpacing: "10mm"
};
export default new Vuex.Store({
state: {
......@@ -17,8 +17,8 @@ export default new Vuex.Store({
productDetail: {},
windowWH: { width: 0, height: 0 },
desktopDevice: 1, //1是兄弟,2是其他
desktoVersion: getVersion() || "print", //print2.0是2.0,print4.0是4.0 print600是600
orderType: "GC", //GC是POD,CN是PODCN US是PODUS
desktoVersion: getVersion() || "print", //print2.0是2.0,print4.0是4.0 print600是600 print600SC是600SC
orderType: "GC", //GC是POD,CN是PODCN US是PODUS OP是操作单
WHproportion: 1, //宽高比例
defaultProportion: 1,
isPreView: false,
......@@ -30,7 +30,7 @@ export default new Vuex.Store({
unit: "mm",
language: "cn",
autoPrint: false,
gridSpacing: 10,
gridSpacing: 10
},
defaultGrid: [
{
......@@ -39,7 +39,7 @@ export default new Vuex.Store({
row: 16,
col: 18,
h: 0,
w: 0,
w: 0
},
{
label: "16×21",
......@@ -47,7 +47,7 @@ export default new Vuex.Store({
row: 16,
col: 21,
h: 0,
w: 0,
w: 0
},
{
label: "7×8",
......@@ -55,7 +55,7 @@ export default new Vuex.Store({
row: 7,
col: 8,
h: 0,
w: 0,
w: 0
},
{
label: "10×12",
......@@ -63,7 +63,7 @@ export default new Vuex.Store({
value: 3,
col: 12,
h: 0,
w: 0,
w: 0
},
{
label: "14×16",
......@@ -71,7 +71,7 @@ export default new Vuex.Store({
value: 2,
col: 16,
h: 0,
w: 0,
w: 0
},
{
label: "40×50",
......@@ -80,10 +80,10 @@ export default new Vuex.Store({
col: 50,
h: 0,
w: 0,
disabled: true,
},
disabled: true
}
],
grid: [],
grid: []
},
mutations: {
setDefaultSetting(state) {
......@@ -127,15 +127,8 @@ export default new Vuex.Store({
return (state.grid = [arr]);
}
let proportion = state.WHproportion;
console.log(130, proportion);
state.grid.forEach((el) => {
state.grid.forEach(el => {
if (el.value == 0) {
// if (state.defaultProportion == 1.5) {
// proportion = 1.4;
// } else if (state.defaultProportion == 1.7) {
// proportion = 1.4;
// }
el.h = 630 * proportion;
el.w = 480 * proportion;
} else if (el.value == 1) {
......@@ -179,7 +172,7 @@ export default new Vuex.Store({
row: 18,
col: 22,
h: 0,
w: 0,
w: 0
},
{
label: "24×24",
......@@ -187,13 +180,64 @@ export default new Vuex.Store({
row: 24,
col: 24,
h: 0,
w: 0,
w: 0
}
];
} else if (state.desktoVersion == "print600SC") {
state.grid = [
{
label: "16×18",
value: 1,
row: 16,
col: 18,
h: 0,
w: 0
},
{
label: "14×16",
row: 14,
value: 2,
col: 16,
h: 0,
w: 0
},
{
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: "24×24",
value: 5,
row: 24,
col: 24,
h: 0,
w: 0
},
{
label: "18×22",
value: 6,
row: 18,
col: 22,
h: 0,
w: 0
}
];
} else {
state.grid = [...state.defaultGrid];
}
},
}
},
getters: {
systemSetting(state) {
......@@ -202,9 +246,9 @@ export default new Vuex.Store({
getActionList(state) {
return state.actionList;
},
getActionIndex: (state) => state.actionIndex,
imgList: (state) => state.imgList,
getActionIndex: state => state.actionIndex,
imgList: state => state.imgList
},
actions: {},
modules: {},
modules: {}
});
......@@ -12,26 +12,25 @@ export default {
<p>自动调整底材的白色油墨量,抑制整体的油墨消耗量。</p>
<p>但是,根据颜色,完成品的亮度有时会略微降低。</p>
`,
bMaterialBlack:
`
bySubInk: `
<p>是否使用 ORGR 进行指定</p>
`,
bMaterialBlack: `
<b>利用底材的黑色</b>
<p>在黑色底材上打印时,利用底材的黑色打印时,设定为ON。</p>
<p>自动将黑色(RGB=0)作为透明色处理。</p>
<p>已在详细设置菜单中将其它颜色指定为透明色时,设定为OFF。</p>
`,
bMultiple:
`
bMultiple: `
<b>彩色的复合路径打印</b>
<p>彩色的复合路径打印是针对含有彩色的图像通过增加压板的进给次数(LF)来喷出更精细的油墨液滴。尽管打印时间变长,但可以更加细致地再现色彩。</p>
`,
byHighlight:
`
byHighlight: `
<b>高光</b>
<p>选择RGB=254的白度(浓度)。值越大,白度越增加。</p>
<p>打印HighlightCheckPattern.arxp选择适当的值。</p>
`,
byMask:
`
byMask: `
<b>遮光</b>
<p>调节底材的白色油墨量。</p>
<p>底材饱和度高时请增加。</p>
......@@ -40,87 +39,74 @@ export default {
<p>4:用于红色、紫色、绿色等鲜艳的底色。</p>
<p>5:在暗色区以外的所有区域中以最大白色油墨量打印。</p>
`,
bFastMode:
`
bFastMode: `
<b>白色高速打印</b>
<p>在白色油墨使用模式下高速打印。油墨量和浓度不变。</p>
<p>横纹明显时设定为OFF。</p>
`,
bDivide:
`
bDivide: `
<b>白色分次打印</b>
<p>分两层,每层用一半的油墨量进行白色打印。
总油墨量不变。</p>
`,
bPause:
`
bPause: `
<b>白色/彩色个别打印</b>
<p>打印白色层后,暂停(等待时间)后打印彩色层。打印极小的图像时请选择。</p>
`,
bTransColor:
`
bTransColor: `
<b>透明色</b>
<p>指定打印时不使用油墨而是作为透明色处理的颜色。</p>
<p>根据颜色的再现性,建议取消选中[利用底材的黑色]。</p>
`,
byChoke:
`
byChoke: `
<b>白色油墨的削减范围</b>
<p>通过减少白色油墨的打印范围,防止白色油墨从彩色油墨下露出。</p>
<p>通常为1-3,数字越大,白色油墨的削减量增力口。</p>
<p>如果原图像的周围能看到白色的线或点,很可能是“抗锯齿“导致,请确认原图像。</p>
`,
byMinWhite:
`
byMinWhite: `
<b>最小白色油墨量</b>
<p>设置值越大,使用“彩色+白色油墨"打印时的暗色区域底材的白色油墨量越增加。</p>
<p>如果选择“特殊”,则设置值可以选择大于“3”的值。</p>
<p>请注意,设置值越大,越容易渗透。</p>
`,
bySaturation:
`
bySaturation: `
<b>饱和度</b>
<p>增加颜色的鲜艳度。请用于稍暗或色调不足的图像、CMYK颜色模式的图像、扫描仪的图像旁。</p>
`,
byBrightness:
`
byBrightness: `
<b>亮度</b>
<p>值越大,颜色变得越亮。</p>
`,
byContrast:
`
byContrast: `
<b>对比度</b>
<p>使亮的颜色更亮、暗的颜色更暗,从而给呆板的图像增加颜色强弱。</p>
`,
iCyanBalance:
`
iCyanBalance: `
<b>青色</b>
<p>调整青色油墨量。</p>
<p>如果增加值,整体会偏向淡蓝色。</p>
<p>如果减少值,整体会偏红。</p>
`,
iMagentaBalance:
`
iMagentaBalance: `
<b>红色</b>
<p>调整青色油墨量。</p>
<p>如果增加值,整体会偏向红紫色。</p>
<p>如果减少值,整体会偏绿。</p>
`,
iYellowBalance:
`
iYellowBalance: `
<b>黄色</b>
<p>调整黄色油墨量。</p>
<p>如果增加值,整体会偏黄。</p>
<p>如果减少值,整体会偏蓝。</p>
`,
iBlackBalance:
`
iBlackBalance: `
<b>黑色</b>
<p>调整黑色油墨量。</p>
<p>如果增加值,整体会偏黑。</p>
......@@ -128,20 +114,17 @@ export default {
`,
printTime:
`
printTime: `
<b>打印时间</b>
<p>“x1”以按照高光5打印的时间作为标准。</p>
<p>提高高光增加了白色油墨量时打印时间变长。</p>
`,
whiteInk:
`
whiteInk: `
<b>白色油墨量</b>
<p>高光5的油墨量为“400%",以此作为标准。</p>
<p>实际油墨消耗量取决于打印图像内的色彩。请将其当作油墨消耗量的标准。</p>
`,
byInkVolume:
`
byInkVolume: `
<b>油墨量</b>
<p>减少彩色油墨量以防止油墨渗透。</p>
<p>根据InkVolume.arxp的打印结果选择适当的值。</p>
......@@ -150,15 +133,13 @@ export default {
<p>6-4 用于薄平纹织物和棉/聚酯纤维/聚氨酯混纺。</p>
<p>3-1用于聚酯纤维针织物和没有吸水性合成纤维。</p>
`,
bUniPrint:
`
bUniPrint: `
<b>单向打印</b>
<p>将打印方向固定为一个方向。</p>
<p>优先执行来自打印机操作面板的指定,仅在打印机的设置是[自动]时有效。</p>
`,
byDoublePrint:
`
byDoublePrint: `
<b>2次打印</b>
<p>设置为0时,打印1次。</p>
<p>设置为1~3时,分2次打印。</p>
......@@ -166,4 +147,4 @@ export default {
<p>设置值越大,从第1次打印开始到第2次打印开始的间隔越长,可以更加期待提高黑度效果。</p>
`
};
\ No newline at end of file
};
......@@ -15,6 +15,7 @@ const uuid = require("uuid");
import { mapState } from "vuex";
const {
getVersion,
setVersion,
getHostApi,
setDesktopDevice,
getDesktopDevice,
......@@ -278,6 +279,10 @@ export default {
} else if (this.orderType === "OP") {
params.data = { ...data };
}
//如果为惠立彩则判断当前saveImgList字段中的power是否全是true 是则生产完成
const canCallApi =
this.desktopDevice != 3 ||
(data.saveImgList?.every(el => el.power) ?? false);
try {
console.log("生产完成");
......@@ -624,15 +629,15 @@ export default {
productMark: this.detail.productMark
};
if (
this.detail.mssWidth &&
this.detail.adjustable == 1 &&
this.detail.mssHeight
) {
obj.size = {
width: this.detail.mssWidth,
height: this.detail.mssHeight
};
if (this.detail.adjustable && this.detail.specList?.length) {
obj.sizeObj = this.detail.specList.reduce((acc, el) => {
if (!el?.faceTitle) return acc;
acc[el.faceTitle] = {
width: el.mssWidth || 0, // 默认值防undefined
height: el.mssHeight || 0
};
return acc;
}, {});
}
//设置储存图片的字段,并添加power标识
if (!this.detail["saveImgList"]?.length) {
......@@ -658,6 +663,31 @@ export default {
},
async getDataInfo(e, isForcedProduction) {
//查询后先检查当前是否有数据,有则先走生产完成
if (
this.detail &&
Object.keys(this.detail).length > 0 &&
this.isAutoFinish
) {
try {
await this.setData(this.detail);
} catch (err) {
console.error("setData 执行失败", err);
}
}
if (this.detail && !this.isAutoFinish && this.desktopDevice == 3) {
//惠立彩判断是否全部图片都已经打印完成
const canCallApi =
this.detail.saveImgList?.every(el => el.power) ?? false;
if (canCallApi) {
bus.$emit("busEmit", {
value: this.detail.newId,
type: "completeFail"
});
}
}
//判断生产单号是否为空
if (this.productionNo === "")
return this.$message.warning("请录入生产单号/操作单号");
......@@ -665,16 +695,16 @@ export default {
// const today = moment(new Date()).format("YYYY-MM-DD");
//判断上一单未勾选添加当天日期是否跳过
// if (!this.isAutoFinish && today != getNowDate()) {
// this.$confirm("请注意自动完成上一单未勾选", "提示", {
// confirmButtonText: "跳过提示",
// type: "warning"
// }).then(res => {
// if (res == "confirm") {
// setNowDate(today);
// }
// });
// }
if (!this.isAutoFinish && today != getNowDate()) {
this.$confirm("请注意自动完成上一单未勾选", "提示", {
confirmButtonText: "跳过提示",
type: "warning"
}).then(res => {
if (res == "confirm") {
setNowDate(today);
}
});
}
//判断生产单号是US CN GC(老pod),并设置 setOrderType
if (this.productionNo.includes("_")) {
......@@ -904,10 +934,11 @@ export default {
// window.location.reload();
},
changeDesktoVersionFn(value) {
// console.log(553, value);
setVersion(value);
this.selectGridIndex = 0;
this.$store.commit("changeDesktoVersion", value);
ipcRenderer.send("update-version", value);
this.$store.commit("getNewGrid");
this.$store.commit("setGrid");
this.command(0);
},
......@@ -1036,6 +1067,7 @@ export default {
<el-option label="2.0" value="print"></el-option>
<el-option label="4.0" value="print4.0"></el-option>
<el-option label="600" value="print600"></el-option>
<el-option label="600SC" value="print600SC"></el-option>
</el-select>
</div>
......
......@@ -336,7 +336,7 @@ export default {
if (this.imgList?.length) {
this.getBackFile({
files: this.imgList,
size: this.detail.designImageSize || null
size: this.detail.sizeObj || null
});
}
},
......@@ -511,13 +511,9 @@ export default {
setDesignImg(title) {
let img = this.selectImgList.find(it => it.title === title);
if (img) {
// console.log(this.detail.designImageSize, "this.detail.size");
this.getBackFile(
{ files: [img], size: this.detail.designImageSize },
() => {
this.imgHistoryList.push(JSON.parse(JSON.stringify(this.imgList)));
}
);
this.getBackFile({ files: [img], size: this.detail.sizeObj }, () => {
this.imgHistoryList.push(JSON.parse(JSON.stringify(this.imgList)));
});
}
},
selectImg(it, index) {
......@@ -529,27 +525,35 @@ export default {
let item = this.imgList.find(img => img.fileName === it.fileName);
if (item) return;
this.selectImgIndex = index;
// console.log(this.detail.designImageSize);
let size = null;
if (
this.detail.mssWidth &&
this.detail.adjustable &&
this.detail.mssHeight
) {
size = {
width: this.detail.mssWidth,
height: this.detail.mssHeight
};
let sizeObj = null;
// if (
// this.detail.mssWidth &&
// this.detail.adjustable &&
// this.detail.mssHeight
// ) {
// size = {
// width: this.detail.mssWidth,
// height: this.detail.mssHeight
// };
// }
if (this.detail.adjustable && this.detail.specList?.length) {
sizeObj = this.detail.specList.reduce((acc, el) => {
if (!el?.faceTitle) return acc;
acc[el.faceTitle] = {
width: el.mssWidth || 0, // 默认值防undefined
height: el.mssHeight || 0
};
return acc;
}, {});
}
this.getBackFile({ files: [it], size }, () => {
console.log("selectImg", it);
this.getBackFile({ files: [it], size: sizeObj }, () => {
this.imgHistoryList.push(JSON.parse(JSON.stringify(this.imgList)));
});
this.imgDom = document.getElementById("imgBox");
if (this.imgDom) this.imgDom.style.webkitClipPath = "none";
});
// setTimeout(() => {}, 300);
// this.selectImgIndexList = Array.from(new Set(this.selectImgIndexList))
// this.getBackFile({ files: [it], size });
},
ev(type) {
if (this.selectIndex < 0 && this.imgList.length) {
......@@ -757,7 +761,12 @@ export default {
bw = bw.clientWidth;
this.isView = false;
this.isMove = false;
const keyMap = {
: "A",
: "B",
A: "A",
B: "B"
};
for (let i = 0; i < files.length; i++) {
files[i].url = files[i]?.productionFile || files[i].url;
await that.$nextTick();
......@@ -766,14 +775,20 @@ export default {
let width_px, height_px, rate, x, y;
let data = await that.getImageSize(files[i].url);
const isCut = files[i].isCut;
console.log("size", size);
console.log("files.title", files[i]);
const title = files[i].title;
const matchKey = keyMap[title] || title;
const templateSize = size[matchKey];
if (size && !isCut) {
//带黄点模判断是否是cp类,cp类按照newMmToPxFn方法重新计算宽高
if (isCp) {
width_px = newMmToPxFn(size.width);
height_px = newMmToPxFn(size.height);
width_px = newMmToPxFn(templateSize.width);
height_px = newMmToPxFn(templateSize.height);
} else {
width_px = mmToPx(size.width);
height_px = mmToPx(size.height);
width_px = mmToPx(templateSize.width);
height_px = mmToPx(templateSize.height);
}
x = w;
y = height_px / 2;
......@@ -817,6 +832,7 @@ export default {
h: height_px,
r: 0
});
console.log("imgList", that.imgList);
that.selectIndex = that.imgList.length - 1;
that.showImgSetting = true;
......@@ -826,21 +842,6 @@ export default {
await this.$nextTick();
const { hasOutsideValidPixel } = await checkImageOutsideGrid();
this.isOver = hasOutsideValidPixel;
// this.$nextTick(async () => {
// //等图片铺上网格后判断是否超过网格
// // if (isImageBiggerThanGrid && hasOutsideValidPixel) {
// // //图大于台版且超过台版有素材
// // this.isOver = hasOutsideValidPixel;
// // } else if (!isImageBiggerThanGrid) {
// // //图小于台版
// // this.isOver = isImageBiggerThanGrid;
// // } else if (isImageBiggerThanGrid && !hasOutsideValidPixel) {
// // //图大于台版且超过台版没有有素材
// // this.isOver = hasOutsideValidPixel;
// // }
// });
if (i === files.length - 1) {
callback && callback();
}
......@@ -1265,7 +1266,7 @@ export default {
this.systemSetting = this.$dataStore.get("setting");
bus.$on("busEmit", v => {
let { type, value, size, productMark } = v;
let { type, value, sizeObj, productMark } = v;
switch (type) {
case "productingMessage":
......@@ -1286,14 +1287,19 @@ export default {
if (
this.detail &&
this.detail.mssWidth &&
this.detail.adjustable &&
this.detail.mssHeight
this.detail.specList?.length
) {
this.detail.designImageSize = {
width: this.detail.mssWidth,
height: this.detail.mssHeight
};
this.detail.sizeObj = this.detail.specList.reduce((acc, el) => {
// 容错:跳过无效数据
if (!el?.faceTitle) return acc;
// 赋值:动态键名
acc[el.faceTitle] = {
width: el.mssWidth || 0, // 默认值防undefined
height: el.mssHeight || 0
};
return acc;
}, {});
}
break;
......@@ -1315,7 +1321,8 @@ export default {
});
break;
case "sendFile":
this.detail.designImageSize = size;
this.detail.sizeObj = sizeObj;
console.log("sizeObj", sizeObj);
this.imgList = [];
this.selectImgList = [];
......@@ -1340,7 +1347,7 @@ export default {
this.getBackFile(
{
files: [value[this.selectImgIndex]],
size: this.detail.designImageSize || null
size: this.detail.sizeObj || null
},
() => {
this.imgHistoryList.push(
......@@ -1625,7 +1632,7 @@ export default {
<div>{{ detail.startStockingTime }}</div>
</div>
<div
v-if="detail.mssWidth && detail.mssHeight"
v-if="detail.specList && detail.specList.length"
class="div-item"
style="flex: 100%;"
>
......@@ -1633,22 +1640,30 @@ export default {
<div class="item-value">
mm:&nbsp;(&nbsp; w:
{{ detail.mssWidth }}
{{ detail.specList[selectImgIndex].mssWidth }}
&nbsp; h:
{{ detail.mssHeight }}&nbsp;)
{{ detail.specList[selectImgIndex].mssHeight }}&nbsp;)
</div>
</div>
<div
v-if="detail.mssWidth && detail.mssHeight"
v-if="detail.specList && detail.specList.length"
class="div-item"
style="flex: 100%;"
>
<div style="opacity: 0;">模规格:</div>
<div class="item-value">
inch:&nbsp;(&nbsp;w:
{{ (Number(detail.mssWidth) / 25.4).toFixed(1) }}
{{
(
Number(detail.specList[selectImgIndex].mssWidth) / 25.4
).toFixed(1)
}}
&nbsp;h:
{{ (Number(detail.mssHeight) / 25.4).toFixed(1) }}&nbsp;)
{{
(
Number(detail.specList[selectImgIndex].mssHeight) / 25.4
).toFixed(1)
}}&nbsp;)
</div>
</div>
</div>
......
......@@ -10,7 +10,7 @@ module.exports = {
/** vue3.0内置了webpack所有东西,
* webpack配置,see https://github.com/vuejs/vue-cli/blob/dev/docs/webpack.md
**/
chainWebpack: (config) => {
chainWebpack: config => {
const svgRule = config.module.rule("svg");
svgRule.uses.clear();
svgRule
......@@ -18,7 +18,7 @@ module.exports = {
.loader("svg-sprite-loader")
.options({
symbolId: "icon-[name]",
include: ["./src/icons"],
include: ["./src/icons"]
});
config.module
......@@ -28,15 +28,15 @@ module.exports = {
.loader("pug-html-loader")
.end();
},
configureWebpack: (config) => {
configureWebpack: config => {
config.resolve = {
// 配置解析别名
extensions: [".js", ".json", ".vue"], // 自动添加文件名后缀
alias: {
vue: "vue/dist/vue.js",
"@": path.resolve(__dirname, "./src"),
"@c": path.resolve(__dirname, "./src/components"),
},
"@c": path.resolve(__dirname, "./src/components")
}
};
},
// 生产环境是否生成 sourceMap 文件
......@@ -50,11 +50,11 @@ module.exports = {
// css预设器配置项
loaderOptions: {
sass: {
prependData: `@import "./src/styles/main.css";`,
},
prependData: `@import "./src/styles/main.css";`
}
},
// 启用 CSS modules for all css / pre-processor files.
requireModuleExtension: true, // 是否开启支持‘foo.module.css’样式
requireModuleExtension: true // 是否开启支持‘foo.module.css’样式
},
// use thread-loader for babel & TS in production build
// enabled by default if the machine has more than 1 cores
......@@ -80,15 +80,15 @@ module.exports = {
ws: true,
changOrigin: true,
pathRewrite: {
"^/devApi": "",
},
},
"^/devApi": ""
}
}
},
overlay: {
// 全屏模式下是否显示脚本错误
warnings: true,
errors: true,
},
errors: true
}
},
/**
* 第三方插件配置
......@@ -100,41 +100,45 @@ module.exports = {
extraResources: [
{
from: "./print/",
to: "../print",
to: "../print"
},
{
from: "./print4.0/",
to: "../print4.0",
to: "../print4.0"
},
{
from: "./print600/",
to: "../print600",
to: "../print600"
},
{
from: "./print600SC/",
to: "../print600SC"
},
{
from: "./logs/",
to: "../logs",
to: "../logs"
},
{
from: "./config/",
to: "../config",
to: "../config"
},
{
from: "./dialogstatic/",
to: "../dialogstatic",
to: "../dialogstatic"
},
{
from: "./html/",
to: "../html",
to: "../html"
},
{
from: "./huiLiCaiImg/",
to: "../huiLiCaiImg",
to: "../huiLiCaiImg"
},
{
from: "scripts", // 本地脚本目录
to: "scripts", // 输出到 resources/scripts
filter: ["**/*"], // 包含所有文件
},
filter: ["**/*"] // 包含所有文件
}
],
win: {
......@@ -142,16 +146,16 @@ module.exports = {
target: [
{
target: "nsis",
arch: ["x64", "ia32"], // 支持64位和32位系统
},
],
arch: ["x64", "ia32"] // 支持64位和32位系统
}
]
},
nsis: {
oneClick: false, // 禁用一键安装
allowToChangeInstallationDirectory: true, // 允许用户更改安装目录
perMachine: true, // 为所有用户安装
},
},
},
},
perMachine: true // 为所有用户安装
}
}
}
}
};
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