法律法规、通知公告 分页问题处理

css/common.css

 [v-cloak] {
 	display: none;
 }
-
-
 /* 基础工具样式类 */
 .pd-01rem {
 	padding-bottom: 0.1rem;

index.html

@@ -34,22 +34,12 @@
 				font-weight: bold;
 			}
 
-			.wrapper .item .bgImg1:first-child {
-				background-image: url('./image/yh-list.png');
+			.wrapper .item .bgImg:first-child {
+				background-image: url('./image/yellow.png');
 			}
 
-			/* .wrapper .item .bgImg1:last-child {
-				background-image: url('./image/dw-list.png');
-			} */
-			.wrapper .item .bgImg2:first-child {
-				background-image: url('./image/notice-list.png');
-			}
-			
-			.wrapper .item .bgImg2:last-child {
-				background-image: url('./image/law-list.png');
-			}
-			.wrapper .item .bgImg3:first-child {
-				background-image: url('./image/emergency.png');
+			.wrapper .item .bgImg:last-child {
+				background-image: url('./image/blue.png');
 			}
 
 			.wrapper .item .bgImg span {
@@ -62,31 +52,33 @@
 		<!-- 获取授权用户信息 本地token等操作 -->
 		<script type="text/javascript" src="sdk/jssdk2/index.js"></script>
 		<div id="app">
+			
 			<div class="wrapper">
 				<div class="item">
-					<p class="bgImg bgImg1" @click="nav('yh-list')">
+					<p class="bgImg" @click="nav('yh-list')">
+						<span>隐患管理</span>
 					</p>
-					<!-- <p class="bgImg bgImg1" @click="nav('dw-list')">
+					<!-- <button @click="link()">打开图片</button>
+					<button @click="link('pdf')">打开pdf</button> -->
+					<!-- <p class="bgImg" @click="nav('dw-list')">
+						<span>危险作业备案</span>
 					</p> -->
 				</div>
-				<!-- <div class="item">
-					<p class="bgImg bgImg2" @click="nav('notice-list')">
-						
+				<div class="item">
+					<p class="bgImg" @click="nav('notice-list')">
+						<span>通知公告</span>
 					</p>
-					<p class="bgImg bgImg2" @click="nav('law-lv1')">
+					<p class="bgImg" @click="nav('law-lv1')">
+						<span>法律法规</span>
 					</p>
 				
 				</div>
-				<div class="item">
-					<p class="bgImg bgImg3" @click="nav('emergency')">
+				<!-- <div class="item">
+					<p class="bgImg" @click="nav('emergency')">
+						<span>应急演练</span>
 					</p>
 				</div> -->
 			</div>
 		</div>
 	</body>
-	<!-- <span>通知公告</span> -->
-	<!-- <span>应急演练</span> -->
-	<!-- <span>法律法规</span> -->
-	<!-- <span>危险作业备案</span> -->
-	<!-- <span>隐患管理</span> -->
 </html>
\ No newline at end of file

sdk/http.js

@@ -16,7 +16,7 @@ var http2 = {
 		 */
 		const data = SM.encrypt(JSON.stringify(params.reqParams), params.interfacePublicKey)
 		
-		// console.log('http2方法进来了~普通请求参数', JSON.stringify(params.reqParams))
+		console.log('http2方法进来了~普通请求参数', JSON.stringify(params.reqParams))
 		
 		const extraData = { // 公共请求头设置
 			// header: {

sdk/includeHead.js

@@ -20,8 +20,8 @@ document.write('<script type="text/javascript" src="https://isdapp.shandong.gov.
 				<script type="text/javascript" src="' + contextPath + '/sdk/jssdk2/sm2/build/SM.js"></script>');
 
 // 移动端 debugger 调试	
-// document.write('<script type="text/javascript" src="//cdn.bootcdn.net/ajax/libs/eruda/2.4.1/eruda.js"></script>\
-// 				<script>eruda.init();</script>');			
+document.write('<script type="text/javascript" src="//cdn.bootcdn.net/ajax/libs/eruda/2.4.1/eruda.js"></script>\
+				<script>eruda.init();</script>');			
 
 /**
  * 项目业务相关 js

src/dw-list-detail.js

@@ -7,7 +7,7 @@ window.addEventListener("load", function() {
 		el: '#app',
 		data() {
 			return {
-				previewUrl: axios.defaults.baseURL,
+				previewUrl: BASE_URL,
 				form: {
 					id: '',
 					companyId: '',

src/emergency.js

@@ -39,23 +39,6 @@ window.addEventListener("load", function() {
 				console.log('search', val)
 				this.getList()
 			},
-			exportFile(item){
-				http.downloadFile('/api/dangerJobReport/export',{
-					fileType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-					fileName: 'DW-'+ gemhoUtil.getTargetDateYMD().replaceAll('-', '') +'.xlsx'
-				}).then((res)=>{
-					vant.Toast({
-						message: '操作成功',
-					})
-					this.loading = false; // 加载状态结束
-				})
-			},
-			add(){
-				gemhoUtil.navigatePage('./dw-list-detail.html?type=add')
-			},
-			edit(item){
-				gemhoUtil.navigatePage('./dw-list-detail.html?planId='+item.id+'&type=edit')
-			},
 			getList(){
 				if(this.loading){
 					return

src/law-list.html

@@ -18,7 +18,7 @@
 	<body>
 		<div id="app">
 			<div class="content" v-cloak>
-				<van-list v-model:loading="loading" :offset="10" :finished="finished" finished-text="没有更多了" @load="getList">
+				<van-list v-model:loading="loading" :offset="10" :finished="finished" finished-text="没有更多了" @load="getList" :immediate-check="false">
 					<van-cell v-for="(item, index) in list" :key="item">
 						<div class="list-item-wrapper" @click="detail(index)">
 							<p class="">
@@ -28,7 +28,7 @@
 							<p class="">
 								{{item.lawTitle}}
 							</p>
-							<div class="list-function-btn-wrapper pd-01rem" style="justify-content: space-between;">
+							<div class="list-function-btn-wrapper pd-01rem" style="justify-content: space-between; color: gray;">
 								<span>{{item.lawPublisher}}</span>
 								<span>{{item.lawDate}}</span>
 							</div>

src/law-list.js

@@ -13,7 +13,7 @@ window.addEventListener("load", function() {
 				loading: false,
 				finished: false,
 				page: 0,
-				size: 999,
+				size: 10,
 				total: 0
 			}
 		},
@@ -21,41 +21,45 @@ window.addEventListener("load", function() {
 			this.getList()
 		},
 		methods: {
-			detail(index){
+			detail(index) {
 				this.list[index].currentUserRead = true
 				// location.href = './law-list-detail.html?law_id='+this.list[index].lawId
-				gemhoUtil.navigatePage('./law-list-detail.html?law_id='+this.list[index].lawId)
+				gemhoUtil.navigatePage('./law-list-detail.html?law_id=' + this.list[index].lawId)
 			},
-			getList(){
-				if(this.loading){
-					return
-				}
-				this.loading = true
+			getList() {
+				// if(this.loading){
+				// 	return
+				// }
+				// this.loading = true
+				setTimeout(() => {
+
+
 					http2.post({
 						serviceId: API_KEY_MAP["law-list"]['id'],
 						interfacePublicKey: API_KEY_MAP["law-list"]["publicKey"],
 						interfacePrivateKey: API_KEY_MAP["law-list"]["privateKey"],
 						reqParams: {
-						page: this.page++,// 每次请求增加下一页
+							page: this.page++, // 每次请求增加下一页
 							size: this.size,
 							category_id: gemhoUtil.getParameter('category_id'),
 							sort: 'lawId,desc',
 						}
 					}, (res) => {
 
-					if(res){
+						if (res) {
 							console.log('接口回调数据', JSON.parse(res))
 
 							var result = JSON.parse(res)
 							this.list.push(...result.content);
 							this.total = result.totalElements
 
-						if(this.page*this.size >= this.total){
+							if (this.page * this.size >= this.total) {
 								this.finished = true; // 下滑不在刷新数据
 							}
 						}
 						this.loading = false
 					})
+				}, 0)
 			}
 		},
 	});

src/law-lv1.html

@@ -19,7 +19,7 @@
 	<body>
 		<div id="app">
 			<div class="content" v-cloak>
-				<van-list v-model:loading="loading" :offset="10" :finished="finished" finished-text="没有更多了" @load="getList">
+				<van-list v-model:loading="loading" :offset="10" :finished="finished" finished-text="没有更多了" @load="getList" :immediate-check="false">
 					<van-cell v-for="(item, index) in list" :key="item">
 						<div class="list-item-wrapper" @click="nav(item)" >
 							<p class="">

src/law-lv1.js

@@ -13,7 +13,7 @@ window.addEventListener("load", function() {
 				loading: false,
 				finished: false,
 				page: 0,
-				size: 999,
+				size: 20,
 				total: 0
 			}
 		},
@@ -21,27 +21,30 @@ window.addEventListener("load", function() {
 			this.getList()
 		},
 		methods: {
-			nav(item){
+			nav(item) {
 				// location.href='./law-lv2.html?pid=' + item.id
 				gemhoUtil.navigatePage('./law-lv2.html?pid=' + item.id)
 			},
-			getList(){
-				if(this.loading){
-					return
-				}
-				this.loading = true
+			getList() {
+				// if(this.loading){
+				// 	return
+				// }
+				// this.loading = true
+				setTimeout(() => {
+
+
 					http2.post({
 						serviceId: API_KEY_MAP["law-lv"]['id'],
 						interfacePublicKey: API_KEY_MAP["law-lv"]["publicKey"],
 						interfacePrivateKey: API_KEY_MAP["law-lv"]["privateKey"],
 						reqParams: {
-						page: this.page++,// 每次请求增加下一页
+							page: this.page++, // 每次请求增加下一页
 							size: this.size,
 							// sort: 'createTime,desc',
 						}
 					}, (res) => {
 
-					if(res){
+						if (res) {
 							console.log('接口回调数据', JSON.parse(res))
 
 							var result = JSON.parse(res)
@@ -49,12 +52,13 @@ window.addEventListener("load", function() {
 							this.list.push(...result.content);
 							this.total = result.totalElements
 
-						if(this.page*this.size >= this.total){
+							if (this.page * this.size >= this.total) {
 								this.finished = true; // 下滑不在刷新数据
 							}
 						}
 						this.loading = false
 					})
+				}, 0)
 			}
 		},
 	});

src/law-lv2.html

@@ -19,7 +19,7 @@
 	<body>
 		<div id="app">
 			<div class="content" v-cloak>
-				<van-list v-model:loading="loading" :offset="10" :finished="finished" finished-text="没有更多了" @load="getList">
+				<van-list v-model:loading="loading" :offset="10" :finished="finished" finished-text="没有更多了" @load="getList" :immediate-check="false">
 					<van-cell v-for="(item, index) in list" :key="item">
 						<div class="list-item-wrapper" @click=nav(item.id)>
 							<p class="">

src/law-lv2.js

@@ -11,7 +11,7 @@ window.addEventListener("load", function() {
 				loading: false,
 				finished: false,
 				page: 0,
-				size: 999,
+				size: 20,
 				total: 0
 			}
 		},
@@ -20,28 +20,31 @@ window.addEventListener("load", function() {
 			this.getList()
 		},
 		methods: {
-			nav(category_id){
+			nav(category_id) {
 				// location.href = './law-list.html?category_id=' + category_id
 				gemhoUtil.navigatePage('./law-list.html?category_id=' + category_id)
 			},
-			getList(){
-				if(this.loading){
-					return
-				}
-				this.loading = true
+			getList() {
+				// if(this.loading){
+				// 	return
+				// }
+				// this.loading = true
+				setTimeout(() => {
+
+
 					http2.post({
 						serviceId: API_KEY_MAP["law-lv"]['id'],
 						interfacePublicKey: API_KEY_MAP["law-lv"]["publicKey"],
 						interfacePrivateKey: API_KEY_MAP["law-lv"]["privateKey"],
 						reqParams: {
-						page: this.page++,// 每次请求增加下一页
+							page: this.page++, // 每次请求增加下一页
 							size: this.size,
 							pid: gemhoUtil.getParameter('pid'),
 							// sort: 'createTime,desc',
 						}
 					}, (res) => {
 
-					if(res){
+						if (res) {
 							console.log('接口回调数据', JSON.parse(res))
 
 							var result = JSON.parse(res)
@@ -49,15 +52,16 @@ window.addEventListener("load", function() {
 							this.list.push(...result.content);
 							this.total = result.totalElements
 
-						if(!this.list.length){
+							if (!this.list.length) {
 								this.nav(gemhoUtil.getParameter('pid'))
 							}
-						if(this.page*this.size >= this.total){
+							if (this.page * this.size >= this.total) {
 								this.finished = true; // 下滑不在刷新数据
 							}
 						}
 						this.loading = false
 					})
+				}, 0)
 			}
 		},
 	});

src/notice-list-detail.html

@@ -17,11 +17,12 @@
 			.van-cell__value{overflow: unset; }
 			.van-cell:after{border-bottom:none;}
 			.van-radio-group--horizontal{float: right;}
+			/* font-size: 0.48rem; */
 		</style>
 	</head>
 	<body>
 		<div id="app">
-			<div class="content" v-cloak style="font-size: 0.48rem; padding:0.15rem" v-html="noticeContent"></div>
+			<div class="content" v-cloak style="padding:0.15rem" v-html="noticeContent"></div>
 		</div>
 	</body>
 </html>
\ No newline at end of file