|
|
@@ -147,8 +147,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
- <div style="vertical-align: middle;border-bottom: #E2E4EE solid 1px;padding-bottom: 12px; padding-top: 11px;"
|
|
|
- >
|
|
|
+ <div style="vertical-align: middle;border-bottom: #E2E4EE solid 1px;padding-bottom: 12px; padding-top: 11px;">
|
|
|
<div style="display: inline-flex; width:24%;text-align: left; margin-bottom: 10px;">
|
|
|
<div style="font-size:12px;
|
|
|
font-family:MicrosoftYaHei;
|
|
|
@@ -283,7 +282,9 @@
|
|
|
</el-checkbox>
|
|
|
</div>
|
|
|
|
|
|
- <div style="width: 100%;display: inline-flex; padding: 12px 0 ;border-bottom: #E2E4EE solid 1px; margin-left:-20px; padding-left: 20px;" v-show="panelState == 12">
|
|
|
+ <div
|
|
|
+ style="width: 100%;display: inline-flex; padding: 12px 0 ;border-bottom: #E2E4EE solid 1px; margin-left:-20px; padding-left: 20px;"
|
|
|
+ v-show="panelState == 12">
|
|
|
<div>
|
|
|
<div :style="{ backgroundImage: 'url(' + element.imgSrc + ')','width':'100px', 'height':'100px','background-repeat': 'no-repeat',
|
|
|
'background-position': 'center',
|
|
|
@@ -329,12 +330,11 @@
|
|
|
line-height: 24px;
|
|
|
color:rgba(255,255,255,1);" @click="setGroup(element)">{{element.children.length>0?'解组':'组合'}}</div>
|
|
|
</div>
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
- <div style="border-bottom: #E2E4EE solid 1px; width: 100%;padding-left: 20px; padding-bottom: 11px;"
|
|
|
- >
|
|
|
+ <div style="border-bottom: #E2E4EE solid 1px; width: 100%;padding-left: 20px; padding-bottom: 11px;">
|
|
|
<div>
|
|
|
<div style="font-size:12px;
|
|
|
font-family:MicrosoftYaHei;
|
|
|
@@ -390,14 +390,14 @@
|
|
|
<div class="item"></div>
|
|
|
<div style="border-bottom: #E2E4EE solid 1px; padding-bottom: 11px;" v-show="panelState!=14">
|
|
|
<div style="display:flex; flex-direction: row;margin-left: 18px;">
|
|
|
- <div style="font-size:12px;
|
|
|
+ <div style="font-size:12px;
|
|
|
font-family:MicrosoftYaHei;
|
|
|
color:rgba(51,51,51,1);
|
|
|
display: inline-block;
|
|
|
line-height:38px;">
|
|
|
透明度</div>
|
|
|
- <el-slider v-model="element.opacity" show-input input-size="mini"
|
|
|
- style="width: 80%;margin-left: 10px;"></el-slider>
|
|
|
+ <el-slider v-model="element.opacity" show-input input-size="mini" style="width: 80%;margin-left: 10px;">
|
|
|
+ </el-slider>
|
|
|
</div>
|
|
|
<div style="display:flex; flex-direction: row;margin-left: 18px;">
|
|
|
<span style="font-size:12px;
|
