BYD/structureplugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangzhijiang
2024-03-08 16:58:30 +08:00
parent 61e9e46e2e 5cad5fcf4d
commit dba75f37ef
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue
+6 -6
View File
@@ -81,7 +81,7 @@
<div @click="closeView(item)" class="addRemarkBtn" v-show="item.closeBtn"> <div @click="closeView(item)" class="addRemarkBtn" v-show="item.closeBtn">
<a-icon type="close-circle" class="iconClass"/></div> <a-icon type="close-circle" class="iconClass"/></div>
</div> </div>
<div v-if="item.addModalState" style="margin-top: 18px"> <div v-if="item.addModalState" style="margin-top: 40px">
<a-textarea <a-textarea
v-model.trim="item.remark" v-model.trim="item.remark"
:maxlength="500" :maxlength="500"
@@ -165,7 +165,7 @@
<div @click="closeView(item)" class="addRemarkBtn" v-show="item.closeBtn"> <div @click="closeView(item)" class="addRemarkBtn" v-show="item.closeBtn">
<a-icon type="close-circle" class="iconClass"/></div> <a-icon type="close-circle" class="iconClass"/></div>
</div> </div>
<div v-if="item.addModalState" style="margin-top: 18px"> <div v-if="item.addModalState" style="margin-top: 40px">
<a-textarea <a-textarea
v-model.trim="item.remark" v-model.trim="item.remark"
:maxlength="500" :maxlength="500"
@@ -659,7 +659,7 @@ export default {
} }
.detail-content-left-item { .detail-content-left-item {
padding: 16px 20px; padding: 16px 20px 28px 20px;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #EFF1F3; border: 1px solid #EFF1F3;
cursor: pointer; cursor: pointer;
@@ -668,7 +668,7 @@ export default {
} }
.detail-content-right-item { .detail-content-right-item {
padding: 16px 20px; padding: 16px 20px 28px 20px;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #EFF1F3; border: 1px solid #EFF1F3;
cursor: pointer; cursor: pointer;
@@ -843,8 +843,8 @@ export default {
} }
.addRemarkBtn{ .addRemarkBtn{
position: absolute; position: absolute;
bottom: 0; bottom: -26px;
right: -19px; right: 0;
/*z-index: 10;*/ /*z-index: 10;*/
} }
.iconClass{ .iconClass{
jero-web/src/views/documentTool/documentComparison/modules/viewDifferenceModal.vue
+6 -6
View File
@@ -33,7 +33,7 @@
<div @click="closeView" class="addRemarkBtn" v-show="oldCloseBtn"> <div @click="closeView" class="addRemarkBtn" v-show="oldCloseBtn">
<a-icon type="close-circle" class="iconClass"/></div> <a-icon type="close-circle" class="iconClass"/></div>
</div> </div>
<div v-if="oldAddModalState" style="margin-top: 10px"> <div v-if="oldAddModalState" style="margin-top: 38px">
<a-textarea <a-textarea
v-model.trim="oldRemark" v-model.trim="oldRemark"
:maxlength="500" :maxlength="500"
@@ -66,7 +66,7 @@
<div @click="newCloseView" class="addRemarkBtn" v-show="newCloseBtn"> <div @click="newCloseView" class="addRemarkBtn" v-show="newCloseBtn">
<a-icon type="close-circle" class="iconClass"/></div> <a-icon type="close-circle" class="iconClass"/></div>
</div> </div>
<div v-if="newAddModalState" style="margin-top: 10px"> <div v-if="newAddModalState" style="margin-top: 38px">
<a-textarea <a-textarea
v-model.trim="newRemark" v-model.trim="newRemark"
:maxlength="500" :maxlength="500"
@@ -254,7 +254,7 @@ export default {
} }
.detail-content-left-item { .detail-content-left-item {
padding: 16px 20px; padding: 16px 20px 28px 20px;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #fff; border: 1px solid #fff;
cursor: pointer; cursor: pointer;
@@ -263,7 +263,7 @@ export default {
} }
.detail-content-right-item { .detail-content-right-item {
padding: 16px 20px; padding: 16px 20px 28px 20px;
box-sizing: border-box; box-sizing: border-box;
/*border: 1px solid #EFF1F3;*/ /*border: 1px solid #EFF1F3;*/
cursor: pointer; cursor: pointer;
@@ -305,7 +305,7 @@ export default {
} }
.addRemarkBtn{ .addRemarkBtn{
position: absolute; position: absolute;
bottom: 0; bottom: -26px;
right: -20px; right: 0;
} }
</style> </style>