处理冲突

src/api/knowledge/auditProcess.js

@@ -16,7 +16,7 @@ returnData.findAllApprovalNodes=function (parameter) {
 // 保存
 returnData.batchInsertApprovalNodes=function (parameter) {
   var url= returnData.baseUrl + '/knowledgeApprovalNode/batchInsertApprovalNodes'
-  return rxAjax.postJson(url,parameter).then (res => {
+  return rxAjax.postForm(url,parameter).then (res => {
     return res
   })
 }

src/api/knowledge/statistics/search.js

@@ -0,0 +1,23 @@
+import rxAjax from '@/assets/js/ajax.js';
+// 栏目定义 api接口
+export const returnData = {};
+
+returnData.baseUrl= '/api-knowledge';
+
+// 各业务系统分布
+returnData.searchSystemDetailVisits=function (parameter) {
+  var url= returnData.baseUrl + '/analysis/searchSystemDetailVisits'
+  return rxAjax.get(url,parameter).then (res => {
+    return res
+  })
+}
+
+// 组织访问量
+returnData.organizationSearchs=function (parameter) {
+  var url= returnData.baseUrl + '/analysis/organizationSearchs'
+  return rxAjax.postJson(url,parameter).then (res => {
+    return res
+  })
+}
+
+export default returnData

src/api/knowledge/statistics/synthesize.js

@@ -0,0 +1,33 @@
+import rxAjax from '@/assets/js/ajax.js';
+// 栏目定义 api接口
+export const returnData = {};
+
+returnData.baseUrl= '/api-knowledge';
+
+// 各板块访问量分布
+returnData.moduleUserVisits=function (parameter) {
+  var url= returnData.baseUrl + '/analysis/moduleUserVisits'
+  return rxAjax.get(url,parameter).then (res => {
+    return res
+  })
+}
+
+// 各板块访问量分布(UV)
+returnData.moduleUserUniqueVisits=function (parameter) {
+  var url= returnData.baseUrl + '/analysis/moduleUserUniqueVisits'
+  return rxAjax.get(url,parameter).then (res => {
+    return res
+  })
+}
+
+// 组织访问量
+// returnData.organizationVisits=function (parameter) {
+//   var url= returnData.baseUrl + '/analysis/organizationVisits'
+//   return rxAjax.postJson(url,parameter).then (res => {
+//     return res
+//   })
+// }
+
+returnData.organizationVisits = returnData.baseUrl + '/analysis/organizationVisits'
+
+export default returnData

src/api/knowledge/statistics/warehouse.js

@@ -0,0 +1,27 @@
+import rxAjax from '@/assets/js/ajax.js';
+// 栏目定义 api接口
+export const returnData = {};
+
+returnData.baseUrl= '/api-knowledge';
+
+// 知识类型访问量分布
+returnData.knowledgeTypeVisitProportion=function (parameter) {
+  var url= returnData.baseUrl + '/analysis/knowledgeTypeVisitProportion'
+  return rxAjax.get(url,parameter).then (res => {
+    return res
+  })
+}
+
+// 各一级分类知识创建数量
+returnData.level1KnowledgeHistogram=function (parameter) {
+  var url= returnData.baseUrl + '/analysis/level1KnowledgeHistogram'
+  return rxAjax.get(url,parameter).then (res => {
+    return res
+  })
+}
+
+// 组织创建知识数量
+// 专辑分类搜索查询
+returnData.organizationKnowledges = returnData.baseUrl + '/analysis/organizationKnowledges'
+
+export default returnData

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

@@ -299,12 +299,12 @@ export default {
     init() {
       api.yelp().then(res => {
         if(res.code == 200) {
-          this.yelpNum = res.data || 0
+          this.yelpNum = res.data < 99 ? res.data : 99
         }
       })
       api.approve().then(res => {
         if(res.code == 200) {
-          this.approveNum = res.data || 0
+          this.approveNum = res.data < 99 ? res.data : 99
         }
       })
       api.categories().then(res => {

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

@@ -14,14 +14,14 @@ export default {
       type: Array,
       default: () => []
     },
-    barData: {
+    barTitle: {
       type: Array,
       default: () => []
     },
-    barTitle: {
+    barData: {
       type: Array,
       default: () => []
-    }
+    },
   },
   computed: {
     option() {

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

@@ -18,7 +18,7 @@ export default {
       type: String
     },
     num: {
-      type: String
+      type: Number
     },
     picture: {
       type: String

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

@@ -48,14 +48,12 @@ export default {
         echarts.init(document.getElementById("baseEchart")).resize();
       });
     });
-  },
-  computed: {
-
   },
   methods: {
      _initEchart() {
       let that=this
       const echartInstance = echarts.init(this.$refs.baseEchartRef);
+      
       echartInstance.setOption(this.option);
       echartInstance.on('legendselectchanged', function (params) {
         if(that.option.name=='barOption'){

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

@@ -4,7 +4,7 @@
       <div class="content">
         <div>
           <span>{{ title }}</span>
-          <span>更新时间: {{ time }}</span>
+          <!-- <span>更新时间: {{ time }}</span> -->
         </div>
         <div>
           <span v-for="(item,index) in lookData" 
@@ -39,6 +39,7 @@ export default {
   },
   methods: {
     handleSearchClick(index) {
+      if(this.lookIndex == index) return
       this.lookIndex = index
       console.log(this.dataNameArr[index])
       this.$emit('callBack',this.dataNameArr[index])

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

@@ -212,6 +212,18 @@ export default {
     }
   }
 }
+.frontLoading {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(248,248,248,0.5);
+  align-items: center;
+  justify-content: center;
+  display: flex;
+  text-align: center;
+  font-size: 16px;
+  z-index: 10000;
+}
 </style>
 <style scoped>
 /deep/   .divdefault {

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

@@ -135,7 +135,7 @@ export default {
           sorter: true,
           sortField: 'search'
         },
-      ]
+      ],
     }
   },
   mounted() {

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

@@ -189,7 +189,6 @@ export default {
           barData.dataBas0.push(element.archive)
           barData.dataBas1.push(element.wiki)
         })
-        console.log(barXData)
         this.barXData=barXData,
         this.barData=barData
       })

vue.config.js

@@ -156,10 +156,10 @@ const vueConfig = {
     proxy: {
         '/api-knowledge': {
             // target: 'http://10.5.100.64:5208',
-            target: 'http://10.5.100.230:9009',//服务器
-            // target: 'http://www.hkcqjy.com.cn:8088',
+             target: 'http://10.5.100.230:9009',//服务器
+            // target: 'http://www.hkcqjy.com.cn:8096',
             // target: 'http://192.168.0.185:7206',    // 张哲
-            // target: 'http://192.168.0.205:7206',//柳哥
+            //target: 'http://192.168.0.205:7206',//柳哥
             // target: 'http://10.5.0.233:9900',
             // target: 'http://10.5.100.64:9900',
             pathRewrite: { '^/api': '' },