zhuliu 11 tháng trước cách đây
mục cha
commit
f47596d519

+ 1 - 1
src/views/components/dialog/menuDialog/noveltySearchContrast.vue

@@ -26,7 +26,7 @@
                                         <i class="el-icon-delete" @click.stop="handleRemove(index)"></i>
                                     </span>
                                     </span>
-                                    <el-image fit="contain" ref="image" class="img"  :src="$commonJS.checkViewer(picture)" :preview-src-list="form.pictureUrl.map(item=>$commonJS.checkViewer(form.fileGuid))"></el-image>
+                                    <el-image fit="contain" ref="image" class="img"  :src="$commonJS.checkViewer(picture)" :preview-src-list="form.pictureUrl.map(item=>$commonJS.checkViewer(item))"></el-image>
                                 </span>
                             </template>
                             

+ 10 - 1
src/views/noveltySearch/components/details/components/contrastRecords/contrastRecords.vue

@@ -10,7 +10,16 @@
             <el-table ref="table" class="hideIconTable" :data="tableData" border v-loading="loading" :header-cell-style="{'text-align':'center'}" :maxHeight="tableHeight - 50" row-key="keyId"  :span-method="objectSpanMethod"  @cell-dblclick="cellDblclick" @cell-click="cellClick">
                 <el-table-column v-for="item in column.filter(item=>!item.ifHidden)" :key="item.field" :prop="item.field" :label="item.name"  align="center">
                     <template slot-scope="scope">
-                        <div>
+                        <div v-if="item.field == 'markSelectText'">
+                            <div v-html="`[${scope.row.markSelectField}]${scope.row[item.field]}`"></div>
+                        </div>
+                        <div v-else-if="item.field == 'technicalFeature'">
+                            <div style="width:100px;height:100px">
+                                <el-image v-for="picture in scope.row.systemFileList" :key="picture.guid" fit="contain" ref="image" style="width:100%;height:100%"  :src="$commonJS.checkViewer(picture.guid)" :preview-src-list="scope.row.systemFileList.map(item=>$commonJS.checkViewer(item.guid))"></el-image>
+                            </div>
+                            <div v-html="scope.row[item.field]"></div>
+                        </div>
+                        <div v-else>
                             <div v-if="editedMessage.field && editedMessage.field == item.field && editedMessage.data.id == scope.row.id">
                                 <my-RichText :autoFocus="true" :ref="item.field" :value="scope.row[item.field]" @blur="(value)=>changeMessage(item,scope.row,value)"></my-RichText>
                             </div>