提交代码

src/config/router.config.js

@@ -213,18 +213,18 @@ export const constantRouterMap = [
                 component: () => import('@/views/modules/knowledge/statistics/synthesize')
             },
             {
-                path: 'warehouse',
-                name: 'warehouse',
+                path: 'warehousePage',
+                name: 'warehousePage',
                 component: () => import('@/views/modules/knowledge/statistics/warehouse')
             },
             {
-                path: 'album',
-                name: 'album',
+                path: 'albumPage',
+                name: 'albumPage',
                 component: () => import('@/views/modules/knowledge/statistics/album')
             },
             {
-                path: 'map',
-                name: 'map',
+                path: 'mapPage',
+                name: 'mapPage',
                 component: () => import('@/views/modules/knowledge/statistics/map')
             },
             {

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

@@ -305,7 +305,6 @@ export default {
   .table-style {
     width: 100%;
     background-color: #fff;
-    margin-top: 20px;
     padding: 20px 30px;
     display: inline-block;
     >div:first-child {

src/views/modules/knowledge/statistics/components/BarEchart.vue

@@ -31,7 +31,9 @@ export default {
           feature: {
               magicType: {
                   show: true,
-                  type: ['line', 'bar']
+                  type: ['line', 'bar'],
+                  iconStyle:{borderColor:'#6d6d6d'},
+                  emphasis:{iconStyle:{borderColor:'#6d6d6d'}}
               }
           },
           right:'4%'

src/views/modules/knowledge/statistics/components/BarEchartOne.vue

@@ -27,7 +27,9 @@ export default {
           feature: {
               magicType: {
                   show: true,
-                  type: ['line', 'bar']
+                  type: ['line', 'bar'],
+                  iconStyle:{borderColor:'#6d6d6d'},
+                  emphasis:{iconStyle:{borderColor:'#6d6d6d'}}
               }
           },
           right:'4%'

src/views/modules/knowledge/statistics/components/DataShow.vue

@@ -34,32 +34,33 @@
     <div class="rightDetail">
       <div class="rightDetailtop">访问量明细</div>
       <div class="rightDetailBottom" v-if="interface==0">
-        组织路径:{{showData.organization}} </br>
-        总访问量: {{showData.total}} </br>
-        知识仓库访问量:{{showData.knowledge}} </br>
-        知识专辑访问量:{{showData.album}} </br>
-        知识地图访问量:{{showData.map}} </br>
-        搜索服务访问量:{{showData.search}}
+        <p style="margin-bottom: 16px;">组织路径:{{showData.organization?showData.organization:'--'}}</p>
+        总访问量: {{showData.total?showData.total:'--'}} </br>
+        知识仓库访问量:{{showData.knowledge?showData.knowledge:'--'}} </br>
+        知识专辑访问量:{{showData.album?showData.album:'--'}} </br>
+        知识地图访问量:{{showData.map?showData.map:'--'}} </br>
+        搜索服务访问量:{{showData.search?showData.search:'--'}}
       </div>
       <div class="rightDetailBottom" v-if="interface==1">
-        组织路径:{{showData.organization}} </br>
-        知识总量: {{showData.total}} </br>
-        文档知识数量:{{showData.archive}} </br>
-        维基知识数量:{{showData.wiki}}
+        <p style="margin-bottom: 16px;">组织路径:{{showData.organization?showData.organization:'--'}}</p>
+        知识总量: {{showData.total?showData.total:'--'}} </br>
+        文档知识数量:{{showData.archive?showData.archive:'--'}} </br>
+        维基知识数量:{{showData.wiki?showData.wiki:'--'}}
       </div>
       <div class="rightDetailBottom" v-if="interface==2">
-        组织路径:{{showData.organization}} </br>
-        专辑创建总量: {{showData.album}} </br>
-        专辑访问量pv:{{showData.pv}} 
+        <p style="margin-bottom: 16px;">组织路径:{{showData.organization?showData.organization:'--'}}</p>
+        专辑创建总量: {{showData.album?showData.album:'--'}} </br>
+        专辑访问量pv:{{showData.pv?showData.pv:'--'}} 
       </div>
       <div class="rightDetailBottom" v-if="interface==3">
-        组织路径:{{showData.organization}} </br>
-        地图创建总量: {{showData.map}} </br>
-        地图访问量pv:{{showData.pv}} 
+        <p style="margin-bottom: 16px;">组织路径:{{showData.organization?showData.organization:'--'}}</p>
+        地图创建总量: {{showData.map?showData.map:'--'}} </br>
+        地图访问量pv:{{showData.pv?showData.pv:'--'}} 
       </div>
       <div class="rightDetailBottom" v-if="interface==4">
-        组织路径:{{showData.organization}} </br>
+        <p style="margin-bottom: 16px;">组织路径:{{showData.organization?showData.organization:'--'}}</p>
         <p v-for="(item,index) in showData.item">{{item.name}}: {{item.value}} </p>
+        <p v-if="checkId==null">--</p>
       </div>
     </div>
   </div>
@@ -163,6 +164,8 @@ export default {
     //重置
     handleResetClick(){
       this.searchValue=''
+      this.checkId=null
+      this.showData={}
       this.getTreeData()
     },
     //组织结构
@@ -239,9 +242,12 @@ export default {
   line-height:54px;
 }
 .rightDetailBottom{
+  padding-top: 26px;
   text-align: center;
-  line-height: 30px;
+  line-height: 40px;
   background: #fff;
   height: calc(100% - 54px);
+  overflow: auto;
+  font-size: 14px;
 }
 </style>

src/views/modules/knowledge/statistics/components/LineEchart.vue

@@ -76,6 +76,7 @@ export default {
   },
   computed: {
     option() {
+      let showNum=Math.floor(window.innerWidth*0.8276/(50*this.barDataUv.length)*100)
       return {
         toolbox: {//图形转换
           feature: {
@@ -133,8 +134,17 @@ export default {
           }
         },
         grid: {
-          left: '12%'
+          left: '5%',
+          right: '5%',
+          containLabel: true
         },
+        dataZoom: [
+          {
+            show: true,
+            start: 0,
+            end: showNum
+          }
+        ],
         series: [
           {
             data: this.barDataUv,

src/views/modules/knowledge/statistics/components/PieEchart.vue

@@ -40,7 +40,7 @@ export default {
             orient: 'vertical',
             data: this.pieDataTitleLeft,
             itemWidth: 15,
-            right: '30%',
+            right: '22%',
             top: 'middle',
             formatter: function (name) {
               if(name.length < 6) return name
@@ -51,7 +51,7 @@ export default {
             orient: 'vertical',
             data: this.pieDataTitleRight,
             itemWidth: 15,
-            right: '10%',
+            right: '2%',
             top: 'middle',
             formatter: function (name) {
               if(name.length < 6) return name
@@ -68,7 +68,7 @@ export default {
             name: 'Access From',
             type: 'pie',
             center: ['30%', '50%'],
-            radius: ['40%', '70%'],
+            radius: [window.innerWidth/40, window.innerWidth/18],
             itemStyle: {
               borderColor: '#fff',
               borderWidth: 2,

src/views/modules/knowledge/statistics/components/RoseEchart.vue

@@ -32,7 +32,7 @@ export default {
           {
             type: 'pie',
             startAngle:60,
-            radius: '70%',
+            radius: window.innerWidth/20,
             center: ['50%', '50%'],
             data: this.roseData,
            

src/views/modules/knowledge/statistics/components/card.vue

@@ -35,19 +35,19 @@ export default {
   display:flex;
   align-items:center;
   justify-content:space-between;
-  padding:10px 20px 10px 30px;
+  padding:0.52vw 1vw 0.52vw 1.5625vw;
 
   >div:first-child {
     display:flex;
     flex-direction:column;
 
     div:first-child {
-      font-size: 18px;
+      font-size: 1vw;
       font-weight: bold;
     }
 
     div:last-child {
-      font-size: 8px;
+      font-size: 0.8vw;
       color:#b1b1b1;
       margin-top:5px;
     }

src/views/modules/knowledge/statistics/components/pieChange.vue

@@ -4,13 +4,13 @@
       <template slot="title">
         <span style="color:#6d6d6d">切换为饼状图</span>
       </template>
-      <a-icon @click="changePeitype(1)" type="pie-chart" :style="{marginRight:'0.5vw',color:peitype==1?'#6d6d6d':'#6d6d6d','borderBottom': peitype==1?'1px solid #6d6d6d':'1px solid #6d6d6d'}"/>
+      <a-icon class="iconType" @click="changePeitype(1)" type="pie-chart" :style="{marginRight:'10px',color:peitype==1?'#6d6d6d':'#6d6d6d','borderBottom': peitype==1?'1px solid #6d6d6d':'1px solid #6d6d6d'}"/>
     </a-tooltip>
     <a-tooltip placement="bottom" overlayClassName="tooltipBoxpieChange">
       <template slot="title">
         <span style="color:#6d6d6d">切换为环状图</span>
       </template>
-      <a-icon @click="changePeitype(2)" type="chrome" :style="{color:peitype==2?'#6d6d6d':'#6d6d6d','borderBottom': peitype==2?'1px solid #6d6d6d':'1px solid #6d6d6d'}"/>    </a-tooltip>
+      <a-icon class="iconType" @click="changePeitype(2)" type="chrome" :style="{color:peitype==2?'#6d6d6d':'#6d6d6d','borderBottom': peitype==2?'1px solid #6d6d6d':'1px solid #6d6d6d'}"/>    </a-tooltip>
   </div>
 </template>
 
@@ -58,5 +58,7 @@ export default {
     box-shadow: none;
   }
 }
-
+.iconType{
+  font-size: 15px;
+}
 </style>

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

@@ -298,7 +298,6 @@ export default {
   .table-style {
     width: 100%;
     background-color: #fff;
-    margin-top: 20px;
     padding: 20px 30px;
     display: inline-block;
     >div:first-child {

src/views/modules/knowledge/statistics/search.vue

@@ -197,7 +197,6 @@ export default {
   .table-style {
     width: 100%;
     background-color: #fff;
-    margin-top: 20px;
     padding: 20px 30px;
     display: inline-block;
     >div:first-child {

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

@@ -259,7 +259,6 @@ export default {
   .table-style {
     width: 100%;
     background-color: #fff;
-    margin-top: 20px;
     padding: 20px 30px;
     display: inline-block;
     >div:first-child {