Commit 0d5acd12 by zhuzhequan

Merge branch 'dev' into 'master'

Dev

See merge request !76
parents f18d4579 b553e00f
......@@ -316,8 +316,8 @@
<ElDropdownMenu>
<ElDropdownItem
:loading="tifDownloadLoading"
@click="downloadTif('tiff', 40)"
>TIF(40cm)</ElDropdownItem
@click="downloadTif('tiff', 42)"
>TIF(40+2cm)</ElDropdownItem
>
<ElDropdownItem
:loading="tifDownloadLoading"
......@@ -326,8 +326,8 @@
>
<ElDropdownItem
:loading="pngDownloadLoading"
@click="downloadTif('png', 40)"
>PNG(40cm)</ElDropdownItem
@click="downloadTif('png', 42)"
>PNG(40+2cm)</ElDropdownItem
>
<ElDropdownItem
:loading="pngDownloadLoading"
......@@ -2215,7 +2215,7 @@
</el-form-item>
<el-form-item label="排版宽度:" prop="type">
<el-radio-group v-model="typesettingForm.templateWidth">
<el-radio :value="40">40cm</el-radio>
<el-radio :value="42">40+2cm</el-radio>
<el-radio :value="60">60cm</el-radio>
</el-radio-group>
</el-form-item>
......
......@@ -280,8 +280,8 @@
<ElDropdownMenu>
<ElDropdownItem
:loading="tifDownloadLoading"
@click="downloadTif('tiff', 40)"
>TIF(40cm)</ElDropdownItem
@click="downloadTif('tiff', 42)"
>TIF(40+2cm)</ElDropdownItem
>
<ElDropdownItem
:loading="tifDownloadLoading"
......@@ -290,8 +290,8 @@
>
<ElDropdownItem
:loading="pngDownloadLoading"
@click="downloadTif('png', 40)"
>PNG(40cm)</ElDropdownItem
@click="downloadTif('png', 42)"
>PNG(40+2cm)</ElDropdownItem
>
<ElDropdownItem
:loading="pngDownloadLoading"
......@@ -2504,7 +2504,7 @@
</el-form-item>
<el-form-item label="排版宽度:" prop="type">
<el-radio-group v-model="typesettingForm.templateWidth">
<el-radio :value="40">40cm</el-radio>
<el-radio :value="42">40+2cm</el-radio>
<el-radio :value="60">60cm</el-radio>
</el-radio-group>
</el-form-item>
......
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