diff --git a/package-lock.json b/package-lock.json index 6f61ddc..a2b1156 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "vueDatav", + "name": "parkBigScreen2", "version": "0.1.0", "lockfileVersion": 1, "requires": true, @@ -7370,6 +7370,15 @@ } } }, + "loading-view-vue": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/loading-view-vue/-/loading-view-vue-1.0.3.tgz", + "integrity": "sha512-77pOrRRX5+2rJZNaQlwMb9B+3oIQ4DNR7J8q8MLHosHU9ZkrzNqnPHslYoJnp9C2Yi/LTjD1w6LGRLRnQ5LHjQ==", + "requires": { + "core-js": "^3.6.5", + "vue": "^2.6.11" + } + }, "locate-path": { "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-2.0.0.tgz", @@ -10352,6 +10361,11 @@ "ajv-keywords": "^3.4.1" } }, + "screenfull": { + "version": "5.0.2", + "resolved": "https://registry.npmmirror.com/screenfull/-/screenfull-5.0.2.tgz", + "integrity": "sha512-cCF2b+L/mnEiORLN5xSAz6H3t18i2oHh9BA8+CQlAh5DRw2+NFAGQJOSYbcGw8B2k04g/lVvFcfZ83b3ysH5UQ==" + }, "scss-tokenizer": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", diff --git a/package.json b/package.json index babebfc..7ad9dc5 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,8 @@ "core-js": "^3.6.4", "dayjs": "^1.11.4", "echarts": "^5.3.3", + "loading-view-vue": "^1.0.3", + "screenfull": "^5.0.2", "vue": "^2.6.11", "vue-router": "^3.1.6", "vue-seamless-scroll": "^1.1.21", diff --git a/src/api/form.js b/src/api/form.js index e596809..fcf5dfb 100644 --- a/src/api/form.js +++ b/src/api/form.js @@ -82,5 +82,13 @@ export const BiApi = { params: query }) }, + // 授权码获取车场信息 + getPkParkingInfo: (query) => { + return request({ + url: '/pk/parking/PkParkingInfo/getPkParkingInfoIdByAuthCode', + method: 'get', + params: query + }) + }, } diff --git a/src/api/request.js b/src/api/request.js index 9061487..ab585e1 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -9,7 +9,7 @@ const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 baseURL: 'http://192.168.31.128:8866', // 超时 - timeout: 30000 + timeout: 15000 }) // request拦截器 service.interceptors.request.use(config => { diff --git a/src/assets/img/fullscreen/exit-fullscreen.png b/src/assets/img/fullscreen/exit-fullscreen.png new file mode 100644 index 0000000..e8481ab Binary files /dev/null and b/src/assets/img/fullscreen/exit-fullscreen.png differ diff --git a/src/assets/img/fullscreen/fullscreen.png b/src/assets/img/fullscreen/fullscreen.png new file mode 100644 index 0000000..7776808 Binary files /dev/null and b/src/assets/img/fullscreen/fullscreen.png differ diff --git a/src/components/index.js b/src/components/index.js index 530c72e..ea1490c 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -32,6 +32,8 @@ import income from './companySummary/income' // 营业收入 import distribution from './companySummary/distribution' // 客户分布 // import history from './companySummary/history' // 发展历程 +import screenfull from './screenfull' // 全屏按钮 + const components = { bgAnimation, modal, @@ -65,7 +67,7 @@ const components = { // wordCloud, distribution, // history, - + screenfull, }; const install = (Vue = {}) => { diff --git a/src/components/screenfull/index.vue b/src/components/screenfull/index.vue new file mode 100644 index 0000000..9e24a5e --- /dev/null +++ b/src/components/screenfull/index.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/src/views/Brand.vue b/src/views/Brand.vue index a796617..fee569a 100644 --- a/src/views/Brand.vue +++ b/src/views/Brand.vue @@ -1,6 +1,19 @@