zc

.env.development

@@ -11,7 +11,7 @@ VUE_APP_RENEWAL_ENCODING = ''
 
 # ####################外网接口配置####################
 # 1.8
-VUE_APP_BASE_API =  '192.168.1.8/api'
+# VUE_APP_BASE_API =  '192.168.1.8/api'
 # 韩
 # VUE_APP_BASE_API =  '192.168.1.20:8080'
 # 飞
@@ -23,7 +23,7 @@ VUE_APP_BASE_API =  '192.168.1.8/api'
 # 43服务器
 # VUE_APP_BASE_API = '192.168.1.43/api'
 # 柴
-# VUE_APP_BASE_API = '192.168.1.9:8080'
+VUE_APP_BASE_API = '192.168.1.9:8080'
 # 暨大
 # VUE_APP_BASE_API = 'lab.sxitdlc.com/jndxlabSystem/'
 # 矿大-文昌
@@ -38,7 +38,11 @@ VUE_APP_BASE_API =  '192.168.1.8/api'
 
 # ####################内网接口配置####################
 
-VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'
+# 1.8
+# VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'
+
+# 柴
+VUE_APP_BASE_LOCAL_API = '192.168.1.9:8080'
 
 
 

src/components/subSensorComponent.vue

@@ -27,7 +27,7 @@
         data() {
             return {
                 queryParams: {
-                    pageNum: 1,
+                    page: 1,
                     pageSize: 10,
                 },
                 dataList: [],
@@ -48,7 +48,7 @@
             getList(){
                 window.clearInterval(this.tableTimer);
                 laboratoryBigViewFindSubSensor(this.queryParams).then(response => {
-                    if(response.data.records.length == this.queryParams.pageSize || this.queryParams.pageNum == 1){
+                    if(response.data.records.length == this.queryParams.pageSize || this.queryParams.page == 1){
                         let list = JSON.parse(JSON.stringify(this.dataListA));
                         let newList = JSON.parse(JSON.stringify(list.concat(response.data.records)));
                         if(response.data.records.length == 2){
@@ -61,7 +61,7 @@
                         this.tableActionFun();
                     }else{
                         let obj = JSON.parse(JSON.stringify(this.queryParams));
-                        obj.pageNum = 1;
+                        obj.page = 1;
                         laboratoryBigViewFindSubSensor(obj).then(responseOne => {
                             let list = JSON.parse(JSON.stringify(this.dataListA));
                             let ListA = response.data.records;
@@ -74,7 +74,7 @@
                             }
                             this.$set(this,'dataList',list.concat(newList));
                             this.$set(this, 'total', response.data.total);
-                            this.$set(this.queryParams,'pageNum',1);
+                            this.$set(this.queryParams,'page',1);
                             this.tableActionFun();
                         });
                     }
@@ -86,7 +86,7 @@
                 this.$refs.scrollDiv.scrollTop = 0;
                 if(this.dataList[2]){
                     this.tableTimerFun();
-                }else if(!this.dataList[2] && this.queryParams.pageNum != 1){
+                }else if(!this.dataList[2] && this.queryParams.page != 1){
                     setTimeout(function(){
                         self.tableTimerFun();
                     },2000);
@@ -97,7 +97,7 @@
                 let self = this;
                 if(this.dataList[2]){
                     this.tableTimerFun();
-                }else if(!this.dataList[2] && this.queryParams.pageNum != 1){
+                }else if(!this.dataList[2] && this.queryParams.page != 1){
                     setTimeout(function(){
                         self.tableTimerFun();
                     },2000);
@@ -109,13 +109,13 @@
                     let csrollTop = this.$refs.scrollDiv.scrollTop
                     let maxHeight = this.$refs.scrollDiv.scrollHeight - this.$refs.scrollDiv.offsetHeight
                     if (csrollTop >= maxHeight) {
-                        if (this.accMul(this.queryParams.pageSize,this.queryParams.pageNum) < this.total) {
-                            this.$set(this.queryParams,'pageNum',this.queryParams.pageNum+1);
+                        if (this.accMul(this.queryParams.pageSize,this.queryParams.page) < this.total) {
+                            this.$set(this.queryParams,'page',this.queryParams.page+1);
                             this.$nextTick(()=>{
                                 this.getList();
                             })
                         }else{
-                            this.$set(this.queryParams,'pageNum',1);
+                            this.$set(this.queryParams,'page',1);
                             this.$nextTick(()=>{
                                 this.getList();
                             })