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

@@ -25,7 +25,7 @@
         </div>
       </div>
       <div class="middleBox">
-        <div class="topTitle" style="width: 240px;">
+        <div class="topTitle" style="width: 60%;">
           <div>搜索访问量分布（pv）</div>
           <div>{{format_number(barTotalNum)}}
           </div>
@@ -206,9 +206,9 @@ export default {
               let resStr = ''
               for (let i=0;i<seriesData.length;i++) {
                 if(i==0){
-                  resStr=resStr+"<div class='tooltipBox' style='margin-top:0px'><div class='tooltipLeft' style='background:"+that.colorbarArr[i]+"'></div>&nbsp;&nbsp;&nbsp;&nbsp;"+that.format_number(seriesData[i].data[dataIndex].value)+"&nbsp;&nbsp;&nbsp;&nbsp;"+seriesData[i].percentage[dataIndex]*100+"%</div>"
+                  resStr=resStr+"<div class='tooltipBox' style='margin-top:0px'><div class='tooltipLeft' style='background:"+that.colorbarArr[i]+"'></div>&nbsp;&nbsp;&nbsp;&nbsp;"+that.format_number(seriesData[i].data[dataIndex].value)+"&nbsp;&nbsp;&nbsp;&nbsp;"+that.accMul(seriesData[i].percentage[dataIndex],100)+"%</div>"
                 }else{
-                  resStr=resStr+"<div class='tooltipBox'><div class='tooltipLeft' style='background:"+that.colorbarArr[i]+"'></div>&nbsp;&nbsp;&nbsp;&nbsp;"+that.format_number(seriesData[i].data[dataIndex].value)+"&nbsp;&nbsp;&nbsp;&nbsp;"+seriesData[i].percentage[dataIndex]*100+"%</div>"
+                  resStr=resStr+"<div class='tooltipBox'><div class='tooltipLeft' style='background:"+that.colorbarArr[i]+"'></div>&nbsp;&nbsp;&nbsp;&nbsp;"+that.format_number(seriesData[i].data[dataIndex].value)+"&nbsp;&nbsp;&nbsp;&nbsp;"+that.accMul(seriesData[i].percentage[dataIndex],100)+"%</div>"
                 }
               }
               //const { name, value } = params
@@ -315,6 +315,20 @@ export default {
         pieChart0.setOption(option0);
       })
     },
+    accMul(arg1, arg2){
+        var m = 0, s1 = arg1.toString(), s2 = arg2.toString();
+        try {
+            m += s1.split(".")[1].length;
+        }
+        catch (e) {
+        }
+        try {
+            m += s2.split(".")[1].length;
+        }
+        catch (e) {
+        }
+        return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m);
+    },
     // 饼状图
     getKnowledgeTypeAmount(){
       let that = this
@@ -586,6 +600,7 @@ export default {
   border-radius: 10px;
   height: 24.896vw;
   margin-top: 1.25vw;
+  position: relative;
 }
 .bottomBox{
   width: 100%;
@@ -598,12 +613,14 @@ export default {
   background: #fff;
   border-radius: 10px;
   width: 49.6vw;
+  position: relative;
 }
 .bottomBoxRight{
   height: 20vw;
   background: #fff;
   border-radius: 10px;
   width: 26vw;
+  position: relative;
 }
 .numBox img{
   width: 5.15625vw;

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

@@ -145,21 +145,7 @@ export default {
     },
     lookDetail(data){
       if(this.type=='list0'||this.type=='list1'){
-        if(this.approval) {
-          this.$router.push({
-            name: "knowledgeAuditInfo",
-            query: {
-                pkId: data.pkId
-            }
-          })
-        } else {
-          this.$router.push({
-            name: "knowledgeContentInfo",
-            query: {
-                pkId: data.pkId
-            }
-          })
-        }
+        
       }else{
         let getData = {
           documentId:data.documentId,

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

@@ -115,9 +115,9 @@ export default {
   methods: {
     lookDetail(data){
       if(data.knowledgeId){
-        window.open('knowledgeContentInfo?pkId='+data.knowledgeId)
+        window.open('knowledgeContentInfo?pkId='+data.knowledgeId+'&type=2')
       }else{
-        window.open('knowledgeContentInfo?pkId='+data.pkId)
+        window.open('knowledgeContentInfo?pkId='+data.pkId+'&type=2')
       }
     },
     closeDel(){

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

@@ -113,7 +113,7 @@ export default {
         if(this.item.type==1){
           window.open(this.item.outerAccessUrl)
         }else{
-          window.open('knowledgeContentInfo?pkId='+this.item.knowledgeId)
+          window.open('knowledgeContentInfo?pkId='+this.item.knowledgeId+'&type=2')
         }
       }else{
         let postData = {pkId:this.item.pkId}
@@ -122,7 +122,7 @@ export default {
             if(this.item.type==1){
               window.open(this.item.outerAccessUrl)
             }else{
-              window.open('knowledgeContentInfo?pkId='+this.item.knowledgeId)
+              window.open('knowledgeContentInfo?pkId='+this.item.knowledgeId+'&type=2')
             }
             this.item.state=1
             this.$emit('refresh')

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

@@ -275,4 +275,9 @@ export default {
 .tableBox /deep/.ant-table-row{
   height: 4vw;
 }
+</style>
+<style>
+.descContentInfo img{
+  max-width: 100%;
+}
 </style>

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

@@ -99,7 +99,7 @@ export default {
             ussd:'{"id":"'+this.detailData.pkId+'","type":"'+this.detailData.type+'"}'
           }
           //console.log(postData)
-          if(this.$route.query.type==1){
+          if(this.$route.query.type==1||this.$route.query.type==2){
             analysis.pageTrack(postData).then((res) => {
 
             })
@@ -168,7 +168,6 @@ export default {
   padding: 29px 10.93vw;
   background: #FAFAFA;
   box-sizing: border-box;
-
   .content {
     width: 100%;
     height: 100%;
@@ -183,7 +182,6 @@ export default {
       font-weight: 550;
       color: #202124;
     }
-
     .info {
       font-size: 0.83vw;
       color: #5E5E5E;
@@ -236,4 +234,9 @@ export default {
   color:#C0C0C0;
   font-size:1.14vw;
 }
+</style>
+<style>
+.descContentInfo img{
+  max-width: 100%;
+}
 </style>

vue.config.js

@@ -170,6 +170,7 @@ const vueConfig = {
             //target: 'http://10.5.100.230:9009',//服务器
            // target: 'http://10.5.100.64:5208',
             //target: 'http://192.168.0.205:7206',//柳哥
+            //target: 'http://10.5.100.101/',
             target: 'http://www.hkcqjy.com.cn:8088',
             //target: 'http://10.5.100.230:9009',//服务器
             // target: 'http://10.5.0.233:9900',
@@ -182,6 +183,7 @@ const vueConfig = {
         // target: 'http://localhost:9900',
         // target: 'http://10.5.0.233:9900',
         //target: 'http://10.5.100.64:9900',
+        //target: 'http://10.5.100.101/',
         target: 'http://www.hkcqjy.com.cn:8088',
         //target: 'http://10.5.100.64:5208',
         //target: 'http://192.168.0.176:7206',//柳哥