From b090a02988f1b920f85ba2bb56b748249c7a7283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Fri, 17 May 2024 10:47:12 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=A4=87=E6=B3=A8=E4=B8=8D=E5=AF=B9?=
 =?UTF-8?q?=E9=BD=90=EF=BC=8C=20=E5=B7=A1=E6=9F=A5=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=96=B0=E9=9A=90=E6=82=A3=E6=B7=BB=E5=8A=A0=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?input=E4=B8=8D=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InspectionReport/pages/InspectionReport/InspectionReport.js | 2 +-
 .../pages/InspectionReport/InspectionReport.wxss                | 1 -
 .../pages/safetyinspection/safetyinspection.wxml                | 2 +-
 .../pages/safetyinspection/safetyinspection.wxss                | 1 +
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
index 1c79c01..96809f5 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
@@ -300,7 +300,7 @@ Page({
     });
   },
   addAnother() {
-    let newValue = this.data.arr1.length + 1; // 根据数组长度确定新值
+    let newValue = this.data.arr1.length + 1; // 根据addAnother数组长度确定新值
     let newArr = this.data.arr1.concat({
       value: newValue.toString(),
       name: this.data.hazardDesc
diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss
index fedec8a..f5bb206 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss
@@ -110,7 +110,6 @@ page {
   display: flex;
   flex-direction: column;
   margin: 20rpx;
-  padding-left: 40rpx;
 }
 .image1{
   margin-top: 20rpx;
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
index 2355ea5..f2f9bb3 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
@@ -32,7 +32,7 @@
       </view>
     </view>
     <view class="input1">
-      <input bindinput="changenewContent" value="{{newContentWithIndex}}" type="text" placeholder="  请输入新的隐患信息" />
+      <input bindinput="changenewContent" value="{{newContent}}" type="text" placeholder="  请输入新的隐患信息" />
     </view>
     <view class="add" bind:tap="addAnother">
       <image src="../../../../images/add.png" class="add_img"></image>
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss
index bd670fc..c76320a 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss
@@ -134,6 +134,7 @@ page {
   display: flex;
   flex-direction: column;
   margin: 20rpx;
+  padding-left: 40rpx;
 }
 .image1{
   margin-top: 20rpx;

From e65e30a7d79ca7e66f463f311549373ccd99f0a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Fri, 17 May 2024 10:57:20 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=90=88=E6=A0=BC=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=BD=91=E7=BB=9C=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/safetyinspection/safetyinspection.js                 | 3 +++
 .../pages/safetyinspection/safetyinspection.wxml               | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
index 8bd8fa4..a612a8a 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
@@ -303,6 +303,9 @@ handelClickSave(){
     remark:this.data.remark,
     address:""
   }
+  if (!this.data.reviewTime) {
+    form.reviewTime=null
+  }
 console.log(this.data.checkboxOptions.concat(this.data.addHiddenDangeList))
 addRecord(form).then(res => {
     if(res.code == 0){
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
index f2f9bb3..ac32554 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
@@ -27,8 +27,7 @@
       </van-checkbox-group>
       <view class="addHiddenDangeList">
         <text wx:for="{{addHiddenDangeList}}" wx:for-index="index" class="addHiddenDangeListText"
-              wx:for-item="item">{{index + checkboxOptionsnumber
-}}. {{item.hazardDesc}}</text>
+              wx:for-item="item"> {{item.hazardDesc}}</text>
       </view>
     </view>
     <view class="input1">

From 881c07d679cfa696922997476bd1298c64d00d59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Fri, 17 May 2024 18:40:10 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E4=B8=8A=E6=8A=A5-?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=8E=E8=BF=94=E5=9B=9E=E5=AE=89=E6=A3=80?=
 =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E5=88=97=E8=A1=A8=EF=BC=8C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9C=AA=E5=88=B7=E6=96=B0=E5=B7=A1=E6=9F=A5=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E6=8B=9F=E5=A4=8D=E6=9F=A5=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=9A=84=E6=97=A5=E6=9C=9F=EF=BC=8C=E4=BD=86=E6=98=AF=E5=B7=A1?=
 =?UTF-8?q?=E6=9F=A5=E8=AE=B0=E5=BD=95=E4=B8=AD=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E6=98=AF=E5=88=B0=E5=85=B7=E4=BD=93=E6=97=B6=E5=88=86=E7=A7=92?=
 =?UTF-8?q?=EF=BC=8C=E9=80=89=E6=8B=A9=E6=97=B6=E4=B9=9F=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E6=98=AF=E9=80=89=E6=8B=A9=E5=85=B7=E4=BD=93=E6=97=B6=E5=88=86?=
 =?UTF-8?q?=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InspectionReport/InspectionReport.js      | 126 ++++++++++++++----
 .../InspectionReport/InspectionReport.json    |   3 +-
 .../InspectionReport/InspectionReport.wxml    |  49 +++++--
 .../InspectionReport/InspectionReport.wxss    |   8 ++
 .../safetyinspection/safetyinspection.js      |  94 +++++++++++--
 .../safetyinspection/safetyinspection.json    |   4 +-
 .../safetyinspection/safetyinspection.wxml    |  37 ++++-
 7 files changed, 266 insertions(+), 55 deletions(-)

diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
index 96809f5..098a458 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
@@ -8,13 +8,17 @@ const App = getApp()
 import {
   addRecord,
   securityCheckk,
-  inspectionStaff
+  inspectionStaff,
+  showRecord
 } from "../../../../utils/api"
 Page({
   /**
    * 页面的初始数据
    */
   data: {
+    showtime:false,
+    checkboxOptions:[],
+    checkboxOptionsnumber:0,
     hiddenDangeList: [],
     newObj:[],
     addRecord: [],
@@ -58,6 +62,12 @@ Page({
     imageId: 1,
     arr: [],
     arr1: [],
+    addHiddenDangeList:[],
+    checkboxValue:[],
+    newContent:'',
+    currentDate: new Date().getTime(),
+    minDate: new Date(2020, 0, 1).getTime(),
+    maxDate: new Date(2030, 11, 31).getTime()
   },
   /**
    * 生命周期函数--监听页面加载
@@ -71,6 +81,35 @@ Page({
     })
     this.reverseLocation()
     this.getList()
+
+  },
+  showTime(){
+      this.setData({
+        showtime:true
+      })
+  },
+
+  showRecordData() {
+    console.log(this.data.companyId)
+    let parm = {
+      id: this.data.companyId
+    }
+    showRecord(parm).then(res => {
+      console.log(res)
+      if(res.data[0].hiddenDangeList){
+        let checkboxOptions = res.data[0].hiddenDangeList.filter(item=>item.hazardStatus === 0).map(item=>({hazardDesc:item.hazardDesc,hazardStatus:0}));
+        let checkboxOptionsnumber=checkboxOptions.length+1;
+        console.log(checkboxOptionsnumber)
+        this.setData({
+          checkboxOptions,
+          checkboxOptionsnumber
+        })
+      }
+      this.setData({
+        showList:res.data
+      })
+      console.log(this.data.showList)
+    })
   },
   getCurrentDateTime() {
     const now = new Date();
@@ -104,7 +143,7 @@ Page({
       })
       return false
     }
-    if(this.data.checkResultFlag == 0 && !this.data.reviewTime){
+    if(this.data.checkResultFlag == 0 && !this.data.getData){
       wx.showToast({
         title: '请选择拟复查时间',
         icon:'none'
@@ -122,17 +161,23 @@ Page({
     const hours = now.getHours().toString().padStart(2, '0');
     const minutes = now.getMinutes().toString().padStart(2, '0');
     const seconds = now.getSeconds().toString().padStart(2, '0');
-    addRecord({
-      companyId: this.data.companyId,
+    console.log(this.data.getData)
+    let form={ companyId: this.data.companyId,
       checkTime: this.getCurrentDateTime(),
       checkPersonsIdList: this.data.checkPersonsIdList,
       checkResultFlag: this.data.checkResultFlag,
-      reviewTime:`${this.data.reviewTime} ${hours}:${minutes}:${seconds}`,
-      hiddenDangeList:[...this.data.hiddenDangeList,{hazardStatus:2,hazardDesc:this.data.hazardDesc2}] ,
+      reviewTime:this.data.getData,
+      hiddenDangeList:this.data.checkboxOptions.concat(this.data.addHiddenDangeList),
       attachmentUrls:this.data.uploadImageList.map(item=>({fileName:item.originFileName,attachmentUrl:item.ossUrl.url})),
       remark: '',
       reviewAddress:this.data.addressContent
-    }).then(
+    }
+      if (!this.data.reviewTime) {
+        form.reviewTime=null
+      }
+    addRecord(
+      form
+    ).then(
       res => {
         if(res.code == 0){
           wx.showToast({
@@ -158,7 +203,7 @@ Page({
     }).then(({
       data
     }) => {
-      console.log(data)
+      console.log(data.list)
       this.setData({
         companyList: data.list,
       });
@@ -266,6 +311,9 @@ Page({
       selectedNames: names,
       checkPersonsIdList:this.data.selectedOptions
     }); // 关闭弹出层
+  },
+  onCloseTime(){
+
   },
   onChange1(event) {
     console.log(event)
@@ -299,27 +347,18 @@ Page({
       hazardDesc2: e.detail.value
     });
   },
-  addAnother() {
-    let newValue = this.data.arr1.length + 1; // 根据addAnother数组长度确定新值
-    let newArr = this.data.arr1.concat({
-      value: newValue.toString(),
-      name: this.data.hazardDesc
-    });
+  changenewContent(e){
     this.setData({
-      arr1: newArr,
-      hazardDesc: '', // 清空输入框的值
+      newContent: e.detail.value
     });
-    const nameArray = this.data.arr1.map(item => item.name);
-    nameArray.forEach(value => {
-      // 创建一个新的对象，设置 hazardDesc 属性为当前值
-       this.data.newObj = {
-          hazardStatus: '0',  // 如果需要同时设置 hazardStatus 属性，可以在这里进行设置
-          hazardDesc: value
-      };
-  });
-
-  this.data.hiddenDangeList.push(this.data.newObj);
-  console.log(this.data.hiddenDangeList)
+  },
+  addAnother() {
+      let newArr = this.data.addHiddenDangeList.concat({ hazardDesc: this.data.newContent, hazardStatus: 0 });
+      this.setData({
+        addHiddenDangeList: newArr,
+        newContent: '', // 清空输入框的值
+      });
+      console.log('添加后的数组:', this.data.addHiddenDangeList);
   },
   pickerChange: function (e) {
       this.setData({
@@ -343,6 +382,7 @@ Page({
       gridNName: this.data.companyList[e.detail.value].name,
       companyId:this.data.companyList[e.detail.value].id
     });
+    this.showRecordData()
   },
   bindRemarkInput(e) {
     this.setData({
@@ -598,4 +638,36 @@ Page({
       }
     })
   },
+  closePopup() {
+    this.setData({ showPopup: false });
+  },
+
+  onInput(event) {
+    var date = new Date(event.detail);
+    var year = date.getFullYear();
+    var month = ("0" + (date.getMonth() + 1)).slice(-2); 
+    var day = ("0" + date.getDate()).slice(-2);
+    var hour = ("0" + date.getHours()).slice(-2);
+    var minute = ("0" + date.getMinutes()).slice(-2);
+    var second = ("0" + date.getSeconds()).slice(-2);
+    var formattedDateTime = year + "-" + month + "-" + day + " " + hour + ":" + minute + ":" + second;
+    console.log(formattedDateTime); 
+    this.setData({
+      getData:formattedDateTime
+    })
+
+  },
+
+  onConfirm(event) {
+    const { value } = event.detail;
+    this.setData({
+      currentDate: value,
+      showtime: false
+    });
+    console.log('选中的日期时间:', new Date(value));
+  },
+
+  onCancel() {
+    this.setData({ showtime: false });
+  }
 })
\ No newline at end of file
diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.json b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.json
index 3e0357b..2068200 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.json
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.json
@@ -8,6 +8,7 @@
       "van-checkbox": "@vant/weapp/checkbox/index",
       "van-checkbox-group": "@vant/weapp/checkbox-group/index",
      "van-popup": "@vant/weapp/popup/index",
-    "van-picker": "@vant/weapp/picker/index"
+    "van-picker": "@vant/weapp/picker/index",
+    "van-datetime-picker": "@vant/weapp/datetime-picker/index"
     }
 }
\ No newline at end of file
diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
index 57202fb..2075d59 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
@@ -48,12 +48,13 @@
       </view>
     </view>
     <view class="checkbox1">
-      <van-checkbox-group value="{{ result }}" bind:change="onChange">
-        <van-checkbox  custom-class="group"  data-value="{{item.value}}" name="{{item.value}}" wx:for="{{arr1}}" >{{item.name}}</van-checkbox>
-      </van-checkbox-group>
+      <view class="addHiddenDangeList">
+        <text wx:for="{{addHiddenDangeList}}" wx:for-index="index" class="addHiddenDangeListText"
+              wx:for-item="item">{{index+1}}.{{item.hazardDesc}}</text>
+      </view>
     </view>
     <view class="input1">
-      <input bindinput="changeHazardDesc" type="text" value="{{hazardDesc}}" placeholder="  请输入" />
+      <input bindinput="changenewContent" type="text" value="{{newContent}}" placeholder="  请输入" />
     </view>
     <view class="add" bind:tap="addAnother">
       <image src="../../../../images/add.png" class="add_img"></image>
@@ -97,14 +98,18 @@
   </view>
   <view class="prosecutors">
     <text class="prosecutors_req" wx:if="{{checkResultFlag == 0}}">*</text>
-    <view class="nes"> 
+    <view class="nes" bind:tap="showTime" > 
     <view class="conclusion">
       <text class="prosecutors_pre">拟复查时间</text>
-      <picker mode="date" class="prosecutors_name" bindchange="pickerChange1" value="{{data}}">
+      <view class="{{getData?'prosecutors_name':'gray'}}">
+            {{getData?getData:'请选择'}}
+          </view>
+      <!-- <picker mode="date" class="prosecutors_name" bindchange="pickerChange1" value="{{data}}">
           <view class="{{getData?'':'gray'}}">
             {{getData?getData:'请选择'}}
           </view>
-        </picker>
+        </picker> -->
+        
     </view>
     <view class="conclusion_right">
       <image src="../../../../images/right.png" class="prosecutors_img"></image>
@@ -151,5 +156,33 @@
     </van-checkbox-group>
   </view>
 </van-popup>
-
+<van-popup show="{{ showtime }}" close-icon="close" position="bottom" custom-style="height: 50%" bind:close="closePopup" round>
+  <van-datetime-picker
+      type="datetime"
+      value="{{ currentDate }}"
+      min-date="{{ minDate }}"
+      max-date="{{ maxDate }}"
+      bind:input="onInput"
+      bind:confirm="onConfirm"
+      bind:cancel="onCancel"
+    />
+</van-popup>
+<!-- <van-popup show="{{ showTime }}" closeable close-icon="close" position="bottom" custom-style="height: 50%" bind:close="onClose" round>
+  <view class="popup-content">
+    <van-checkbox-group value="{{selectedOptions}}"  bind:change="onChange1">
+      <van-checkbox name="{{item.staffId}}"  custom-class="checkbox"  wx:for="{{arr}}">{{item.name}}</van-checkbox>
+    </van-checkbox-group>
+  </view>
+</van-popup> -->
+<!-- <van-popup show="{{ showTime }}" position="bottom" bind:close="closePopup" custom-style="height: 50%">
+    <van-datetime-picker
+      type="datetime"
+      value="{{ currentDate }}"
+      min-date="{{ minDate }}"
+      max-date="{{ maxDate }}"
+      bind:input="onInput"
+      bind:confirm="onConfirm"
+      bind:cancel="onCancel"
+    />
+  </van-popup> -->
 
diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss
index f5bb206..596198b 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss
@@ -290,6 +290,14 @@ page {
   margin-left: 50rpx;
   margin-bottom: 20rpx;
 }
+.addHiddenDangeList{
+  display: flex;
+  flex-direction: column;
+  margin-left: 70rpx;
+}
+.addHiddenDangeListText {
+margin-bottom: 20rpx;
+}
 .group{
   margin-top: 20rpx;
 }
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
index a612a8a..ca09625 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
@@ -11,6 +11,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+
     checkboxOptionsnumber:0,
     orgid:'',
     orgType:'',
@@ -35,7 +36,11 @@ Page({
     checkboxValue:[],
     uploadImageList: [],//图片上传的数组
     imageId:1,
-    addHiddenDangeList:[]
+    addHiddenDangeList:[],
+    currentDate: new Date().getTime(),
+    minDate: new Date(2020, 0, 1).getTime(),
+    maxDate: new Date(2030, 11, 31).getTime(),
+    showtime:false,
   },
   /**
    * 生命周期函数--监听页面加载
@@ -104,13 +109,18 @@ Page({
       });
     });
   },
+  showTime(){
+    this.setData({
+      showtime:true
+    })
+},
   onChange(event) {
     console.log(event.detail);
     this.data.checkboxOptions.forEach((item,index)=>{
         if(event.detail.findIndex(item=>item==index) != -1){
-          item.hazardStatus = 1
-        }else{
           item.hazardStatus = 0
+        }else{
+          item.hazardStatus = 1
         }
     })
     this.setData({
@@ -182,7 +192,6 @@ Page({
     })
 
   },  
-
   showPopup() {
     this.setData({ showPopup: true }); // 点击按钮显示弹出层
   },
@@ -227,12 +236,28 @@ Page({
     });
   },
   addAnother() {
-    let newArr = this.data.addHiddenDangeList.concat({ hazardDesc: this.data.newContent, hazardStatus: 0 });
-    this.setData({
-      addHiddenDangeList: newArr,
-      newContent: '', // 清空输入框的值
-    });
-    console.log('添加后的数组:', this.data.addHiddenDangeList);
+    if ( !this.data.newContent) {
+      wx.showModal({
+        title: '提示',
+        content: '输入不能为空',
+        success (res) {
+          if (res.confirm) {
+            console.log('用户点击确定')
+          } else if (res.cancel) {
+            console.log('用户点击取消')
+          }
+        }
+      })
+    }else{
+      let newArr = this.data.addHiddenDangeList.concat({ hazardDesc: this.data.newContent, hazardStatus: 0 });
+      this.setData({
+        addHiddenDangeList: newArr,
+        newContent: '', // 清空输入框的值
+      });
+      console.log('添加后的数组:', this.data.addHiddenDangeList);
+      
+    }
+    
    
   },
      // 删除选中的图片
@@ -287,7 +312,6 @@ handelClickSave(){
     })
     return false
   }
-
   const now = new Date();
   const hours = now.getHours().toString().padStart(2, '0');
   const minutes = now.getMinutes().toString().padStart(2, '0');
@@ -482,6 +506,22 @@ pickerChange: function(e) {
     checkResultFlag:e.detail.value,
     checkResultFlagName:this.data.array[e.detail.value]
   });
+  if (e.detail.value) {
+    console.log(this.data.checkboxOptions)
+      if (this.data.addHiddenDangeList && this.data.checkboxOptions.length<0) {
+        wx.showModal({
+          title: '提示',
+          content: '隐患最少输入一条',
+          success (res) {
+            if (res.confirm) {
+              console.log('用户点击确定')
+            } else if (res.cancel) {
+              console.log('用户点击取消')
+            }
+          }
+        })
+      }
+  }
 },
 pickerChange1: function(e) {
   this.setData({
@@ -495,6 +535,38 @@ bindRemarkInput(e){
   console.log(this.data.remark)
   console.log(this.data.remark)
 },
+closePopup() {
+  this.setData({ showPopup: false });
+},
+
+onInput(event) {
+  var date = new Date(event.detail);
+  var year = date.getFullYear();
+  var month = ("0" + (date.getMonth() + 1)).slice(-2); 
+  var day = ("0" + date.getDate()).slice(-2);
+  var hour = ("0" + date.getHours()).slice(-2);
+  var minute = ("0" + date.getMinutes()).slice(-2);
+  var second = ("0" + date.getSeconds()).slice(-2);
+  var formattedDateTime = year + "-" + month + "-" + day + " " + hour + ":" + minute + ":" + second;
+  console.log(formattedDateTime); 
+  this.setData({
+    getData:formattedDateTime
+  })
+
+},
+
+onConfirm(event) {
+  const { value } = event.detail;
+  this.setData({
+    currentDate: value,
+    showtime: false
+  });
+  console.log('选中的日期时间:', new Date(value));
+},
+
+onCancel() {
+  this.setData({ showtime: false });
+}
 
 })
 
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.json b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.json
index 8ecdb53..1e8e5bc 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.json
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.json
@@ -7,7 +7,9 @@
      "van-uploader": "@vant/weapp/uploader/index",
      "van-popup": "@vant/weapp/popup/index",
     "van-picker": "@vant/weapp/picker/index",
-    "wux-actionsheet": "../../../../components/dist/actionsheet/index"
+    "wux-actionsheet": "../../../../components/dist/actionsheet/index",
+    "van-datetime-picker": "@vant/weapp/datetime-picker/index"
+    
   },
   "permissions": {
     "scope.record": true
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
index ac32554..8728aa8 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
@@ -56,14 +56,17 @@
   </view>
   <view class="prosecutors" >
     <text class="prosecutors_req" wx:if="{{checkResultFlag == 0}}">*</text>
-    <view class="nes"> 
+    <view class="nes"  bind:tap="showTime"> 
     <view class="conclusion">
       <text class="prosecutors_pre">拟复查时间</text>
-      <picker mode="date" class="prosecutors_name" bindchange="pickerChange1" value="{{reviewTime}}">
+      <view class="{{getData?'prosecutors_name':'gray'}}">
+            {{getData?getData:'请选择'}}
+          </view>
+      <!-- <picker mode="date" class="prosecutors_name" bindchange="pickerChange1" value="{{reviewTime}}">
           <view class="{{reviewTime?'':'gray'}}">
             {{reviewTime?reviewTime:'请选择'}}
           </view>
-        </picker>
+        </picker> -->
     </view>
     <view class="conclusion_right">
       <image src="../../../../images/right.png" class="prosecutors_img"></image>
@@ -117,14 +120,14 @@
             <text class="logs-content-txt">{{item.checkResultFlag == 1?'合格':'不合格'}}</text>
           </view>
           <view>
-            <text class="logs-content-title">隐患明细：</text>
-            <text class="logs-content-txt" name="{{index}}"  wx:for="{{item.hiddenDangeList}}">{{index + 1}}. {{item.hazardDesc}}</text>
+            <text class="logs-content-title">{{index==0?'未整改隐患： ':'隐患明细：'}}</text>
+            <text class="logs-content-txt" name="{{index}}"  wx:for="{{item.hiddenDangeList}}">{{index + 1}}.{{item.hazardDesc}}</text>
           </view>
-          <view>
+          <view wx:if="{{index}}">
             <text class="logs-content-title">整改要求：</text>
             <text class="logs-content-txt" wx:for="{{item.hiddenDangeList}}">{{item.hazardStatus}}</text>
           </view>
-          <view>
+          <view wx:if="{{index}}">
             <text class="logs-content-title">拟复查时间：</text>
             <text class="logs-content-txt">{{item.reviewTime}}</text>
           </view>
@@ -162,3 +165,23 @@
   </view>
 </van-popup>
 <wux-actionsheet id="wux-actionsheet" />
+<view class="container">
+  <van-datetime-picker  wx:if="{{showtime}}"
+    type="datetime"
+    value="{{ currentDate }}"
+    min-date="{{ minDate }}"
+    max-date="{{ maxDate }}"
+    bind:input="onInput"
+  />
+</view>
+<van-popup show="{{ showtime }}" close-icon="close" position="bottom" custom-style="height: 50%" bind:close="closePopup" round>
+  <van-datetime-picker
+      type="datetime"
+      value="{{ currentDate }}"
+      min-date="{{ minDate }}"
+      max-date="{{ maxDate }}"
+      bind:input="onInput"
+      bind:confirm="onConfirm"
+      bind:cancel="onCancel"
+    />
+</van-popup>
\ No newline at end of file

From b661b3f306ff95957e44be29f67e5dc1212d2645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Mon, 20 May 2024 09:27:49 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E9=9A=90?=
 =?UTF-8?q?=E6=82=A3=E6=98=8E=E7=BB=86=E6=9C=80=E5=B0=91=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E4=B8=80=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/InspectionReport/InspectionReport.js                 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
index 098a458..9759e34 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
@@ -150,7 +150,8 @@ Page({
       })
       return false
     }
-    if(this.data.checkResultFlag == 0 && this.data.hiddenDangeList.length<0){
+    console.log( this.data.addHiddenDangeLis)
+    if(this.data.checkResultFlag == 0 && this.data.addHiddenDangeList){
       wx.showToast({
         title: '请填写隐患明细',
         icon:'none'

From d0266838cc483aa1b3a197911b012813b400a777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Mon, 20 May 2024 09:32:12 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E8=A6=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=AD=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InspectionReport/pages/InspectionReport/InspectionReport.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
index 9759e34..72747f7 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
@@ -153,7 +153,7 @@ Page({
     console.log( this.data.addHiddenDangeLis)
     if(this.data.checkResultFlag == 0 && this.data.addHiddenDangeList){
       wx.showToast({
-        title: '请填写隐患明细',
+        title: '隐患明细最少输入一条',
         icon:'none'
       })
       return false

From 96c84338a148b53bea0311ec4f220a3e2e922dd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Mon, 20 May 2024 16:26:35 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9C=AA=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InspectionReport/InspectionReport.js      |  65 ++++++----
 .../InspectionReport/InspectionReport.wxml    |   4 +-
 .../safetyinspection/safetyinspection.js      | 116 ++++++++++--------
 .../safetyinspection/safetyinspection.wxml    |   8 +-
 4 files changed, 116 insertions(+), 77 deletions(-)

diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
index 72747f7..e3e2874 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
@@ -122,6 +122,19 @@ Page({
     return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
   },
   submitBiao() {
+    console.log("zhixingle")
+    console.log(this.data.newContent)
+    if (this.data.newContent) {
+      let newArr = this.data.addHiddenDangeList.concat({
+        hazardDesc: this.data.newContent,
+        hazardStatus: 0
+      });
+      console.log(newArr)
+      this.setData({
+        addHiddenDangeList: newArr,
+      });
+    }
+
     if(!this.data.companyId){
       wx.showToast({
         title: '请选择企业',
@@ -150,8 +163,9 @@ Page({
       })
       return false
     }
-    console.log( this.data.addHiddenDangeLis)
-    if(this.data.checkResultFlag == 0 && this.data.addHiddenDangeList){
+    console.log( this.data.addHiddenDangeList)
+    
+    if(this.data.checkResultFlag == 0 && this.data.addHiddenDangeList.length<1){
       wx.showToast({
         title: '隐患明细最少输入一条',
         icon:'none'
@@ -162,7 +176,11 @@ Page({
     const hours = now.getHours().toString().padStart(2, '0');
     const minutes = now.getMinutes().toString().padStart(2, '0');
     const seconds = now.getSeconds().toString().padStart(2, '0');
-    console.log(this.data.getData)
+    let checkboxOptions =this.data.addHiddenDangeList.filter(item=>item.hazardStatus === 0).map(item=>({hazardDesc:item.hazardDesc,hazardStatus:2,requirements:this.data.hazardDesc2}));
+    this.setData({
+      addHiddenDangeList:checkboxOptions
+    })
+    console.log(this.data.addHiddenDangeList)
     let form={ companyId: this.data.companyId,
       checkTime: this.getCurrentDateTime(),
       checkPersonsIdList: this.data.checkPersonsIdList,
@@ -176,24 +194,25 @@ Page({
       if (!this.data.reviewTime) {
         form.reviewTime=null
       }
-    addRecord(
-      form
-    ).then(
-      res => {
-        if(res.code == 0){
-          wx.showToast({
-            title: '新增成功',
-            duration:2000,
-            success:function(){
-                setTimeout(()=>{
-                  wx.navigateBack({
-                      delta: 1
-                  })
-                },2000)
-            }
-          })
-        }
-    });
+      console.log(form)
+    // addRecord(
+    //   form
+    // ).then(
+    //   res => {
+    //     if(res.code == 0){
+    //       wx.showToast({
+    //         title: '新增成功',
+    //         duration:2000,
+    //         success:function(){
+    //             setTimeout(()=>{
+    //               wx.navigateBack({
+    //                   delta: 1
+    //               })
+    //             },2000)
+    //         }
+    //       })
+    //     }
+    // });
 
   },
 
@@ -347,6 +366,7 @@ Page({
     this.setData({
       hazardDesc2: e.detail.value
     });
+    console.log(this.data.hazardDesc2)
   },
   changenewContent(e){
     this.setData({
@@ -354,7 +374,8 @@ Page({
     });
   },
   addAnother() {
-      let newArr = this.data.addHiddenDangeList.concat({ hazardDesc: this.data.newContent, hazardStatus: 0 });
+      let newArr = this.data.addHiddenDangeList.concat({ hazardDesc: this.data.newContent, hazardStatus: 0, requirements:this.data.hazardDesc2});
+      console.log()
       this.setData({
         addHiddenDangeList: newArr,
         newContent: '', // 清空输入框的值
diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
index 2075d59..5c41e5e 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
@@ -56,10 +56,10 @@
     <view class="input1">
       <input bindinput="changenewContent" type="text" value="{{newContent}}" placeholder="  请输入" />
     </view>
-    <view class="add" bind:tap="addAnother">
+    <!-- <view class="add" bind:tap="addAnother">
       <image src="../../../../images/add.png" class="add_img"></image>
       <text>再添加一条</text>
-    </view>
+    </view> -->
   </view>
 
 
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
index ca09625..51afc3e 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
@@ -37,7 +37,7 @@ Page({
     uploadImageList: [],//图片上传的数组
     imageId:1,
     addHiddenDangeList:[],
-    currentDate: new Date().getTime(),
+    currentDate:null,
     minDate: new Date(2020, 0, 1).getTime(),
     maxDate: new Date(2030, 11, 31).getTime(),
     showtime:false,
@@ -55,6 +55,7 @@ Page({
     this.showRecordData()
     this.toOinspectionStaff()
     this.securityCheckk()
+
   },
 
   /**
@@ -66,14 +67,22 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+  
+    console.log(111111);
+    debugger
+    console.log(this.getCurrentDateTime());
+    this.setData({
+      currentDate:this.getCurrentDateTime()
+    })
   },
 
   /**
    * 生命周期函数--监听页面隐藏
    */
   onHide() {
-
+    this.setData({
+      currentDate:null
+    })
   },
 
   /**
@@ -118,11 +127,13 @@ Page({
     console.log(event.detail);
     this.data.checkboxOptions.forEach((item,index)=>{
         if(event.detail.findIndex(item=>item==index) != -1){
+          console.log("我被选中了")
           item.hazardStatus = 0
         }else{
           item.hazardStatus = 1
         }
     })
+    console.log(this.data.checkboxOptions)
     this.setData({
       checkboxValue:event.detail,
     })
@@ -156,13 +167,14 @@ Page({
     });
   },
   showRecordData() {
+    console.log("我执行了")
     let parm = {
       id: this.data.companyId
     }
     showRecord(parm).then(res => {
       console.log(res)
       if(res.data[0].hiddenDangeList){
-        let checkboxOptions = res.data[0].hiddenDangeList.filter(item=>item.hazardStatus === 0).map(item=>({hazardDesc:item.hazardDesc,hazardStatus:0}));
+        let checkboxOptions = res.data[0].hiddenDangeList.filter(item=>item.hazardStatus === 0).map(item=>({hazardDesc:item.hazardDesc,hazardStatus:1}));
         let checkboxOptionsnumber=checkboxOptions.length+1;
         console.log(checkboxOptionsnumber)
         this.setData({
@@ -173,6 +185,7 @@ Page({
       this.setData({
         showList:res.data
       })
+      console.log(this.data.checkboxOptions)
       console.log(this.data.showList)
     })
   },
@@ -234,32 +247,10 @@ Page({
     this.setData({
       newContent: e.detail.value
     });
+    console.log('添加后的数组:', this.data.newContent);
+    console.log(this.data.checkboxOptions)
   },
-  addAnother() {
-    if ( !this.data.newContent) {
-      wx.showModal({
-        title: '提示',
-        content: '输入不能为空',
-        success (res) {
-          if (res.confirm) {
-            console.log('用户点击确定')
-          } else if (res.cancel) {
-            console.log('用户点击取消')
-          }
-        }
-      })
-    }else{
-      let newArr = this.data.addHiddenDangeList.concat({ hazardDesc: this.data.newContent, hazardStatus: 0 });
-      this.setData({
-        addHiddenDangeList: newArr,
-        newContent: '', // 清空输入框的值
-      });
-      console.log('添加后的数组:', this.data.addHiddenDangeList);
-      
-    }
-    
-   
-  },
+
      // 删除选中的图片
      deleteImage(e) {
        console.log(this.data.uploadImageList,'data中');
@@ -280,10 +271,27 @@ Page({
     const hours = now.getHours().toString().padStart(2, '0');
     const minutes = now.getMinutes().toString().padStart(2, '0');
     const seconds = now.getSeconds().toString().padStart(2, '0');
+    debugger
     return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
   },
  
 handelClickSave(){
+  console.log(this.data.checkboxOptions)
+  console.log(this.data.newContent)
+  console.log("zhixingle")
+  console.log(this.data.newContent)
+  if (this.data.newContent) {
+    let newArr = this.data.addHiddenDangeList.concat({
+      hazardDesc: this.data.newContent,
+      hazardStatus: 0
+    });
+    console.log(newArr)
+    this.setData({
+      addHiddenDangeList: newArr,
+    });
+  }
+  console.log(this.data.checkboxOptions)
+  console.log(this.data.addHiddenDangeList)
   if(this.data.selectedOptions.length === 0){
     wx.showToast({
       title: '请选择检查人员',
@@ -298,14 +306,34 @@ handelClickSave(){
     })
     return false
   }
-  if(this.data.checkResultFlag == 0 && !this.data.reviewTime){
+  if(this.data.checkResultFlag == 0 && !this.data.getData){
     wx.showToast({
       title: '请选择拟复查时间',
       icon:'none'
     })
     return false
   }
-  if(this.data.checkResultFlag == 0 && this.data.checkboxOptions.length<0){
+  console.log(this.data.checkboxOptions)
+    let hasHazardStatus1 = false;
+   this.data.checkboxOptions.forEach(item => {
+    if (item.hazardStatus === 0) {
+      hasHazardStatus1 = true;
+      // 如果找到了符合条件的元素，可以直接 return 结束循环
+      return;
+    }
+ 
+  });
+  // let checkbox = this.data.checkboxOptions.map(item => {
+  //   // item.hazardStatus = 0;
+  //   // return item;
+  //   if (item.hazardStatus = 0) {
+  //     return
+  //   }
+  // });
+  // console.log(checkbox)
+  console.log( "11",hasHazardStatus1)
+if(this.data.checkResultFlag == 0 && !hasHazardStatus1 && this.data.addHiddenDangeList.length<1){
+  console.log("1111",hasHazardStatus1)
     wx.showToast({
       title: '请填写隐患明细',
       icon:'none'
@@ -316,17 +344,22 @@ handelClickSave(){
   const hours = now.getHours().toString().padStart(2, '0');
   const minutes = now.getMinutes().toString().padStart(2, '0');
   const seconds = now.getSeconds().toString().padStart(2, '0');
+  console.log(this.data.checkboxOptions)
+  console.log(this.data.addHiddenDangeList)
   let form = {
     companyId:this.data.companyId,
     checkTime:this.getCurrentDateTime(),
     checkPersonsIdList:this.data.selectedOptions,
     checkResultFlag:this.data.checkResultFlag,
-    reviewTime:`${this.data.reviewTime} ${hours}:${minutes}:${seconds}`,
+    reviewTime:this.data.getData,
     hiddenDangeList:this.data.checkboxOptions.concat(this.data.addHiddenDangeList),
     attachmentUrls:this.data.uploadImageList.map(item=>({fileName:item.originFileName,attachmentUrl:item.ossUrl.url})),
     remark:this.data.remark,
     address:""
   }
+  console.log(this.data.checkboxOptions)
+  console.log(this.data.addHiddenDangeList)
+  console.log(this.data.hiddenDangeList)
   if (!this.data.reviewTime) {
     form.reviewTime=null
   }
@@ -506,22 +539,7 @@ pickerChange: function(e) {
     checkResultFlag:e.detail.value,
     checkResultFlagName:this.data.array[e.detail.value]
   });
-  if (e.detail.value) {
-    console.log(this.data.checkboxOptions)
-      if (this.data.addHiddenDangeList && this.data.checkboxOptions.length<0) {
-        wx.showModal({
-          title: '提示',
-          content: '隐患最少输入一条',
-          success (res) {
-            if (res.confirm) {
-              console.log('用户点击确定')
-            } else if (res.cancel) {
-              console.log('用户点击取消')
-            }
-          }
-        })
-      }
-  }
+  console.log(this.data.checkboxOptions)
 },
 pickerChange1: function(e) {
   this.setData({
@@ -552,7 +570,7 @@ onInput(event) {
   this.setData({
     getData:formattedDateTime
   })
-
+  console.log(this.data.getData)
 },
 
 onConfirm(event) {
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
index 8728aa8..24665b1 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
@@ -33,10 +33,10 @@
     <view class="input1">
       <input bindinput="changenewContent" value="{{newContent}}" type="text" placeholder="  请输入新的隐患信息" />
     </view>
-    <view class="add" bind:tap="addAnother">
+    <!-- <view class="add" bind:tap="addAnother">
       <image src="../../../../images/add.png" class="add_img"></image>
       <text>再添加一条</text>
-    </view>
+    </view> -->
   </view>
   <view class="prosecutors" >
     <text class="prosecutors_req">*</text>
@@ -59,8 +59,8 @@
     <view class="nes"  bind:tap="showTime"> 
     <view class="conclusion">
       <text class="prosecutors_pre">拟复查时间</text>
-      <view class="{{getData?'prosecutors_name':'gray'}}">
-            {{getData?getData:'请选择'}}
+      <view class="{{currentDate?'prosecutors_name':'gray'}}">
+            {{currentDate?currentDate:'请选择'}}
           </view>
       <!-- <picker mode="date" class="prosecutors_name" bindchange="pickerChange1" value="{{reviewTime}}">
           <view class="{{reviewTime?'':'gray'}}">

From 31cf5807cc7acdf90dba08baa6e03bf2c95f910a Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 22 May 2024 09:22:55 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=AE=89=E6=A3=80=E5=B7=A1=E6=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InspectionReport/InspectionReport.js      |  67 ++++-------
 .../InspectionReport/InspectionReport.wxml    |  27 +++--
 .../safetyinspection/safetyinspection.js      | 104 +++++++++++-------
 .../safetyinspection/safetyinspection.wxml    |  92 ++++++++--------
 subpages/securityCheck/pages/securityCheck.js |   5 +-
 .../securityCheck/pages/securityCheck.wxml    |   4 +-
 utils/index.js                                |  27 ++++-
 7 files changed, 175 insertions(+), 151 deletions(-)

diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
index e3e2874..3eb514c 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
@@ -18,7 +18,6 @@ Page({
   data: {
     showtime:false,
     checkboxOptions:[],
-    checkboxOptionsnumber:0,
     hiddenDangeList: [],
     newObj:[],
     addRecord: [],
@@ -67,7 +66,8 @@ Page({
     newContent:'',
     currentDate: new Date().getTime(),
     minDate: new Date(2020, 0, 1).getTime(),
-    maxDate: new Date(2030, 11, 31).getTime()
+    maxDate: new Date(2030, 11, 31).getTime(),
+    checkboxValue:[]
   },
   /**
    * 生命周期函数--监听页面加载
@@ -90,25 +90,21 @@ Page({
   },
 
   showRecordData() {
-    console.log(this.data.companyId)
+    this.setData({
+      checkboxOptions:null
+    })
     let parm = {
       id: this.data.companyId
     }
     showRecord(parm).then(res => {
-      console.log(res)
       if(res.data[0].hiddenDangeList){
-        let checkboxOptions = res.data[0].hiddenDangeList.filter(item=>item.hazardStatus === 0).map(item=>({hazardDesc:item.hazardDesc,hazardStatus:0}));
-        let checkboxOptionsnumber=checkboxOptions.length+1;
-        console.log(checkboxOptionsnumber)
+        let checkboxOptions = res.data[0].hiddenDangeList.filter(item=>item.hazardStatus === 0).map(item=>({hazardDesc:item.hazardDesc,hazardStatus:0,id:item.id}));
         this.setData({
           checkboxOptions,
-          checkboxOptionsnumber
+          beforeFlag: res.data[0].checkResultFlag
         })
+        console.log(this.data.checkboxOptions);
       }
-      this.setData({
-        showList:res.data
-      })
-      console.log(this.data.showList)
     })
   },
   getCurrentDateTime() {
@@ -122,19 +118,6 @@ Page({
     return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
   },
   submitBiao() {
-    console.log("zhixingle")
-    console.log(this.data.newContent)
-    if (this.data.newContent) {
-      let newArr = this.data.addHiddenDangeList.concat({
-        hazardDesc: this.data.newContent,
-        hazardStatus: 0
-      });
-      console.log(newArr)
-      this.setData({
-        addHiddenDangeList: newArr,
-      });
-    }
-
     if(!this.data.companyId){
       wx.showToast({
         title: '请选择企业',
@@ -163,30 +146,29 @@ Page({
       })
       return false
     }
-    console.log( this.data.addHiddenDangeList)
     
-    if(this.data.checkResultFlag == 0 && this.data.addHiddenDangeList.length<1){
+    if(this.data.checkResultFlag == 0 && this.data.checkboxValue.length<1&&!this.data.hazardDesc2){
       wx.showToast({
         title: '隐患明细最少输入一条',
         icon:'none'
       })
       return false
     }
-    const now = new Date();
-    const hours = now.getHours().toString().padStart(2, '0');
-    const minutes = now.getMinutes().toString().padStart(2, '0');
-    const seconds = now.getSeconds().toString().padStart(2, '0');
-    let checkboxOptions =this.data.addHiddenDangeList.filter(item=>item.hazardStatus === 0).map(item=>({hazardDesc:item.hazardDesc,hazardStatus:2,requirements:this.data.hazardDesc2}));
-    this.setData({
-      addHiddenDangeList:checkboxOptions
-    })
-    console.log(this.data.addHiddenDangeList)
+    this.data.checkboxOptions.forEach(item => {
+      if(this.checkboxValue.findIndex(itemC=>itemC === item.value) == -1){
+        item.hazardStatus = '1';
+      }else{
+        item.hazardStatus = '0';
+      }
+  })
+  console.log(this.data.checkboxValue);
+  console.log(this.data.checkboxOptions);
     let form={ companyId: this.data.companyId,
       checkTime: this.getCurrentDateTime(),
       checkPersonsIdList: this.data.checkPersonsIdList,
       checkResultFlag: this.data.checkResultFlag,
       reviewTime:this.data.getData,
-      hiddenDangeList:this.data.checkboxOptions.concat(this.data.addHiddenDangeList),
+      hiddenDangeList:null,
       attachmentUrls:this.data.uploadImageList.map(item=>({fileName:item.originFileName,attachmentUrl:item.ossUrl.url})),
       remark: '',
       reviewAddress:this.data.addressContent
@@ -277,13 +259,11 @@ Page({
    */
   onShareAppMessage() {},
   onChange(event) {
-    console.log("111", event)
+    console.log(event);
     this.setData({
-      result: event.detail
+      checkboxValue: event.detail
     });
-    console.log(this.data.result);
-    console.log(this.data.hiddenDangeList);
-    
+    console.log(this.data.checkboxValue);
   },
   afterRead(event) {
     const {
@@ -402,7 +382,8 @@ Page({
     // 更新当前选中的索引
     this.setData({
       gridNName: this.data.companyList[e.detail.value].name,
-      companyId:this.data.companyList[e.detail.value].id
+      companyId:this.data.companyList[e.detail.value].id,
+      checkboxValue:[]
     });
     this.showRecordData()
   },
diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
index 5c41e5e..dddd8a0 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
@@ -44,13 +44,16 @@
     <view class="prosecutors">
       <text class="prosecutors_req"  wx:if="{{checkResultFlag == 0}}">*</text>
       <view class="conclusion1">
-        <text class="prosecutors_pre">隐患明细</text>
+        <text class="prosecutors_pre">{{beforeFlag == 1?'隐患明细':'未整改隐患'}}</text>
       </view>
     </view>
     <view class="checkbox1">
+      <van-checkbox-group value="{{checkboxValue}}" bind:change="onChange" wx:if="{{checkboxOptions}}" >
+        <van-checkbox custom-class="group"  name="{{item.id}}" wx:for="{{checkboxOptions}}">{{index + 1}}. {{item.hazardDesc}}</van-checkbox>
+      </van-checkbox-group>
       <view class="addHiddenDangeList">
         <text wx:for="{{addHiddenDangeList}}" wx:for-index="index" class="addHiddenDangeListText"
-              wx:for-item="item">{{index+1}}.{{item.hazardDesc}}</text>
+              wx:for-item="item"> {{item.hazardDesc}}</text>
       </view>
     </view>
     <view class="input1">
@@ -62,21 +65,17 @@
     </view> -->
   </view>
 
-
-  <view class="pitfall">
+  <view class="pitfall"  wx:if="{{beforeFlag == 1}}">
     <view class="prosecutors">
-      <view class="requirement">
+      <text class="prosecutors_req">*</text>
+      <view class="conclusion1">
         <text class="prosecutors_pre">整改要求</text>
       </view>
     </view>
-    <!-- <view class="checkbox1">
-  <van-checkbox-group value="{{ hazardDesc }}">
-    <van-checkbox name="hazardDesc">{{ hazardDesc }}</van-checkbox>
-  </van-checkbox-group>
-</view> -->
-<view class="input1">
-  <input bindinput="changeHazardDescStatus2" type="text" placeholder="请输入" value="{{ hazardDesc2 }}" />
-</view>
+
+  <view class="input1">
+    <input bindinput="changeHazardDescStatus2" type="text" placeholder="  请输入" value="{{ hazardDesc2 }}" />
+  </view>
   </view>
 
   <view class="prosecutors">
@@ -138,7 +137,7 @@
          </view>
     <text class="text_27">备注</text>
     <view class="textarea1">
-      <textarea placeholder-style="color: #C1C1C1;"   bindinput="bindRemarkInput" maxlength="100" placeholder-class="gray" placeholder="请输入" />
+      <textarea placeholder-style="color: #C1C1C1;"   bindinput="bindRemarkInput" maxlength="100" placeholder-class="gray" placeholder="  请输入" />
     </view>
   </view>
 </view>
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
index 51afc3e..e154477 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
@@ -4,15 +4,13 @@ const App = getApp()
 import {
   showRecord,addRecord,inspectionStaff,securityCheckk
 } from "../../../../utils/api"
-
+import {timestampToTime} from "../../../../utils/index"
 const config = require('../../../../utils/config')
 Page({
   /**
    * 页面的初始数据
    */
   data: {
-
-    checkboxOptionsnumber:0,
     orgid:'',
     orgType:'',
     pageNo:'1',
@@ -21,7 +19,6 @@ Page({
     imageUrls:[],
     remark:'',//备注
     reviewTime:'',
-    checkResultFlag:'',
     array: ['不合格', '合格'], // 选择器的数据源
     arrlist:[],
     fileList: [],
@@ -37,21 +34,26 @@ Page({
     uploadImageList: [],//图片上传的数组
     imageId:1,
     addHiddenDangeList:[],
-    currentDate:null,
+    currentDate: new Date().getTime(),
     minDate: new Date(2020, 0, 1).getTime(),
     maxDate: new Date(2030, 11, 31).getTime(),
     showtime:false,
+    checkResultFlag:null,
+    checkResultFlagRouter:null,
+    hazardStatus2:null
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    this.setData({
-      companyId: options.resiId,
-      orgid:App.globalData.user.agencyId
-    })
-    console.log(App.globalData)
-
+    if(options){
+      this.setData({
+        companyId: options.resiId,
+        orgid:App.globalData.user.agencyId,
+        checkResultFlagRouter:options.flag,
+        currentDateShow:timestampToTime(new Date().getTime(),1)
+      })
+    }
     this.showRecordData()
     this.toOinspectionStaff()
     this.securityCheckk()
@@ -67,13 +69,9 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-  
-    console.log(111111);
-    debugger
-    console.log(this.getCurrentDateTime());
-    this.setData({
-      currentDate:this.getCurrentDateTime()
-    })
+    // this.setData({
+    //   currentDate:this.getCurrentDateTime()
+    // })
   },
 
   /**
@@ -118,7 +116,7 @@ Page({
       });
     });
   },
-  showTime(){
+  handelShowTime(){
     this.setData({
       showtime:true
     })
@@ -138,6 +136,14 @@ Page({
       checkboxValue:event.detail,
     })
   },
+  handelConfirmDate(value){
+    this.setData({
+      showtime:false,
+      currentDateShow:timestampToTime(value.detail,1),
+      currentDate:value.detail
+
+    })
+  },
   afterRead(event) {
     const {
       file
@@ -172,21 +178,34 @@ Page({
       id: this.data.companyId
     }
     showRecord(parm).then(res => {
-      console.log(res)
+    res.data.forEach(item => {
+      if (item.hiddenDangeList) {
+        item.hiddenDangeList0 = [];
+        item.hiddenDangeList1 = [];
+        item.hiddenDangeList2 = [];
+        item.hiddenDangeList.forEach(itemC => {
+          if (itemC.hazardStatus === 0) {
+            item.hiddenDangeList0.push(itemC);  
+          } else if (itemC.hazardStatus === 1) {
+            item.hiddenDangeList1.push(itemC);
+          }else if (itemC.hazardStatus === 2) {
+            item.hiddenDangeList2.push(itemC);
+          }
+        });
+      }
+    });
+
       if(res.data[0].hiddenDangeList){
         let checkboxOptions = res.data[0].hiddenDangeList.filter(item=>item.hazardStatus === 0).map(item=>({hazardDesc:item.hazardDesc,hazardStatus:1}));
-        let checkboxOptionsnumber=checkboxOptions.length+1;
-        console.log(checkboxOptionsnumber)
         this.setData({
           checkboxOptions,
-          checkboxOptionsnumber
         })
       }
       this.setData({
         showList:res.data
       })
       console.log(this.data.checkboxOptions)
-      console.log(this.data.showList)
+      console.log(this.data.showList,'seeeeee')
     })
   },
   toOinspectionStaff(){
@@ -247,8 +266,6 @@ Page({
     this.setData({
       newContent: e.detail.value
     });
-    console.log('添加后的数组:', this.data.newContent);
-    console.log(this.data.checkboxOptions)
   },
 
      // 删除选中的图片
@@ -262,6 +279,11 @@ Page({
               uploadImageList: this.data.uploadImageList
           })
       }
+  },
+  changenewHazardStatus2(e){
+    this.setData({
+      hazardStatus2:e.detail.value
+    })
   },
    getCurrentDateTime() {
     const now = new Date();
@@ -271,15 +293,10 @@ Page({
     const hours = now.getHours().toString().padStart(2, '0');
     const minutes = now.getMinutes().toString().padStart(2, '0');
     const seconds = now.getSeconds().toString().padStart(2, '0');
-    debugger
     return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
   },
  
 handelClickSave(){
-  console.log(this.data.checkboxOptions)
-  console.log(this.data.newContent)
-  console.log("zhixingle")
-  console.log(this.data.newContent)
   if (this.data.newContent) {
     let newArr = this.data.addHiddenDangeList.concat({
       hazardDesc: this.data.newContent,
@@ -306,13 +323,20 @@ handelClickSave(){
     })
     return false
   }
-  if(this.data.checkResultFlag == 0 && !this.data.getData){
+  if(this.data.checkResultFlag == 0 && !this.data.currentDate){
     wx.showToast({
       title: '请选择拟复查时间',
       icon:'none'
     })
     return false
   }
+  if(this.data.checkResultFlagRouter == 1 && !this.data.hazardStatus2){
+    wx.showToast({
+      title: '请填写整改要求',
+      icon:'none'
+    })
+    return false
+  }
   console.log(this.data.checkboxOptions)
     let hasHazardStatus1 = false;
    this.data.checkboxOptions.forEach(item => {
@@ -331,7 +355,6 @@ handelClickSave(){
   //   }
   // });
   // console.log(checkbox)
-  console.log( "11",hasHazardStatus1)
 if(this.data.checkResultFlag == 0 && !hasHazardStatus1 && this.data.addHiddenDangeList.length<1){
   console.log("1111",hasHazardStatus1)
     wx.showToast({
@@ -344,26 +367,23 @@ if(this.data.checkResultFlag == 0 && !hasHazardStatus1 && this.data.addHiddenDan
   const hours = now.getHours().toString().padStart(2, '0');
   const minutes = now.getMinutes().toString().padStart(2, '0');
   const seconds = now.getSeconds().toString().padStart(2, '0');
-  console.log(this.data.checkboxOptions)
-  console.log(this.data.addHiddenDangeList)
   let form = {
     companyId:this.data.companyId,
     checkTime:this.getCurrentDateTime(),
     checkPersonsIdList:this.data.selectedOptions,
     checkResultFlag:this.data.checkResultFlag,
-    reviewTime:this.data.getData,
+    reviewTime:this.data.checkResultFlag === '1'?null:timestampToTime(this.data.currentDate,1),
     hiddenDangeList:this.data.checkboxOptions.concat(this.data.addHiddenDangeList),
     attachmentUrls:this.data.uploadImageList.map(item=>({fileName:item.originFileName,attachmentUrl:item.ossUrl.url})),
     remark:this.data.remark,
     address:""
   }
-  console.log(this.data.checkboxOptions)
-  console.log(this.data.addHiddenDangeList)
-  console.log(this.data.hiddenDangeList)
-  if (!this.data.reviewTime) {
-    form.reviewTime=null
+  if(this.data.hazardStatus2){
+    form.hiddenDangeList.push({hazardDesc:this.data.hazardStatus2,hazardStatus:2})
   }
-console.log(this.data.checkboxOptions.concat(this.data.addHiddenDangeList))
+  this.setData({
+    newContent:null
+  })
 addRecord(form).then(res => {
     if(res.code == 0){
       wx.showToast({
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
index 24665b1..143b113 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
@@ -13,12 +13,27 @@
     </view></view>
    
   </view>
-
+  <view class="prosecutors" >
+    <text class="prosecutors_req">*</text>
+    <view class="nes"> 
+    <view class="conclusion">
+      <text class="prosecutors_pre">检查结论</text>
+      <picker class="prosecutors_name" bindchange="pickerChange" value="{{checkResultFlag}}" range="{{array}}">
+        <view class="{{checkResultFlagName?'':'gray'}}">
+          {{checkResultFlagName?checkResultFlagName:'请选择'}}
+        </view>
+      </picker>
+    </view>
+    <view class="conclusion_right">
+      <image src="../../../../images/right.png" class="prosecutors_img"></image>
+    </view></view>
+   
+  </view>
   <view class="pitfall">
     <view class="prosecutors" style="border-bottom: none;">
       <view>
         <text class="prosecutors_req" wx:if="{{checkResultFlag == 0}}">*</text>
-        <text class="prosecutors_pre1">未整改隐患</text>
+        <text class="prosecutors_pre1">{{checkResultFlagRouter === '1'?'隐患明细':'未整改隐患'}}</text>
       </view>
     </view>
     <view class="checkbox1">
@@ -38,35 +53,26 @@
       <text>再添加一条</text>
     </view> -->
   </view>
-  <view class="prosecutors" >
+  <view class="prosecutors" wx:if="{{checkResultFlagRouter == 1}}">
     <text class="prosecutors_req">*</text>
     <view class="nes"> 
     <view class="conclusion">
-      <text class="prosecutors_pre">检查结论</text>
-      <picker class="prosecutors_name" bindchange="pickerChange" value="{{checkResultFlag}}" range="{{array}}">
-        <view class="{{checkResultFlagName?'':'gray'}}">
-          {{checkResultFlagName?checkResultFlagName:'请选择'}}
-        </view>
-      </picker>
+      <text class="prosecutors_pre">整改要求</text>
+      <input type="text" placeholder="请填写整改要求" bindinput="changenewHazardStatus2" value="{{hazardStatus2}}" style="margin-left: 10rpx;"/>
     </view>
     <view class="conclusion_right">
-      <image src="../../../../images/right.png" class="prosecutors_img"></image>
-    </view></view>
+    </view>
+    </view>
    
   </view>
-  <view class="prosecutors" >
-    <text class="prosecutors_req" wx:if="{{checkResultFlag == 0}}">*</text>
-    <view class="nes"  bind:tap="showTime"> 
+  <view class="prosecutors" wx:if="{{checkResultFlag == 0}}">
+    <text class="prosecutors_req">*</text>
+    <view class="nes"  bind:tap="handelShowTime"> 
     <view class="conclusion">
       <text class="prosecutors_pre">拟复查时间</text>
-      <view class="{{currentDate?'prosecutors_name':'gray'}}">
-            {{currentDate?currentDate:'请选择'}}
-          </view>
-      <!-- <picker mode="date" class="prosecutors_name" bindchange="pickerChange1" value="{{reviewTime}}">
-          <view class="{{reviewTime?'':'gray'}}">
-            {{reviewTime?reviewTime:'请选择'}}
+      <view class="{{currentDateShow?'prosecutors_name':'gray'}}">
+            {{currentDateShow?currentDateShow:'请选择'}}
           </view>
-        </picker> -->
     </view>
     <view class="conclusion_right">
       <image src="../../../../images/right.png" class="prosecutors_img"></image>
@@ -102,7 +108,7 @@
   <view class="text2">
     巡查记录
   </view>
-    <view class="logsBox" wx:for="{{showList}}" wx:for-index="index">
+    <view class="logsBox" wx:for="{{showList}}" wx:for-index="index" wx:key="index">
       <view class="item-dian {{index!=0?'item-dian1':''}}">
         <view class="neidian"></view>
       </view>
@@ -112,8 +118,8 @@
       <view class="logs-content">
         <view class="logs-content-left">
           <view>
-            <text class="logs-content-title">检察人员：</text>
-            <text class="logs-content-txt">{{item.chekPersons||'--'}}</text>
+            <text class="logs-content-title">检查人员：</text>
+            <text class="logs-content-txt">{{item.checkPersons||'--'}}</text>
           </view>
           <view>
             <text class="logs-content-title">检查结论：</text>
@@ -121,15 +127,19 @@
           </view>
           <view>
             <text class="logs-content-title">{{index==0?'未整改隐患： ':'隐患明细：'}}</text>
-            <text class="logs-content-txt" name="{{index}}"  wx:for="{{item.hiddenDangeList}}">{{index + 1}}.{{item.hazardDesc}}</text>
+            <text class="logs-content-txt" name="{{index}}"  wx:for="{{item.hiddenDangeList0}}">{{index + 1}}.{{item.hazardDesc}}</text>
           </view>
-          <view wx:if="{{index}}">
+          <view>
+            <text class="logs-content-title" wx:if="{{item.hiddenDangeList2.length == 0}}">已整改隐患：</text>
+            <text class="logs-content-txt" name="{{index}}"  wx:for="{{item.hiddenDangeList1}}">{{index + 1}}.{{item.hazardDesc}}</text>
+          </view>
+          <view wx:if="{{item.hiddenDangeList2.length != 0}}">
             <text class="logs-content-title">整改要求：</text>
-            <text class="logs-content-txt" wx:for="{{item.hiddenDangeList}}">{{item.hazardStatus}}</text>
+            <text class="logs-content-txt" wx:for="{{item.hiddenDangeList2}}">{{index + 1}}.{{item.hazardDesc}}</text>
           </view>
-          <view wx:if="{{index}}">
+          <view >
             <text class="logs-content-title">拟复查时间：</text>
-            <text class="logs-content-txt">{{item.reviewTime}}</text>
+            <text class="logs-content-txt">{{item.reviewTime || '--'}}</text>
           </view>
           <view>
             <text class="logs-content-title">附件：</text>
@@ -165,23 +175,13 @@
   </view>
 </van-popup>
 <wux-actionsheet id="wux-actionsheet" />
-<view class="container">
-  <van-datetime-picker  wx:if="{{showtime}}"
-    type="datetime"
-    value="{{ currentDate }}"
-    min-date="{{ minDate }}"
-    max-date="{{ maxDate }}"
-    bind:input="onInput"
-  />
-</view>
 <van-popup show="{{ showtime }}" close-icon="close" position="bottom" custom-style="height: 50%" bind:close="closePopup" round>
   <van-datetime-picker
-      type="datetime"
-      value="{{ currentDate }}"
-      min-date="{{ minDate }}"
-      max-date="{{ maxDate }}"
-      bind:input="onInput"
-      bind:confirm="onConfirm"
-      bind:cancel="onCancel"
-    />
+  type="datetime"
+  value="{{ currentDate }}"
+  min-date="{{ minDate }}"
+  max-date="{{ maxDate }}"
+  bind:confirm="handelConfirmDate"
+  bind:input="onInput"
+/>
 </van-popup>
\ No newline at end of file
diff --git a/subpages/securityCheck/pages/securityCheck.js b/subpages/securityCheck/pages/securityCheck.js
index 0245d92..461fd6c 100644
--- a/subpages/securityCheck/pages/securityCheck.js
+++ b/subpages/securityCheck/pages/securityCheck.js
@@ -20,7 +20,6 @@ Page({
 
   },
     onLoad(options) {
-     
       this.getList()
 
     },
@@ -133,7 +132,7 @@ onScrollToLower(e){
      * 生命周期函数--监听页面显示
      */
     onShow() {
-
+      this.getList()
     },
     
 
@@ -176,7 +175,7 @@ onScrollToLower(e){
     toDetails(e){
       console.log(e)
       wx.navigateTo({
-        url: `../../../subpages/safetyinspection/pages/safetyinspection/safetyinspection?resiId=${e.currentTarget.dataset.resiid}`,
+        url: `../../../subpages/safetyinspection/pages/safetyinspection/safetyinspection?resiId=${e.currentTarget.dataset.resiid}&flag=${e.currentTarget.dataset.flag}`,
       })
     }
 
diff --git a/subpages/securityCheck/pages/securityCheck.wxml b/subpages/securityCheck/pages/securityCheck.wxml
index d1afb16..5091305 100644
--- a/subpages/securityCheck/pages/securityCheck.wxml
+++ b/subpages/securityCheck/pages/securityCheck.wxml
@@ -12,7 +12,7 @@
     <view class="section_5">
       <scroll-view scroll-y="{{true}}"  scroll-into-view="scrollToHere" wx:if="{{waitingCheckStyle}}" style="width: 100%; height: 90vh;"
       lower-threshold="{{ lowerThreshold }}" bindscrolltolower="onScrollToLower">
-      <view class="list_1"  wx:for="{{flag0Array}}" bind:tap="toDetails" data-resiId="{{item.id}}">
+      <view class="list_1"  wx:for="{{flag0Array}}" bind:tap="toDetails" data-flag="{{item.checkResultFlag}}" data-resiId="{{item.id}}">
         <view class="section_1-0"  id="scrollToHere">
         <view class="title">{{item.name}}</view>
         <view class="title_mall">检查时间: {{item.orderDate}}</view>
@@ -31,7 +31,7 @@
 
 
   <scroll-view scroll-y="{{true}}"  scroll-into-view="scrollToHere"  wx:if="{{qualifiedStyle}}" style="width: 100%; height: 90vh;" lower-threshold="{{ lowerThreshold }}" bindscrolltolower="onScrollToLower"> 
-      <view class="list_1"  wx:for="{{flag1Array}}"  data-resiId="{{item.id}}" bind:tap="toDetails">
+      <view class="list_1"  wx:for="{{flag1Array}}"  data-resiId="{{item.id}}" bind:tap="toDetails" data-flag="{{item.checkResultFlag}}">
         <view class="section_1-0"  id="scrollToHere" >
         <view class="title">{{item.name}}</view>
         <view class="title_mall">检查时间: {{item.orderDate}}</view>
diff --git a/utils/index.js b/utils/index.js
index c370b49..d9f80ac 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -8,4 +8,29 @@ export function encryptedData(key, data) {
     // 加密数据
     return encryptor.encrypt(data);
 }
-
+// 使用方法:
+// timestampToTime(1591841249)   //返回2020-06-11
+// timestampToTime(1591841249,1) //返回 2020-06-11 10:10:10
+// timestampToTime(1591841249,2)   //返回2020年06月11日
+export function timestampToTime(value, type = 0){
+    var time = new Date(value);
+    var year = time.getFullYear();
+    var month = time.getMonth() + 1;
+    var date = time.getDate();
+    var hour = time.getHours();
+    var minute = time.getMinutes();
+    var second = time.getSeconds();
+    month = month < 10 ? "0" + month : month; 
+    date = date < 10 ? "0" + date : date; 
+    hour = hour < 10 ? "0" + hour : hour; 
+    minute = minute < 10 ? "0" + minute : minute; 
+    second = second < 10 ? "0" + second : second; 
+    var arr = [ 
+        year + "-" + month + "-" + date, 
+        year + "-" + month + "-" + date + " " + hour + ":" + minute + ":" + second, 
+        year + "年" + month + "月" + date, 
+        year + "年" + month + "月" + date + " " + hour + ":" + minute + ":" + second, 
+        hour + ":" + minute + ":" + second 
+    ] 
+    return arr[type]; 
+} 
\ No newline at end of file

From 8fa17dfe3ce7ef4e001cf824924f8d534973a736 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 22 May 2024 10:48:43 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/InspectionReport/InspectionReport.wxml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
index dddd8a0..b419cb5 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
@@ -100,7 +100,7 @@
     <view class="nes" bind:tap="showTime" > 
     <view class="conclusion">
       <text class="prosecutors_pre">拟复查时间</text>
-      <view class="{{getData?'prosecutors_name':'gray'}}">
+      <view class="{{getData?'':'gray'}} prosecutors_name">
             {{getData?getData:'请选择'}}
           </view>
       <!-- <picker mode="date" class="prosecutors_name" bindchange="pickerChange1" value="{{data}}">

From e79c92fc7887bdfbff52c3a45b99c986f37d0c86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Wed, 22 May 2024 16:37:32 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=20bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InspectionReport/InspectionReport.js      | 103 +++++++++++-------
 .../InspectionReport/InspectionReport.wxml    |   2 +-
 .../safetyinspection/safetyinspection.js      |  42 +++----
 subpages/securityCheck/pages/securityCheck.js |   2 +-
 4 files changed, 89 insertions(+), 60 deletions(-)

diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
index 3eb514c..3a340ba 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
@@ -91,19 +91,19 @@ Page({
 
   showRecordData() {
     this.setData({
-      checkboxOptions:null
+      checkboxOptions:[]
     })
     let parm = {
       id: this.data.companyId
     }
     showRecord(parm).then(res => {
       if(res.data[0].hiddenDangeList){
-        let checkboxOptions = res.data[0].hiddenDangeList.filter(item=>item.hazardStatus === 0).map(item=>({hazardDesc:item.hazardDesc,hazardStatus:0,id:item.id}));
+        let checkboxOptions = res.data[0].hiddenDangeList.filter(item=>item.hazardStatus === 0).map(item=>({hazardDesc:item.hazardDesc,hazardStatus:0}));
         this.setData({
-          checkboxOptions,
+          checkboxOptions: checkboxOptions || [],
           beforeFlag: res.data[0].checkResultFlag
         })
-        console.log(this.data.checkboxOptions);
+        console.log(this.data.beforeFlag);
       }
     })
   },
@@ -146,55 +146,80 @@ Page({
       })
       return false
     }
-    
-    if(this.data.checkResultFlag == 0 && this.data.checkboxValue.length<1&&!this.data.hazardDesc2){
+
+    if(this.data.checkResultFlag == 0 && this.data.checkboxValue.length<1&&!this.data.newContent){
       wx.showToast({
         title: '隐患明细最少输入一条',
         icon:'none'
       })
       return false
     }
-    this.data.checkboxOptions.forEach(item => {
-      if(this.checkboxValue.findIndex(itemC=>itemC === item.value) == -1){
-        item.hazardStatus = '1';
-      }else{
-        item.hazardStatus = '0';
-      }
-  })
-  console.log(this.data.checkboxValue);
-  console.log(this.data.checkboxOptions);
-    let form={ companyId: this.data.companyId,
+    if (this.data.checkboxOptions) {
+      console.log(this.data.checkboxOptions)
+      this.data.checkboxOptions.forEach(item => {
+        console.log(item)
+        console.log(this.data.checkboxValue)
+        if(this.data.checkboxValue.findIndex(itemC=>itemC === item.value) == -1){
+          item.hazardStatus = '1';
+        }else{
+          item.hazardStatus = '0';
+        }
+    })
+    }
+    if (this.data.newContent) {
+      let newArr = this.data.addHiddenDangeList.concat({
+        hazardDesc: this.data.newContent,
+        hazardStatus: 0
+      });
+      console.log(newArr)
+      this.setData({
+        addHiddenDangeList: newArr,
+      });
+    }
+    if (this.data.hazardDesc2) {
+      let newArr = this.data.addHiddenDangeList.concat({
+        hazardDesc: this.data.hazardDesc2,
+        hazardStatus: 2
+      });
+      console.log(newArr)
+      this.setData({
+        addHiddenDangeList: newArr,
+      });
+    }
+
+    let form={ 
+      companyId: this.data.companyId,
       checkTime: this.getCurrentDateTime(),
       checkPersonsIdList: this.data.checkPersonsIdList,
       checkResultFlag: this.data.checkResultFlag,
       reviewTime:this.data.getData,
-      hiddenDangeList:null,
+      hiddenDangeList:this.data.checkboxOptions.concat(this.data.addHiddenDangeList),
       attachmentUrls:this.data.uploadImageList.map(item=>({fileName:item.originFileName,attachmentUrl:item.ossUrl.url})),
-      remark: '',
+      remark: this.data.remarks,
       reviewAddress:this.data.addressContent
     }
-      if (!this.data.reviewTime) {
-        form.reviewTime=null
-      }
+      // if (!this.data.reviewTime) {
+      //   form.reviewTime=null
+      // }
       console.log(form)
-    // addRecord(
-    //   form
-    // ).then(
-    //   res => {
-    //     if(res.code == 0){
-    //       wx.showToast({
-    //         title: '新增成功',
-    //         duration:2000,
-    //         success:function(){
-    //             setTimeout(()=>{
-    //               wx.navigateBack({
-    //                   delta: 1
-    //               })
-    //             },2000)
-    //         }
-    //       })
-    //     }
-    // });
+    addRecord(
+      form
+    ).then(
+      res => {
+        if(res.code == 0){
+          wx.showToast({
+            title: '新增成功',
+            duration:2000,
+            success:function(){
+                setTimeout(()=>{
+                  wx.navigateBack({
+                      delta: 1
+                  })
+                },2000)
+            }
+          })
+        }
+    });
 
   },
 
diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
index b419cb5..b18253b 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
@@ -67,7 +67,7 @@
 
   <view class="pitfall"  wx:if="{{beforeFlag == 1}}">
     <view class="prosecutors">
-      <text class="prosecutors_req">*</text>
+      <!-- <text class="prosecutors_req">*</text> -->
       <view class="conclusion1">
         <text class="prosecutors_pre">整改要求</text>
       </view>
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
index e154477..451f745 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
@@ -40,7 +40,8 @@ Page({
     showtime:false,
     checkResultFlag:null,
     checkResultFlagRouter:null,
-    hazardStatus2:null
+    hazardStatus2:null,
+    name:""
   },
   /**
    * 生命周期函数--监听页面加载
@@ -48,6 +49,7 @@ Page({
   onLoad(options) {
     if(options){
       this.setData({
+
         companyId: options.resiId,
         orgid:App.globalData.user.agencyId,
         checkResultFlagRouter:options.flag,
@@ -111,7 +113,10 @@ Page({
       data
     }) => {
       console.log(data)
+      var firstItem = data.list[0];
+      console.log(firstItem)
       this.setData({
+        reviewAddress:firstItem.address,
         companyList: data.list,
       });
     });
@@ -173,7 +178,6 @@ Page({
     });
   },
   showRecordData() {
-    console.log("我执行了")
     let parm = {
       id: this.data.companyId
     }
@@ -372,11 +376,11 @@ if(this.data.checkResultFlag == 0 && !hasHazardStatus1 && this.data.addHiddenDan
     checkTime:this.getCurrentDateTime(),
     checkPersonsIdList:this.data.selectedOptions,
     checkResultFlag:this.data.checkResultFlag,
-    reviewTime:this.data.checkResultFlag === '1'?null:timestampToTime(this.data.currentDate,1),
+    reviewTime:this.data.currentDateShow,
     hiddenDangeList:this.data.checkboxOptions.concat(this.data.addHiddenDangeList),
     attachmentUrls:this.data.uploadImageList.map(item=>({fileName:item.originFileName,attachmentUrl:item.ossUrl.url})),
     remark:this.data.remark,
-    address:""
+    reviewAddress:""
   }
   if(this.data.hazardStatus2){
     form.hiddenDangeList.push({hazardDesc:this.data.hazardStatus2,hazardStatus:2})
@@ -384,21 +388,21 @@ if(this.data.checkResultFlag == 0 && !hasHazardStatus1 && this.data.addHiddenDan
   this.setData({
     newContent:null
   })
-addRecord(form).then(res => {
-    if(res.code == 0){
-      wx.showToast({
-        title: '新增成功',
-        duration:2000,
-        success:function(){
-            setTimeout(()=>{
-              wx.navigateBack({
-                  delta: 1
-              })
-            },2000)
-        }
-      })
-    }
-  })
+// addRecord(form).then(res => {
+//     if(res.code == 0){
+//       wx.showToast({
+//         title: '新增成功',
+//         duration:2000,
+//         success:function(){
+//             setTimeout(()=>{
+//               wx.navigateBack({
+//                   delta: 1
+//               })
+//             },2000)
+//         }
+//       })
+//     }
+//   })
   console.log(form);
 },
 chooseImage() {
diff --git a/subpages/securityCheck/pages/securityCheck.js b/subpages/securityCheck/pages/securityCheck.js
index 461fd6c..7cde803 100644
--- a/subpages/securityCheck/pages/securityCheck.js
+++ b/subpages/securityCheck/pages/securityCheck.js
@@ -175,7 +175,7 @@ onScrollToLower(e){
     toDetails(e){
       console.log(e)
       wx.navigateTo({
-        url: `../../../subpages/safetyinspection/pages/safetyinspection/safetyinspection?resiId=${e.currentTarget.dataset.resiid}&flag=${e.currentTarget.dataset.flag}`,
+        url: `../../../subpages/safetyinspection/pages/safetyinspection/safetyinspection?resiId=${e.currentTarget.dataset.resiid}&flag=${e.currentTarget.dataset.flag}&name=${e.currentTarget.dataset.name}`,
       })
     }