修改map背景图

src/api/knowledge/home.js

@@ -28,6 +28,14 @@ home.searchKeywordTrack=function (parameter) {
   })
 }
 home.searchApi=function (parameter) {
+  parameter.keyword=parameter.keyword
+              .replace(new RegExp("#",'g'), "%23")
+              .replace(new RegExp("&",'g'), "%26")
+              .replace(/\+/g, "%2B")
+              .replace(new RegExp("//",'g'), "%2F")
+              .replace(new RegExp("=",'g'), "%3D")
+              .replace(/\?/g, "%3F");
+  console.log(parameter)
   var url= '/api-knowledge/search/search';
   let config={
     headers:{'businessKey':'knowlege-manager'}

src/layouts/MainHead.vue

@@ -112,12 +112,12 @@ export default {
       appSystem: [{'key':1,'title':'首页','component':'/knowledgePage/home','menuNavType':2,'initArr':['home','']},
                   {'key':2,'title':'知识仓库','component':'/knowledgePage/warehouseIndex','menuNavType':2,
                   'initArr':['warehouseIndex','searchData','contentData','knowledgeAddUpdate','knowledgeContentInfo','knowledgeAuditInfo']},
-                  {'key':3,'title':'知识地图','component':'/knowledgePage/mapIndex','menuNavType':2,
+                  {'key':'map','title':'知识地图','component':'/knowledgePage/mapIndex','menuNavType':2,
                   'initArr':['mapList','mapIndex']},
                   {'key':4,'title':'知识专辑','component':'/knowledgePage/albumIndex','menuNavType':2,
                   'initArr':['albumDetail','albumIndex']},
                   {'key':5,'title':'知识学习','component':'http://www.hkcqjy.com.cn:8088/learning/','menuNavType':2,'initArr':[]},
-                  //{'key':6,'title':'统计分析','component':'/knowledgePage/analysis','menuNavType':2,'initArr':['analysis']},
+                  {'key':6,'title':'统计分析','component':'/knowledgePage/analysis','menuNavType':2,'initArr':['analysis']},
                   {'key':7,'title':'管理后台','component':'/knowledge/knowledge','menuNavType':2,'initArr':[]},
                 ], //系统应用
       appSystemMore: [],

src/permission.js

@@ -22,9 +22,9 @@ router.beforeEach((to, from, next) => {
             data.ussd='{"id":"'+to.query.pkId+'","type":""}'
         }
         if(to.meta.subModule!='详情'||to.query.pkId){
-            /*analysis.pageTrack(data).then((res) => {
+            analysis.pageTrack(data).then((res) => {
 
-            })*/
+            })
         }
     }
     // next();

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

@@ -60,8 +60,8 @@
             <albumBox :item="item" :scope="scope" @del='del' class="listBoxitem"></albumBox>
           </div>
         </div>
-        <div class="loadingPage" v-show="showLoading">
-          <div class="loadingPageShow">
+        <div class="loadingPageAlbum" v-show="showLoading">
+          <div class="loadingPageAlbumShow">
             <a-icon type="loading" style="margin-right:10px"/>
             加载中
           </div>
@@ -430,7 +430,7 @@ export default {
   width: 70%;
   margin-top: 4px;
 }
-.loadingPage{
+.loadingPageAlbum{
   width: 59.22vw;
   height: 40vw;
   /*background: #0000007a;*/
@@ -439,7 +439,7 @@ export default {
   display: block;
   position: absolute;
 }
-.loadingPage div{
+.loadingPageAlbum div{
   font-size: 1.2vw;
   color: #202124;
   height: 100%;

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

@@ -173,9 +173,9 @@ export default {
             page:datares.url,
             platform:datares.systemName,
           }
-          /*analysis.pageTrack(data).then((res) => {
+          analysis.pageTrack(data).then((res) => {
 
-          })*/
+          })
          // window.open(res.data)
         })
       }

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

@@ -372,7 +372,7 @@ export default {
   margin-bottom:0px;
 }
 .rightMenu{
-  background:url('../../../../image/map/main_bg.png') no-repeat;
+  background:url('../../../../image/map/main_bg_bb.png') no-repeat;
   background-size: 100% 100%;
   width: 86.71875vw;
   height: 46.25vw;

src/views/modules/knowledge/warehouse/knowledgeAddUpdate.vue

@@ -224,7 +224,7 @@ export default {
         },
         {
           title: '审批人',
-          dataIndex: 'approverName',
+          dataIndex: 'approverAndActualName',
           align: 'center'
         },
         {
@@ -306,7 +306,8 @@ export default {
         this.knowledgeForm.attachment = res.data.attachment
         this.knowledgeForm.attachmentName = res.data.attachmentName
         this.knowledgeForm.organizationIds = res.data.organizationIds
-        this.approverData = res.data.approvals
+        //this.approverData = res.data.approvals
+        this.getApprover()
         this.knowledgeForm.createBy = res.data.createBy
         this.knowledgeForm.author = res.data.author
         //res.data.organizationId='[{\"organizationId\":\"C0000\",\"organizationName\":\"惠科集团\",\"organizationTree\":[\"惠科集团\"]},{\"gradeId\":\"O/F\",\"gradeName\":\"制造职系\"},{\"gradeLevelId\":\"1\",\"gradeLevelName\":\"1\"}]'

src/views/modules/knowledge/warehouse/knowledgeAuditInfo.vue

@@ -2,8 +2,8 @@
   <div class="page">
     <div class="content">
       <div style="margin-left: -6.44vw;" class="btnGoBack" @click="goBack"><a-icon type="left" />返回</div>
-      <img :src="(knowledgeForm.approvalStatus==1||knowledgeForm.approvalStatus==3) ? audit : reject" style="width:8.22vw;height:8.22vw;position:absolute;top:2.08vw;right:5vw;" alt="">
-      <div class="document-style">文档状态: <span :style="{color: (knowledgeForm.approvalStatus==1||knowledgeForm.approvalStatus==3) ? '#FF900D' : '#F84E4C' }" >{{ (knowledgeForm.approvalStatus==1||knowledgeForm.approvalStatus==3) ? '审批中' : '驳回' }}</span></div>
+      <img v-if="knowledgeForm.approvalStatus!=5" :src="(knowledgeForm.approvalStatus==1||knowledgeForm.approvalStatus==3) ? audit : reject" style="width:8.22vw;height:8.22vw;position:absolute;top:2.08vw;right:5vw;" alt="">
+      <div class="document-style">文档状态: <span :style="{color: (knowledgeForm.approvalStatus==1||knowledgeForm.approvalStatus==3||knowledgeForm.approvalStatus==5) ? '#FF900D' : '#F84E4C' }" >{{ (knowledgeForm.approvalStatus==1||knowledgeForm.approvalStatus==3) ? '审批中' : knowledgeForm.approvalStatus==5?'审批通过':'驳回' }}</span></div>
       <a-divider style="margin:0;background:#eeeeee!important;" />
       <div class="content-info">
         <div class="title-style">所选分类</div>
@@ -79,7 +79,7 @@ export default {
         },
         {
           title: '审批人',
-          dataIndex: 'approverName',
+          dataIndex: 'approverAndActualName',
           align: 'center'
         },
         {

src/views/modules/knowledge/warehouse/knowledgeContentInfo.vue

@@ -100,9 +100,9 @@ export default {
           }
           //console.log(postData)
           if(this.$route.query.type==1||this.$route.query.type==2){
-            /*analysis.pageTrack(postData).then((res) => {
+            analysis.pageTrack(postData).then((res) => {
 
-            })*/
+            })
           }
         }
       })