修改bug

src/views/modules/knowledge/album/detail.vue

@@ -38,7 +38,7 @@
       </div>
       <div class="userEnd">
         <div class="albumPhoto">
-          <img :src="imgUrl"/>
+          <img :src="imgUrl" @click="openPreview(detailDataBase.cover)"/>
           <div>{{detailDataBase.createTime}}</div>
         </div>
       </div>
@@ -134,7 +134,7 @@
                 </div>
               </div>
             </div>
-            <div class="albumList" v-else>
+            <div class="albumList" style="margin-top:0;" v-else>
               <div :key="index" @click="changeCatalogue(index)" :class="albumPkId==item.pkId?'albumitem actionAlbum':'albumitem'" v-for="(item, index) in albumArr">
                 <div class="leftPoint0"></div>
                 <div class="pointText">{{item.name}}</div>
@@ -277,6 +277,7 @@
         </div>
       </div>
     </a-modal>
+    <previewVisible ref="previewVisible"></previewVisible>
   </div>
 </template>
 
@@ -288,13 +289,15 @@ import album from '@/api/knowledge/album'
 import api from '@/api/knowledge/warehouseIndex'
 import pageList from '../components/pageListAlbum'
 import albumList from '../components/albumList'
+import previewVisible from '../components/previewVisible'
 import { ACCESS_TOKEN } from '@/store/mutation-types';
 import {mapState} from "vuex";
 export default {
   name: 'contentData',
   components: {
     pageList,
-    albumList
+    albumList,
+    previewVisible
   },
   computed: {
     ...mapState({
@@ -456,6 +459,9 @@ export default {
     this.init()
   },
   methods: {
+    openPreview(src){
+      this.$refs.previewVisible.openBig(src)
+    },
     //点击加载更多评论
     getMoreList(){
       this.yelpPageNum = this.yelpPageNum+1
@@ -823,6 +829,14 @@ export default {
    },
    changeAction(num){
     this.tapAction = num
+    if(this.$route.query.pkId) {
+      if(this.tapAction==1||this.tapAction==3){
+        this.getApprovals()
+      }
+      if(this.tapAction==2){
+        this.getYelp()
+      }
+    }
    },
    //初始化
    async init() {
@@ -854,6 +868,12 @@ export default {
   }
 }
 </script>
+<style>
+.titleRight .ant-radio-button-wrapper:not(:first-child):before{
+  display: none;
+  background: #000;
+}
+</style>
 <style lang="less" scoped>
 .categoryBox{
   display: inline-block;
@@ -947,29 +967,47 @@ export default {
 }
 .titleRight{
   margin-left: auto;
-  border: 1px solid #EEEEEE;
-  border-radius: 0.416666vw;
+  border: 2px solid #EEEEEE;
+  border-radius: 6px;
   color: #202124;
   font-size: 0.73vw;
   height: 1.875vw;
+  overflow: hidden;
+  background: #EEEEEE;
 }
 .titleRight /deep/.ant-radio-button-wrapper{
+  border-radius: 0vw;
   background: #eee;
   font-weight: 400;
-  border-color: #EEEEEE;
-  height: 1.875vw;
-  line-height: 1.8vw;
+  border-color: #eeeeee00;
+  height: calc(1.875vw - 4px);
+  line-height: calc(1.875vw - 4px);
+  box-shadow: none!important;
+}
+.titleRight /deep/.ant-radio-button-wrapper:focus{
+  box-shadow: none!important;
 }
 .titleRight /deep/.ant-radio-button-wrapper:hover{
   color: #202124;
 }
+.titleRight /deep/.ant-radio-button-wrapper:before{
+  background-color: #d9d9d900;
+}
 .titleRight /deep/.ant-radio-button-wrapper-checked{
+  border-radius: 6px;
+  box-shadow: none!important;
   background: #fff;
   font-weight: 400;
   border-color: #EEEEEE;
   color: #202124;
   box-shadow:none;
 }
+.titleRight /deep/.ant-radio-button{
+  display: none;
+}
+.titleRight /deep/.ant-radio-button-wrapper-checked:focus{
+  box-shadow: none!important;
+}
 .titleRight /deep/.ant-radio-button-wrapper-checked:hover{
   background: #fff;
   border-color: #EEEEEE;

src/views/modules/knowledge/album/index.vue

@@ -60,6 +60,12 @@
             <albumBox :item="item" :scope="scope" @del='del' class="listBoxitem"></albumBox>
           </div>
         </div>
+        <div class="loadingPage" v-show="showLoading">
+          <div class="loadingPageShow">
+            <a-icon type="loading" style="margin-right:10px"/>
+            加载中
+          </div>
+        </div>
       </div>
     </div>
     <pageBar style="padding-bottom: 1.4125vw;" ref="pageBarref" @pageChange="pageChange" :total="total" :pageSize="pageSize"></pageBar>
@@ -105,6 +111,7 @@ export default {
   },
   data() {
     return {
+      showLoading:false,
       delId:'',
       delVisible:false,
       scope:2,//1-我的专辑  2-全部专辑  3-我的点评
@@ -143,6 +150,7 @@ export default {
   methods: {
     //搜索
     searchResult(data){
+      this.pageNum = 1
       this.searchName = decodeURI(data.keyword)
       this.getData()
     },
@@ -186,7 +194,9 @@ export default {
       if(this.searchName!=''){
         postData.params.name = this.searchName
       }
+      this.showLoading=true
       album.query(postData).then((res) => {
+        this.showLoading=false
         this.dataList = res.result.data
         this.total = res.result.totalCount
         this.$refs.pageBarref.setPageNum(this.pageNum)
@@ -326,6 +336,9 @@ export default {
   height: 3vw;
   font-weight: 550;
 }
+.level1Title :hover{
+  color: #406CC4;
+}
 .level1Title div{
   text-overflow:ellipsis;
   overflow: hidden;
@@ -343,6 +356,9 @@ export default {
   overflow: hidden;
   white-space:nowrap;
 }
+.level2:hover{
+  color: #406CC4;
+}
 .userHead{
   margin-right: 1.09375vw;
   text-align: center;
@@ -410,4 +426,21 @@ export default {
   width: 70%;
   margin-top: 4px;
 }
+.loadingPage{
+  width: 59.22vw;
+  height: 40vw;
+  /*background: #0000007a;*/
+  background: none;
+  z-index: 8;
+  display: block;
+  position: absolute;
+}
+.loadingPage div{
+  font-size: 1.2vw;
+  color: #202124;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 </style>

src/views/modules/knowledge/components/albumList.vue

@@ -4,19 +4,21 @@
       <div slot="actions" key="comment-nested-reply-to" >
         <div class="actionBox">
           {{item.createTime}}
-          <div class="albumCallback" @click="showSubmitBox(item.pkId)" v-if="item.state==1">
+          <div class="albumCallback" @click="showSubmitBox(item.pkId,0)" v-if="item.state==1">
             <img src="../../../../image/reply.png" class="btnsty"/>
             回复
           </div>
         </div>
         <div class="submitBoxAlbum" v-show="replyPkid==item.pkId">
           <a-input-search
+            :ref="item.pkId"
             v-model="item.replyComment"
             class="commentAdd"
             placeholder="我也说一句"
             enter-button="提交"
             size="large"
             maxLength="100"
+            @blur="hideReply()"
             @search="reply(-1)"
           />
         </div>
@@ -39,19 +41,22 @@
           <div slot="actions" key="comment-nested-reply-to">
             <div class="actionBox">
               {{item0.createTime}}
-              <div class="albumCallback" @click="showSubmitBox(item0.pkId)"  v-if="item0.state==1">
+              <div class="albumCallback" @click="showSubmitBox(item0.pkId,1)"  v-if="item0.state==1">
                 <img src="../../../../image/reply.png" class="btnsty"/>
                 回复
               </div>
             </div>
             <div class="submitBoxAlbum" v-show="replyPkid==item0.pkId">
+              {{item0.pkId}}
               <a-input-search
+                :ref="item0.pkId"
                 v-model="item0.replyComment"
                 class="commentAdd commentAddlevel2"
                 placeholder="我也说一句"
                 enter-button="提交"
                 size="large"
                 maxLength="100"
+                @blur="hideReply()"
                 @search="reply(index0)"
               >
               <div slot="prefix" style="font-size: 1.14583vw;">{{item0.replyLeft}}</div>
@@ -84,6 +89,7 @@ import header1 from '../../../../image/header1.png'
 import home from '@/api/knowledge/home'
 import contentData from '@/api/knowledge/contentData'
 import {mapState} from "vuex";
+import { toString } from 'lodash';
 export default {
   props: {
     item: {
@@ -109,15 +115,30 @@ export default {
   created() {
   },
   methods: {
+    hideReply(){
+      let that = this
+      that.replyPkid = ''
+    },
     showMoreData(){
       this.showAll = true
     },
-    showSubmitBox(pkId){
+    showSubmitBox(pkId,type){
       if(this.replyPkid==pkId){
         this.replyPkid = ''
       }else{
         this.replyPkid = pkId
       }
+      let that = this
+      setTimeout(function(){
+        let pkIdStr = pkId.toString()
+        if(type==0){
+          that.$refs[pkIdStr].focus()
+        }else{
+          that.$refs[pkIdStr][0].focus()
+        }
+      },300)
+      //let inputEle = document.getElementById(pkId);
+      //inputEle.focus();
     },
     lookDetail(data){
       if(this.type=='list0'||this.type=='list1'){
@@ -143,7 +164,13 @@ export default {
           secretType:data.secretType
         }
         home.viewApi(getData).then((res) => {
-          window.open(res.data)
+          let datares = res.data
+          if(this.item.documentPath.indexOf('dcc系统')==0){
+            var encrypts = encrypt(this.user.userId);
+            window.open(datares.url+"&userId="+encrypts)
+          }else{
+            window.open(datares.url)
+          }
         })
       }
     },

src/views/modules/knowledge/components/pageList.vue

@@ -53,6 +53,10 @@
       <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>
+    <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>
     <div class="listItem listContent"  v-if="type=='home'">
       位于：{{item.documentPath}}
     </div>
@@ -190,12 +194,12 @@ export default {
           secretType:data.secretType
         }
         home.viewApi(getData).then((res) => {
+          let datares = res.data
           if(this.item.documentPath.indexOf('dcc系统')==0){
             var encrypts = encrypt(this.user.userId);
-            console.log(this.user);
-            window.open(res.data+"&userId="+encrypts)
+            window.open(datares.url+"&userId="+encrypts)
           }else{
-            window.open(res.data)
+            window.open(datares.url)
           }
         })
       }

src/views/modules/knowledge/components/previewVisible.vue

@@ -0,0 +1,41 @@
+<template>
+  <div>
+    <a-modal :closable="false" class="previewImg" width="50%" :visible="previewVisible" :footer="null" @cancel="handleCancel">
+      <img alt="example" style="width: 100%;margin-top: -1vw;" :src="'/api/api-system/system/core/sysFile/previewFile?fileId='+imgStr"/>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+  },
+  data() {
+    return {
+      previewVisible: false,
+      imgStr: ''
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    //打开大图
+    openBig(data){
+      this.imgStr=data
+      this.previewVisible = true
+    },
+    //关闭大图
+    handleCancel(){
+      this.previewVisible = false
+    },
+  }
+}
+</script>
+
+<style scoped>
+.previewImg /deep/.ant-modal-content{
+  background: none;
+  box-shadow: none;
+}
+</style>

src/views/modules/knowledge/home.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="homePage" id="homePage">
     <a-back-top :target="targetfn"/>
-    <a-carousel autoplay>
+    <a-carousel autoplay v-if="!showTap">
       <div v-for="(item, index) in bannerArr" :key="index" @click="goKnowledge(item)">
         <!--<img src="../../../image/banner.jpg" class="bannerClass"/>-->
         <img :src="'/api/api-system/system/core/sysFile/previewFile?fileId='+item.bannerFile" class="bannerClass"/>
@@ -9,17 +9,23 @@
         <p class="bannerContent">{{item.summary}}</p>
       </div>
     </a-carousel>
-    <search :hideSelect="true" searchWidth="59.58vw" class="searchbar" @searchResult="searchResult"></search>
-    <div class="searchBox">
+    <div class="searchHead">
+      <search :hideSelect="true" searchWidth="59.58vw" class="searchbar" @searchResult="searchResult"></search>
       <div class="tabBoxHome" v-if="showTap">
         <div v-for="(item, index) in tapArr" :key="index" @click="changeAction(index)" v-show="item.show">
-          <span>{{item.name}}</span>
+          <span v-if="index==2" style="padding-left: 0vw;">{{item.name}}</span>
+          <span v-else-if="index==3" style="padding-left: 0.7vw;">{{item.name}}</span>
+          <span v-else>{{item.name}}</span>
           <img v-if="tapAction==index" src="../../../image/tabAction.png"/>
         </div>
         <div class="orderBox">
           <div @click="changeOrder(index)" v-for="(item, index) in orderArr" :key="index" :class="orderFiled==index?'orderAction':''">{{item}}</div>
         </div>
       </div>
+    </div>
+    
+    <div class="searchBox">
+      
       <div class="noDataBox" v-if="dataList.length==0">
         <img src="../../../image/noDataNew.png" class="noData"/>
         <p class="noDataText">暂无搜索结果</p>
@@ -27,7 +33,7 @@
       <div v-else class="DataBox">
         <div class="listBox">
           <div class="listBoxItem" v-for="(item, index) in dataList" :key="index">
-            <pageList :item="item" type="home"></pageList>
+            <pageList class="listSearchBox listItemClass" :item="item" type="home"></pageList>
           </div>
         </div>
       </div>
@@ -244,6 +250,7 @@ export default {
 .homePage{
   height: calc(100% - 0vw);
   overflow: scroll;
+  background: #FAFAFA;
 }
 .ant-carousel >>> .slick-slide {
   text-align: center;
@@ -300,7 +307,7 @@ export default {
 }
 .DataBox{
   width:100%;
-
+  margin-top: 1vw
 }
 .noDataText{
   color:#C0C0C0;
@@ -309,6 +316,7 @@ export default {
 .tabBoxHome{
   width: 100%;
   display: flex;
+  padding: 0px 10.94vw;
 }
 .orderBox div{
   color: #202124;
@@ -322,8 +330,8 @@ export default {
 }
 .tabBoxHome div{
   width: 8.12vw;
-  height:4.17vw;
-  text-align: center;
+  /*height:4.17vw;*/
+  text-align: left;
   float:left;
 }
 .tabBoxHome span{
@@ -333,6 +341,7 @@ export default {
   font-size: 0.9375vw;
   cursor: pointer;
   display: inline-block;
+  padding-left: 0.4vw;
 }
 .tabBoxHome img{
   margin-top: 0.9375vw;
@@ -345,9 +354,7 @@ export default {
   opacity: 0.73;
 }
 .listBoxItem{
-  margin-top: 0.42vw;
-  margin-bottom: 0.83vw;
-  padding: 1.5625vw;
+  /*padding: 0 1.5625vw;*/
 }
 .searchbar{
   margin-top: 1.71875vw!important;
@@ -369,4 +376,19 @@ export default {
   height: 4px;
   background: #5C86D9;
 }
+.searchHead{
+  background: #fff;
+  display: inline-grid;
+  width: 100%;
+  min-height: 7.2vw;
+}
+.listSearchBox{
+  margin-top: 0.42vw;
+  margin-bottom: 1.1vw;
+  padding: 1.5625vw;
+  border-radius: 10px;
+}
+.listItemClass{
+  background: #fff;
+}
 </style>

src/views/modules/knowledge/map/index.vue

@@ -31,7 +31,7 @@
         </div>
         <div v-if="showBoxArr.indexOf(index)>-1">
           <img v-if="overArr.indexOf(index)>-1" src="../../../../image/map/list_bg_over.png" class="pointTextBg"/>
-          <img v-else-if="pointNum==index" src="../../../../image/map/list_bg_over.png" class="pointTextBg"/>
+          <img v-else-if="pointNum==index" src="../../../../image/map/list_bg_over_b.png" class="pointTextBg"/>
           <img v-else src="../../../../image/map/list_bg.png" class="pointTextBg"/>
         </div>
         <img v-if="showBoxArr.indexOf(index)>-1" :src="imgArr[item.imgNum]" class="pointBlock"/>