提交代码

src/layouts/MainHead.vue

@@ -112,6 +112,7 @@ export default {
                   {'key':3,'title':'知识地图','component':'/knowledgePage/mapIndex','menuNavType':2},
                   {'key':4,'title':'知识专辑','component':'/knowledgePage/albumIndex','menuNavType':2},
                   {'key':5,'title':'知识学习','component':'http://www.hkcqjy.com.cn:8088/learning/','menuNavType':2},
+                  {'key':6,'title':'统计分析','component':'/knowledgePage/analysis','menuNavType':2},
                 ], //系统应用
       appSystemMore: [],
       appAdhibition: [], //应用

src/permission.js

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

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

@@ -245,6 +245,7 @@
               maxWidth: '40vw',
               'overflow-x': 'auto'
             }"
+            changeOnSelect
             :getPopupContainer="triggerNode => { return triggerNode.parentNode }"
             :options="classifyListAdd" 
             :fieldNames="{ label: 'name', value: 'pkId', children: 'children' }"

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

@@ -40,7 +40,7 @@
       </div>
       <div class="bottomBox">
         <div class="bottomBoxLeft">
-          <div class="topTitle" style="width: 46vw;padding-bottom:1.2vw;border-bottom:1px solid #f4f6f9">
+          <div class="topTitle textBorder">
             <div>高频搜索词</div>
           </div>
           <div ref="eCharts1" class="wordCloudBox"></div>
@@ -329,6 +329,11 @@ export default {
             textStyle:{
               'color':'#FAFAFB'
             },
+            formatter: params => {
+              //console.log(params.data.name)
+              //const { name, value } = params
+              return params.data.name
+            }
           },
           grid: {
             left: '3%',
@@ -356,18 +361,19 @@ export default {
                   }
               },
               label:{
-                fontSize:18,
-                lineHeight:26
+                fontSize:window.innerWidth/100,
+                lineHeight:window.innerWidth/100
               },
               labelLine:{
+                
                 lineStyle:{
                   color:'#000'
                 },
-                length:60,
+                length:window.innerWidth/100,
                 length2:0
               },
               emphasis: {
-                scaleSize:30,
+                scaleSize:10,
                 itemStyle: {
                   shadowBlur: 10,
                   shadowOffsetX: 0,
@@ -420,7 +426,7 @@ export default {
             width: '100%',
             height: '100%',
             // 词的大小，最小12px，最大60px，可以在这个范围调整词的大小
-            sizeRange: [12, 60],
+            sizeRange: [window.innerWidth/100, window.innerWidth/30],
             // 每个词旋转的角度范围和旋转的步进
             rotationRange: [0, 90],
             rotationStep: 90,
@@ -557,6 +563,7 @@ export default {
   display: flex;
   background: #FAFAFA;
   flex-direction: column;
+  padding-bottom: 2vw;
 }
 .numBox{
   width: 24.73vw;
@@ -682,4 +689,9 @@ export default {
   margin-right: 16px;
   margin-top:8px;
 }
+.textBorder{
+  width: 46vw!important;
+  padding-bottom: 1vw;
+  border-bottom: 1px solid rgb(244, 246, 249);
+}
 </style>

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

@@ -172,7 +172,7 @@ export default {
             return false
           }
           let datares = res.data
-          if(this.item.documentPath.indexOf('dcc系统')==0){
+          if(this.item.documentPath.indexOf('dcc系统')==0||this.item.documentPath.indexOf('DCC系统')==0){
             var encrypts = encrypt(this.user.userId);
             window.open(datares.url+"&userId="+encrypts)
           }else{

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

@@ -203,7 +203,7 @@ export default {
             return false
           }
           let datares = res.data
-          if(this.item.documentPath.indexOf('dcc系统')==0){
+          if(this.item.documentPath.indexOf('dcc系统')==0||this.item.documentPath.indexOf('DCC系统')==0){
             var encrypts = encrypt(this.user.userId);
             window.open(datares.url+"&userId="+encrypts)
           }else{