zhangli 2 سال پیش
والد
کامیت
927dbaca4a

+ 2 - 0
src/views/modules/knowledge/album/detail.vue

@@ -874,6 +874,7 @@ export default {
   margin: 0px 10.94vw;
   border-bottom-left-radius: 10px;
   border-bottom-right-radius: 10px;
+  margin-bottom: 2vw;
 }
 .noDataBox{
   width: 100%;
@@ -1121,6 +1122,7 @@ export default {
 }
 .tableBoxAlbum /deep/.ant-table-column-title{
   font-weight: 550;
+  font-size: 0.9375vw;
 }
 .tableBoxAlbum /deep/.ant-table-tbody{
   font-size: 0.9375vw;

+ 1 - 12
src/views/modules/knowledge/components/onlyOffice.vue

@@ -100,18 +100,7 @@ import home from '@/api/knowledge/home'
           height: '100%',
           events: {
             "onRequestInsertImage":function (event) {
-              that.docEditor.insertImage({
-                "c": "watermark",
-                "images": [
-                    {
-                        "fileType": "jpg",
-                        "url": "http://yz.rdaosoft.com/bgdh/Public/images/004.jpg"
-                    }
-                ],
-                "fileType": "jpg",
-                //"url": "http://10.5.100.64:9900/api/api-system/system/core/sysFile/previewFile?fileId=1602843876539887617"
-                "url": "http://yz.rdaosoft.com/bgdh/Public/images/004.jpg"
-              });
+              
             },
             onDocumentReady:function(data){
               that.showLoading = false

+ 3 - 1
src/views/modules/knowledge/components/pageListAlbum.vue

@@ -182,6 +182,7 @@ export default {
 }
 .listBottom1 div{
   float: left;
+  display: flex;
 }
 .listBottom{
   margin-top: 1.4vw;
@@ -202,7 +203,8 @@ export default {
 }
 .lineBox{
   margin: 0px 0.8333vw;
-  margin-top: 0.34vw;
+  margin-top: 0.5vw;
+  height: 0.6vw;
 }
 .delBoxMain{
   text-align: center;

+ 9 - 5
src/views/modules/knowledge/components/pageListMap.vue

@@ -18,15 +18,15 @@
       <div class="listItem listTitle">
         {{item.titles}}<div v-if="item.state==0" class="studyType0">未学习</div><div v-else class="studyType1">已学习</div>
       </div>
-      <div class="listItem listContent" v-if="item.summary!=null">
-        {{item.summary}}
+      <div class="listItem listContent" v-if="item.summary!=null" v-html="item.summary!=null?item.summary.replaceAll('\n\r','</br>').replaceAll('\r\n','</br>').replaceAll('\n','</br>').replaceAll('\r','</br>').replace('\\n','</br>'):''">
+        
       </div>
       <div class="listItem listBottom1" v-if="item.categoryArr.length!=0">
         <div v-for="(item0, index) in item.categoryArr" :key="index">
           <div>
             {{item0}}
           </div>
-          <a-divider style="margin-top: 0.5vw;" v-if="index!=(item.categoryArr.length-1)" class="lineBox" type="vertical" />
+          <a-divider style="margin-top: 0.4vw;" v-if="index!=(item.categoryArr.length-1)" class="lineBox" type="vertical" />
         </div>
       </div>
       <div class="listItem listBottom">
@@ -40,7 +40,7 @@
             <span v-if="item.documentType<5">{{typeArr[(item.documentType-1)]}}</span>
             <span v-else>{{typeArr[4]}}</span>
           </div>
-          <a-divider class="lineBox" type="vertical" />
+          <a-divider class="lineBox" style="margin-top: 0.2vw;" type="vertical" />
         </template>
         <div>
           <img src="../../../../image/lookTime.png"/>
@@ -190,11 +190,14 @@ export default {
 }
 .listBottom1 div{
   float: left;
+  display: flex;
 }
 .listBottom{
   margin-top: 1.4vw;
   font-size: 0.83vw;
   color: #C0C0C0;
+  display: flex;
+  align-items: center;
 }
 .listBottom div{
   float: left;
@@ -212,7 +215,8 @@ export default {
 }
 .lineBox{
   margin: 0px 0.8333vw;
-  margin-top: 0.34vw;
+  margin-top: 0.5vw;
+  height:  0.8vw;
 }
 .studyType0{
   width: 3.02vw;

+ 7 - 2
src/views/modules/knowledge/map/list.vue

@@ -3,7 +3,7 @@
     <div class="userTop">
       <div class="userMidle">
         <p class="userMidleName">{{ dataDetail.title }}</p>
-        <p class="userMidleNum">上传文件数量<span>{{ dataDetail.contentTotal }}</span></p>
+        <p class="userMidleNum"><span>上传文件数量</span><span>{{ dataDetail.contentTotal }}</span></p>
       </div>
     </div>
     <div class="tabBoxContent">
@@ -287,7 +287,12 @@ export default {
   font-size: 0.83333vw;
   text-align: left;
 }
-.userMidleNum span{
+.userMidleNum span:first-child{
+  float: left;
+  padding-top:0.22vw;
+}
+.userMidleNum span:last-child{
+  float: left;
   color: #202124;
   font-size: 1.04166vw;
   margin-left: 0.4166vw;