Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

packages/3.0.0/AppHealthReport/components/Detail.vue

@@ -184,7 +184,7 @@
         tableData: [],
         recordList: [],
         colConfigs: [
-          {prop: 'createTime', label: '上报日期', align: 'center', dateFormart: 'YYYY-MM-DD'},
+          {prop: 'createTime', label: '上报日期', align: 'center', dateFormat: 'YYYY-MM-DD'},
           {prop: 'status', label: '健康状态', align: 'center', formart: v => v === '0' ? '异常' : '正常' }
         ],
         tabList: ['基本信息', '每日上报', '异常处理']

packages/IntelligentSecurity/components/AiSlwVideo.vue

@@ -290,7 +290,7 @@
           this.$nextTick(() => {
             this.$refs.timeline && this.$refs.timeline.init()
           })
-        }, 60)
+        }, 260)
       },
 
       screenshots () {

packages/wechat/AppVillageInfo/components/Event.vue

@@ -84,7 +84,7 @@
           { prop: 'type', label: '类型', formart: v => this.dict.getLabel('villInfoType', v) },
           { prop: 'title', label: '标题', align: 'left' },
           { prop: 'status', label: '发布状态', align: 'center', formart: v => this.dict.getLabel('villInfoStatus', v) },
-          { prop: 'createDate', label: '发布时间', dateFormart: 'YYYY-MM-DD', align: 'center' },
+          { prop: 'createDate', label: '发布时间', dateFormat: 'YYYY-MM-DD', align: 'center' },
           { prop: 'createUser', label: '发布人', align: 'center' },
           { prop: 'areaName', label: '来源地区', align: 'center' },
           { slot: 'options', label: '操作' }