Skip to content

E
electron-printer
Commit 0d4d8e09 by linjinhong
Options

测试提交

parent c145e81b
Showing with 40 additions and 11 deletions
config/env.json
{ {
"apiApiHost":"http://10.168.1.212:8060/api", "apiApiHost":"http://10.168.31.142:8060/api",
"fileApiUrl":"http://10.168.1.212:80/upload/factory", "fileApiUrl":"http://10.168.31.142:80/upload/factory",
"visionUrl":"https://console.jomalls.com" "visionUrl":"https://console.jomalls.com"
} }
src/views/design/main/index.vue
...@@ -846,9 +846,15 @@ export default { ...@@ -846,9 +846,15 @@ export default {
class="border-col" class="border-col"
style="align-items: stretch;flex-grow: 1" style="align-items: stretch;flex-grow: 1"
> >
<div class="img"> <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="" /> <img class="full-width" src="#" alt="" />
</div> </el-carousel-item>
</el-carousel>
</el-col> </el-col>
<div class="boxLine"></div> <div class="boxLine"></div>
<el-col <el-col
...@@ -880,12 +886,18 @@ export default { ...@@ -880,12 +886,18 @@ export default {
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row class="border-row">
<el-col :span="6" class="text-center">B面</el-col> <el-col :span="6" class="text-center">B面</el-col>
<el-col :span="9" class="border-col"> <el-col :span="9" class="border-col">
<div class="img"> <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="" /> <img class="full-width" src="#" alt="" />
</div> </el-carousel-item>
</el-carousel>
</el-col> </el-col>
<el-col :span="9" style="overflow: hidden;"> <el-col :span="9" style="overflow: hidden;">
<el-checkbox-group <el-checkbox-group
...@@ -1047,7 +1059,8 @@ export default { ...@@ -1047,7 +1059,8 @@ export default {
:style="{ 'background-color': !isView ? '#77797a' : '#fff' }" :style="{ 'background-color': !isView ? '#77797a' : '#fff' }"
> >
<div class="container"> <div class="container">
<div v-if="isView" id="img" style="background-color: #fff; "> <div style="width: 100%;height: 100%; ">
<div v-if="isView" id="img">
<div <div
id="line" id="line"
style="left: 26%;top: 57%;background-color: transparent;overflow: hidden;cursor: none;" style="left: 26%;top: 57%;background-color: transparent;overflow: hidden;cursor: none;"
...@@ -1101,9 +1114,14 @@ export default { ...@@ -1101,9 +1114,14 @@ export default {
style="border-style:dashed" style="border-style:dashed"
></div> ></div>
</div> </div>
<img class="template-img" draggable="false" :src="img" alt="" /> <div style="width: 1040px;height: 100%;"></div>
<!-- <img class="template-img" draggable="false" :src="img" alt="" /> -->
</div> </div>
<div v-else id="line" class="boxShaow"> <div
v-else
style="width: 100%;height: 100%;background-color:#77797a "
>
<div id="line" class="boxShaow">
<!-- <div <!-- <div
class="sucaitu" class="sucaitu"
:style="{ width: gridWH.w + 'px', height: gridWH.h + 'px' }" :style="{ width: gridWH.w + 'px', height: gridWH.h + 'px' }"
...@@ -1180,6 +1198,17 @@ export default { ...@@ -1180,6 +1198,17 @@ export default {
</div> </div>
</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 <print-dialog
:visible="printDialogShow" :visible="printDialogShow"
:imgList="imgList" :imgList="imgList"
...@@ -1483,7 +1512,7 @@ img { ...@@ -1483,7 +1512,7 @@ img {
} }
.border-row { .border-row {
border-top: 1px solid #ececec; border-top: 1px solid #ececec;
border-bottom: 1px solid #ececec; // border-bottom: 1px solid #ececec;
display: flex; display: flex;
width: 100%; width: 100%;
height: 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