From 1725cb78ef8413d2933da5edaf6db5d7e42189ed Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 27 Apr 2022 14:59:25 +0800
Subject: [PATCH] 29346

---
 src/apps/AppMonitoringObject/Detail.vue       |  2 +-
 .../AppMonitoringObject/MonitorAddView.vue    | 42 +++++++++++--------
 .../AppMonitoringObject/MonitorRemoveView.vue |  6 +--
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue
index 1f9b6bb8..496c7ed9 100644
--- a/src/apps/AppMonitoringObject/Detail.vue
+++ b/src/apps/AppMonitoringObject/Detail.vue
@@ -246,7 +246,7 @@
       </div>
 
       <div class="footer-btn" v-if="info.status == 1">
-        <div class="confirm-btn" @click="toRemove('您确认要解除此监测对象的风险吗？', 1)">消除风险</div>
+        <div class="confirm-btn" @click="toAddView('您确认要解除此监测对象的风险吗？', 1)">消除风险</div>
       </div>
 
       <div class="footer-btn" v-if="info.status == 2">
diff --git a/src/apps/AppMonitoringObject/MonitorAddView.vue b/src/apps/AppMonitoringObject/MonitorAddView.vue
index b612f7f4..1fc3fa01 100644
--- a/src/apps/AppMonitoringObject/MonitorAddView.vue
+++ b/src/apps/AppMonitoringObject/MonitorAddView.vue
@@ -1,25 +1,27 @@
 <template>
   <div class="MonitorAddView">
-    <div class="type" v-if="status == 0">
-      <div><span style="color: #FF4466">*</span>监测对象类型</div>
-      <div>
-        <AiSelect dict="fpRiskType" v-model="riskType" />
+    <div class="containter">
+      <div class="type" v-if="status == 0">
+        <div><span style="color: #FF4466">*</span>监测对象类型</div>
+        <div>
+          <AiSelect dict="fpRiskType" v-model="riskType" />
+        </div>
       </div>
-    </div>
-    <div class="type" v-if="status == 1">
-      <div><span style="color: #FF4466">*</span>风险消除方式</div>
-      <div>
-        <AiSelect dict="fpRiskEliminationMethod" v-model="riskEliminationMethod" />
+      <div class="type" v-if="status == 1">
+        <div><span style="color: #FF4466">*</span>风险消除方式</div>
+        <div>
+          <AiSelect dict="fpRiskEliminationMethod" v-model="riskEliminationMethod" />
+        </div>
       </div>
-    </div>
-    <div class="remark">
-      <div class="title"><span style="display: inline-block;width: 8px;"></span>备注说明</div>
-      <u-input v-model="opinion" type="textarea" placeholder="请输入备注说明" height="200" :maxlength="500"></u-input>
-    </div>
-    <div class="remark">
-      <div class="title"><span style="display: inline-block;width: 8px;"></span>图片<span style="color: #999999;font-size: 14px;">(最多9张)</span></div>
-      <div style="padding-bottom: 20px; box-sizing: border-box;">
-        <AiUploader :def.sync="file" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
+      <div class="remark">
+        <div class="title"><span style="display: inline-block;width: 8px;"></span>备注说明</div>
+        <u-input v-model="opinion" type="textarea" placeholder="请输入备注说明" height="200" :maxlength="500"></u-input>
+      </div>
+      <div class="remark">
+        <div class="title"><span style="display: inline-block;width: 8px;"></span>图片<span style="color: #999999;font-size: 14px;">(最多9张)</span></div>
+        <div style="padding-bottom: 20px; box-sizing: border-box;">
+          <AiUploader :def.sync="file" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
+        </div>
       </div>
     </div>
 
@@ -123,6 +125,10 @@ export default {
 
 <style lang="scss" scoped>
 .MonitorAddView {
+  .containter {
+    padding-bottom: 112px;
+    box-sizing: border-box;
+  }
   .type {
     display: flex;
     justify-content: space-between;
diff --git a/src/apps/AppMonitoringObject/MonitorRemoveView.vue b/src/apps/AppMonitoringObject/MonitorRemoveView.vue
index d22cc16b..8b9f35f5 100644
--- a/src/apps/AppMonitoringObject/MonitorRemoveView.vue
+++ b/src/apps/AppMonitoringObject/MonitorRemoveView.vue
@@ -37,7 +37,7 @@
 
     <div class="result">
       <div class="title">处理意见</div>
-      <div class="check">
+      <div class="check" v-if="info.status != 2">
         <div class="left">
           <span style="color: #FF4466;">*</span>
           <span>审核结果</span>
@@ -111,10 +111,6 @@ export default {
       })
     },
     submit() {
-      // if (!this.form.opinion) {
-      //   return this.$u.toast('请输入备注说明')
-      // }
-
       if (this.form.pass == 1) {   // 申请纳入
         this.$http.post(`/app/apppreventionreturntopoverty/examine`,null,{
           params: {