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

# Conflicts:
#	project/pingchang/apps/AppRiskArea/components/List.vue

project/pingchang/apps/AppRiskArea/components/Add.vue

@@ -11,6 +11,9 @@
             <el-form-item prop="areaId" style="width: 100%;" label="选择地区" :rules="[{required: true, message: '请选择地区', trigger: 'change'}]">
               <ai-area-select clearable @fullname="v => form.areaName = v" always-show :instance="instance" v-model="form.areaId"></ai-area-select>
             </el-form-item>
+            <el-form-item prop="address" style="width: 100%;" label="详细地址">
+              <el-input size="small" type="textarea" :rows="5" placeholder="请输入详细地址" v-model="form.address"></el-input>
+            </el-form-item>
             <el-form-item label="风险等级" style="width: 100%;" prop="level" :rules="[{required: true, message: '请选择风险等级', trigger: 'change'}]">
               <ai-select
                 v-model="form.level"
@@ -47,7 +50,8 @@
         form: {
           level: '',
           areaId: '',
-          areaName: ''
+          areaName: '',
+          address: ''
         },
         id: ''
       }
@@ -68,7 +72,7 @@
 
     methods: {
       getInfo (id) {
-        this.instance.post(`/app/appepidemicdangerousarea/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/appepidemicpreventionriskarea/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.form = res.data
           }
@@ -78,7 +82,7 @@
       confirm () {
         this.$refs.form.validate((valid) => {
           if (valid) {
-            this.instance.post(`/app/appepidemicdangerousarea/addOrUpdate`, {
+            this.instance.post(`/app/appepidemicpreventionriskarea/addOrUpdate`, {
               ...this.form
             }).then(res => {
               if (res.code == 0) {

project/pingchang/apps/AppRiskArea/components/List.vue

@@ -66,33 +66,34 @@ export default {
     moduleName: String
   },
 
-  data() {
-    return {
-      search: {
-        current: 1,
-        size: 10,
-        level: '',
-        province: ''
-      },
-      currIndex: -1,
-      areaList: [],
-      total: 10,
-      colConfigs: [
-        {prop: 'province', label: '省级', align: 'left', width: '200px'},
-        {prop: 'city', label: '市级', align: 'center'},
-        {prop: 'district', label: '区级', align: 'center'},
-        {prop: 'town', label: '镇级', align: 'center'},
-        {prop: 'village', label: '村级', align: 'center'},
-        {prop: 'level', label: '等级', align: 'center', formart: v => this.dict.getLabel('epidemicDangerousAreaLevel', v)},
-        {prop: 'createTime', label: '设置时间', align: 'center'},
-        {prop: 'createUserName', label: '添加人', align: 'center'},
-        {slot: 'options', label: '操作', align: 'center'}
-      ],
-      areaName: '',
-      unitName: '',
-      tableData: []
-    }
-  },
+    data() {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          level: '',
+          province: ''
+        },
+        currIndex: -1,
+        areaList: [],
+        total: 10,
+        colConfigs: [
+          { prop: 'province',  label: '省级', align: 'left', width: '200px' },
+          { prop: 'city', label: '市级', align: 'center' },
+          { prop: 'district', label: '区级', align: 'center' },
+          { prop: 'town', label: '镇级', align: 'center' },
+          { prop: 'village', label: '村级', align: 'center' },
+          { prop: 'address', label: '详细地址', align: 'center' },
+          { prop: 'level', label: '等级', align: 'center', formart: v => this.dict.getLabel('epidemicDangerousAreaLevel', v) },
+          { prop: 'createTime', label: '设置时间', align: 'center' },
+          { prop: 'createUserName', label: '添加人', align: 'center' },
+          { slot: 'options', label: '操作', align: 'center' }
+        ],
+        areaName: '',
+        unitName: '',
+        tableData: []
+      }
+    },
 
   computed: {
     ...mapState(['user'])
@@ -104,30 +105,30 @@ export default {
     })
   },
 
-  methods: {
-    getList() {
-      this.instance.post(`/app/appepidemicpreventionriskarea/list`, null, {
-        params: {
-          ...this.search
-        }
-      }).then(res => {
-        if (res.code == 0) {
-          this.tableData = res.data.records
-          this.total = res.data.total
-        }
-      })
-    },
-
-    remove(id) {
-      this.$confirm('确定删除该数据？').then(() => {
-        this.instance.post(`/app/appepidemicpreventionriskarea/delete?ids=${id}`).then(res => {
+    methods: {
+      getList() {
+        this.instance.post(`/app/appepidemicpreventionriskarea/list`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
           if (res.code == 0) {
-            this.$message.success('删除成功！')
-            this.getList()
+            this.tableData = res.data.records
+            this.total = res.data.total
           }
         })
-      })
-    },
+      },
+
+      remove(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appepidemicpreventionriskarea/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      },
 
     toAdd(id) {
       this.$emit('change', {