Merge remote-tracking branch 'origin/dev' into dev

packages/jianping/AppAssessment/components/List.vue

@@ -1,7 +1,7 @@
 <template>
   <ai-list class="notice">
     <template slot="title">
-      <ai-title title="走访排查情况统计" isShowBottomBorder :isShowArea="true" v-model="search.areaId" :instance="instance" @change="getList"></ai-title>
+      <ai-title title="走访排查情况统计" isShowBottomBorder :isShowArea="true" isShowBack @onBackClick="back" v-model="search.areaId" :instance="instance" @change="getList"></ai-title>
     </template>
     <template slot="content">
       <ai-search-bar>
@@ -110,6 +110,12 @@
             this.total = res.data.total
           }
         })
+      },
+
+      back () {
+        this.$emit('change', {
+          type: 'Statistics'
+        })
       }
     }
   }

packages/jianping/AppRiskWarning/components/Add.vue

@@ -38,7 +38,7 @@
               <el-input v-model="form.address" :maxlength="30" size="small" placeholder="请输入联系地址"></el-input>
             </el-form-item>
             <el-form-item label="备注说明" prop="remarks" style="width: 100%;">
-              <el-input v-model="form.remarks" :rows="5" style="width: 100%;" type="textarea" :maxlength="500" size="small" placeholder="请输入..."></el-input>
+              <el-input v-model="form.remarks" :rows="5" style="width: 100%;" type="textarea" :maxlength="500" size="small" placeholder="请简要说明风险情况"></el-input>
             </el-form-item>
           </el-form>
         </template>

packages/jianping/AppVisitToVerify/components/List.vue

@@ -21,7 +21,7 @@
             @change="search.current = 1, getList()">
           </ai-select>
           <el-button size="small" v-if="checkType === '2'" :disabled="addIds.length == 0" type="primary" @click="addMonitor">纳入监测</el-button>
-          <el-button size="small" v-if="checkType === '2'" :disabled="removeIds.length == 0" @click="removeAll">解除风险</el-button>
+          <el-button size="small" v-if="checkType !== '0'" :disabled="removeIds.length == 0" @click="removeAll">解除风险</el-button>
         </template>
         <template #right>
           <el-input