|
|
|
@ -305,7 +305,7 @@
|
|
|
|
|
</p>
|
|
|
|
|
<p v-else><a-icon type="check" :style="{ color: 'green' }" /></p>
|
|
|
|
|
<p>{{ item.fieldName }}:</p>
|
|
|
|
|
<p v-if="isDiff" v-html="item.mergeHtml"></p>
|
|
|
|
|
<p v-if="!isDiff" v-html="item.mergeHtml"></p>
|
|
|
|
|
<p v-else>{{ item.targetVal }}</p>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
@ -334,7 +334,7 @@
|
|
|
|
|
</p>
|
|
|
|
|
<p v-else><a-icon type="check" :style="{ color: 'green' }" /></p>
|
|
|
|
|
<p>{{ item.fieldName }}:</p>
|
|
|
|
|
<p v-if="isDiff" v-html="item.mergeHtml"></p>
|
|
|
|
|
<p v-if="!isDiff" v-html="item.mergeHtml"></p>
|
|
|
|
|
<p v-else>{{ item.targetVal }}</p>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|