隐患列表 演练列表

index.html

@@ -60,9 +60,9 @@
 					</p>
 					<!-- <button @click="link()">打开图片</button>
 					<button @click="link('pdf')">打开pdf</button> -->
-					<!-- <p class="bgImg" @click="nav('dw-list')">
+					<p class="bgImg" @click="nav('dw-list')">
 						<span>危险作业备案</span>
-					</p> -->
+					</p>
 				</div>
 				<div class="item">
 					<p class="bgImg" @click="nav('notice-list')">
@@ -73,11 +73,11 @@
 					</p>
 				
 				</div>
-				<!-- <div class="item">
+				<div class="item">
 					<p class="bgImg" @click="nav('emergency')">
 						<span>应急演练</span>
 					</p>
-				</div> -->
+				</div>
 			</div>
 		</div>
 	</body>

src/dw-list-detail.js

@@ -70,32 +70,67 @@ window.addEventListener("load", function() {
 				// 在文件上传之前的处理逻辑，例如校验文件大小、文件类型等
 				return true; // 返回 true 继续上传，返回 false 中止上传
 			},
-			afterRead(file) {
-				console.log('afterRead',file)
-				// 文件读取完成后的处理逻辑
-				const formData = new FormData();
-				formData.append('file', file.file); // 通过FormData构建要上传的文件数据
-				formData.append('modelName', 'dangerjob');
-
-				// 发送HTTP POST请求
-				fetch(this.previewUrl + '/api/common/upload', {
-						method: 'POST',
-						body: formData
+			afterRead(file) { // 调用爱山东中台系统，将数据流传递过去
+				vant.Toast.loading({
+					message: '正在处理...',
+					forbidClick: true,
+					loadingType: 'spinner',
+				});
+				http2.post({
+					serviceId: API_KEY_MAP["upload"]['id'],
+					interfacePublicKey: API_KEY_MAP["upload"]["publicKey"],
+					interfacePrivateKey: API_KEY_MAP["upload"]["privateKey"],
+					reqParams: {
+						modelName: 'dangerjob',
+					},
+					fileList: [{
+						fileName: 'file',
+						file: file.file
+					}]
+				}, (res) => {
+						
+					if(res){
+						console.log('接口回调数据', JSON.parse(res))
+						var result = JSON.parse(res)
+						
+						this.form.filePathList = result.body ? [result.body] : []
+						this.loading = false; // 加载状态结束
+						
+					
+						vant.Toast.clear()
+						vant.Toast({
+							message: '操作完成',
 						})
-					.then(response => {
-						if (response.ok) {
-							return response.json();
 					}
-						throw new Error('Network response was not ok.');
-					})
-					.then(data => {
-						console.log(data); // 处理后端返回的数据
-						// 可根据后端返回的数据做进一步处理，如显示上传成功信息等
-						this.form.filePathList = data.body ? [data.body] : []
 				})
-					.catch(error => {
-						console.error('There has been a problem with your fetch operation:', error);
-					});
+			
+			
+			
+				// // console.log('afterRead',file)
+				// // 文件读取完成后的处理逻辑
+				// const formData = new FormData();
+				// formData.append('file', file.file); // 通过FormData构建要上传的文件数据
+				// formData.append('modelName', 'dangerjob');
+
+				// // 发送HTTP POST请求
+				// fetch(this.previewUrl + '/api/common/upload', {
+				// 		method: 'POST',
+				// 		body: formData
+				// 	})
+				// 	.then(response => {
+				// 		if (response.ok) {
+				// 			return response.json();
+				// 		}
+				// 		throw new Error('Network response was not ok.');
+				// 	})
+				// 	.then(data => {
+				// 		console.log(data); // 处理后端返回的数据
+				// 		// 可根据后端返回的数据做进一步处理，如显示上传成功信息等
+				// 		this.form.filePathList = data.body ? [data.body] : []
+				// 	})
+				// 	.catch(error => {
+				// 		console.error('There has been a problem with your fetch operation:', error);
+				// 	});
 			},
 			resetData() {
 				// 使用 Object.assign 来重写 this.$data，以达到重置 data 的目的
@@ -143,16 +178,18 @@ window.addEventListener("load", function() {
 					})
 					return;
 				}
-				// let formData = new FormData()
-				// for (const key of Object.keys(this.form)) {
-				// 	formData.append(key, this.form[key]);
-				// }
-				this.form.companyId = this.companyId
+				// this.form.companyId = this.companyId
 				this.form.workTime = [this.form.workTime1, this.form.workTime2]
 
-				var url = "/api/dangerJobReport/create"
 
-				http.post(url, this.form).then((res) => {
+				http2.post({
+					serviceId: API_KEY_MAP["dw-list-detail"]['id'],
+					interfacePublicKey: API_KEY_MAP["dw-list-detail"]["publicKey"],
+					interfacePrivateKey: API_KEY_MAP["dw-list-detail"]["privateKey"],
+					reqParams: this.form
+				}, (res) => {
+						
+					if(res){
 						console.log('添加结果', res)
 						vant.Toast({
 							message: '操作成功',
@@ -160,7 +197,19 @@ window.addEventListener("load", function() {
 						if (!this.form.id) { // 添加时则
 							location.reload()
 						}
+					}
 				})
+				// var url = "/api/dangerJobReport/create"
+
+				// http.post(url, this.form).then((res) => {
+				// 	console.log('添加结果', res)
+				// 	vant.Toast({
+				// 		message: '操作成功',
+				// 	})
+				// 	if (!this.form.id) { // 添加时则
+				// 		location.reload()
+				// 	}
+				// })
 			},
 			formatDate(date, type) {
 				var ymd =

src/dw-list.html

@@ -16,12 +16,12 @@
 		</style>
 	</head>
 	<body>
-		<div id="app">
+		<div id="app"  v-cloak>
 			<div class="searchfuntionBtnWrapper">
-				<van-button type="info" size="small" @click="add">新增</van-button>
+				<van-button type="info" size="small" @click="add">{{addBtnText}}</van-button>
 			</div>
-			<div class="content" v-cloak>
-				<van-list v-model:loading="loading" :offset="10" :finished="finished" finished-text="没有更多了" @load="getList">
+			<div class="content">
+				<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" >
 							<p class="">
@@ -31,7 +31,7 @@
 								作业人数：{{item.workNumber}}
 							</p>
 							<p class="">
-								作业时间：{{item.workTime}}
+								作业时间：{{item.workTime&&item.workTime.join('~')||''}}
 							</p>
 							<p class="">
 								主要场所：{{item.mainPlace}}

src/dw-list.js

@@ -7,6 +7,7 @@ window.addEventListener("load", function() {
 		el: '#app',
 		data() {
 			return {
+				addBtnText: '新增',
 				value: '',
 				list: [],
 				loading: false,

src/emergency-detail.js

@@ -152,13 +152,13 @@ window.addEventListener("load", function() {
 				}, (res) => {
 						
 					if(res){
-						// console.log('接口回调数据', JSON.parse(res))
+						console.log('接口回调数据', JSON.parse(res))
 						
 						var result = JSON.parse(res)
 						this.loading = false; // 加载状态结束
 						
 						// console.log('响应结果', result.content)
-						this.form = res.body.content[0]
+						this.form = result.body.content[0]
 						
 						if(this.form.completionStatus===1){
 							this.disabled = true

src/emergency.html

@@ -21,7 +21,7 @@
 				<van-search v-model="planName" placeholder="请输入计划名称" @search="onSearch" @clear="onClear" />
 			</div>
 			<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(item)">
 							<p class="list-status-tag">

src/emergency.js

@@ -40,10 +40,11 @@ window.addEventListener("load", function() {
 				this.getList()
 			},
 			getList(){
-				if(this.loading){
-					return
-				}
-				this.loading = true
+				// if(this.loading){
+				// 	return
+				// }
+				// this.loading = true
+				setTimeout(() => {
 				http2.post({
 					serviceId: API_KEY_MAP["emergency"]['id'],
 					interfacePublicKey: API_KEY_MAP["emergency"]["publicKey"],
@@ -58,7 +59,7 @@ window.addEventListener("load", function() {
 					if(res){
 						console.log('接口回调数据', JSON.parse(res))
 						
-						var result = JSON.parse(res)
+						var result = JSON.parse(res).body
 						this.loading = false; // 加载状态结束
 						this.list.push(...result.content);
 						this.total = result.totalElements
@@ -69,6 +70,7 @@ window.addEventListener("load", function() {
 					}
 					this.loading = false
 				})
+				}, 0)
 			}
 		},
 	});

src/law-list.js

@@ -22,7 +22,7 @@ window.addEventListener("load", function() {
 		},
 		methods: {
 			detail(index) {
-				this.list[index].currentUserRead = true
+				// 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)
 			},