From 3984573deebecc51603ba5965348833e222ee44a Mon Sep 17 00:00:00 2001
From: wangpeng <wangpeng@zcloudchina.com>
Date: Mon, 19 Feb 2024 09:51:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E7=AE=A1=E6=8E=A7=E6=8E=92?=
 =?UTF-8?q?=E6=9F=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |    4 +
 .../custom/list-item-check-hidden-form.vue    |    9 +-
 .../custom/list-item-check-list.vue           |   59 +-
 .../custom/list-item-check-next.vue           |   12 +-
 .../custom/list-item.vue                      |    6 +-
 .../custom/list.vue                           |    1 +
 .../custom/other-hidden-add.vue               | 1059 +++++++++++++++++
 .../hidden-danger-add/hidden-danger-add.vue   |    4 +-
 .../hidden-danger-check-risk-detail.vue       |    2 +-
 .../hidden-trouble-app/check-items-list.vue   |    2 +-
 .../hidden-trouble-app/check-items-next.vue   |    2 +-
 .../hidden-trouble-app/exclude-form.vue       |    4 +-
 .../hidden-trouble-app/hidden-trouble-app.vue |    1 +
 .../hidden-trouble-uncheck.vue                |    1 +
 .../hidden-trouble-app/other-hidden-add.vue   |    6 +-
 15 files changed, 1120 insertions(+), 52 deletions(-)
 create mode 100644 pages/application/hidden-danger-check-standard/custom/other-hidden-add.vue

diff --git a/pages.json b/pages.json
index 650d7b0..943829f 100644
--- a/pages.json
+++ b/pages.json
@@ -333,6 +333,10 @@
       "path": "pages/application/hidden-danger-check-standard/custom/list-item-check-next",
       "style": {}
     },
+    {
+      "path": "pages/application/hidden-danger-check-standard/custom/other-hidden-add",
+      "style": {}
+    },
     {
       "path": "pages/application/hidden-danger-check-standard/record/custom-list",
       "style": {}
diff --git a/pages/application/hidden-danger-check-standard/custom/list-item-check-hidden-form.vue b/pages/application/hidden-danger-check-standard/custom/list-item-check-hidden-form.vue
index cf902c2..3cd7857 100644
--- a/pages/application/hidden-danger-check-standard/custom/list-item-check-hidden-form.vue
+++ b/pages/application/hidden-danger-check-standard/custom/list-item-check-hidden-form.vue
@@ -55,13 +55,13 @@
           </view>
         </view>
       </view>
-<!--      <view class="cu-form-textarea margin-top">
+      <view class="cu-form-textarea margin-top">
         <view class="cu-form-title">
           隐患部位
           <button class="cu-btn bg-green sm reg-btn" @click="openHidden" >隐患字典</button>
         </view>
         <textarea maxlength="-1" :disabled="modalName!=null" v-model="pd.HIDDENPART" placeholder="请对隐患部位进行详细描述(必填项)"></textarea>
-      </view>-->
+      </view>
 			<view class="cu-form-textarea margin-top">
 				<view class="cu-form-title">隐患描述</view>
 				<textarea maxlength="-1" :disabled="modalName!=null" v-model="pd.HIDDENDESCR" placeholder="请对隐患进行详细描述(必填项)"></textarea>
@@ -286,7 +286,7 @@
         this.pd.CHECK_CONTENT = JSON.parse(decodeURIComponent(event.CHECK_CONTENT));
         this.pd.CHECK_STANDARD = JSON.parse(decodeURIComponent(event.CHECK_STANDARD));
         this.pd.REFERENCE_BASIS = JSON.parse(decodeURIComponent(event.REFERENCE_BASIS));
-        this.pd.HIDDENDESCR = JSON.parse(decodeURIComponent(event.CHECK_UNQUALIFIED));
+        this.pd.HIDDENDESCR = JSON.parse(decodeURIComponent(event.CHECK_RESULT));
 				this.baoBaoType = JSON.parse(decodeURIComponent(event.baoBaoType))+'';
         console.log(this.baoBaoType)
 				this.index = event.index;
@@ -866,6 +866,7 @@
 						prePage.$vm.initflag = true;    // A 页面 init方法 为true
 						prePage.$vm.list[_this.index].ISNORMAL = 1;
 						prePage.$vm.list[_this.index].HIDDEN_ID = _this.pd.HIDDEN_ID;
+            prePage.$vm.list[_this.index].CHECK_RESULT = _this.pd.HIDDENDESCR;
             prePage.$vm.list[_this.index].CHECK_UNQUALIFIED = _this.pd.HIDDENDESCR;
 					}
 					uni.navigateBack({});
@@ -1059,7 +1060,7 @@
       },
       confirm(info){
         this.pd.HIDDENPART = info.HIDDEN_PART
-        this.pd.HIDDENDESCR = info.INSPECTION_BASIS
+        // this.pd.HIDDENDESCR = info.INSPECTION_BASIS
         this.pd.HIDDENLEVEL = 'hiddenLevel0001'
         this.pd.HIDDENLEVELNAME = '一般隐患'
         if (info.HIDDEN_TYPE_ONE_NAME){this.pd.HIDDENTYPENAME = info.HIDDEN_TYPE_ONE_NAME}
diff --git a/pages/application/hidden-danger-check-standard/custom/list-item-check-list.vue b/pages/application/hidden-danger-check-standard/custom/list-item-check-list.vue
index 71ba647..a8850d7 100644
--- a/pages/application/hidden-danger-check-standard/custom/list-item-check-list.vue
+++ b/pages/application/hidden-danger-check-standard/custom/list-item-check-list.vue
@@ -15,13 +15,10 @@
 							<view class="select">
 								<view @click="checkTrue({index:index},item.HASHIDDEN,0)" class="flex align-center">
 									<radio class='mr10' :class="item.ISNORMAL==0?'checked':''" :checked="item.ISNORMAL==0" disabled></radio>
-									<text>合格.{{ item.OPERATION_TYPE === 1 ? item.CHECK_QUALIFIED : '' }}</text>
+									<text>合格</text>
 								</view>
 								<view v-if="item.ISNORMAL==0" @click="$noMultipleClicks(gotoAddImg,item.RECORDITEM_ID)" class="cuIcon-infofill text-blue unqualified"></view>
 							</view>
-              <view v-if="item.ISNORMAL==0 && item.OPERATION_TYPE === 2" class="input">
-                <textarea maxlength="-1" v-model="item.CHECK_UNQUALIFIED" placeholder="合格信息详细描述(必填项)"></textarea>
-              </view>
 							<view class="select">
 								<view class="flex align-center" @click="$noMultipleClicks(goToAdd,
 								{
@@ -37,15 +34,12 @@
                   CHECK_ITEM_NAME:item.CHECK_ITEM_NAME,
                   CHECK_STANDARD: item.CHECK_STANDARD,
                   REFERENCE_BASIS: item.REFERENCE_BASIS,
-                  CHECK_UNQUALIFIED: item.item.CHECK_UNQUALIFIED
+                  CHECK_RESULT: item.CHECK_UNQUALIFIED
                 })">
 									<radio class='red mr10' :class="item.ISNORMAL==1?'checked':''" :checked="item.ISNORMAL==1" disabled ></radio>
-									<text>不合格.{{ item.OPERATION_TYPE === 1 ? item.CHECK_UNQUALIFIED : '' }}</text>
+									<text>不合格</text>
 								</view>
 								<view v-if="item.ISNORMAL==1" @click="$noMultipleClicks(goToEdit,item.HIDDEN_ID)" class="cuIcon-infofill text-blue unqualified"></view>
-                <view v-if="item.ISNORMAL==1 && item.OPERATION_TYPE === 2" class="input">
-                  <textarea maxlength="-1" disabled v-model="item.CHECK_UNQUALIFIED" placeholder="不合格信息详细描述(必填项)"></textarea>
-                </view>
 							</view>
               <view class="select">
                 <view @click="checkTrue({index:index},item.HASHIDDEN,2)" class="flex align-center">
@@ -54,6 +48,9 @@
                 </view>
               </view>
 						</view>
+            <view v-if="item.ISNORMAL==0 || item.ISNORMAL==1" class="input" >
+              <textarea :disabled="item.OPERATION_TYPE === 1 ? true : false" maxlength="-1" v-model="item.CHECK_RESULT" placeholder="检查详细描述(必填项)"  :class="item.OPERATION_TYPE === 1 ? 'bgh' : ''"   style="border: 1px solid #eeeeee;  z-index: 999; height: 50px; padding: 10px;font-size: 12px; width: 100%"></textarea>
+            </view>
 					</radio-group>
 				</view>
 			</view>
@@ -109,7 +106,7 @@
 					title: '请稍候'
 				})
 				uni.request({
-					url: basePath + '/app/hiddenDangerCheckStandardCustom/goCheck',
+					url: basePath + '/app/hiddenDangerCheckStandardCustom/goCheck', // /app/listmanager/goCheck
 					method: 'POST',
 					dataType: 'json',
 					header: {
@@ -134,6 +131,11 @@
 											_this.list[i].HIDDEN_ID = res.data.records[j].HIDDEN_ID;
                       _this.list[i].CHECKRECORD_ID = res.data.records[j].CHECKRECORD_ID;
 											_this.list[i].RECORDITEM_ID = res.data.records[j].RECORDITEM_ID;
+                      if (res.data.records[j].ISNORMAL === 0) {
+                        _this.list[i].CHECK_QUALIFIED = res.data.records[j].CHECK_RESULT;
+                      } else if (res.data.records[j].ISNORMAL === 1) {
+                        _this.list[i].CHECK_UNQUALIFIED = res.data.records[j].CHECK_RESULT;
+                      }
 											// _this.list[i].is_checked = 1;
 										}
 									}
@@ -158,14 +160,12 @@
 
 			//去保存
 			save: function (){
-
+        var _this = this;
         for(var i=0;i<_this.list.length;i++){
           if(this.list[i].ISNORMAL && this.list[i].OPERATION_TYPE === 2) {
             var CHECK_RESULT = ''
-            if (this.list[i].ISNORMAL === 0) {
-              CHECK_RESULT = _this.list[i].CHECK_QUALIFIED
-            } else if (this.list[i].ISNORMAL === 1) {
-              CHECK_RESULT = _this.list[i].CHECK_UNQUALIFIED
+            if (this.list[i].ISNORMAL === 0 || this.list[i].ISNORMAL === 1) {
+              CHECK_RESULT = _this.list[i].CHECK_RESULT
             } else if (this.list[i].ISNORMAL === 2) {
               CHECK_RESULT = "不涉及"
             }
@@ -179,15 +179,6 @@
             }
           }
         }
-        if (!_this.other[0].USER_ID) {
-          uni.showToast({
-            icon: 'none',
-            title: '请添加检查人',
-            duration: 1500
-          });
-          return;
-        }
-				var _this = this;
 				uni.showLoading({
 					title: '请稍候'
 				})
@@ -199,10 +190,8 @@
 						item.CUSTOM_ITEM_ID = _this.list[i].CUSTOM_ITEM_ID
 
 						item.ISNORMAL = _this.list[i].ISNORMAL
-            if (_this.list[i].ISNORMAL === 0) {
-              item.CHECK_RESULT = _this.list[i].CHECK_QUALIFIED
-            } else if (_this.list[i].ISNORMAL === 1) {
-              item.CHECK_RESULT = _this.list[i].CHECK_UNQUALIFIED
+            if (_this.list[i].ISNORMAL === 0 || _this.list[i].ISNORMAL === 1) {
+              item.CHECK_RESULT = _this.list[i].CHECK_RESULT
             } else {
               item.CHECK_RESULT = ''
             }
@@ -337,6 +326,13 @@
 					_this.list[e.index].HIDDEN_ID='';
 					_this.$forceUpdate();//强制刷新
 				}
+        if (STATUS === 0) {
+          _this.$set(_this.list[e.index], 'CHECK_RESULT', _this.list[e.index].CHECK_QUALIFIED)
+        } else if (STATUS === 1) {
+          _this.$set(_this.list[e.index], 'CHECK_RESULT', _this.list[e.index].CHECK_UNQUALIFIED)
+        } else {
+          _this.$set(_this.list[e.index], 'CHECK_RESULT', '不涉及')
+        }
 			},
 			//跳转事件
 			goToAdd(e) {
@@ -365,7 +361,7 @@
               +'&CHECK_ITEM_NAME='+ encodeURIComponent(JSON.stringify(e.CHECK_ITEM_NAME))
               +'&CHECK_STANDARD='+ encodeURIComponent(JSON.stringify(e.CHECK_STANDARD))
               +'&REFERENCE_BASIS='+ encodeURIComponent(JSON.stringify(e.REFERENCE_BASIS))
-              +'&CHECK_UNQUALIFIED='+ encodeURIComponent(JSON.stringify(e.CHECK_UNQUALIFIED))
+              +'&CHECK_RESULT='+ encodeURIComponent(JSON.stringify(e.CHECK_RESULT))
 							+'&index='+e.index
               +'&baoBaoType='+this.baoBaoType
 				});
@@ -391,4 +387,9 @@
 		transform: scale(0.9);
 	}
 
+.bgh{
+  background: #f8f6f6;
+  color: #d9d7d7;
+}
+
 </style>
diff --git a/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue b/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue
index 68925ef..62db3fa 100644
--- a/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue
+++ b/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue
@@ -293,7 +293,7 @@
 				this.buttonloading = true
 				return new Promise((resolve, reject) => {
 					uni.request({
-						url: basePath + "/app/checkrecord/finish", //提交接口
+						url: basePath + "/app/customCheckRecord/finish", //提交接口 // /app/checkrecord/finish
 						method: 'POST',
 						dataType: 'json',
 						header:{
@@ -303,7 +303,7 @@
 							CHECK_TIME:_this.date+' '+_this.time+':00',
 							DESCR:_this.DESCR,
 							CHECKRECORD_ID:_this.CHECKRECORD_ID,
-							LISTMANAGER_ID:_this.listId,
+							CUSTOM_ID:_this.listId,
 							OTHER:JSON.stringify(_this.other),
 							  CORPINFO_ID:loginUser.CORPINFO_ID,
 							  USER_ID:loginUser.USER_ID,
@@ -379,7 +379,7 @@
 			},
 			addOtherHidden: function (){
 				uni.navigateTo({
-					url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add?listId='+ this.listId
+					url: '/pages/application/hidden-danger-check-standard/custom/other-hidden-add?listId='+ this.listId
 				});
 			},
 			removeOther: function(index){
@@ -396,7 +396,7 @@
 					success: function (res) {
 						if (res.cancel) {
 							uni.request({
-								url: basePath + "/app/hidden/delete", //提交接口
+								url: basePath + "/app/customHidden/delete", //提交接口 // /app/hidden/delete
 								method: 'POST',
 								dataType: 'json',
 								header:{
@@ -435,14 +435,14 @@
 					title: '请稍候'
 				})
 				uni.request({
-					url: basePath + '/app/hidden/getOtherHidden',
+					url: basePath + '/app/customHidden/getOtherHidden', // /app/hidden/getOtherHidden
 					method: 'POST',
 					dataType: 'json',
 					header: {
 						'Content-type':'application/x-www-form-urlencoded'
 					},
 					data: {
-						LISTMANAGER_ID: _this.listId,
+						CUSTOM_ID: _this.listId,
             CORPINFO_ID:loginUser.CORPINFO_ID,
             USER_ID:loginUser.USER_ID,
 					},
diff --git a/pages/application/hidden-danger-check-standard/custom/list-item.vue b/pages/application/hidden-danger-check-standard/custom/list-item.vue
index d00e454..1c05dca 100644
--- a/pages/application/hidden-danger-check-standard/custom/list-item.vue
+++ b/pages/application/hidden-danger-check-standard/custom/list-item.vue
@@ -19,7 +19,7 @@
 					</view>
 					<view class="spot-cont">
 						<view class="text f30">
-							{{item.DICTIONARY_NAMES.replaceAll(',','--')}}
+							{{ item.DICTIONARY_NAMES ? item.DICTIONARY_NAMES.replace(/,/g,'--') : '' }}
 						</view>
 						<view v-if="item.ELECTRONIC_FENCE_ID" class="text f30">
 							所属电子围栏：{{item.ELECTRONIC_FENCE}}
@@ -84,7 +84,7 @@
 					title: '请稍候'
 				})
 				uni.request({
-					url: basePath + '/app/hiddenDangerCheckStandardCustom/getCheckItem',
+					url: basePath + '/app/hiddenDangerCheckStandardCustom/getCheckItem', // /app/listmanager/getRisk
 					method: 'POST',
 					dataType: 'json',
 					header: {
@@ -103,7 +103,7 @@
 							_this.CHECKRECORD_ID = res.data.CHECKRECORD_ID;
 							if (res.data.checkmap) {
 								for (var i = 0; i < _this.list.length; i++) {
-									if (res.data.checkmap[_this.list[i].CHECK_ITEM] >= _this.list[i].RISK_COUNT) {
+									if (res.data.checkmap[_this.list[i].CHECK_ITEM]) {
 										_this.list[i].isChecked = 1
 									}
 								}
diff --git a/pages/application/hidden-danger-check-standard/custom/list.vue b/pages/application/hidden-danger-check-standard/custom/list.vue
index b36f872..f570c5c 100644
--- a/pages/application/hidden-danger-check-standard/custom/list.vue
+++ b/pages/application/hidden-danger-check-standard/custom/list.vue
@@ -145,6 +145,7 @@
 				totalList:[],
         treeNode: [], //部门下拉数据
         DEPT: '',
+        DEPTNAME: '',
 				page: 1,
 				rows: 1000,
 				totalCount:0,
diff --git a/pages/application/hidden-danger-check-standard/custom/other-hidden-add.vue b/pages/application/hidden-danger-check-standard/custom/other-hidden-add.vue
new file mode 100644
index 0000000..c955a1c
--- /dev/null
+++ b/pages/application/hidden-danger-check-standard/custom/other-hidden-add.vue
@@ -0,0 +1,1059 @@
+<template>
+	<view :class="isUps == true ? 'prevent' : ''">
+		<cu-custom bgColor="bg-gradual-blueness" :isBack="true">
+			<block slot="backText">返回</block>
+			<block slot="content">其他隐患登记</block>
+		</cu-custom>
+		<scroll-view scroll-y="false" >
+		<view class="form">
+<!-- 			<view class="cu-form-textarea">
+				<view class="cu-form-title text-hui">检查内容</view>
+				<view class="f24 text-black">
+				{{pd.CHECK_CONTENT}}
+				</view>
+			</view> -->
+      <view class="cu-bar bg-white margin-top">
+        <view class="action" style="font-size: 28upx; font-weight: bold; color: #000;">
+          隐患照片
+        </view>
+        <view class="action">
+          {{imgList.length}}/4
+        </view>
+      </view>
+      <view class="cu-form-group">
+        <view class="grid col-4 grid-square flex-sub">
+          <view class="bg-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage"  data-type="0" :data-url="imgList[index].filePath">
+            <image  :src="imgList[index].filePath" mode="aspectFill"></image>
+            <view class="cu-tag bg-red" @tap.stop="DelImg"  data-type="0" :data-index="index">
+              <text class='cuIcon-close'></text>
+            </view>
+          </view>
+          <view class="solids" @tap.stop="openAuth('CAMERA')" v-if="imgList.length<4">
+            <text class='cuIcon-cameraadd'></text>
+          </view>
+        </view>
+      </view>
+      <view class="cu-bar bg-white">
+        <view class="action">
+          隐患视频
+        </view>
+        <view class="action">
+          {{videoList.length}}/1
+        </view>
+      </view>
+      <view class="cu-form-group">
+        <view class="grid col-4 grid-square flex-sub">
+          <view class="bg-img" v-for="(item,vindex) in videoList" :key="vindex" style="background-color: #000">
+            <image src="/static/icon-apps/video.png" mode="aspectFill" @click="playVideo"
+                   :data-src="videoList[vindex].filePath"></image>
+            <view class="cu-tag bg-red" @tap.stop="DelVideo" data-type="0" :data-index="vindex">
+              <text class='cuIcon-close'></text>
+            </view>
+          </view>
+          <view class="solids" @tap.stop="openAuthVideo('CAMERA')" v-if="videoList.length == 0">
+            <text class='cuIcon-cameraadd'></text>
+          </view>
+        </view>
+      </view>
+			<view class="cu-form-textarea margin-top">
+				<view class="cu-form-title text-hui">隐患描述</view>
+				<textarea maxlength="-1" :disabled="modalName!=null" v-model="pd.HIDDENDESCR" placeholder="请对隐患进行详细描述(必填项)"></textarea>
+			</view>
+			<view class="cu-form-textarea margin-top">
+				<view class="cu-form-title text-hui">隐患部位</view>
+				<textarea maxlength="-1" :disabled="modalName!=null" v-model="pd.HIDDENPART" placeholder="请对隐患部位进行详细描述(必填项)"></textarea>
+			</view>
+			<view class="cu-form-group margin-top">
+				<view class="title">隐患级别</view>
+				<picker @change="levelPickerChange" :value="lindex" :range="levelList" range-key="NAME">
+					<view class="picker">
+						{{pd.HIDDENLEVELNAME?pd.HIDDENLEVELNAME:'请选择'}}
+					</view>
+				</picker>
+			</view>
+			<view class="cu-form-group margin-top">
+				<view class="title">隐患类型</view>
+        <view class="picker-tree-box">
+          <view class="picker-tree" @tap="showZgTree2">{{pd.HIDDENTYPENAME?pd.HIDDENTYPENAME:'请选择'}}</view>
+        </view>
+        <tki-tree ref="tkiTree2"
+                  :selectParent="true"
+                  :range="hiddenTypeList"
+                  rangeKey="name"
+                  @confirm="zgtreeConfirm2"
+                  @cancel="zgtreeCancel2"></tki-tree>
+<!--				<picker @change="typePickerChange" :value="tindex" :range="hiddenTypeList" range-key="NAME">-->
+<!--					<view class="picker">-->
+<!--						{{pd.HIDDENTYPENAME?pd.HIDDENTYPENAME:'请选择'}}-->
+<!--					</view>-->
+<!--				</picker>-->
+			</view>
+
+<!--			<view class="cu-form-group margin-top">-->
+<!--				<view class="title">验收部门</view>-->
+<!--				<view class="picker" @tap="showYsTree">{{pd.CHECKDEPTNAME?pd.CHECKDEPTNAME:'请选择'}}</view>-->
+<!--				<tki-tree ref="tkiTree1"-->
+<!--						  :selectParent=true-->
+<!--						  :range="treeNode"-->
+<!--						  rangeKey="name"-->
+<!--						  @confirm="ystreeConfirm"></tki-tree>-->
+<!--			</view>-->
+
+			<view class="cu-form-group margin-top">
+				<view class="title text-hui">是否立即整改</view>
+				<radio-group class="selected">
+          <!--          没有选择隐患级别时占位使用-->
+          <view class="group mr20" v-show="!pd.HIDDENLEVEL">
+            <radio class='radio' value="1" :checked="RECTIFICATIONTYPE==1" @click="radioType(1)"></radio>
+            <text>是</text>
+          </view>
+          <!--          选择了重大隐患-->
+          <view class="group mr20" v-show="pd.HIDDENLEVEL === 'hiddenLevel0002'">
+            <radio class='radio' value="1" :checked="true" disabled></radio>
+            <text>是</text>
+          </view>
+          <!--          选择了一般隐患-->
+          <view class="group mr20" v-show="pd.HIDDENLEVEL === 'hiddenLevel0001'">
+            <radio class='radio' value="1" :checked="RECTIFICATIONTYPE==1" @click="radioType(1)"></radio>
+            <text>是</text>
+          </view>
+          <view class="group">
+            <radio class='radio' value="2" :checked="RECTIFICATIONTYPE==2" @click="radioType(2)"></radio>
+            <text>否</text>
+          </view>
+				</radio-group>
+			</view>
+
+			<view class="cu-form-group margin-top" v-if="RECTIFICATIONTYPE==2">
+				<view class="title">整改责任部门</view>
+				<view class="picker-tree-box">
+					<view class="picker-tree" @tap="showZgTree">{{pd.RECTIFICATIONDEPTNAME?pd.RECTIFICATIONDEPTNAME:'请选择'}}</view>
+				</view>
+				<tki-tree ref="tkiTree"
+						  :selectParent=true
+						  :range="treeNode"
+						  rangeKey="name"
+						  @confirm="zgtreeConfirm"
+						  @cancel="zgtreeCancel"></tki-tree>
+			</view>
+			<view class="cu-form-group margin-top" v-if="RECTIFICATIONTYPE==2 && rectificationUserList.length>0">
+				<view class="title">整改责任人</view>
+				<picker @change="PickerZgr" :value="uindex" :range="rectificationUserList" range-key="NAME">
+					<view class="picker">
+						{{pd.RECTIFICATIONORNAME?pd.RECTIFICATIONORNAME:'请选择'}}
+					</view>
+				</picker>
+			</view>
+			<view class="cu-form-group margin-top" v-if="RECTIFICATIONTYPE==2">
+				<view class="title">整改期限</view>
+				<picker mode="date" :value="pd.RECTIFICATIONDEADLINE" :start="rectifyPlanCompletionStartTime" @change="changeDate">
+					<view class="picker">
+						{{pd.RECTIFICATIONDEADLINE?pd.RECTIFICATIONDEADLINE:'请选择'}}
+					</view>
+				</picker>
+			</view>
+
+			<view class="cu-form-textarea margin-top" v-if="RECTIFICATIONTYPE==1">
+				<view class="cu-form-title text-hui">整改描述</view>
+				<textarea maxlength="-1" :disabled="modalName!=null" v-model="pd.RECTIFYDESCR" placeholder="请对隐患进行整改描述(必填项)"></textarea>
+			</view>
+			<view class="cu-bar bg-white margin-top" v-if="RECTIFICATIONTYPE==1">
+				<view class="action">
+					整改后图片
+				</view>
+				<view class="action">
+					{{imgList1.length}}/4
+				</view>
+			</view>
+			<view class="cu-form-group" v-if="RECTIFICATIONTYPE==1">
+				<view class="grid col-4 grid-square flex-sub">
+					<view class="bg-img" v-for="(item,index) in imgList1" :key="index" @tap="ViewImage" data-type="1" :data-url="imgList1[index].filePath">
+						<image  :src="imgList1[index].filePath" mode="aspectFill"></image>
+						<view class="cu-tag bg-red" @tap.stop="DelImg"  data-type="1" :data-index="index">
+							<text class='cuIcon-close'></text>
+						</view>
+					</view>
+					<view class="solids" @tap.stop="openAuthZg('CAMERA')" v-if="imgList1.length<4">
+						<text class='cuIcon-cameraadd'></text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="padding flex flex-direction">
+			<button :loading="buttonloading" class="cu-btn bg-blue margin-tb-sm lg" @click="$noMultipleClicks(goSubmit)">提交</button>
+		</view>
+		</scroll-view>
+    <view :class="['cu-modal',{'show':modalShow}]" v-if="modalShow">
+      <view class="cu-dialog">
+        <view class="cu-bar bg-white justify-end">
+          <view class="content">播放视频</view>
+          <view class="action" @tap="modalShow = false">
+            <text class="cuIcon-close text-red"></text>
+          </view>
+        </view>
+        <video :src="videoSrc" :autoplay="true" @fullscreenchange="fullScreenHandler"></video>
+        <view class="cu-bar bg-white justify-end">
+          <view class="action">
+            <button class="cu-btn line-green text-green" @click="modalShow = false">关闭</button>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <yk-authpup ref="authpup" type="top" @changeAuth="ChooseImage(0)" :permissionID="permissionID"></yk-authpup>
+    <yk-authpup ref="authpup_video" type="top" @changeAuth="chooseVideo(0)" :permissionID="permissionID"></yk-authpup>
+    <yk-authpup ref="authpup_zg" type="top" @changeAuth="ChooseImage(1)" :permissionID="permissionID"></yk-authpup>
+	</view>
+</template>
+
+<script>
+	import {
+		basePath,corpinfoId,deptId,loginUser,formatDate,loginSession,baseImgPath
+	} from '@/common/tool.js';
+	import tkiTree from "@/components/select-tree/select-tree.vue"
+	import gcoord from '@/common/gcoord.js'
+  import ykAuthpup from "@/components/yk-authpup/yk-authpup"
+	export default {
+		components: {
+			tkiTree,ykAuthpup
+		},
+		data() {
+			return {
+        permissionID:'',
+				isUps:false,
+				buttonloading: false,
+				msg:'add',
+				riskId:'',
+				itemId:'',
+				index:'',
+				noClick:true,
+				pd:[{"RECTIFICATIONTYPE":2}],
+				imgList: [],
+				imgList1: [],
+				HIDDENDESCR:'',//隐患描述
+				HIDDENPART:'',//隐患部位
+				modalName: null,
+				id:'',
+				CHECK_CONTENT:'',
+				checkId:'',
+				RECTIFYDESCR:'',//整改描述
+				RECTIFICATIONTYPE:2,//是否立即
+				treeNode:[],//部门下拉数据
+				RECTIFICATIONDEPT:'',//整改部门
+				RECTIFICATIONDEPTNAME:'请选择',//整改部门
+				CHECKDEPT:'',//验收部门
+				CHECKDEPTNAME:'请选择',//验收部门
+				rectificationUserList:[],
+				RECTIFICATIONOR:'',//整改人
+				uindex: -1,
+				lindex: -1,
+				levelList:[],
+				tindex: -1,
+				hiddenTypeList:[],
+				HIDDENLEVEL:'',//隐患级别
+				RECTIFICATIONDEADLINE:'',//整改期限
+				rectifyPlanCompletionStartTime:'',
+				LISTMANAGER_ID:'',
+				CHECKRECORD_ID:'',
+        videoList:[],
+        videoSrc:'',
+        modalShow:false,
+			}
+		},
+		onLoad(event){
+			let now = new Date();
+			var tomorrow=now.setDate(now.getDate()+1);
+			tomorrow=new Date(tomorrow);
+			this.rectifyPlanCompletionStartTime =  formatDate(tomorrow, 'yyyy-MM-dd');
+			this.pd.HIDDEN_ID = event.HIDDEN_ID;
+			this.CHECKRECORD_ID = event.CHECKRECORD_ID;
+			if(this.pd.HIDDEN_ID){
+				this.msg="edit";
+				this.getData();
+			}else {
+				// this.pd.CHECK_CONTENT = JSON.parse(decodeURIComponent(event.checkContent));
+				// this.riskId = JSON.parse(decodeURIComponent(event.riskId));
+				// this.itemId = JSON.parse(decodeURIComponent(event.itemId));
+				// this.index = event.index;
+				this.LISTMANAGER_ID = event.listId;
+			}
+			this.getDept();
+			this.getLevel();
+			this.getHiddenType();
+			loginSession();
+		},
+		methods: {
+      fullScreenHandler(e) {
+        if (uni.getSystemInfoSync().platform == "ios") { return }
+      },
+			getData() {
+				var _this = this;
+				uni.showLoading({
+					title: '请稍候'
+				})
+				uni.request({
+					url: basePath + '/app/customHidden/goEdit',  // /app/hidden/goRiskListCheckEdit
+					method: 'POST',
+					dataType: 'json',
+					header: {
+						'Content-type': 'application/x-www-form-urlencoded'
+					},
+					data: {
+						HIDDEN_ID: _this.pd.HIDDEN_ID,
+            CORPINFO_ID:loginUser.CORPINFO_ID,
+            USER_ID:loginUser.USER_ID,
+					},
+					success: (res) => {
+						if ("success" == res.data.result) {
+							uni.hideLoading();
+							_this.pd = res.data.pd; //参数map
+							_this.RECTIFICATIONTYPE=_this.pd.RECTIFICATIONTYPE;
+							let files=res.data.hImgs;
+              for(var i=0;i<files.length;i++){
+                let img={};
+                img.filePath=baseImgPath+files[i].FILEPATH;
+                if(files[i].FILEPATH.substring(files[i].FILEPATH.lastIndexOf("."), files[i].FILEPATH.length) === '.jpg'){
+                  img.id=files[i].IMGFILES_ID;
+                  _this.imgList.push(img);
+                } else {
+                  img.id=files[i].IMGFILES_ID;
+                  _this.videoList.push(img);
+                }
+              }
+
+							let files1=res.data.rImgs;
+							for(var i=0;i<files1.length;i++){
+								let img={};
+								img.filePath=baseImgPath+files[i].FILEPATH;
+								img.id=files[i].IMGFILES_ID;
+								_this.imgList1.push(img);
+							}
+							_this.getUserList();
+						} else if ("exception" == data.result) {
+							uni.showToast({
+								title: '错误',
+								duration: 2000
+							});
+						}
+					}
+				});
+			},
+			getDept() {
+				var _this = this;
+				uni.request({
+					url: basePath + '/app/sys/listTree',//部门下拉接口
+					method: 'POST',
+					dataType: 'json',
+					header: {
+						'Content-type':'application/x-www-form-urlencoded'
+					},
+					data: {
+            CORPINFO_ID:loginUser.CORPINFO_ID,
+            USER_ID:loginUser.USER_ID,
+					},
+					success: (res) => {
+						if("success" == res.data.result){
+								_this.treeNode=eval(res.data.zTreeNodes);
+						} else {
+							uni.showToast({
+								title: res.data.message,
+								duration: 2000
+							});
+						}
+					}
+				});
+			},
+			// 确定回调事件
+			zgtreeConfirm(e) {
+				this.isUps=false;
+				this.pd.RECTIFICATIONDEPT=e[0].id;
+				this.pd.RECTIFICATIONDEPTNAME=e[0].name;
+				this.uindex=-1;
+				this.pd.RECTIFICATIONOR='';
+				this.pd.RECTIFICATIONORNAME='';
+				this.$forceUpdate();//强制刷新
+				this.getUserList();
+			},
+			// 取消回调事件
+			zgtreeCancel(e) {
+				this.isUps=false;
+			},
+			// 显示树形选择器
+			showZgTree() {
+				this.isUps=true
+				this.$refs.tkiTree._show();
+			},
+
+			// 确定回调事件
+			ystreeConfirm(e) {
+				this.pd.CHECKDEPT=e[0].id;
+				this.pd.CHECKDEPTNAME=e[0].name;
+				this.$forceUpdate();//强制刷新
+			},
+			// 显示树形选择器
+			showYsTree() {
+				this.$refs.tkiTree1._show();
+			},
+			//获取人员列表
+			getUserList(){
+				//发送 post 请求
+				var _this = this;
+				uni.request({
+					method: 'POST',
+					dataType: 'json',
+					header: {
+						'Content-type':'application/x-www-form-urlencoded'
+					},
+					url: basePath+'/app/sys/listUser',
+					data: {
+            DEPARTMENT_ID:_this.pd.RECTIFICATIONDEPT,
+            tm:new Date().getTime(),
+            CORPINFO_ID:loginUser.CORPINFO_ID,
+            USER_ID:loginUser.USER_ID,
+          },
+					success: function(res){
+						if("success" == res.data.result){
+								_this.rectificationUserList=res.data.userList;
+						}else{
+							uni.showToast({
+								title: res.data.message,
+								duration: 2000
+							});
+						}
+					}
+				})
+			},
+			PickerZgr(e) {
+				this.uindex = e.detail.value;
+				this.pd.RECTIFICATIONOR=this.rectificationUserList[this.uindex].USER_ID;
+				this.pd.RECTIFICATIONORNAME=this.rectificationUserList[this.uindex].NAME;
+				this.$forceUpdate();//强制刷新
+			},
+			//获取数据字典数据
+			getLevel: function () {
+				var _this = this;
+				uni.request({
+					method: 'POST',
+					dataType: 'json',
+					header: {
+						'Content-type': 'application/x-www-form-urlencoded'
+					},
+					url: basePath + '/dictionaries/getLevels?tm=' + new Date().getTime(),
+					data: {
+            DICTIONARIES_ID: '5e7cf8620ba54ad89719d0be62133c7a',
+            CORPINFO_ID:loginUser.CORPINFO_ID,
+            USER_ID:loginUser.USER_ID,
+          },
+					success: function (res) {
+						_this.levelList = res.data.list;
+					}
+				});
+			},
+			levelPickerChange(e) {
+        if(e.detail.value==1){
+          this.RECTIFICATIONTYPE = 2;
+        }
+				this.lindex = e.detail.value;
+				this.pd.HIDDENLEVEL=this.levelList[this.lindex].BIANMA;
+				this.pd.HIDDENLEVELNAME=this.levelList[this.lindex].NAME;
+				this.$forceUpdate();//强制刷新
+			},
+      getHiddenType: function () {
+        var _this = this;
+        uni.request({
+          method: 'POST',
+          dataType: 'json',
+          header: {
+            'Content-type': 'application/x-www-form-urlencoded'
+          },
+          url: basePath + '/dictionaries/getLevels',
+          data: {
+            DICTIONARIES_ID: '3babc15144444bdc8d763d0af2bdfff8',
+            CORPINFO_ID:loginUser.CORPINFO_ID,
+            USER_ID:loginUser.USER_ID,
+          },
+          success: function ({data}) {
+            for (let i = 0; i < data.list.length; i++) {
+              if (data.list[i].BIANMA.indexOf(loginUser.PROVINCE) > -1) {
+                _this.getTrainDicList(data.list[i].DICTIONARIES_ID)
+                break
+              }
+            }
+          }
+        });
+      },
+      getTrainDicList(parentId) { // trainDicList
+        var _this = this;
+        uni.request({
+          method: 'POST',
+          dataType: 'json',
+          header: {
+            'Content-type': 'application/x-www-form-urlencoded'
+          },
+          url: basePath + '/dictionaries/listAllDictToParId',
+          data: {
+            parentId,
+            CORPINFO_ID:loginUser.CORPINFO_ID,
+            USER_ID:loginUser.USER_ID,
+          },
+          success: function ({data}) {
+            let zTreeNodes = data.zTreeNodes
+            zTreeNodes = zTreeNodes.replace(/"nodes":\[/g, '"children":[')
+            _this.hiddenTypeList = JSON.parse(zTreeNodes)
+          }
+        });
+      },
+      showZgTree2(){
+        this.isUps=true
+        this.$refs.tkiTree2._show();
+      },
+      zgtreeCancel2(e){
+        this.isUps=false;
+      },
+      zgtreeConfirm2(e){
+        this.isUps=false;
+        if(e[0]?.parents.length === 1){
+          this.pd.HIDDENTYPE = [e[0]?.parents[0]?.id || '', e[0]?.id || ''];
+          this.pd.HIDDENTYPENAME = [e[0]?.parents[0]?.name || '', e[0]?.name || ''].join('/')
+        }else if(e[0]?.parents.length === 2) {
+          this.pd.HIDDENTYPE = [e[0]?.parents[0]?.id || '', e[0]?.parents[1]?.id || '', e[0]?.id || ''];
+          this.pd.HIDDENTYPENAME = [e[0]?.parents[0]?.name || '', e[0]?.parents[1]?.name || '', e[0]?.name || ''].join('/')
+        }else{
+          this.pd.HIDDENTYPE = [e[0]?.id || ''];
+          this.pd.HIDDENTYPENAME = [e[0]?.name || ''].join('/');
+        }
+      },
+			typePickerChange(e) {
+				this.tindex = e.detail.value;
+				this.pd.HIDDENTYPE=this.hiddenTypeList[this.tindex].BIANMA;
+				this.pd.HIDDENTYPENAME=this.hiddenTypeList[this.tindex].NAME;
+				this.$forceUpdate();//强制刷新
+			},
+			changeDate(e) {
+				this.pd.RECTIFICATIONDEADLINE = e.detail.value
+				this.$forceUpdate();//强制刷新
+			},
+
+      openAuth(permissionID){
+        this.permissionID = permissionID;
+        setTimeout(()=>{
+          this.$refs['authpup'].open();
+        },200)
+      },
+
+      openAuthZg(permissionID){
+        this.permissionID = permissionID;
+        setTimeout(()=>{
+          this.$refs['authpup_zg'].open();
+        },200)
+      },
+
+			//图片上传
+			ChooseImage(e) {
+				var _this = this;
+				var ss=4-this.imgList.length;
+				uni.chooseImage({
+					count: ss, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['camera','album'], //从相册选择
+					success: (res) => {
+            if(e==0) {
+              for (let i = 0; i < res.tempFilePaths.length; i++) {
+                let img={};
+                img.id='';
+                img.filePath=res.tempFilePaths[i];
+                this.imgList.push(img)
+              }
+            }else {
+              for (let i = 0; i < res.tempFilePaths.length; i++) {
+                let img = {};
+                img.id = '';
+                img.filePath = res.tempFilePaths[i];
+                this.imgList1.push(img)
+              }
+            }
+					}
+				});
+			},
+			ViewImage(e) {
+				console.info(e.currentTarget.dataset.type)
+				if(e.currentTarget.dataset.type==0) {
+					let files =[];
+					for(var i=0;i<this.imgList.length;i++){
+						files.push(this.imgList[i].filePath)
+					}
+					uni.previewImage({
+						urls: files,
+						current: e.currentTarget.dataset.url
+					});
+				}else{
+					let files =[];
+					for(var i=0;i<this.imgList1.length;i++){
+						files.push(this.imgList1[i].filePath)
+					}
+					uni.previewImage({
+						urls: files,
+						current: e.currentTarget.dataset.url
+					});
+				}
+			},
+			DelImg(e) {
+				var _this = this;
+				let i=e.currentTarget.dataset.index
+				uni.showModal({
+					title: '秦安双控',
+					content: '确定要删除这张图片吗？',
+					cancelColor:"#000000",
+					cancelText: '取消',
+					confirmText: '确定',
+					success: res => {
+						if (res.confirm) {
+							if(e.currentTarget.dataset.type==0) {
+								if(_this.imgList[i].id) {
+									uni.showLoading({
+										title: '处理中'
+									})
+									uni.request({
+										url: basePath+'/app/imgfiles/delete',
+										method: 'POST',
+										dataType: 'json',
+										header: {
+											'Content-type':'application/x-www-form-urlencoded'
+										},
+										data: {
+											IMGFILES_ID: _this.imgList[i].id,
+                      CORPINFO_ID:loginUser.CORPINFO_ID,
+                      USER_ID:loginUser.USER_ID,
+										},
+										success: (res) => {
+											uni.hideLoading();
+											uni.showToast({
+												icon: 'none',
+												title: '删除成功',
+												duration: 1500
+											});
+											_this.imgList.splice(i, 1)
+										},
+										fail: (err) => {
+											uni.hideLoading();
+											uni.showModal({
+												content: err.errMsg,
+												showCancel: false
+											});
+										}
+									})
+								}else {
+									this.imgList.splice(e.currentTarget.dataset.index, 1)
+								}
+							}else{
+								if(_this.imgList1[i].id) {
+									uni.showLoading({
+										title: '处理中'
+									})
+									uni.request({
+										url: basePath+'/app/imgfiles/delete',
+										method: 'POST',
+										dataType: 'json',
+										header: {
+											'Content-type':'application/x-www-form-urlencoded'
+										},
+										data: {
+											IMGFILES_ID: _this.imgList1[i].id,
+                      CORPINFO_ID:loginUser.CORPINFO_ID,
+                      USER_ID:loginUser.USER_ID,
+										},
+										success: (res) => {
+											uni.hideLoading();
+											uni.showToast({
+												icon: 'none',
+												title: '删除成功',
+												duration: 1500
+											});
+											_this.imgList1.splice(i, 1)
+										},
+										fail: (err) => {
+											uni.hideLoading();
+											uni.showModal({
+												content: err.errMsg,
+												showCancel: false
+											});
+										}
+									})
+								}else {
+									this.imgList1.splice(e.currentTarget.dataset.index, 1)
+								}
+							}
+						}
+					}
+				})
+			},
+			textareaAInput(e){
+				this.pd.HIDDENDESCR= e.detail.value
+			},
+			textareaBInput(e){
+				this.pd.HIDDENPART= e.detail.value
+			},
+			textareaCInput(e){
+				this.pd.RECTIFYDESCR= e.detail.value
+			},
+			goSubmit() {
+				var _this = this;
+				// if (!_this.pd.CHECKDEPT) {
+				// 	uni.showToast({
+				// 		icon: 'none',
+				// 		title: '请选择验收部门',
+				// 		duration: 1500
+				// 	});
+				// 	return;
+				// }
+				if (_this.imgList.length <= 0) {
+					uni.showToast({
+						icon: 'none',
+						title: '请上传隐患图片',
+						duration: 1500
+					});
+					return;
+				}
+				if (!_this.pd.HIDDENDESCR) {
+					uni.showToast({
+						icon: 'none',
+						title: '请填隐患描述',
+						duration: 1500
+					});
+					return;
+				}
+				if (!_this.pd.HIDDENPART) {
+					uni.showToast({
+						icon: 'none',
+						title: '请填隐患部位',
+						duration: 1500
+					});
+					return;
+				}
+				if (!_this.pd.HIDDENLEVEL) {
+					uni.showToast({
+						icon: 'none',
+						title: '请选择隐患级别',
+						duration: 1500
+					});
+					return;
+				}
+				if (!_this.pd.HIDDENTYPE) {
+					uni.showToast({
+						icon: 'none',
+						title: '请选择隐患类型',
+						duration: 1500
+					});
+					return;
+				}
+				if (_this.RECTIFICATIONTYPE == 1 && !_this.pd.RECTIFYDESCR) {
+					uni.showToast({
+						icon: 'none',
+						title: '请填整改描述',
+						duration: 1500
+					});
+					return;
+				}
+				if (_this.RECTIFICATIONTYPE == 1 && _this.imgList1.length <= 0) {
+					uni.showToast({
+						icon: 'none',
+						title: '请上传整改后图片',
+						duration: 1500
+					});
+					return;
+				}
+				if (_this.RECTIFICATIONTYPE == 2 && !_this.pd.RECTIFICATIONDEPT) {
+					uni.showToast({
+						icon: 'none',
+						title: '请选择整改部门',
+						duration: 1500
+					});
+					return;
+				}
+				if (_this.RECTIFICATIONTYPE == 2 && !_this.pd.RECTIFICATIONOR) {
+					uni.showToast({
+						icon: 'none',
+						title: '请选择整改人',
+						duration: 1500
+					});
+					return;
+				}
+				if (_this.RECTIFICATIONTYPE == 2 && !_this.pd.RECTIFICATIONDEADLINE) {
+					uni.showToast({
+						icon: 'none',
+						title: '请选择整改期限',
+						duration: 1500
+					});
+					return;
+				}
+				var fileList = [];
+				for (var i = 0; i < _this.imgList.length; i++) {
+					if(!_this.imgList[i].id){
+						var file = {};
+						file.type = 3;
+						file.filePath = _this.imgList[i].filePath;
+						fileList.push(file);
+					}
+				}
+				for (var i = 0; i < _this.videoList.length; i++) {
+				  if(!_this.videoList[i].id){
+					var file = {};
+					file.type = 3;
+					file.filePath = _this.videoList[i].filePath;
+					fileList.push(file);
+				  }
+				}
+				if (_this.RECTIFICATIONTYPE == 1){
+					for (var i = 0; i < _this.imgList1.length; i++) {
+						if(!_this.imgList1[i].id) {
+							var file = {};
+							file.type = 4;
+							file.filePath = _this.imgList1[i].filePath;
+							fileList.push(file);
+						}
+					}
+				}
+				new Promise((resolve, reject) => {
+					_this.submit().then(() => {resolve();})
+				}).then(() => {
+					var i=0;
+					_this.uploadImg(fileList,i).then(() => {resolve();})
+				}).then(() => {
+					var pages = getCurrentPages();	// 获取当前页面栈
+					var prePage = pages[pages.length - 2];	// 上一个页面
+					// var task = prePage.$vm.list[_this.index];
+					if(_this.index) {
+						prePage.$vm.initflag = true;    // A 页面 init方法 为true
+						// prePage.$vm.list[_this.index].ISNORMAL = 1;
+						// prePage.$vm.list[_this.index].HIDDEN_ID = _this.pd.HIDDEN_ID;
+					}
+					uni.navigateBack({});
+					uni.hideLoading();
+				})
+			},
+			uploadImg(tempFilePaths,i){
+				return new Promise((resolve, reject) => {
+					var _this = this;
+					if(tempFilePaths.length==0){
+						resolve();
+					}
+					uni.showLoading({
+						title: '上传中'
+					})
+					uni.uploadFile({
+						url: basePath+'/app/imgfiles/add',
+						filePath: tempFilePaths[i].filePath,
+						name: 'FFILE',
+						formData: {
+							'TYPE': tempFilePaths[i].type,
+							'FOREIGN_KEY': _this.pd.HIDDEN_ID,
+              CORPINFO_ID: loginUser.CORPINFO_ID,
+              USER_ID: loginUser.USER_ID,
+						},
+						success: (res) => {
+							i++;
+							if (tempFilePaths.length > i) {
+								_this.uploadImg(tempFilePaths, i);
+							} else {
+								uni.hideLoading();
+								resolve();
+							}
+						},
+						fail: (err) => {
+							uni.hideLoading();
+							uni.showModal({
+								content: err.errMsg,
+								showCancel: false
+							});
+						}
+					})
+				})
+			},
+			submit(){
+				return new Promise((resolve, reject) => {
+					var _this = this;
+					// var pages = getCurrentPages();	// 获取当前页面栈
+					// var prePage = pages[pages.length - 2];	// 上一个页面
+					// var task = prePage.$vm.list[_this.index];
+					let longitude;
+					let latitude;
+					console.info(_this.LISTMANAGER_ID);
+					uni.getLocation({
+						type: 'GCJ02',
+						success: function (res1) {
+							longitude = res1.longitude;
+							latitude = res1.latitude;
+							var result = gcoord.transform(
+									[longitude, latitude],    // 经纬度坐标
+									gcoord.GCJ02,               // 当前坐标系
+									gcoord.BD09                // 目标坐标系
+							);
+							longitude = result[0];
+							latitude =  result[1];
+							//发送 post 请求提交保存
+							this.buttonloading = true
+							uni.request({
+								url: basePath+'/app/customHidden/'+_this.msg, // /app/hidden/'+_this.msg
+								method: 'POST',
+								dataType: 'json',
+								header: {
+									'Content-type':'application/x-www-form-urlencoded'
+								},
+								data: {
+									HIDDEN_ID:_this.pd.HIDDEN_ID,
+									SOURCE:'3',
+									STATE:'0',
+									HIDDENDESCR:_this.pd.HIDDENDESCR,
+									HIDDENPART:_this.pd.HIDDENPART,
+									LATITUDE:latitude,
+									LONGITUDE:longitude,
+									RECTIFYDESCR:_this.pd.RECTIFYDESCR?_this.pd.RECTIFYDESCR:'',
+									RECTIFICATIONDEADLINE:_this.pd.RECTIFICATIONDEADLINE?_this.pd.RECTIFICATIONDEADLINE:'',
+									RECTIFICATIONTYPE:_this.RECTIFICATIONTYPE,
+									RECTIFICATIONOR:_this.pd.RECTIFICATIONOR,
+									HIDDENTYPE:_this.pd.HIDDENTYPE,
+									HIDDENLEVEL:_this.pd.HIDDENLEVEL,
+									RECTIFICATIONDEPT:_this.pd.RECTIFICATIONDEPT,
+									// CHECKDEPT:_this.pd.CHECKDEPT?_this.pd.CHECKDEPT:'',
+									// CHECK_CONTENT:_this.pd.CHECK_CONTENT,
+									HIDDENFINDDEPT:deptId,
+									CREATOR:loginUser.USER_ID,
+									LISTMANAGER_ID: _this.LISTMANAGER_ID,
+									  HIDDENTYPE_NAME:_this.pd.HIDDENTYPENAME,
+									  HIDDENTYPE1:_this.pd.HIDDENTYPE[0] || '',
+									  HIDDENTYPE2:_this.pd.HIDDENTYPE[1] || '',
+									  HIDDENTYPE3:_this.pd.HIDDENTYPE[2] || '',
+									  CORPINFO_ID:loginUser.CORPINFO_ID,
+									  USER_ID:loginUser.USER_ID,
+									// RECORDITEM_ID:_this.itemId,
+									// RISKITEM_ID:_this.riskId,
+								},
+								success: (res) => {
+									this.buttonloading = false
+									if ("success" == res.data.result) {
+										_this.pd.HIDDEN_ID= res.data.pd.HIDDEN_ID;
+										resolve();
+										// prePage.$vm.initflag = true;    // A 页面 init方法 为true
+										// prePage.$vm.list[_this.index].ISNORMAL = 1;
+										// prePage.$vm.list[_this.index].HIDDEN_ID = _this.HIDDEN_ID;
+										// uni.navigateBack({});
+										// uni.hideLoading();
+									} else {
+										uni.showToast({
+											title: res.data.msaesge,
+											duration: 2000
+										});
+									}
+								}
+							});
+						},
+						fail: function(res){
+							uni.hideLoading();
+							uni.showToast({
+								title: "获取位置失败",
+								duration: 2000
+							});
+						}
+					});
+
+				});
+			},
+			radioType(e){
+				this.RECTIFICATIONTYPE = e
+			},
+      openAuthVideo(permissionID){
+        this.permissionID = permissionID;
+        setTimeout(()=>{
+          this.$refs['authpup_video'].open();
+        },200)
+      },
+      chooseVideo(e){
+        var _this = this;
+        uni.chooseVideo({
+          maxDuration:60,
+          count: 1, //默认9
+          // sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+          sourceType: ['camera','album'], //从相册选择
+          success: (res) => {
+            if(res.tempFilePath.substring(res.tempFilePath.lastIndexOf(".") + 1, res.tempFilePath.length) === 'mp4'){
+              let img={};
+              img.id='';
+              img.filePath=res.tempFilePath;
+              this.videoList.push(img)
+            }else {
+              uni.showToast({
+                title: "只能上传MP4格式",
+                duration: 2000
+              });
+            }
+          }
+        });
+      },
+      DelVideo(e){
+        uni.showModal({
+          title: '',
+          content: '确定要删除这个视频吗？',
+          cancelColor: "#000000",
+          cancelText: '取消',
+          confirmText: '确定',
+          success: res => {
+            if (res.confirm) {
+              this.videoList = []
+            }
+          }
+        })
+      },
+      playVideo(e) {
+        this.videoSrc = e.currentTarget.dataset.src
+        this.modalShow = true
+      }
+		}
+	}
+</script>
+
+<style>
+	.prevent {
+			width: 100%;
+			height: 100%;
+			position: fixed;
+			top: 0;
+			left: 0;
+			overflow: hidden;
+		}
+	.cu-form-title{
+		padding: 20upx 0;
+	}
+	.cu-form-textarea{
+		background-color: #ffffff;
+		padding: 1upx 30upx 20upx;
+		min-height: 100upx;
+	}
+	.cu-form-textarea textarea {
+		height: 4.6em;
+		width: 100%;
+		line-height: 1.2em;
+		flex: 1;
+		font-size: 28upx;
+		padding: 0;
+	}
+	.selected{
+		display: flex;
+		align-items: center;
+		height: 100upx;
+	}
+	.selected .radio{
+		 transform:scale(0.8);
+		 margin-right: 10upx;
+	}
+	.group{
+		display: flex;
+		align-items: center;
+	}
+	.cu-form-group .title{
+		font-size: 28upx;
+		color: #666;
+	}
+	.cu-bar .action:first-child {
+	    font-size: 28upx;
+	}
+</style>
diff --git a/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue b/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue
index a747600..fe0615a 100644
--- a/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue
@@ -295,7 +295,7 @@
 					title: '请稍候'
 				})
 				uni.request({
-					url: basePath + '/app/hidden/goEdit',
+					url: basePath + '/app/hidden/goRiskListCheckEdit', // /app/hidden/goEdit
 					method: 'POST',
 					dataType: 'json',
 					header: {
@@ -889,7 +889,7 @@
 							latitude =  result[1];
 							//发送 post 请求提交保存
 							uni.request({
-								url: basePath+'/app/hidden/appAdd',
+								url: basePath+'/app/hidden/riskListCheckAppAdd',
 								method: 'POST',
 								dataType: 'json',
 								header: {
diff --git a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue
index ec9143a..76cb64a 100644
--- a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue
@@ -662,7 +662,7 @@
 					var _this = this;
 					this.buttonloading = true
 					uni.request({
-						url: basePath + "/app/hidden/check", //提交接口
+						url: basePath + "/app/hidden/riskListCheckInspection", //提交接口 // /app/hidden/check
 						method: 'POST',
 						dataType: 'json',
 						header: {
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-list.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-list.vue
index bf2fa9b..79a2896 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-list.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-list.vue
@@ -248,7 +248,7 @@
 				if(_this.list[e.index].HIDDEN_ID){
 					//不合格改为合格时 删除旧隐患
 					uni.request({
-						url: basePath+'/app/hidden/delete',
+						url: basePath+'/app/hidden/riskListCheckHiddenDelete', // /app/hidden/delete
 						xhrFields: {
 							withCredentials: true
 						},
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-next.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-next.vue
index 68925ef..e598aa3 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-next.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-next.vue
@@ -396,7 +396,7 @@
 					success: function (res) {
 						if (res.cancel) {
 							uni.request({
-								url: basePath + "/app/hidden/delete", //提交接口
+								url: basePath + "/app/hidden/riskListCheckHiddenDelete", //提交接口 // /app/hidden/delete
 								method: 'POST',
 								dataType: 'json',
 								header:{
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue
index 29aa7d9..c58c497 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue
@@ -213,7 +213,7 @@
         permissionID:'',
 				isUps:false,
 				buttonloading: false,
-				msg:'add',
+				msg:'riskListCheckAdd',
 				riskId:'',
 				itemId:'',
 				LISTMANAGER_ID:'',
@@ -264,7 +264,7 @@
 			this.rectifyPlanCompletionStartTime =  formatDate(tomorrow, 'yyyy-MM-dd');
 			this.pd.HIDDEN_ID = event.HIDDEN_ID;
 			if(this.pd.HIDDEN_ID){
-				this.msg="edit";
+				this.msg="riskListCheckEdit";
 				this.getData();
 			}else {
 				this.pd.CHECK_CONTENT = JSON.parse(decodeURIComponent(event.checkContent));
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-app.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-app.vue
index 04733f2..31b6581 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-app.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-app.vue
@@ -145,6 +145,7 @@
 				totalList:[],
         treeNode: [], //部门下拉数据
         DEPT: '',
+        DEPTNAME: '',
 				page: 1,
 				rows: 1000,
 				totalCount:0,
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-uncheck.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-uncheck.vue
index c5f24a5..3a29d43 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-uncheck.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-uncheck.vue
@@ -143,6 +143,7 @@
         totalList1:[],
         treeNode: [], //部门下拉数据
         DEPT: '',
+        DEPTNAME: '',
 				page: 1,
 				rows: 1000,
 				totalCount:0,
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue
index 18f4da7..37b73e9 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue
@@ -222,7 +222,7 @@
         permissionID:'',
 				isUps:false,
 				buttonloading: false,
-				msg:'add',
+				msg:'riskListCheckAdd', // add
 				riskId:'',
 				itemId:'',
 				index:'',
@@ -268,7 +268,7 @@
 			this.pd.HIDDEN_ID = event.HIDDEN_ID;
 			this.CHECKRECORD_ID = event.CHECKRECORD_ID;
 			if(this.pd.HIDDEN_ID){
-				this.msg="edit";
+				this.msg="riskListCheckEdit"; // edit
 				this.getData();
 			}else {
 				// this.pd.CHECK_CONTENT = JSON.parse(decodeURIComponent(event.checkContent));
@@ -292,7 +292,7 @@
 					title: '请稍候'
 				})
 				uni.request({
-					url: basePath + '/app/hidden/goEdit',
+					url: basePath + '/app/hidden/goRiskListCheckEdit', // /app/hidden/goEdit
 					method: 'POST',
 					dataType: 'json',
 					header: {