diff --git a/README.md b/README.md index 656ce92..1233a33 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -大湾社区城市书房智慧大屏 +葛店城市书房智慧大屏 ```bash # install dependency diff --git a/package.json b/package.json index 187e971..b9a09b6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "qy-big-screen", "version": "1.0.0", - "description": "大湾社区城市书房智慧大屏", + "description": "葛店城市书房智慧大屏", "scripts": { "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve", "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build", diff --git a/public/static/config.js b/public/static/config.js index b7777ea..9729c71 100644 --- a/public/static/config.js +++ b/public/static/config.js @@ -1,5 +1,5 @@ window.g = { AXIOS_TIMEOUT: 10000, - ApiUrl: 'http://127.0.0.1:8080', // 配置服务器地址, + ApiUrl: 'http://192.168.110.39:8080', // 配置服务器地址, LibUrl: 'http://118.253.150.248:8099' // 图创地址 } diff --git a/src/api/library.js b/src/api/library.js index 36db8a6..e24d867 100644 --- a/src/api/library.js +++ b/src/api/library.js @@ -154,6 +154,15 @@ export function FetchWeekJH(params) { }) } +// initIntoNum +export function FetchInitIntoNum(params) { + return request({ + url: '/dxhtsg/initIntoNum' + '?' + qs.stringify(params, { indices: false }), + method: 'get', + urlType: 'local' + }) +} + export default { FetchInitToken, FetchLibBookTotal, @@ -171,5 +180,6 @@ export default { FetchSync36, FetchTotalResource, FetchTodayJH, - FetchWeekJH + FetchWeekJH, + FetchInitIntoNum } diff --git a/src/assets/json/lib.json b/src/assets/json/lib.json index b74d0f9..0864cbb 100644 --- a/src/assets/json/lib.json +++ b/src/assets/json/lib.json @@ -1,3 +1,3 @@ { - "大湾社区城市书房":[114.664064,30.478882] + "葛店城市书房":[114.664064,30.478882] } \ No newline at end of file diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 2666fe2..8d15e45 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -844,15 +844,16 @@ // 左边进度条 .pageOne-left-progress{ display: flex; - justify-content: space-between; + flex-direction: column; + // justify-content: space-between; flex-wrap: wrap; - padding: 0 .25rem; + padding: 0 .5rem; li{ position: relative; - width: 2.5rem; + width: 100%; font-size: .225rem; padding-left: .1625rem; - margin-top: .7rem; + margin-top: .35rem; p{ position: relative; &::before{ diff --git a/src/main.js b/src/main.js index b4c5ae0..ce11ba1 100644 --- a/src/main.js +++ b/src/main.js @@ -26,7 +26,7 @@ import { Message } from 'element-ui' Vue.prototype.$message = Message // 馆代码 1201为东西湖馆代码 / 本地测试用FTZN -Vue.prototype.libcode = '1201' +Vue.prototype.libcode = 'DWSF' // 全局注册过滤 - 时间 import { parseTime, getFormattedDate } from '@/utils/index.js' diff --git a/src/views/index.vue b/src/views/index.vue index 9d32d66..ee61963 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -59,7 +59,7 @@ export default { currentPage: null, // 当前显示的页面数据 isLoading: false, height: '', - headerTitle: '大湾社区城市书房智慧大屏', + headerTitle: '葛店城市书房智慧大屏', pageData: [ { id: 1, title: 'PageOne', delayed: 20, isShow: false }, { id: 2, title: 'PageTwo', delayed: 20, isShow: false }, diff --git a/src/views/map/index.vue b/src/views/map/index.vue index bbcbfc4..bd8416b 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -237,7 +237,7 @@ export default { const result = JSON.parse(res.data) if (result.success & result.resultlist.length !== 0) { // BZL_YEAR 本年办证人数 - this.cardTotal = result.resultlist.filter(item => item.LIBCODE !== '999').reduce((acc, obj) => acc + obj.BZL_YEAR, 0) + this.cardTotal = result.resultlist.filter(item => item.LIBCODE === 'DWSF').reduce((acc, obj) => acc + obj.BZL_YEAR, 0) } else { this.cardTotal = 0 } @@ -304,7 +304,7 @@ export default { }) }, getUserTotal() { - const libraries = ['1201'] + const libraries = ['DWSF'] const getTotalPromises = libraries.map(libcode => this.getTotalForLibcode(libcode)) return Promise.all(getTotalPromises) .then(results => { @@ -321,7 +321,7 @@ export default { const result = JSON.parse(res.data) if (result.length !== 0) { const libCode = { - '1201': [114.664064, 30.478882] + 'DWSF': [114.664064, 30.478882] } // console.log('this.libALLNum', this.libALLNum) const updatedLibraries = result.map(library => { @@ -376,7 +376,7 @@ export default { mapImg.src = require('../../assets/images/map-bg2.png') var XAData = this.libInfoData.map(item => { return [ - { name: '大湾社区城市书房' }, + { name: '葛店城市书房' }, { name: item.name, value: item.address } ] }) @@ -399,7 +399,7 @@ export default { } var series = []; [ - ['大湾社区城市书房', XAData] + ['葛店城市书房', XAData] ].forEach(function(item, i) { series.push( { diff --git a/src/views/pageOne/index.vue b/src/views/pageOne/index.vue index 22d7ae4..c1908db 100644 --- a/src/views/pageOne/index.vue +++ b/src/views/pageOne/index.vue @@ -65,7 +65,7 @@ - + @@ -134,7 +134,8 @@