Merge remote-tracking branch 'origin/new-exam' into new-exam

ruoyi-admin/src/main/resources/templates/system/checkReport/add.html

@@ -438,6 +438,7 @@
                         data:this.params,
                         success:((res)=>{
                             this.AreaList = res.data
+                            this.postForm.area = ''
                         }) ,
                     });
                 },

ruoyi-admin/src/main/resources/templates/system/checkReport/edit.html

@@ -303,7 +303,7 @@
             // 初始化地市列表
             this.getCityList();
             if (this.postForm.framework){
-                this.getAreaList()
+                this.getAreaList('mounted')
             }
             this.getCheckView()
             // var date = new Date();
@@ -511,7 +511,8 @@
                     }) ,
                 });
             },
-            getAreaList(){
+            getAreaList(type){
+                if (type === 'mounted'){
                     this.params.parentId = this.postForm.framework
                     // this.postForm.area = ''
                     $.ajax({
@@ -522,6 +523,19 @@
                             this.AreaList = res.data
                         }) ,
                     });
+                }else{
+                    this.params.parentId = this.postForm.framework
+                    this.postForm.area = ''
+                    $.ajax({
+                        url: ctx + "system/area/getSysAreaList",
+                        type: 'GET',
+                        data:this.params,
+                        success:((res)=>{
+                            this.AreaList = res.data
+                        }) ,
+                    });
+                }
+
             },
             submitForm() {
                 this.$refs.postForm.validate((valid) => {