diff --git a/public/config.js b/public/config.js
index 3ac41dd..400c452 100644
--- a/public/config.js
+++ b/public/config.js
@@ -1,11 +1,8 @@
window.publicConfig = {
// 请求地址
- // BASE_API:'http://10.97.121.2/api',
- // BASE_API:'http://192.168.66.16/api',
- BASE_API:'http://61.144.224.21:8442/api',
+ BASE_API:'http://61.144.224.21:8443/api',
// socket url
- // WS_URL_TY: 'ws://10.97.121.2/ty',
- WS_URL_TY: 'ws://192.168.66.16/ty',
- WS_URL_WH: 'ws://192.168.66.16/wh',
- WS_URL_ZL: 'ws://192.168.66.16/zl'
+ WS_URL_TY: 'ws://61.144.224.21:8443/ty',
+ WS_URL_WH: 'ws://61.144.224.21:8443/wh',
+ WS_URL_ZL: 'ws://61.144.224.21:8443/zl'
}
\ No newline at end of file
diff --git a/src/api/home.js b/src/api/home.js
index 48ff4e2..3640539 100644
--- a/src/api/home.js
+++ b/src/api/home.js
@@ -83,4 +83,13 @@ export function libLeaseData(param){
method: 'post',
param,
})
+}
+
+// 文化板块今日人流量趋势
+export function whtdrs(param){
+ return request({
+ url:'/library.pass/getLibraryGroupHoursList',
+ method: 'post',
+ param,
+ })
}
\ No newline at end of file
diff --git a/src/api/home.js_bak b/src/api/home.js_bak
new file mode 100644
index 0000000..8bbec22
--- /dev/null
+++ b/src/api/home.js_bak
@@ -0,0 +1,67 @@
+// 导入axios实例
+import request from '@/utils/request'
+
+// 定义接口的传参
+const api={
+ // 日客流趋势
+ daily_klqs:'/pass.passcc/allGroupTimeNum',
+
+}
+
+// 获取群组
+export function allGroupTimeNum(param) {
+ return request({
+ url: api.daily_klqs,
+ method: 'get',
+ params:param,
+ })
+}
+
+export function homeBarData(param) {
+ return request({
+ url: '/pass.passcc/allGroupTimeNum&granularity=daily',
+ method: 'post',
+ param,
+ })
+}
+// ge
+export function allGroupNum(param) {
+ return request({
+ url: '/pass.passcc/allGroupNum',
+ method: 'post',
+ param,
+ })
+}
+// 实时进馆人数
+export function allInfoDatas(param) {
+ return request({
+ url: '/pass.passcc/realTimeData',
+ method: 'post',
+ param,
+ })
+}
+// 今日各场馆的趋势
+export function tdGroupRealTimeEnter(param) {
+ return request({
+ url: '/pass.passcc/toDayGroupsEnterNum',
+ method: 'get',
+ param,
+ })
+}
+// 图书馆人流趋势
+export function tsgTrends(param) {
+ return request({
+ url: '/library.pass/allFlowTrends',
+ method: 'get',
+ param,
+ })
+}
+
+// 借书信息
+export function tsgbr(param){
+ return request({
+ url: '/library.pass/allFlowTrends',
+ method: 'post',
+ param,
+ })
+}
diff --git a/src/assets/img/pcg_bg2.png b/src/assets/img/pcg_bg2.png
new file mode 100644
index 0000000..c9c5956
Binary files /dev/null and b/src/assets/img/pcg_bg2.png differ
diff --git a/src/views/HomeView - 副本.vue b/src/views/HomeView - 副本.vue
deleted file mode 100644
index 3daa81d..0000000
--- a/src/views/HomeView - 副本.vue
+++ /dev/null
@@ -1,1191 +0,0 @@
-
-
-
总览
-
-
-
-
-
-
-
年度进馆总人数
-
{{ year_num }}
-
-
-
-
-
-
-
{{ day_num }}
-
今日进馆总人数
-
-
-
-
-
-
-
{{ week_num }}
-
本周进馆总人数
-
-
-
-
-
-
-
{{ mon_num }}
-
本月进馆总人数
-
-
-
-
-
-
客流趋势
-
- 年
- 月
- 日
-
-
-
-
-
-
-
-
-
-
- -
- {{ tycra.name }}
- {{ tycra.value }}
-
-
- -
- {{tygra.name}}
- {{ tygra.value }}
-
-
- -
- {{yygra.name}}
- {{ yygra.value }}
-
-
-
-
-
-
-
-
-
- -
-
- 20%
- 图书馆
-
- -
-
- 12%
- 文化馆
-
- -
-
- {{bwgra.value}}
- {{bwgra.name}}
-
-
-
-
-
-
-
-
-
-
-
-
各场馆实时进馆人数
-
-
-
{{item.groupName}}
-
{{ item.allEnter }}
-
{{
- item.proportion }}
-
-
-
-
-
+
文化
+
+
+
+
+
总计进馆人数
+
+
+
+
+
{{ tdjg }}
+
今日进馆人数
+
+
+
+
{{ tmjg }}
+
本月进馆人数
+
+
+
+
{{ tyjg }}
+
本年进馆人数
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{a0}: {c0}
{a1}: {c1}
{a2}: {c2}',
+ backgroundColor: 'rgba(0,0,0,0.7)', // 背景
+ padding: [8, 10], //内边距
+ extraCssText: 'box-shadow: 0 0 3px rgba(255, 255, 255, 0.4);', //添加阴影
+ },
+ grid: {
+ borderWidth: 0,
+ top: 240,
+ bottom: 240,
+ right: 20,
+ textStyle: {
+ color: "#fff"
}
+ },
+ xAxis: [{
+ type: "category",
+ axisLine: {
+ show: false,
+ },
+ splitLine: {
+ show: false,
+ },
+ boundaryGap: false, //坐标轴两边留白策略，类目轴和非类目轴的设置和表现不一样
+ axisTick: {
+ show: false
+ },
+ splitArea: {
+ show: false
+ },
+ axisLabel: {
+ inside: false,
+ interval: 0,
+ textStyle: {
+ color: '#FFFFFF',
+ fontWeight: 'normal',
+ fontSize: '12',
+ },
+ },
+ data: name,
}],
- animationEasing:'elasticOut',
- animationDelayUpdate:function(idx){
- return idx*5
- }
- };
+ yAxis: {
+ type: 'value',
+ axisTick: {
+ show: false
+ },
+ axisLine: {
+ show: false,
+ },
+ splitLine: {
+ show: true,
+ lineStyle: {
+ color: '#32346c ',
+ }
+ },
+ axisLabel: {
+ textStyle: {
+ color: '#0095FF',
+ fontWeight: 'normal',
+ fontSize: '12',
+ },
+ formatter: '{value}',
+ },
+ },
+ series: series,
+ }
+ myChart.clear()
option && myChart.setOption(option);
},
- getTsgInfoDatas() {
- let that = this
- console.log(that);
- homeApi.tsgTrends().then(res => {
- // get allTimeData
- const tmpdata = res.data
- console.log(tmpdata)
+ // 从ws 中实时获取数据
+ getsckdata() {
+ let that = this;
+
+ this.ws.onopen = function () {
+ // console.log("ws connected success!")
+ };
+ this.ws.onclose = function (event) {
+ // console.log('WebSocket连接已关闭');
+ };
+ this.ws.onmessage = (e) => {
+ var jstr = JSON.parse(e.data);
+ if (!jstr) {
+ return;
+ }
+
+ // 总计进馆人数
+ const allFlowTrends = jstr.allFlowTrends.data
+ that.tdjg = allFlowTrends.today.incount
+ that.tmjg = allFlowTrends.month.incount
+ that.tyjg = allFlowTrends.year.incount
+ // 今日进馆
+ const hour24 = allFlowTrends.hour24
+ that.gktsg = hour24[0].incount
+ that.gkbwg = hour24[1].incount
+ that.gkwhg = hour24[2].incount
+
+ // 图书借阅信息
+ const libleas = jstr.getLibraryLeaseData.data
+ that.libleaData = libleas
+
+ // 24 小时柱形图数据
+ const vkdata = new Array;
+ vkdata.push({
+ xname: jstr.getLibraryHours24List.data.dkeys.slice(-8, jstr.getLibraryHours24List.data.dkeys.length),
+ xval: jstr.getLibraryHours24List.data.dvalue.slice(-8, jstr.getLibraryHours24List.data.dvalue.length)
+ })
+ that.ecbardata = vkdata;
+ that.cgsf_line();
+
+ // 线图数据
+ function linedata() {
+ that.zxliddata = [];
+ that.rsqsDataName = [], that.rsqsDatas = [];
+ const tmpdata = jstr.getLibraryGroupHoursList.data;
+ tmpdata.forEach((item) => {
+ that.rsqsDataName.push(item.groupName);
+ that.rsqsDatas.push(item.list)
+ })
+
+ that.zxlindata = jstr.toDayGroupsEnterNum.data[0].list.dkeys;
+ that.rsqsDatas.forEach((item) => {
+ let rsqsData = []
+ Object.getOwnPropertyNames(item).forEach((value) => {
+ if (value == 'dvalue') {
+ rsqsData = item[value];
+ }
+ });
+ that.zxliddata.push(rsqsData)
+ })
+ that.cg_line()
+ }
+ linedata();
+
+ }
+ },
- });
- }
},
+ beforeUnmount() {
+ this.ws.close();
+ }
}
\ No newline at end of file
