知识库

pages/index/detail.vue

@@ -236,7 +236,7 @@ export default {
           userId: this.params.userId,
           deptId: this.params.deptId,
           stream: true,
-          type: 1,
+          type: '1',
           id: this.params.id,
           taskId: this.params.taskId,
           sectionId: this.params.sectionId,

pages/investigation/task.vue

@@ -318,7 +318,7 @@
 							<uni-forms-item label="隐患图片" label-position="top" label-width="200px" />
 
 							<u-upload :fileList="fileList" @afterRead="(e) => afterRead(e, 'fileList')"
-								@delete="(e) => deletePic(e, 'fileList')" name="1" :maxCount="1"></u-upload>
+								@delete="(e) => deletePic(e, 'fileList')" name="1"></u-upload>
 						</view>
 						<view class="detail-item">
 							<uni-forms-item label="补充信息" label-position="top" label-width="200px" />
@@ -927,7 +927,7 @@
 						hdTerm: this.hiddenDangerList2[2].id,
 						hdTermName: this.hiddenDangerList2[2].itemname,
 						hdDesc: this.describe.hdDesc,
-						hdPic: this.fileList.length > 0 ? this.fileList[0].url : '',
+						hdPic: this.fileList.length > 0 ? this.fileList : '',
 						hdInfo: this.describe.hdInfo,
 						dangerProblem: this.hiddenDangerList2[0].itemname + '/' + this.hiddenDangerList2[1].itemname +
 							'/' + this.hiddenDangerList2[2].itemname
@@ -1081,7 +1081,7 @@
 						hdTerm: r.id,
 						hdDesc: r.checkedSelect ? r.checkedSelect.hdDesc : '',
 						hdPic: r.checkedSelect ? r.checkedSelect.hdPic : '',
-						hdInfo: r.checkedSelect ? r.checkedSelect.hdPic : '',
+						hdInfo: r.checkedSelect ? r.checkedSelect.hdInfo : '',
 						pcType: 1
 					})
 				})

pages/map/index.vue

@@ -36,7 +36,7 @@
       </view>
       <view class="btn-box">
         <view @click="handleCheck(1)" class="btn btn1" v-show="type=='edit'"> 智能排查 </view>
-        <view @click="handleCheck(2)" class="btn btn2" v-show="type=='edit'"> 人工排查 </view>
+        <view @click="show2 = true" class="btn btn2" v-show="type=='edit'"> 人工排查 </view>
         <view @click="handleCheck(2)" class="btn btn8" v-show="type=='view'"> 查看排查详情 </view>
       </view>
     </view>
@@ -46,7 +46,7 @@
       <view class="btn-box">
         <view @click="onJump(3)" class="btn btn3" v-show="type=='edit'"> 更换 </view>
         <view @click="handleCheck(1)" class="btn btn4" v-show="type=='edit'"> 智能排查 </view>
-        <view @click="handleCheck(2)" class="btn btn5" v-show="type=='edit'"> 人工排查 </view>
+        <view @click="show2 = true" class="btn btn5" v-show="type=='edit'"> 人工排查 </view>
         <view @click="handleCheck(2)" class="btn btn8" v-show="type=='view'"> 查看排查详情 </view>
       </view>
     </view>
@@ -158,7 +158,7 @@
         <cover-view class="umodal-content"> 新增成功</cover-view>
         <cover-view class="umodal-line1"></cover-view>
         <cover-view class="umodal-btnbox">
-          <cover-view class="umodal-btn" @click="handleCheck(2)">
+          <cover-view class="umodal-btn" @click="show2 = true">
             人工排查
           </cover-view>
           <cover-view class="umodal-line2"></cover-view>
@@ -168,6 +168,27 @@
         </cover-view>
       </cover-view>
     </cover-view>
+    <cover-view class="umodal" v-show="show2">
+      <cover-view class="umodal-box" style="height: 280rpx;">
+        <cover-view class="umodal-content" style="padding: 12px 0 0 22px;box-sizing: border-box; height: 180rpx;"> 
+          <cover-view style="height: 40rpx; margin-top: 2px;">您将进入人工排查，智能排查数据将自动转入</cover-view>
+          <cover-view style="height: 40rpx;">人工排查结果，但无法再次转回智能排查。</cover-view>
+          <cover-view style="height: 40rpx;">是否继续，请确认？</cover-view>
+          
+        </cover-view>
+        <cover-view class="umodal-line1"></cover-view>
+        <cover-view class="umodal-btnbox">
+          <cover-view class="umodal-btn" style="color: #606266;" @click="show2 = false">
+            取消
+          </cover-view>
+          <cover-view class="umodal-line2"></cover-view>
+          
+          <cover-view class="umodal-btn" @click="handleCheck(2)">
+            确认
+          </cover-view>
+        </cover-view>
+      </cover-view>
+    </cover-view>
   </view>
 </template>
 <script>
@@ -204,7 +225,8 @@ export default {
       name3: "",
       name4: "",
       show: false,
-      type:''
+      type:'',
+      show2: false,
     };
   },
   onLoad(options) {
@@ -919,7 +941,7 @@ export default {
       font-size: 14px;
       color: #606266;
       line-height: 140rpx;
-      padding-left: 12px;
+      padding-left:12px;
     }
     .umodal-line1{
       width: 100%;