diff --git a/src/assets/js/http.js b/src/assets/js/http.js index e39128ae..1187ae8e 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -41,7 +41,7 @@ if (process.env.NODE_ENV == 'development') { // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 - axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 + // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上 @@ -50,7 +50,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://47.97.202.104:6023/'; // axios.defaults.baseURL = 'http://139.9.66.234:8/'; // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲 - // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西 + axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西 // axios.defaults.baseURL = 'http://120.196.217.6:7000/' //鹤洲 // axios.defaults.baseURL = 'http://117.156.17.59:9090/'; // diff --git a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue index afd9faaa..d79e92cb 100644 --- a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue +++ b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue @@ -651,7 +651,7 @@ {{$t('message.deepFoundConfig.tableList')}} - + + @@ -608,6 +619,9 @@ export default { option6: {}, chart7: Object, option7: {}, + pageNo1: 1, + pageSize1: 10, + total1: 6, pageNo: 1, pageSize: 10, total: 6, @@ -688,6 +702,7 @@ export default { console.log("有数据吗", res); if (res.code == 200 && res.result) { // console.log('下面的数据',res) + this.total1 = res.result.data.total this.tableData2 = res.result.data.records; this.echartData7 = { xAxis: [], @@ -1358,6 +1373,16 @@ export default { // this.selectDeepExcavationMonitorTypeList() console.log(val); }, + handleSizeChange1(val) { + this.pageSize1 = val; + this.selectDeepExcavationAllMeasurePointList() + console.log(val); + }, + handleCurrentChange1(val) { + this.pageNo1 = val; + this.selectDeepExcavationAllMeasurePointList() + console.log(val); + }, createdEchart5() { // console.log(this.$refs['echart5']) let chart5 = echarts.init(this.$refs["echart5"]); @@ -1665,6 +1690,7 @@ export default { return timer; }, showDetail(val) { + this.dateTime = [] this.visibleDialog = true; // console.log("当前点击行的值", val); this.relaId = val.id; @@ -1785,6 +1811,7 @@ export default { }).then(res => { // console.log("有数据吗", res); if (res.code == 200 && res.result) { + this.total1 = res.result.data.total this.tableData2 = res.result.data.records; this.echartData7 = { xAxis: [], @@ -2129,7 +2156,7 @@ export default { } .dialog-box { /deep/.el-dialog { - height: 826px; + height: 920px; box-sizing: border-box; margin-top: 0 !important; margin-bottom: 0; @@ -2224,7 +2251,7 @@ export default { } .bottom { width: 100%; - height: 653px; + height: 750px; .bottom-wrap { height: 100%; width: 100%; @@ -2311,4 +2338,16 @@ export default { /deep/.el-dialog__title { font-weight: bold; } +.pager { + margin-top: 5px; + text-align: center; + .el-pager li.active { + background-color: @--bg-color-primary!important; + } + button:disabled, + .btn-next, + .btn-prev { + background-color: transparent !important; + } +} \ No newline at end of file diff --git a/src/views/projectFront/projectSummary/lotList.vue b/src/views/projectFront/projectSummary/lotList.vue index 5166517e..99a82b0c 100644 --- a/src/views/projectFront/projectSummary/lotList.vue +++ b/src/views/projectFront/projectSummary/lotList.vue @@ -3,7 +3,7 @@
- + {{ $t("message.projectInfo.sectionName") + ":" }}