Skip to content

E
electron-printer
Commit 0d4d8e09 by linjinhong
Options

测试提交

parent c145e81b
Showing with 154 additions and 125 deletions
config/env.json
{
"apiApiHost":"http://10.168.1.212:8060/api",
"fileApiUrl":"http://10.168.1.212:80/upload/factory",
"apiApiHost":"http://10.168.31.142:8060/api",
"fileApiUrl":"http://10.168.31.142:80/upload/factory",
"visionUrl":"https://console.jomalls.com"
}
src/views/design/main/index.vue
......@@ -846,9 +846,15 @@ export default {
class="border-col"
style="align-items: stretch;flex-grow: 1"
>
<div class="img">
<img class="full-width" src="#" alt="" />
</div>
<el-carousel
height="150px"
:autoplay="false"
indicator-position="none"
>
<el-carousel-item v-for="item in 4" :key="item">
<img class="full-width" src="#" alt="" />
</el-carousel-item>
</el-carousel>
</el-col>
<div class="boxLine"></div>
<el-col
......@@ -880,12 +886,18 @@ export default {
</el-col>
</el-row>
<el-row>
<el-row class="border-row">
<el-col :span="6" class="text-center">B面</el-col>
<el-col :span="9" class="border-col">
<div class="img">
<img class="full-width" src="#" alt="" />
</div>
<el-carousel
height="150px"
:autoplay="false"
indicator-position="none"
>
<el-carousel-item v-for="item in 4" :key="item">
<img class="full-width" src="#" alt="" />
</el-carousel-item>
</el-carousel>
</el-col>
<el-col :span="9" style="overflow: hidden;">
<el-checkbox-group
......@@ -1047,137 +1059,154 @@ export default {
:style="{ 'background-color': !isView ? '#77797a' : '#fff' }"
>
<div class="container">
<div v-if="isView" id="img" style="background-color: #fff; ">
<div
id="line"
style="left: 26%;top: 57%;background-color: transparent;overflow: hidden;cursor: none;"
>
<div style="width: 100%;height: 100%; ">
<div v-if="isView" id="img">
<div
class="sucaitu vieWsucaitu"
:style="{ width: '100%', height: '100%' }"
id="line"
style="left: 26%;top: 57%;background-color: transparent;overflow: hidden;cursor: none;"
>
<vue-drag-resize-rotate
:w="item.w / WHproportion"
class-name="my-drag-resize-rotate"
:prevent-deactivation="false"
:h="item.h / WHproportion"
:x="item.x / WHproportion"
:z="item.zIndex / WHproportion"
:aspectRatio="false"
:isActive="false"
:y="item.y / WHproportion"
v-for="(item, index) in imgList"
:key="index"
:draggable="false"
:resizable="false"
:rotatable="false"
:angle="item.r / WHproportion"
style="pointer-events: auto;cursor: default"
<div
class="sucaitu vieWsucaitu"
:style="{ width: '100%', height: '100%' }"
>
<div
ref="sucaitu-img"
:style="{ zIndex: item.zIndex }"
class="sucaitu-img img element"
style="cursor: default"
<vue-drag-resize-rotate
:w="item.w / WHproportion"
class-name="my-drag-resize-rotate"
:prevent-deactivation="false"
:h="item.h / WHproportion"
:x="item.x / WHproportion"
:z="item.zIndex / WHproportion"
:aspectRatio="false"
:isActive="false"
:y="item.y / WHproportion"
v-for="(item, index) in imgList"
:key="index"
:draggable="false"
:resizable="false"
:rotatable="false"
:angle="item.r / WHproportion"
style="pointer-events: auto;cursor: default"
>
<img
crossOrigin="anonymous"
:src="item.url"
:id="item.fileName + '_' + index"
alt=""
style="width: 100%;height: 100%"
class="sucaitu-img"
/>
</div>
</vue-drag-resize-rotate>
<div
ref="sucaitu-img"
:style="{ zIndex: item.zIndex }"
class="sucaitu-img img element"
style="cursor: default"
>
<img
crossOrigin="anonymous"
:src="item.url"
:id="item.fileName + '_' + index"
alt=""
style="width: 100%;height: 100%"
class="sucaitu-img"
/>
</div>
</vue-drag-resize-rotate>
</div>
<div
:class="{ 'no-border-grid': systemSetting.gridShow !== 1 }"
:style="{
width: 480 + 'px',
height: 540 + 'px',
}"
class="grid"
style="border-style:dashed"
></div>
</div>
<div
:class="{ 'no-border-grid': systemSetting.gridShow !== 1 }"
:style="{
width: 480 + 'px',
height: 540 + 'px',
}"
class="grid"
style="border-style:dashed"
></div>
<div style="width: 1040px;height: 100%;"></div>
<!-- <img class="template-img" draggable="false" :src="img" alt="" /> -->
</div>
<img class="template-img" draggable="false" :src="img" alt="" />
</div>
<div v-else id="line" class="boxShaow">
<!-- <div
<div
v-else
style="width: 100%;height: 100%;background-color:#77797a "
>
<div id="line" class="boxShaow">
<!-- <div
class="sucaitu"
:style="{ width: gridWH.w + 'px', height: gridWH.h + 'px' }"
> -->
<div class="sucaitu" :style="{ width: '100%', height: '100%' }">
<vue-drag-resize-rotate
:w="item.w"
class-name="my-drag-resize-rotate"
:prevent-deactivation="false"
:h="item.h"
:x="item.x"
:z="item.zIndex"
:aspectRatio="true"
:isActive="index === selectIndex"
:y="item.y"
v-for="(item, index) in imgList"
:key="index"
:draggable="true"
:resizable="true"
:rotatable="true"
@dragstop="(a) => dragStop(a, item)"
@resizestop="(a) => resizeStop(a, item)"
@rotatestop="(a) => rotating(a, item)"
:angle="item.r"
>
<div class="sucaitu" :style="{ width: '100%', height: '100%' }">
<vue-drag-resize-rotate
:w="item.w"
class-name="my-drag-resize-rotate"
:prevent-deactivation="false"
:h="item.h"
:x="item.x"
:z="item.zIndex"
:aspectRatio="true"
:isActive="index === selectIndex"
:y="item.y"
v-for="(item, index) in imgList"
:key="index"
:draggable="true"
:resizable="true"
:rotatable="true"
@dragstop="(a) => dragStop(a, item)"
@resizestop="(a) => resizeStop(a, item)"
@rotatestop="(a) => rotating(a, item)"
:angle="item.r"
>
<div
ref="sucaitu-img"
:class="{ active: index === selectIndex }"
:style="{ zIndex: item.zIndex }"
class="sucaitu-img img element"
>
<img
crossOrigin="anonymous"
:src="item.url"
:id="item.fileName + '_' + index"
alt=""
style="width: 100%;height: 100%"
class="sucaitu-img"
/>
<i
@click="delImg(index)"
v-if="index === selectIndex"
class=" close el-icon-close"
></i>
<div
v-if="index === selectIndex"
class="control-point control-rotator"
></div>
</div>
</vue-drag-resize-rotate>
</div>
<div
ref="sucaitu-img"
:class="{ active: index === selectIndex }"
:style="{ zIndex: item.zIndex }"
class="sucaitu-img img element"
:class="{ 'no-border-grid': systemSetting.gridShow !== 1 }"
:style="{
width: gridWH.w + 'px',
height: gridWH.h + 'px',
}"
class="grid"
>
<img
crossOrigin="anonymous"
:src="item.url"
:id="item.fileName + '_' + index"
alt=""
style="width: 100%;height: 100%"
class="sucaitu-img"
/>
<i
@click="delImg(index)"
v-if="index === selectIndex"
class=" close el-icon-close"
></i>
<div
v-if="index === selectIndex"
class="control-point control-rotator"
></div>
:style="{ height: gridSpacing.h, lineHeight: gridSpacing.h }"
class="grid-row"
v-for="it in 100"
:key="it"
>
<div
:style="{ width: gridSpacing.w, height: gridSpacing.h }"
class="grid-col"
v-for="it in 100"
:key="it"
></div>
</div>
</div>
</vue-drag-resize-rotate>
</div>
<div
:class="{ 'no-border-grid': systemSetting.gridShow !== 1 }"
:style="{
width: gridWH.w + 'px',
height: gridWH.h + 'px',
}"
class="grid"
>
<div
:style="{ height: gridSpacing.h, lineHeight: gridSpacing.h }"
class="grid-row"
v-for="it in 100"
:key="it"
>
<div
:style="{ width: gridSpacing.w, height: gridSpacing.h }"
class="grid-col"
v-for="it in 100"
:key="it"
></div>
</div>
</div>
</div>
<!-- <div style="width: 100%;height: 100%;background-color:#77797a "></div> -->
<img
class="template-img"
draggable="false"
:src="img"
alt=""
style="position: absolute;width: 1040px;left: 4%"
:style="{ 'z-index': isView ? '0' : '-1' }"
/>
</div>
</div>
<print-dialog
......@@ -1483,7 +1512,7 @@ img {
}
.border-row {
border-top: 1px solid #ececec;
border-bottom: 1px solid #ececec;
// border-bottom: 1px solid #ececec;
display: flex;
width: 100%;
height: 100%;
......
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