Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulator...

liuyg

2021-12-06 487a39a4fdfe0cbdc5ef0bb6ca67ae7854aaeec7

 src/views/workreport/workreport.vue

@@ -91,7 +91,7 @@
        menuWidth: 320,
        dialogClickModal: false,
        column:[{
                  label: "汇报时间",
                  label: "上报时间",
                  prop: "reportTime",
                  type: "datetime",
                  format: "yyyy-MM-dd HH:mm:ss",
@@ -103,7 +103,7 @@
                  search: false,
                  rules: [{
                      required: true,
                      message: "请输入时间",
                      message: "请选择上报时间",
                      trigger: "blur"
                  }]
              },