Merge remote-tracking branch 'origin/master'

portal-manager-ui/admin/src/api/dataActuary.js

@@ -31,3 +31,7 @@ export function getInformationFlow(params) {
 export function productLlist(params) {
   return http.post(`${baseURL}/zwfw/page/info/product/list`, params);
 }
+// 热力图对应的页面
+export function pageLlist(params) {
+  return http.post(`${baseURL}/zwfw/page/info/list`, params);
+}
\ No newline at end of file

portal-manager-ui/admin/src/views/dataActuary/behaviour/mixins/product.js

@@ -9,6 +9,7 @@ export default {
         this.getProductLlist()
     },
     methods: {
+        
         getProductLlist(){
             productLlist({"size":-1}).then(res=>{
               this.ProductLlist = res.data.data

portal-manager-ui/admin/src/views/dataActuary/behaviour/product/product.vue

@@ -8,7 +8,7 @@
 		<div class="list-dv">
 			<a-form-model :model="queryform" :label-col="labelCol" :wrapper-col="wrapperCol" layout="inline">
 				<a-form-model-item>
-					<a-select v-model="queryform.productId" style="width: 200px" placeholder="选择产品">
+					<a-select v-model="queryform.productId" style="width: 200px" placeholder="选择产品" @change="changeProductId">
 						<a-select-option :value="item.id" v-for="(item,index) in product" :key="index">
 							{{item.title}}
 						</a-select-option>
@@ -33,7 +33,7 @@
 			<div class="main">
 				<div class="total-dv">
 					<div>总点击次数</div>
-					<div>312321</div>
+					<div>{{clickSum}}</div>
 				</div>
 				<div style="margin-bottom: 20px;">事件排名Top10</div>
 				<a-table :columns="columns" :data-source="data" :scroll="{ y: 590 }" :pagination="false">
@@ -48,7 +48,8 @@
 	import Heatmap from 'heatmap.js';
 	import moment from 'moment';
 	import {
-		getProductHotCensus
+		getProductHotCensus,
+		pageLlist
 	} from '@/api/dataActuary.js'
 	export default {
 		mixins:[product],
@@ -101,21 +102,47 @@
 				heatmapInstance: null,
 				dataPoint: [],
 				img: '',
-				BASE_URL: process.env.VUE_APP_API_BASE_URL + '/'
+				BASE_URL: process.env.VUE_APP_API_BASE_URL + '/',
+				clickSum:0,//总次数
+				ProductLlist:[]
 			}
 		},
 		mounted() {
 			this.init('queuing')
+			this.getPageLlist()
 		},
 		methods: {
+			// 选择产品
+			changeProductId(v){
+				this.getPageLlist(v)
+			},
+			// 查询页面
+			getPageLlist(productId = 1){
+				pageLlist({productId:productId,size:-1}).then(res=>{
+					const {data} = res.data
+					let arr = []
+					if(data && data.length > 0){
+						data.forEach(element => {
+							arr.push({title:element.pageName,id:element.pageCode})
+						});
+						this.page = arr
+					}else{
+						this.page  = [{
+							title: '首页',
+							id: '/'
+						}]
+					}
+				})
+			},
 			getList() {
 				this.queryform.dateTimeStart = this.time ? this.time[0] : null
 				this.queryform.dateTimeStart = this.time ? this.time[1] : null
 				getProductHotCensus(this.queryform).then(res => {
+					this.clickSum = res.data.clickSum
 					this.data = res.data.data
-					this.img = res.data.screenUrl
+					this.img = (process.env.NODE_ENV == 'development')?`${this.BASE_URL}${res.data.screenUrl}`:res.data.screenUrl
 					let imgSize = new Image();
-					imgSize.src = this.BASE_URL + this.img;
+					imgSize.src = this.img;
 					imgSize.onload = () => {
 						let w = this.$refs.img.width / imgSize.width
 						let h = this.$refs.img.height / imgSize.height

portal-manager-ui/admin/src/views/dataAdmin/dataAdmin.vue

@@ -184,7 +184,6 @@ export default {
     // 查看数据
     handleCkeck(path) {
       if(path.indexOf('http')>-1){
-        alert(path)
         window.open(path)
       }else{
         this.$router.push(path);