Prechádzať zdrojové kódy

Signed-off-by: zhaobao <528046418@qq.com>

zhaobao 1 rok pred
rodič
commit
e60702d165
54 zmenil súbory, kde vykonal 553 pridanie a 30 odobranie
  1. 16 0
      api/aqpt/checklistRecordHazardApi.js
  2. 3 2
      config/index.js
  3. 16 0
      pages.json
  4. 13 7
      pages/index/detail/detail.vue
  5. 1 4
      pages/index/handle/task/checkList/detail/detail.vue
  6. 2 2
      pages/index/handle/task/checkList/form/form.vue
  7. 237 0
      pages/index/handle/task/hazardRecord/form.vue
  8. 242 0
      pages/index/handle/task/hazardRecord/hazardRecord.vue
  9. 14 8
      pages/index/index.vue
  10. 0 0
      unpackage/cache/wgt/__UNI__73F6024/app-service.js
  11. 0 0
      unpackage/cache/wgt/__UNI__73F6024/app-view.js
  12. 0 0
      unpackage/dist/build/app-plus/app-service.js
  13. 0 0
      unpackage/dist/build/app-plus/app-view.js
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/applicationCenter/applicationCenter.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/history/history.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/detail/detail.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/handle/danger/index/index.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/handle/task/checkList/form/form.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/handle/task/checkList/form/transferCheckTask.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/handle/task/task.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/handle/warning/warning.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/message/message.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/myCenter.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/personalData/personalData.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/updatePassword/updatePassword.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list-item/uni-list-item.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list/uni-list.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-section/components/uni-section/uni-section.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.js.map
  50. 9 7
      unpackage/dist/dev/mp-weixin/common/vendor.js
  51. BIN
      unpackage/release/apk/__UNI__73F6024__20240123130745.apk
  52. 0 0
      unpackage/release/apk/history/__UNI__73F6024__20231218102410.apk
  53. BIN
      unpackage/release/apk/history/__UNI__73F6024__20231219104939.apk
  54. 0 0
      unpackage/release/apk/history/app.apk

+ 16 - 0
api/aqpt/checklistRecordHazardApi.js

@@ -0,0 +1,16 @@
+import { request } from '@/libs/request.js'
+
+export function getChecklistHazardRecordView(recordId) {
+  return request({
+    url: `/checklist/hazard/record/view/${recordId}`,
+    method: 'GET'
+  })
+}
+
+export function initChecklistHazardRecordView(data) {
+  return request({
+    url: '/checklist/hazard/record/init',
+    method: 'POST',
+    data
+  })
+}

+ 3 - 2
config/index.js

@@ -1,9 +1,10 @@
 export default {
     base: {
       // dev: 'http://1.15.92.205:7001',		
-      dev: 'https://api.xazhyc.com',
+      // dev: 'https://api.xazhyc.com',
 	  // dev: 'http://192.168.3.253:7001',	
-      pro: 'https://api.xazhyc.com'
+	  dev:"http://192.168.3.5:7001",
+      pro: 'https://api.xazhyc.com',
     },
 	appID: '10007',
 	appKey: '82a8bf439373e311',

+ 16 - 0
pages.json

@@ -136,6 +136,22 @@
 				"navigationBarTitleText" : "转交任务",
 				"enablePullDownRefresh" : false
 			}
+		},
+		{
+			"path" : "pages/index/handle/task/hazardRecord/hazardRecord",
+			"style" : 
+			{
+				"navigationBarTitleText" : "处理任务",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/index/handle/task/hazardRecord/form",
+			"style" : 
+			{
+				"navigationBarTitleText" : "处理检查",
+				"enablePullDownRefresh" : false
+			}
 		}
     ],
 	"tabBar": {

+ 13 - 7
pages/index/detail/detail.vue

@@ -278,13 +278,19 @@
 				if(this.conditions.status!==0) return;				
 				handleCheckTask(item.taskId).then((res)=>{
 					const { checklistId, checklistTypeId } = res.data //recordId-taskId
-					// if (checklistTypeId === 1) {// HazardRecordView											  
-					// } else if (checklistTypeId === 2) {// PointRecordView											  
-					// } else if (checklistTypeId === 3) {// ScoreRecordView											  
-					// }
-					uni.navigateTo({
-						url:`/pages/index/handle/task/task?rid=${item.taskId}&cid=${checklistId}`
-					})	
+					if (checklistTypeId === 1) {// HazardRecordView
+						uni.navigateTo({
+							url:`/pages/index/handle/task/hazardRecord/hazardRecord?rid=${item.taskId}&cid=${checklistId}&title=${item.taskTitle}`
+						})															  
+					} else if (checklistTypeId === 2) {// PointRecordView
+						uni.navigateTo({
+							url:`/pages/index/handle/task/task?rid=${item.taskId}&cid=${checklistId}&title=${item.taskTitle}`
+						})																  
+					} else if (checklistTypeId === 3) {// ScoreRecordView	
+						uni.navigateTo({
+							url:`/pages/index/handle/task/task?rid=${item.taskId}&cid=${checklistId}&title=${item.taskTitle}`
+						})															  
+					}
 				})
 			
 			},

+ 1 - 4
pages/index/handle/task/checkList/detail/detail.vue

@@ -3,10 +3,7 @@
 		<uni-section :title="point.pointContent" type="line">
 			<uni-forms ref="form" :modelValue="formData" :rules="rules" :label-width="300" label-position="top">
 				<uni-forms-item label="检查结果" name="checkResult" required>
-					<view class="uni-data-checkbox-wrap">
-						{{checkResult}}
-						<!-- <uni-data-checkbox  v-model="formData.checkResult" :localdata="checkResults" />		 -->		
-					</view>
+					<view class="uni-data-checkbox-wrap">{{checkResult}}</view>	
 				</uni-forms-item>	
 				<uni-forms-item label="备注" name="remark">
 				  <uni-easyinput disabled v-model="formData.remark" type="textarea" :maxlength="-1" autoHeight placeholder="备注" />

+ 2 - 2
pages/index/handle/task/checkList/form/form.vue

@@ -76,7 +76,7 @@
 					this.itemList=points
 					this.handles=points.filter(item=>(!item.checkResult&&item.pointId!==this.point.pointId))
 				})
-			},			
+			},
 			getLocation(){
 				const self=this;
 				uni.getLocation({
@@ -147,7 +147,7 @@
 						duration:1000,
 						complete() {
 							uni.redirectTo({
-								url:`/pages/app_views/checkList/index/index?type=form&id=${point.checklistId}&recordId=${point.recordId}`
+								url:`/pages/index/detail/detail?type=task&name=待办任务`
 							})
 						}
 					})	

+ 237 - 0
pages/index/handle/task/hazardRecord/form.vue

@@ -0,0 +1,237 @@
+<template>
+	<view class="wrap">
+		<uni-section :title="measure.hazardTitle" type="line">
+			<uni-forms ref="form" :modelValue="formData" :rules="rules" :label-width="300" label-position="top">
+				<uni-forms-item label="检查内容" required>
+				  {{measure.measureContent}}
+				</uni-forms-item>				
+				<uni-forms-item label="检查结果" name="checkResult" required>
+					<view class="uni-data-checkbox-wrap">
+						<uni-data-checkbox v-model="formData.checkResult" :localdata="checkResults" />				
+					</view>
+				</uni-forms-item>	
+				<uni-forms-item label="备注" name="remark">
+				  <uni-easyinput v-model="formData.remark" type="textarea" :maxlength="-1" autoHeight placeholder="备注" />
+				</uni-forms-item>
+				<uni-file-picker  v-model="formData.attachList" 
+				 fileMediatype="image" 
+				 title="请上传附件"
+				 limit="1"
+				 @select="uploadSuccess"
+				 @delete="deleteFile"></uni-file-picker>	
+			</uni-forms>
+		</uni-section>
+		<button type="primary" @click="onSubmit" class="submit-BT">提交</button>		
+	</view>
+</template>
+
+<script>
+import {upload} from '@/api/system/upload.js'	
+import { 
+	getChecklistHazardRecordById, 
+	updateChecklistHazardRecordDoing ,
+} from '@/api/aqpt/checklistHazardRecordApi'
+import { getChecklistHazardRecordView } from '@/api/aqpt/checklistRecordHazardApi'
+	export default {
+		data() {
+			return {
+				checkResults:[
+					{text:"通过",value:1},
+					{text:"不通过",value:-1},
+				],
+				formData:{
+					checkResult:1,	
+					remark:"",
+					attachList:[]
+				},
+				rules:{},
+				measure:{},
+				handles:[],
+				itemList:[]
+			}
+		},
+		created() {
+			this.init()
+		},
+		methods: {
+			init(){
+				let measure=uni.getStorageSync('measure');
+				this.measure=measure;
+				this.getLocation()
+				this.getchecklist()
+			},
+			getchecklist(){
+				getChecklistHazardRecordView(this.measure.recordId).then((res)=>{
+					let itemList=res.data.hazardList
+					let measures=[]						
+					for(let i=0;i<itemList.length;i++){
+						if(itemList[i].riskList){
+							itemList[i].riskList.map(child=>{
+								child.recordList.map(measure=>{
+									measures.push(measure)
+								})
+							})
+						}						
+					}
+					let index=measures.findIndex(item=>item.measureId===this.measure.measureId)
+					if(index>0){
+						let temp=measures[0];
+						measures[0]=JSON.parse(JSON.stringify(this.measure))
+						measures[index]=temp
+					}					
+					this.handles=measures					
+				})
+			},
+			getLocation(){
+				const self=this;
+				uni.getLocation({
+					type: 'wgs84',
+					success: function (res) {
+						self.formData.dutyLongitude=res.longitude
+						self.formData.dutyLatitude=res.latitude
+					}
+				});		
+			},
+			async onSubmit() {
+				let measure=uni.getStorageSync('measure')
+				let attachList=[]
+				for(let i=0;i<this.formData.attachList.length;i++){
+					let filePath=this.formData.attachList[i].url
+					let fileresq=await upload({filePath,formData:{
+						additions: `经度:${this.formData.dutyLongitude};纬度:${this.formData.dutyLatitude}`
+					}}).catch(()=>{
+						uni.showToast({
+							icon:'none',
+							title:"提交失败!"
+						})	
+					})
+					if(fileresq.includes('html')){
+						uni.showToast({
+							icon:'none',
+							title:"图片上传异常"
+						})
+						return
+					}					
+					fileresq=JSON.parse(fileresq)
+					attachList.push(fileresq.data)		
+				}
+				await updateChecklistHazardRecordDoing({
+					recordId:measure.recordId,
+					checklistId:measure.checklistId,
+					riskId:measure.riskId,
+					hazardId:measure.hazardId,
+					measureId:measure.measureId,
+					checkResult:this.formData.checkResult,
+					remark:this.formData.remark,
+					attachList,
+				}).catch(()=>{
+					uni.showToast({
+						icon:'none',
+						title:"提交失败!"
+					})				
+				})	
+				this.batchHandle()
+			},
+			// 批量处理未处理的
+			batchHandle(){
+				let measure=uni.getStorageSync('measure')
+				let handles=JSON.parse(JSON.stringify(this.handles))
+				handles.shift()	
+				this.handles=handles
+				if(handles.length<1){
+					uni.showToast({
+						icon:'none',
+						title:"处理完毕",
+						duration:1000,
+						complete() {
+							uni.redirectTo({
+								url:`/pages/index/detail/detail?type=task&name=待办任务`
+							})
+						}
+					})	
+					return					
+				}
+				this.formData={
+					checkResult:1,	
+					remark:"",
+					attachList:[]
+				}
+				uni.setStorageSync('measure',handles[0]);
+				this.measure=handles[0];								
+			},
+			// 批量处理未处理的【按顺序走到最后一个】
+			goOnNext(){
+				let point=uni.getStorageSync('point')				
+				let pointIdex=this.itemList.findIndex(item=>point.pointId===item.pointId)
+				let handles=this.itemList.slice(pointIdex+1);			
+				let nextPointIdx=handles.findIndex(item=>(!item.checkResult))
+					nextPointIdx=nextPointIdx+pointIdex
+				if(handles.length<1||nextPointIdx<0){
+					uni.showToast({
+						icon:'none',
+						title:"处理完毕",
+						duration:1000,
+						complete() {
+							uni.redirectTo({
+								url:`/pages/app_views/checkList/index/index?type=form&id=${point.checklistId}&recordId=${point.recordId}`
+							})
+						}
+					})	
+					return
+				}			
+				this.formData={
+					checkResult:1,	
+					remark:"",
+					attachList:[]
+				}						
+				let nextPoint=this.itemList[nextPointIdx+1]				
+				uni.setStorageSync('measure',nextPoint);//防止测试刷新数据丢失
+				this.measure=nextPoint;					
+			},
+			uploadSuccess(e){
+				let attachList=JSON.parse(JSON.stringify(this.formData.attachList))
+				attachList.push(e.tempFiles[0])
+				this.formData.attachList=attachList
+			},
+			deleteFile(e){							
+				let attachList=JSON.parse(JSON.stringify(this.formData.attachList))
+				attachList.filter(item=>item.uuid!==e.tempFile.uuid)
+				this.formData.attachList=attachList
+			},			
+		},
+		onUnload() {			
+			uni.removeStorageSync('point')
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.wrap{
+	padding: 20rpx;
+	padding-bottom: 200rpx;
+	.submit-BT {
+		width: 750rpx;
+		color: #4D73FF;
+		text-align: center;
+		font-size: 32rpx;
+		padding-bottom: 68rpx;
+		background-color: #fff;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 99;
+		box-shadow: 0px 0px 12px 0px #0000000A;
+		border-radius: 8px 8px 0px 0px
+	}
+	::v-deep .uni-forms-item{
+		.uni-forms-item__content{
+			.uni-data-checkbox-wrap{
+				height: 100%;
+				display: flex;
+				align-items: center;					
+			}
+	
+		}		
+	}
+}
+</style>

+ 242 - 0
pages/index/handle/task/hazardRecord/hazardRecord.vue

@@ -0,0 +1,242 @@
+<template>
+	<view class="page">
+		<view class="wrap">
+			<template v-if="itemList.length>0">
+				<view class="checklist" v-for="(hazardlist,idx) in itemList" :key="idx">
+					<view class="title more">{{hazardlist.hazardTitle}}</view>
+					<view class="item-cont" v-if="hazardlist.riskList&&hazardlist.riskList.length>0">
+						<view class="checklistItem" v-for="(riskItem,itemIdx) in hazardlist.riskList" :key="itemIdx">
+							<view class="itemTitle more"> {{riskItem.riskTitle}}</view>
+							<view  class="point-cont" v-if="riskItem.recordList&&riskItem.recordList.length>0">
+								<view class="point" v-for="(measure,measureIdx) in riskItem.recordList" :key="measureIdx" @click="check(measure)">
+									<view class="pointContent">
+											<text style="padding-right: 5px;">{{measureIdx+1}})</text>
+											<text>{{measure.measureContent}}</text>
+									</view>
+									<view class="status">{{measure.checkResult|checkResultFilter}}</view>
+								</view>
+							</view>
+						</view>				
+					</view>				
+				</view>
+				<view class="handle-container">	
+					<view class="handle" @click="handleSubmit(1)">全部通过</view>
+					<view class="handle" @click="handleSubmit(2)">全不通过</view>	
+					<view class="handle" @click="handleSubmit(3)">提交</view>
+					<view class="handle" @click="handleSubmit(4)">撤销</view>
+					<view class="handle" @click="handleSubmit(5)">转交</view>
+				</view>
+			</template>
+			<template v-else>没有可处理的清单^-_-^</template>
+		</view>		
+	</view>
+</template>
+<script>
+import { getChecklistHazardRecordView } from '@/api/aqpt/checklistRecordHazardApi'
+import { batchUpdateChecklistHazardRecordDoing } from '@/api/aqpt/checklistHazardRecordApi'
+import {cancelCheckTask,completeCheckTask} from '@/api/aqpt/task.js'	
+	export default {
+		data() {
+			return {
+				defaultProps: {
+					id: 'itemId', 
+					children: 'children',
+					label: 'itemTitle'
+				},
+				accountInfo:{},
+				divider: false,
+				edit: true,
+				itemList:[],
+				recordId:undefined,
+				checklistId:undefined,
+				handleVisiable:false,
+				type:undefined,
+				status:undefined,
+				taskTitle:""
+			}
+		},
+		  filters: {
+		    checkResultFilter(i) {
+			  if (i >= 0) {
+			    const strs = [
+			      '未检查',
+			      '通过'
+			    ]
+			    return strs[i]
+			  } else {
+			    if (i === -1) {
+			      return '未通过'
+			    } else if (i === -2) {
+			      return '发现隐患'
+			    }
+			  }
+		    }
+		  },
+		onLoad({rid,cid,title}) {
+			this.checklistId=cid	
+			this.recordId=rid	
+			let accountInfo=uni.getStorageSync('accountInfo')
+			this.accountInfo=accountInfo
+			this.taskTitle=title
+			this.getchecklistRecord(rid)
+		},
+		methods: {
+			getchecklistRecord(recordId){
+				getChecklistHazardRecordView(recordId).then((res)=>{
+					this.itemList=res.data.hazardList
+					this.status=res.data.status				
+				})
+			},
+			check(measure){		
+				uni.setStorageSync("measure",measure)
+				uni.navigateTo({
+					url:"/pages/index/handle/task/hazardRecord/form"
+				})								
+			},
+			handleSubmit(type){
+				let recordId=this.recordId;
+				let checklistId=this.checklistId;
+				if(type===1){
+					batchUpdateChecklistHazardRecordDoing(recordId,1).then(()=>{
+						this.getchecklistRecord(checklistId,recordId)
+					})
+				}
+				if(type===2){
+					batchUpdateChecklistHazardRecordDoing(recordId,-1).then(()=>{
+						this.getchecklistRecord(checklistId,recordId)
+					})
+				}				
+				if(type===3){//完成
+					completeCheckTask(recordId).then(()=>{				
+						uni.switchTab({
+							url:'/pages/index/index'
+						})
+					}).catch(()=>{
+						uni.showToast({
+							icon:"none",
+							title:"操作失败"
+						})
+					})
+				}
+				if(type===4){//放弃
+					cancelCheckTask(recordId).then(()=>{
+						uni.switchTab({
+							url:'/pages/index/index'
+						})
+					}).catch(()=>{
+						uni.showToast({
+							icon:"none",
+							title:"操作失败"
+						})
+					})
+				}	
+				if(type===5){//转交
+					let taskTitle=this.taskTitle;
+					uni.navigateTo({
+						url:`/pages/index/handle/task/checkList/form/transferCheckTask?tid=${recordId}&title=${taskTitle}`
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page{
+		background-color: #F5F6F8;
+		padding: 20rpx;
+		min-height: 100vh;
+		box-sizing: border-box;
+		margin-bottom: 100rpx;
+		.page-head{
+			text-align: right;
+			padding-bottom: 10rpx;
+			.handle{
+				display: inline-block;
+				background-color: #3384FF;
+				color: #fff;
+				padding: 10rpx 15rpx;
+				box-sizing: border-box;
+				border-right: 1rpx solid #eaeaea;
+				font-size: 30rpx;
+				text-align: center;
+				&:nth-child(4){
+					border: 0;
+				}
+			}
+		}
+	}	
+	.wrap{
+		padding: 20rpx;
+		background-color: #fff;
+		.checklist{
+			.title{
+				color: #222222;
+				font-size: 32rpx;
+				height: 98rpx;
+				line-height: 98rpx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				border-bottom: 1px dashed #E8E8E8;				
+			}
+			.more{
+				background-image: url('/static/tree_more.png');
+				background-size: 30rpx 30rpx;
+				padding-left: 40rpx;
+				background-position: center left;
+				background-repeat: no-repeat;
+			}
+			.item-cont{
+				padding-left: 20rpx;
+				border-bottom: 1px dashed #E8E8E8;	
+				.checklistItem{
+					.itemTitle{
+						color: #222222;
+						font-size: 32rpx;	
+						height: 98rpx;
+						line-height: 98rpx;
+					}
+				}
+				.point-cont{
+					padding-left: 30rpx;
+					.point{
+						display: flex;						
+						color: #666;
+						font-size: 28rpx;	
+						// height: 98rpx;
+						// line-height: 98rpx;
+						.pointContent{
+							flex: 1;
+						}
+					}
+				}
+			}
+		}
+			
+		.handle-container{
+			position: fixed;
+			width: 100%;
+			left: 0;
+			bottom: 0;
+			background-color: #fff;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-top: 1rpx solid #eaeaea;
+			.handle{
+				display:block;
+				background-color: #3384FF;
+				color: #fff;
+				padding: 15rpx 0;
+				width: 20%;
+				box-sizing: border-box;
+				border-right: 1rpx solid #eaeaea;
+				font-size: 26rpx;
+				text-align: center;
+				&:last-child{
+					border: 0;
+				}
+			}
+		}
+	}
+</style>

+ 14 - 8
pages/index/index.vue

@@ -362,15 +362,21 @@
 			handTask(item){
 				handleCheckTask(item.taskId).then((res)=>{
 					const { checklistId, checklistTypeId } = res.data //recordId-taskId
-					// if (checklistTypeId === 1) {// HazardRecordView											  
-					// } else if (checklistTypeId === 2) {// PointRecordView											  
-					// } else if (checklistTypeId === 3) {// ScoreRecordView											  
-					// }					
-					uni.navigateTo({
-						url:`/pages/index/handle/task/task?rid=${item.taskId}&cid=${checklistId}&title=${item.taskTitle}`
-					})	
+					if (checklistTypeId === 1) {// HazardRecordView	
+						uni.navigateTo({
+							url:`/pages/index/handle/task/hazardRecord/hazardRecord?rid=${item.taskId}&cid=${checklistId}&title=${item.taskTitle}`
+						})															  
+					} else if (checklistTypeId === 2) {// PointRecordView
+						uni.navigateTo({
+							url:`/pages/index/handle/task/task?rid=${item.taskId}&cid=${checklistId}&title=${item.taskTitle}`
+						})																  
+					} else if (checklistTypeId === 3) {// ScoreRecordView	
+						uni.navigateTo({
+							url:`/pages/index/handle/task/task?rid=${item.taskId}&cid=${checklistId}&title=${item.taskTitle}`
+						})															  
+					}	
+	
 				})
-
 			}
 		}
 	}

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/cache/wgt/__UNI__73F6024/app-service.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/cache/wgt/__UNI__73F6024/app-view.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/build/app-plus/app-service.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/build/app-plus/app-view.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/applicationCenter/applicationCenter.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/history/history.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/detail/detail.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/handle/danger/index/index.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/handle/task/checkList/form/form.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/handle/task/checkList/form/transferCheckTask.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/handle/task/task.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/handle/warning/warning.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/message/message.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/myCenter.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/personalData/personalData.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/updatePassword/updatePassword.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list-item/uni-list-item.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list/uni-list.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-section/components/uni-section/uni-section.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.js.map


+ 9 - 7
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -2466,7 +2466,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"六院联创","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"六院联创","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败,请尽量确保 data 函数中不访问 vm 对象,否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -10649,7 +10649,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"六院联创","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"六院联创","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -10670,14 +10670,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"六院联创","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"六院联创","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"六院联创","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"六院联创","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -10773,7 +10773,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"六院联创","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"六院联创","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -23071,9 +23071,11 @@ exports.default = void 0;
 var _default = {
   base: {
     // dev: 'http://1.15.92.205:7001',		
-    dev: 'https://api.xazhyc.com',
+    // dev: 'https://api.xazhyc.com',
     // dev: 'http://192.168.3.253:7001',	
-    pro: 'https://api.xazhyc.com'
+    dev: "http://192.168.3.5:7001",
+    // pro: 'https://api.xazhyc.com',
+    pro: 'http://192.168.3.5:7001'
   },
   appID: '10007',
   appKey: '82a8bf439373e311',

BIN
unpackage/release/apk/__UNI__73F6024__20240123130745.apk


+ 0 - 0
unpackage/release/apk/__UNI__73F6024__20231218102410.apk → unpackage/release/apk/history/__UNI__73F6024__20231218102410.apk


BIN
unpackage/release/apk/history/__UNI__73F6024__20231219104939.apk


+ 0 - 0
unpackage/release/apk/app.apk → unpackage/release/apk/history/app.apk


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov