Merge branch 'develop' of http://git.censoft.com.cn/BCDH-HSE/bcdh-app into develop

src/views/common/center.vue

@@ -29,7 +29,6 @@ export default {
         
     },
     mounted(){
-        this.num=50
         postFun(`${this.api[this.params.theme]}/${this.params.id}`)
         .then(res=>{
             let data = res.data.hdReport||res.data.riskMain;
@@ -38,6 +37,7 @@ export default {
             this.$router.replace({
                 name: this.params.path,
                 params: {
+                    id:this.params.id,
                     data: {
                         ...data,
                         taskId:this.params.id
@@ -58,9 +58,14 @@ export default {
         })
     },
     created(){
-        this.num=10
+        let time = setInterval(()=>{
+            if(this.time>=80){
+                clearInterval(time)
+                return false;
+            }
+            this.num++
+        },10)
         if(this.$route.params.id&&this.$route.params.path){
-            this.num=30
             this.params=this.$route.params;
         } else {
              this.num=100;

src/views/danger/majorDanger/majorSurvey.vue

@@ -10,7 +10,7 @@
             <!-- {{item}} -->
             <van-row gutter="">
                 <van-col span="7">隐患单编号：</van-col>
-                <van-col span="17">{{ item.businessId }}</van-col>
+                <van-col span="17">{{ item.businessId||item.id}}</van-col>
             </van-row>
 
             <van-row gutter="">