Browse Source

提交代码

zhangli 1 year ago
parent
commit
dc1c4de538

+ 1 - 1
src/views/modules/knowledge/album/detail.vue

@@ -147,7 +147,7 @@
               <p class="noDataText">暂无内容</p>
             </div>
             <div v-else class="listBoxItemContent listItemClass" v-for="(item, index) in dataList" :key="index">
-              <pageList :item="item" @delRefresh="delList(index)" :showDelete="showDelete"></pageList>
+              <pageList :item="item" @delRefresh="delList(index)" :showDelete="showDelete&&isAdd"></pageList>
             </div>
           </div>
         </div>

+ 4 - 2
src/views/modules/knowledge/components/albumList.vue

@@ -116,8 +116,10 @@ export default {
   },
   methods: {
     hideReply(){
-      let that = this
-      that.replyPkid = ''
+      let that = this;
+      setTimeout(function(){
+        that.replyPkid = ''
+      },200)
     },
     showMoreData(){
       this.showAll = true

+ 12 - 5
src/views/modules/knowledge/components/pageList.vue

@@ -51,11 +51,11 @@
     </div>
     <div class="listItem listContent" style="display:flex" v-if="type=='home'&&item.documentRemark!=''&&item.documentRemark!=null">
       <div style="white-space: nowrap;">摘要:</div>
-      <div class="documentRemarkBox" v-html="item.documentRemark!=null?item.documentRemark.replaceAll('\n\r','</br>').replaceAll('\r\n','</br>').replaceAll('\n','</br>').replaceAll('\r','</br>'):''"></div>
+      <div class="documentRemarkBox" v-html="item.documentRemark!=null?item.documentRemark.replaceAll('\n\r','&nbsp;&nbsp;&nbsp;&nbsp;').replaceAll('\r\n','&nbsp;&nbsp;&nbsp;&nbsp;').replaceAll('\n','&nbsp;&nbsp;&nbsp;&nbsp;').replaceAll('\r','&nbsp;&nbsp;&nbsp;&nbsp;'):''"></div>
     </div>
     <div class="listItem listContent" style="display:flex" v-if="type=='home'&&item.documentContent!=''&&item.documentContent!=null">
       <div style="white-space: nowrap;">附件:</div>
-      <div class="documentRemarkBox" v-html="item.documentContent!=null?item.documentContent.replaceAll('\n\r','</br>').replaceAll('\r\n','</br>').replaceAll('\n','</br>').replaceAll('\r','</br>'):''"></div>
+      <div class="documentRemarkBox" v-html="item.documentContent!=null?item.documentContent.replaceAll('\n\r','&nbsp;&nbsp;&nbsp;&nbsp;').replaceAll('\r\n','&nbsp;&nbsp;&nbsp;&nbsp;').replaceAll('\n','&nbsp;&nbsp;&nbsp;&nbsp;').replaceAll('\r','&nbsp;&nbsp;&nbsp;&nbsp;'):''"></div>
     </div>
     <div class="listItem listContent"  v-if="type=='home'">
       位于:{{item.documentPath}}
@@ -66,9 +66,12 @@
       <img v-else-if="item.documentType==3" src="../../../../image/fileType3.png"/>
       <img v-else-if="item.documentType==4" src="../../../../image/fileType4.png"/>
       <img v-else src="../../../../image/fileType0.png"/>
-      <span v-if="item.documentType<5">{{typeArr[(item.documentType-1)]}}</span>
-      <span v-else>{{typeArr[4]}}</span>
-      <span class="listTime">{{item.uploadTime}}</span>
+      <span v-if="item.documentType<5" class="bottomText">{{typeArr[(item.documentType-1)]}}</span>
+      <span v-else class="bottomText">{{typeArr[4]}}</span>
+      <span style="float:left;font-size: 0.2vw;">|</span>
+      <img src="../../../../image/lookTime.png" style="margin-left: 0.52vw;"/>
+      <span class="bottomText">{{item.viewNum}}</span>
+      <span class="listTime bottomText">{{item.uploadTime}}</span>
     </div>
     <div class="listItem listBottom1" v-if="type=='list1'">
       <div v-for="(item0, index) in item.categoryArr" :key="index">
@@ -393,4 +396,8 @@ export default {
   -webkit-line-clamp: 4;
   overflow: hidden;
 }
+.bottomText{
+  margin-top: -0.1vw;
+  float: left;
+}
 </style>