diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..af31832 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..af31832 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..af31832 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..85eea67 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -168,9 +168,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..af31832 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..85eea67 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -168,9 +168,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..af31832 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..85eea67 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -168,9 +168,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..06287bb 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..af31832 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..85eea67 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -168,9 +168,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..06287bb 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..afd93d7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -65,6 +65,7 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' import { registerGetui } from '@/api/login' @@ -120,19 +121,24 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } + //开启安卓的推送 + const username = getAccount() + window.Android.loginSuccess(username); + + // const cid = this.$store.getters.cid + // console.log('cid:'+cid) + // if(cid && cid!=''){ + // registerGetui(cid).then(res=>{ + // if(res.code==200){ + // console.log('registerGetui success!') + // } + // }) + // } this.fetchData() }, methods: { diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..af31832 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..85eea67 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -168,9 +168,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..06287bb 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..afd93d7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -65,6 +65,7 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' import { registerGetui } from '@/api/login' @@ -120,19 +121,24 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } + //开启安卓的推送 + const username = getAccount() + window.Android.loginSuccess(username); + + // const cid = this.$store.getters.cid + // console.log('cid:'+cid) + // if(cid && cid!=''){ + // registerGetui(cid).then(res=>{ + // if(res.code==200){ + // console.log('registerGetui success!') + // } + // }) + // } this.fetchData() }, methods: { diff --git a/src/page/wellManage/WellBfcf.vue b/src/page/wellManage/WellBfcf.vue index 260dfee..58c7a49 100644 --- a/src/page/wellManage/WellBfcf.vue +++ b/src/page/wellManage/WellBfcf.vue @@ -274,6 +274,7 @@ .index-container { .search-div { position: fixed + width:100vw z-index: 100 top: 40px .search-select { diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..af31832 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..85eea67 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -168,9 +168,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..06287bb 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..afd93d7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -65,6 +65,7 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' import { registerGetui } from '@/api/login' @@ -120,19 +121,24 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } + //开启安卓的推送 + const username = getAccount() + window.Android.loginSuccess(username); + + // const cid = this.$store.getters.cid + // console.log('cid:'+cid) + // if(cid && cid!=''){ + // registerGetui(cid).then(res=>{ + // if(res.code==200){ + // console.log('registerGetui success!') + // } + // }) + // } this.fetchData() }, methods: { diff --git a/src/page/wellManage/WellBfcf.vue b/src/page/wellManage/WellBfcf.vue index 260dfee..58c7a49 100644 --- a/src/page/wellManage/WellBfcf.vue +++ b/src/page/wellManage/WellBfcf.vue @@ -274,6 +274,7 @@ .index-container { .search-div { position: fixed + width:100vw z-index: 100 top: 40px .search-select { diff --git a/src/page/wellManage/WellManage.vue b/src/page/wellManage/WellManage.vue index 964a786..e37524e 100644 --- a/src/page/wellManage/WellManage.vue +++ b/src/page/wellManage/WellManage.vue @@ -230,6 +230,7 @@ .index-container { .search-div { position: fixed + width:100vw z-index: 100 top: 40px .search-select { diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..af31832 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..85eea67 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -168,9 +168,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..06287bb 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..afd93d7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -65,6 +65,7 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' import { registerGetui } from '@/api/login' @@ -120,19 +121,24 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } + //开启安卓的推送 + const username = getAccount() + window.Android.loginSuccess(username); + + // const cid = this.$store.getters.cid + // console.log('cid:'+cid) + // if(cid && cid!=''){ + // registerGetui(cid).then(res=>{ + // if(res.code==200){ + // console.log('registerGetui success!') + // } + // }) + // } this.fetchData() }, methods: { diff --git a/src/page/wellManage/WellBfcf.vue b/src/page/wellManage/WellBfcf.vue index 260dfee..58c7a49 100644 --- a/src/page/wellManage/WellBfcf.vue +++ b/src/page/wellManage/WellBfcf.vue @@ -274,6 +274,7 @@ .index-container { .search-div { position: fixed + width:100vw z-index: 100 top: 40px .search-select { diff --git a/src/page/wellManage/WellManage.vue b/src/page/wellManage/WellManage.vue index 964a786..e37524e 100644 --- a/src/page/wellManage/WellManage.vue +++ b/src/page/wellManage/WellManage.vue @@ -230,6 +230,7 @@ .index-container { .search-div { position: fixed + width:100vw z-index: 100 top: 40px .search-select { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 27bf9d8..a70b7b1 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -138,23 +138,26 @@ removeAccount() removePwd() removeToken() + window.Android.unbindUser(); resolve() }).catch(error => { commit('SET_ROLELIST', []) removeAccount() removePwd() removeToken() + window.Android.unbindUser(); reject(error) }) }) }, - // 登出 + // 纯前端登出 FedLogOut({ commit }) { return new Promise(resolve => { commit('SET_ROLELIST', []) removeAccount() removePwd() removeToken() + window.Android.unbindUser(); resolve() }) } diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..af31832 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..85eea67 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -168,9 +168,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..06287bb 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..afd93d7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -65,6 +65,7 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' import { registerGetui } from '@/api/login' @@ -120,19 +121,24 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } + //开启安卓的推送 + const username = getAccount() + window.Android.loginSuccess(username); + + // const cid = this.$store.getters.cid + // console.log('cid:'+cid) + // if(cid && cid!=''){ + // registerGetui(cid).then(res=>{ + // if(res.code==200){ + // console.log('registerGetui success!') + // } + // }) + // } this.fetchData() }, methods: { diff --git a/src/page/wellManage/WellBfcf.vue b/src/page/wellManage/WellBfcf.vue index 260dfee..58c7a49 100644 --- a/src/page/wellManage/WellBfcf.vue +++ b/src/page/wellManage/WellBfcf.vue @@ -274,6 +274,7 @@ .index-container { .search-div { position: fixed + width:100vw z-index: 100 top: 40px .search-select { diff --git a/src/page/wellManage/WellManage.vue b/src/page/wellManage/WellManage.vue index 964a786..e37524e 100644 --- a/src/page/wellManage/WellManage.vue +++ b/src/page/wellManage/WellManage.vue @@ -230,6 +230,7 @@ .index-container { .search-div { position: fixed + width:100vw z-index: 100 top: 40px .search-select { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 27bf9d8..a70b7b1 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -138,23 +138,26 @@ removeAccount() removePwd() removeToken() + window.Android.unbindUser(); resolve() }).catch(error => { commit('SET_ROLELIST', []) removeAccount() removePwd() removeToken() + window.Android.unbindUser(); reject(error) }) }) }, - // 登出 + // 纯前端登出 FedLogOut({ commit }) { return new Promise(resolve => { commit('SET_ROLELIST', []) removeAccount() removePwd() removeToken() + window.Android.unbindUser(); resolve() }) } diff --git a/src/utils/auth.js b/src/utils/auth.js index cf32a16..a88999d 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -28,11 +28,11 @@ } //关于用户名 export function getAccount() { - return MyLocalStorage.Cache.get(USER_ACCOUNT,99999) + return MyLocalStorage.Cache.get(USER_ACCOUNT) } export function setAccount(username) { - return MyLocalStorage.Cache.set(USER_ACCOUNT, username) + return MyLocalStorage.Cache.set(USER_ACCOUNT, username, 99999) } export function removeAccount() { diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..af31832 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..85eea67 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -168,9 +168,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..06287bb 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..afd93d7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -65,6 +65,7 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' import { registerGetui } from '@/api/login' @@ -120,19 +121,24 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } + //开启安卓的推送 + const username = getAccount() + window.Android.loginSuccess(username); + + // const cid = this.$store.getters.cid + // console.log('cid:'+cid) + // if(cid && cid!=''){ + // registerGetui(cid).then(res=>{ + // if(res.code==200){ + // console.log('registerGetui success!') + // } + // }) + // } this.fetchData() }, methods: { diff --git a/src/page/wellManage/WellBfcf.vue b/src/page/wellManage/WellBfcf.vue index 260dfee..58c7a49 100644 --- a/src/page/wellManage/WellBfcf.vue +++ b/src/page/wellManage/WellBfcf.vue @@ -274,6 +274,7 @@ .index-container { .search-div { position: fixed + width:100vw z-index: 100 top: 40px .search-select { diff --git a/src/page/wellManage/WellManage.vue b/src/page/wellManage/WellManage.vue index 964a786..e37524e 100644 --- a/src/page/wellManage/WellManage.vue +++ b/src/page/wellManage/WellManage.vue @@ -230,6 +230,7 @@ .index-container { .search-div { position: fixed + width:100vw z-index: 100 top: 40px .search-select { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 27bf9d8..a70b7b1 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -138,23 +138,26 @@ removeAccount() removePwd() removeToken() + window.Android.unbindUser(); resolve() }).catch(error => { commit('SET_ROLELIST', []) removeAccount() removePwd() removeToken() + window.Android.unbindUser(); reject(error) }) }) }, - // 登出 + // 纯前端登出 FedLogOut({ commit }) { return new Promise(resolve => { commit('SET_ROLELIST', []) removeAccount() removePwd() removeToken() + window.Android.unbindUser(); resolve() }) } diff --git a/src/utils/auth.js b/src/utils/auth.js index cf32a16..a88999d 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -28,11 +28,11 @@ } //关于用户名 export function getAccount() { - return MyLocalStorage.Cache.get(USER_ACCOUNT,99999) + return MyLocalStorage.Cache.get(USER_ACCOUNT) } export function setAccount(username) { - return MyLocalStorage.Cache.set(USER_ACCOUNT, username) + return MyLocalStorage.Cache.set(USER_ACCOUNT, username, 99999) } export function removeAccount() { diff --git a/src/utils/common.js b/src/utils/common.js index 7014702..23e6a2d 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -5,6 +5,12 @@ return "\tb6c27a2051691fcb386543c800356e05" } +/** + * hbuilder打包跳转高德地图 + * @param lng + * @param lat + * @param name + */ export function openMapWindow(lng,lat,name){ const despos = lng+","+lat const prefix = "androidamap://viewMap?sourceApplication=智能闸井&poiname="+name @@ -12,4 +18,7 @@ const suffix = "" location.assign(prefix+destName+suffix) } +// export function openMapWindow(){ +// +// } diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..af31832 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..85eea67 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -168,9 +168,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..06287bb 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..afd93d7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -65,6 +65,7 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' import { registerGetui } from '@/api/login' @@ -120,19 +121,24 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } + //开启安卓的推送 + const username = getAccount() + window.Android.loginSuccess(username); + + // const cid = this.$store.getters.cid + // console.log('cid:'+cid) + // if(cid && cid!=''){ + // registerGetui(cid).then(res=>{ + // if(res.code==200){ + // console.log('registerGetui success!') + // } + // }) + // } this.fetchData() }, methods: { diff --git a/src/page/wellManage/WellBfcf.vue b/src/page/wellManage/WellBfcf.vue index 260dfee..58c7a49 100644 --- a/src/page/wellManage/WellBfcf.vue +++ b/src/page/wellManage/WellBfcf.vue @@ -274,6 +274,7 @@ .index-container { .search-div { position: fixed + width:100vw z-index: 100 top: 40px .search-select { diff --git a/src/page/wellManage/WellManage.vue b/src/page/wellManage/WellManage.vue index 964a786..e37524e 100644 --- a/src/page/wellManage/WellManage.vue +++ b/src/page/wellManage/WellManage.vue @@ -230,6 +230,7 @@ .index-container { .search-div { position: fixed + width:100vw z-index: 100 top: 40px .search-select { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 27bf9d8..a70b7b1 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -138,23 +138,26 @@ removeAccount() removePwd() removeToken() + window.Android.unbindUser(); resolve() }).catch(error => { commit('SET_ROLELIST', []) removeAccount() removePwd() removeToken() + window.Android.unbindUser(); reject(error) }) }) }, - // 登出 + // 纯前端登出 FedLogOut({ commit }) { return new Promise(resolve => { commit('SET_ROLELIST', []) removeAccount() removePwd() removeToken() + window.Android.unbindUser(); resolve() }) } diff --git a/src/utils/auth.js b/src/utils/auth.js index cf32a16..a88999d 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -28,11 +28,11 @@ } //关于用户名 export function getAccount() { - return MyLocalStorage.Cache.get(USER_ACCOUNT,99999) + return MyLocalStorage.Cache.get(USER_ACCOUNT) } export function setAccount(username) { - return MyLocalStorage.Cache.set(USER_ACCOUNT, username) + return MyLocalStorage.Cache.set(USER_ACCOUNT, username, 99999) } export function removeAccount() { diff --git a/src/utils/common.js b/src/utils/common.js index 7014702..23e6a2d 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -5,6 +5,12 @@ return "\tb6c27a2051691fcb386543c800356e05" } +/** + * hbuilder打包跳转高德地图 + * @param lng + * @param lat + * @param name + */ export function openMapWindow(lng,lat,name){ const despos = lng+","+lat const prefix = "androidamap://viewMap?sourceApplication=智能闸井&poiname="+name @@ -12,4 +18,7 @@ const suffix = "" location.assign(prefix+destName+suffix) } +// export function openMapWindow(){ +// +// } diff --git a/static/QR/weixin.png b/static/QR/weixin.png deleted file mode 100644 index d80b5fb..0000000 --- a/static/QR/weixin.png +++ /dev/null Binary files differ diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..af31832 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..85eea67 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -168,9 +168,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..06287bb 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..afd93d7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -65,6 +65,7 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' import { registerGetui } from '@/api/login' @@ -120,19 +121,24 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } + //开启安卓的推送 + const username = getAccount() + window.Android.loginSuccess(username); + + // const cid = this.$store.getters.cid + // console.log('cid:'+cid) + // if(cid && cid!=''){ + // registerGetui(cid).then(res=>{ + // if(res.code==200){ + // console.log('registerGetui success!') + // } + // }) + // } this.fetchData() }, methods: { diff --git a/src/page/wellManage/WellBfcf.vue b/src/page/wellManage/WellBfcf.vue index 260dfee..58c7a49 100644 --- a/src/page/wellManage/WellBfcf.vue +++ b/src/page/wellManage/WellBfcf.vue @@ -274,6 +274,7 @@ .index-container { .search-div { position: fixed + width:100vw z-index: 100 top: 40px .search-select { diff --git a/src/page/wellManage/WellManage.vue b/src/page/wellManage/WellManage.vue index 964a786..e37524e 100644 --- a/src/page/wellManage/WellManage.vue +++ b/src/page/wellManage/WellManage.vue @@ -230,6 +230,7 @@ .index-container { .search-div { position: fixed + width:100vw z-index: 100 top: 40px .search-select { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 27bf9d8..a70b7b1 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -138,23 +138,26 @@ removeAccount() removePwd() removeToken() + window.Android.unbindUser(); resolve() }).catch(error => { commit('SET_ROLELIST', []) removeAccount() removePwd() removeToken() + window.Android.unbindUser(); reject(error) }) }) }, - // 登出 + // 纯前端登出 FedLogOut({ commit }) { return new Promise(resolve => { commit('SET_ROLELIST', []) removeAccount() removePwd() removeToken() + window.Android.unbindUser(); resolve() }) } diff --git a/src/utils/auth.js b/src/utils/auth.js index cf32a16..a88999d 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -28,11 +28,11 @@ } //关于用户名 export function getAccount() { - return MyLocalStorage.Cache.get(USER_ACCOUNT,99999) + return MyLocalStorage.Cache.get(USER_ACCOUNT) } export function setAccount(username) { - return MyLocalStorage.Cache.set(USER_ACCOUNT, username) + return MyLocalStorage.Cache.set(USER_ACCOUNT, username, 99999) } export function removeAccount() { diff --git a/src/utils/common.js b/src/utils/common.js index 7014702..23e6a2d 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -5,6 +5,12 @@ return "\tb6c27a2051691fcb386543c800356e05" } +/** + * hbuilder打包跳转高德地图 + * @param lng + * @param lat + * @param name + */ export function openMapWindow(lng,lat,name){ const despos = lng+","+lat const prefix = "androidamap://viewMap?sourceApplication=智能闸井&poiname="+name @@ -12,4 +18,7 @@ const suffix = "" location.assign(prefix+destName+suffix) } +// export function openMapWindow(){ +// +// } diff --git a/static/QR/weixin.png b/static/QR/weixin.png deleted file mode 100644 index d80b5fb..0000000 --- a/static/QR/weixin.png +++ /dev/null Binary files differ diff --git a/static/QR/zhifubao.png b/static/QR/zhifubao.png deleted file mode 100644 index 81c3188..0000000 --- a/static/QR/zhifubao.png +++ /dev/null Binary files differ diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..af31832 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..85eea67 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -168,9 +168,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..06287bb 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..afd93d7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -65,6 +65,7 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' import { registerGetui } from '@/api/login' @@ -120,19 +121,24 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } + //开启安卓的推送 + const username = getAccount() + window.Android.loginSuccess(username); + + // const cid = this.$store.getters.cid + // console.log('cid:'+cid) + // if(cid && cid!=''){ + // registerGetui(cid).then(res=>{ + // if(res.code==200){ + // console.log('registerGetui success!') + // } + // }) + // } this.fetchData() }, methods: { diff --git a/src/page/wellManage/WellBfcf.vue b/src/page/wellManage/WellBfcf.vue index 260dfee..58c7a49 100644 --- a/src/page/wellManage/WellBfcf.vue +++ b/src/page/wellManage/WellBfcf.vue @@ -274,6 +274,7 @@ .index-container { .search-div { position: fixed + width:100vw z-index: 100 top: 40px .search-select { diff --git a/src/page/wellManage/WellManage.vue b/src/page/wellManage/WellManage.vue index 964a786..e37524e 100644 --- a/src/page/wellManage/WellManage.vue +++ b/src/page/wellManage/WellManage.vue @@ -230,6 +230,7 @@ .index-container { .search-div { position: fixed + width:100vw z-index: 100 top: 40px .search-select { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 27bf9d8..a70b7b1 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -138,23 +138,26 @@ removeAccount() removePwd() removeToken() + window.Android.unbindUser(); resolve() }).catch(error => { commit('SET_ROLELIST', []) removeAccount() removePwd() removeToken() + window.Android.unbindUser(); reject(error) }) }) }, - // 登出 + // 纯前端登出 FedLogOut({ commit }) { return new Promise(resolve => { commit('SET_ROLELIST', []) removeAccount() removePwd() removeToken() + window.Android.unbindUser(); resolve() }) } diff --git a/src/utils/auth.js b/src/utils/auth.js index cf32a16..a88999d 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -28,11 +28,11 @@ } //关于用户名 export function getAccount() { - return MyLocalStorage.Cache.get(USER_ACCOUNT,99999) + return MyLocalStorage.Cache.get(USER_ACCOUNT) } export function setAccount(username) { - return MyLocalStorage.Cache.set(USER_ACCOUNT, username) + return MyLocalStorage.Cache.set(USER_ACCOUNT, username, 99999) } export function removeAccount() { diff --git a/src/utils/common.js b/src/utils/common.js index 7014702..23e6a2d 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -5,6 +5,12 @@ return "\tb6c27a2051691fcb386543c800356e05" } +/** + * hbuilder打包跳转高德地图 + * @param lng + * @param lat + * @param name + */ export function openMapWindow(lng,lat,name){ const despos = lng+","+lat const prefix = "androidamap://viewMap?sourceApplication=智能闸井&poiname="+name @@ -12,4 +18,7 @@ const suffix = "" location.assign(prefix+destName+suffix) } +// export function openMapWindow(){ +// +// } diff --git a/static/QR/weixin.png b/static/QR/weixin.png deleted file mode 100644 index d80b5fb..0000000 --- a/static/QR/weixin.png +++ /dev/null Binary files differ diff --git a/static/QR/zhifubao.png b/static/QR/zhifubao.png deleted file mode 100644 index 81c3188..0000000 --- a/static/QR/zhifubao.png +++ /dev/null Binary files differ diff --git a/static/media/shake.wav b/static/media/shake.wav deleted file mode 100644 index a353d66..0000000 --- a/static/media/shake.wav +++ /dev/null Binary files differ