| @@ -30,9 +30,7 @@ export default { | |||||
| background-color: #2671E2 !important; | background-color: #2671E2 !important; | ||||
| border-color: #2671E2 !important; | border-color: #2671E2 !important; | ||||
| } | } | ||||
| .el-scrollbar__wrap{ | |||||
| height: 100vh; | |||||
| } | |||||
| .el-table__row{ | .el-table__row{ | ||||
| font-size: 14px!important; | font-size: 14px!important; | ||||
| } | } | ||||
| @@ -163,7 +163,7 @@ export default { | |||||
| // 权限 | // 权限 | ||||
| this.sta_idx_download = this.permissions["sta_idx_download"]; | this.sta_idx_download = this.permissions["sta_idx_download"]; | ||||
| var isnull=this.$route.query.flag; | var isnull=this.$route.query.flag; | ||||
| this.TimetoAhoose=isnull.TimetoAhoose; | |||||
| if (isnull.TimetoAhoose) this.TimetoAhoose=isnull.TimetoAhoose; | |||||
| this.customtime=isnull.customtime; | this.customtime=isnull.customtime; | ||||
| this.fromobj.starttime=isnull.starttime; | this.fromobj.starttime=isnull.starttime; | ||||
| this.fromobj.endoftime=isnull.endoftime; | this.fromobj.endoftime=isnull.endoftime; | ||||
| @@ -335,13 +335,18 @@ export default { | |||||
| }, | }, | ||||
| Toview(item, index) { | Toview(item, index) { | ||||
| let Userrecord = { | let Userrecord = { | ||||
| TimetoAhoose: this.TimetoAhoose, | |||||
| keywordsId: item.matchKeywords[index].keywordsId, | keywordsId: item.matchKeywords[index].keywordsId, | ||||
| customtime: this.customtime, | customtime: this.customtime, | ||||
| starttime: this.fromobj.starttime, | starttime: this.fromobj.starttime, | ||||
| endoftime: this.fromobj.endoftime, | endoftime: this.fromobj.endoftime, | ||||
| houseId: this.houseId, | houseId: this.houseId, | ||||
| }; | }; | ||||
| if (this.TimetoAhoose == 0) { | |||||
| Userrecord.TimetoAhoose = this.TimetoAhoose | |||||
| } | |||||
| if (this.TimetoAhoose == 4) { | |||||
| Userrecord.TimetoAhoose = 2 | |||||
| } | |||||
| this.$router.push({ | this.$router.push({ | ||||
| path: "/Statistics/Insightintothedetails", | path: "/Statistics/Insightintothedetails", | ||||
| query: { flag: Userrecord }, | query: { flag: Userrecord }, | ||||
| @@ -413,6 +418,7 @@ export default { | |||||
| this.namelist = []; | this.namelist = []; | ||||
| this.numlist = []; | this.numlist = []; | ||||
| this.objlist = []; | this.objlist = []; | ||||
| this.alllist = []; | |||||
| var dateType = ""; | var dateType = ""; | ||||
| if (this.TimetoAhoose == 7) { | if (this.TimetoAhoose == 7) { | ||||
| dateType = ""; | dateType = ""; | ||||
| @@ -3,15 +3,14 @@ | |||||
| * https://cli.vuejs.org/zh/config/ | * https://cli.vuejs.org/zh/config/ | ||||
| */ | */ | ||||
| // const url = 'http://192.168.31.161:9999' //长龙 | // const url = 'http://192.168.31.161:9999' //长龙 | ||||
| // const url = 'http://192.168.31.211:9999' // 泽明 | |||||
| // const url = 'http://192.168.31.100:9999' //王笑 | |||||
| // const url = 'http://62.234.122.43:9999' //正式 | |||||
| // const url = 'http://81.70.55.170:9999' // 新测试服务器IP | |||||
| // const url = 'http://192.168.31.149:9999' // 胜浩 | // const url = 'http://192.168.31.149:9999' // 胜浩 | ||||
| // const url = 'https://zanyong.hfju.com' // 正式域名 | |||||
| // const url = 'http://127.0.0.1:9999' // 本地 | // const url = 'http://127.0.0.1:9999' // 本地 | ||||
| const url = 'http://81.70.55.170:9999' // 新测试 | |||||
| // const url = 'http://82.156.35.22:9999' // 新正式ip | |||||
| const url = 'http://81.70.55.170:9999' // 测试服务器 | |||||
| // const url = 'http://62.234.122.43:9999' //正式服务器1 | |||||
| // const url = 'http://82.156.35.22:9999' // 正式服务器2 | |||||
| // const url = 'https://zanyong.hfju.com' // 正式域名 | |||||
| const CompressionWebpackPlugin = require('compression-webpack-plugin') | const CompressionWebpackPlugin = require('compression-webpack-plugin') | ||||
| const productionGzipExtensions = ['js', 'css'] | const productionGzipExtensions = ['js', 'css'] | ||||
| module.exports = { | module.exports = { | ||||