Commit edd150c0 authored by xinzhedeai's avatar xinzhedeai

fix:分页问题处理-安全常识;检查记录;培训演练;特种作业,隐患审核

parent 3de39854
...@@ -74,7 +74,7 @@ window.addEventListener("load", function () { ...@@ -74,7 +74,7 @@ window.addEventListener("load", function () {
sign: 16, sign: 16,
// merId: this.merId ? this.merId : '', // merId: this.merId ? this.merId : '',
safetyName: this.name, safetyName: this.name,
pageNum: this.page++, // 每次请求增加下一页 pageNum: this.page, // 每次请求增加下一页
pageSize: this.size, pageSize: this.size,
type: (this.activeTab+1)+'' type: (this.activeTab+1)+''
}, },
...@@ -98,7 +98,7 @@ window.addEventListener("load", function () { ...@@ -98,7 +98,7 @@ window.addEventListener("load", function () {
if (this.page * this.size >= this.total) { if (this.page * this.size >= this.total) {
this.finished = true; // 下滑不在刷新数据 this.finished = true; // 下滑不在刷新数据
} }else{this.page++}
} }
this.loading = false this.loading = false
setTimeout(() => { setTimeout(() => {
......
...@@ -72,7 +72,7 @@ window.addEventListener('load', function () { ...@@ -72,7 +72,7 @@ window.addEventListener('load', function () {
sign: 1, sign: 1,
type: this.activeTab, type: this.activeTab,
merId: this.merId, merId: this.merId,
pageNum: this.page++, // 每次请求增加下一页 pageNum: this.page, // 每次请求增加下一页
pageSize: this.size, pageSize: this.size,
sort: 'lawId,desc', sort: 'lawId,desc',
merName: this.merName, merName: this.merName,
...@@ -99,7 +99,7 @@ window.addEventListener('load', function () { ...@@ -99,7 +99,7 @@ window.addEventListener('load', function () {
this.total = result.total this.total = result.total
if (this.page * this.size >= this.total) { if (this.page * this.size >= this.total) {
this.finished = true // 下滑不在刷新数据 this.finished = true // 下滑不在刷新数据
} }else{this.page++}
} }
this.loading = false this.loading = false
setTimeout(() => { setTimeout(() => {
......
...@@ -190,7 +190,7 @@ window.addEventListener("load", function() { ...@@ -190,7 +190,7 @@ window.addEventListener("load", function() {
merName: this.merName, merName: this.merName,
exerciseType: this.activeTab + 1, exerciseType: this.activeTab + 1,
safetyTrainingType: this.activeTab == 1 ? 0 : this.subActiveTab, safetyTrainingType: this.activeTab == 1 ? 0 : this.subActiveTab,
pageNum: this.page++, // 每次请求增加下一页 pageNum: this.page, // 每次请求增加下一页
pageSize: this.size, pageSize: this.size,
sort: 'lawId,desc', sort: 'lawId,desc',
...@@ -217,7 +217,7 @@ window.addEventListener("load", function() { ...@@ -217,7 +217,7 @@ window.addEventListener("load", function() {
this.total = result.total this.total = result.total
if (this.page * this.size >= this.total) { if (this.page * this.size >= this.total) {
this.finished = true // 下滑不在刷新数据 this.finished = true // 下滑不在刷新数据
} }else{this.page++}
} }
this.loading = false this.loading = false
} }
......
...@@ -214,7 +214,7 @@ window.addEventListener('load', function () { ...@@ -214,7 +214,7 @@ window.addEventListener('load', function () {
interfacePublicKey: API_KEY_MAP["page"]["publicKey"], interfacePublicKey: API_KEY_MAP["page"]["publicKey"],
interfacePrivateKey: API_KEY_MAP["page"]["privateKey"], interfacePrivateKey: API_KEY_MAP["page"]["privateKey"],
reqParams: { reqParams: {
page: this.page++, // 每次请求增加下一页 page: this.page, // 每次请求增加下一页
size: this.size, size: this.size,
sign: 18, // 消费者建议列表 sign: 18, // 消费者建议列表
"merId": gemhoUtil.getParameter('merId'), "merId": gemhoUtil.getParameter('merId'),
...@@ -241,7 +241,7 @@ window.addEventListener('load', function () { ...@@ -241,7 +241,7 @@ window.addEventListener('load', function () {
if (this.page * this.size >= this.total) { if (this.page * this.size >= this.total) {
this.finished = true; // 下滑不在刷新数据 this.finished = true; // 下滑不在刷新数据
} }else{this.page++}
} }
this.loading = false this.loading = false
setTimeout(() => { setTimeout(() => {
......
...@@ -111,7 +111,7 @@ window.addEventListener("load", function() { ...@@ -111,7 +111,7 @@ window.addEventListener("load", function() {
sign: 32, sign: 32,
workTypeName: this.workTypeName, workTypeName: this.workTypeName,
merName: this.merName, merName: this.merName,
pageNum: this.page++, // 每次请求增加下一页 pageNum: this.page, // 每次请求增加下一页
pageSize: this.size, pageSize: this.size,
sort: 'lawId,desc', sort: 'lawId,desc',
}, },
...@@ -136,7 +136,7 @@ window.addEventListener("load", function() { ...@@ -136,7 +136,7 @@ window.addEventListener("load", function() {
this.total = result.total this.total = result.total
if (this.page * this.size >= this.total) { if (this.page * this.size >= this.total) {
this.finished = true // 下滑不在刷新数据 this.finished = true // 下滑不在刷新数据
} }else{this.page++}
} }
this.loading = false this.loading = false
} }
......
...@@ -191,7 +191,7 @@ window.addEventListener('load', function () { ...@@ -191,7 +191,7 @@ window.addEventListener('load', function () {
sign: 3, sign: 3,
// merId: this.merId ? this.merId : '', // merId: this.merId ? this.merId : '',
merName: this.shanghuName, merName: this.shanghuName,
pageNum: this.page++, // 每次请求增加下一页 pageNum: this.page, // 每次请求增加下一页
pageSize: this.size, pageSize: this.size,
sort: 'lawId,desc', sort: 'lawId,desc',
status: this.yhstatus() status: this.yhstatus()
...@@ -216,6 +216,8 @@ window.addEventListener('load', function () { ...@@ -216,6 +216,8 @@ window.addEventListener('load', function () {
if (this.page * this.size >= this.total) { if (this.page * this.size >= this.total) {
this.finished = true; // 下滑不在刷新数据 this.finished = true; // 下滑不在刷新数据
}else{
this.page++
} }
} }
this.loading = false this.loading = false
......
...@@ -104,7 +104,7 @@ window.addEventListener('load', function () { ...@@ -104,7 +104,7 @@ window.addEventListener('load', function () {
sign: 1, sign: 1,
type: this.activeTab, type: this.activeTab,
merId: this.merId, merId: this.merId,
pageNum: this.page++, // 每次请求增加下一页 pageNum: this.page, // 每次请求增加下一页
pageSize: this.size, pageSize: this.size,
sort: 'lawId,desc', sort: 'lawId,desc',
}, },
...@@ -127,7 +127,7 @@ window.addEventListener('load', function () { ...@@ -127,7 +127,7 @@ window.addEventListener('load', function () {
this.hazardList = result.rows this.hazardList = result.rows
if (this.page * this.size >= this.total) { if (this.page * this.size >= this.total) {
this.finished = true // 下滑不在刷新数据 this.finished = true // 下滑不在刷新数据
} }else{this.page++}
} }
this.loading = false this.loading = false
setTimeout(() => { setTimeout(() => {
......
...@@ -50,7 +50,7 @@ window.addEventListener('load', function () { ...@@ -50,7 +50,7 @@ window.addEventListener('load', function () {
interfacePrivateKey: API_KEY_MAP['no-page']['privateKey'], interfacePrivateKey: API_KEY_MAP['no-page']['privateKey'],
reqParams: { reqParams: {
sign: 10, sign: 10,
pageNum: this.page++, // 每次请求增加下一页 pageNum: this.page, // 每次请求增加下一页
pageSize: this.size, pageSize: this.size,
sort: 'lawId,desc', sort: 'lawId,desc',
merName: this.merName || '', merName: this.merName || '',
...@@ -77,7 +77,7 @@ window.addEventListener('load', function () { ...@@ -77,7 +77,7 @@ window.addEventListener('load', function () {
if (this.page * this.size >= this.total) { if (this.page * this.size >= this.total) {
this.finished = true // 下滑不在刷新数据 this.finished = true // 下滑不在刷新数据
} }else{this.page++}
} }
this.loading = false this.loading = false
setTimeout(() => { setTimeout(() => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment