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: '操作' }

project/oms/apps/AppArticles/components/Event.vue

@@ -108,7 +108,7 @@ export default {
       return [
         {prop: 'type', label: '类型', formart: v => this.dict.getLabel('villInfoType', v)},
         {prop: 'title', label: '标题', align: 'left'},
-        {prop: 'createDate', label: '创建时间', dateFormart: 'YYYY-MM-DD', align: 'center'},
+        {prop: 'createDate', label: '创建时间', dateFormat: 'YYYY-MM-DD', align: 'center'},
         {prop: 'createUser', label: '发布人', align: 'center'},
         {slot: 'options', label: '操作'}
       ]

project/sass/apps/AppGridBlock/components/list.vue

@@ -102,6 +102,7 @@
             :size.sync="page.size"
             @selection-change="(v) => (ids = v.map((e) => e.id))"
             @getList="getList()"
+            :dict="dict"
         >
           <el-table-column
               slot="selectId"
@@ -200,10 +201,8 @@
 
 <script>
 import AMapLoader from "@amap/amap-jsapi-loader";
-import Template from '../../../../../packages/wechat/AppAskForm/components/Template.vue';
 
 export default {
-  components: {Template},
   name: "List",
   label: "网格区块",
   props: {
@@ -260,63 +259,13 @@ export default {
       let _ = this;
       return [
         {type: 'selection'},
-        {
+        {prop: "girdName", align: "left", label: "网格名称",},
-          prop: "girdName",
+        {prop: "girdCode", align: "center", label: "网格编码",},
-          align: "left",
+        {prop: "girdType", align: "center", label: "网格类型", dict: "girdType"},
-          label: "网格名称",
+        {prop: "girdLevel", align: "center", label: "网格层级", dict: "girdLevel"},
-        },
+        {prop: "plottingStatus", align: "center", label: "标绘状态", dict: "plottingStatus"},
-        {
+        {prop: "createTime", align: "center", label: "创建时间", dateFormat: "YYYY-MM-DD"},
-          prop: "girdCode",
+        {prop: "girdMemberNames", align: "center", slot: 'user', width: 200, label: "网格员"},
-          align: "center",
-          label: "网格编码",
-        },
-        {
-          prop: "girdType",
-          align: "center",
-          label: "网格类型",
-          render(h, {row}) {
-            return h("span", {}, _.dict.getLabel("girdType", row.girdType) || '-');
-          },
-        },
-        {
-          prop: "girdLevel",
-          align: "center",
-          label: "网格层级",
-          render(h, {row}) {
-            return h("span", {}, _.dict.getLabel("girdLevel", row.girdLevel) || '-');
-          },
-        },
-        {
-          prop: "plottingStatus",
-          align: "center",
-          label: "标绘状态",
-          render(h, {row}) {
-            return h(
-                "span",
-                {
-                  style: {
-                    color: _.dict.getColor("plottingStatus", row.plottingStatus),
-                  },
-                },
-                _.dict.getLabel("plottingStatus", row.plottingStatus)
-            );
-          },
-        },
-        {
-          prop: "createTime",
-          align: "center",
-          label: "创建时间",
-          render(h, {row}) {
-            return h("span", {}, row.createTime.substring(0, 11));
-          },
-        },
-        {
-          prop: "girdMemberNames",
-          align: "center",
-          slot: 'user',
-          width: 200,
-          label: "网格员",
-        },
       ];
     },
   },

project/sass/apps/AppHealthReport/components/Detail.vue

@@ -74,7 +74,7 @@
         currIndex: 0,
         tableData: [],
         colConfigs: [
-          {prop: 'createTime', label: '上报日期', align: 'center', dateFormart: 'YYYY-MM-DD'},
+          {prop: 'createTime', label: '上报日期', align: 'center', dateFormat: 'YYYY-MM-DD'},
           {
             prop: 'status',
             label: '健康状态',