diff --git a/snowy-admin-web/src/components/XnUpload/index.vue b/snowy-admin-web/src/components/XnUpload/index.vue index 3f48ca85..aa9b7bf4 100644 --- a/snowy-admin-web/src/components/XnUpload/index.vue +++ b/snowy-admin-web/src/components/XnUpload/index.vue @@ -61,7 +61,7 @@ - + @@ -70,13 +70,11 @@ - - 您的浏览器不支持video标签哦,请联系管理员 - - - + { resultArrayValue.value.push(data.response.data) }) emit('update:value', resultArrayValue) - emit('onSuccessful',resultArrayValue) + emit('onSuccessful', resultArrayValue) emit('onChange', resultArrayValue) } } diff --git a/snowy-admin-web/src/utils/tool.js b/snowy-admin-web/src/utils/tool.js index 8784f807..3205c054 100644 --- a/snowy-admin-web/src/utils/tool.js +++ b/snowy-admin-web/src/utils/tool.js @@ -179,39 +179,41 @@ tool.generateString = (length = 8) => { tool.parseTime = (time, cFormat) => { if (time == null || time.length === 0) { - return '' + return '' } const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}' let date if (typeof time === 'object') { - date = time + date = time } else { - if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { - time = parseInt(time) - } - if ((typeof time === 'number') && (time.toString().length === 10)) { - time = time * 1000 - } - date = new Date(time) + if (typeof time === 'string' && /^[0-9]+$/.test(time)) { + time = parseInt(time) + } + if (typeof time === 'number' && time.toString().length === 10) { + time = time * 1000 + } + date = new Date(time) } const formatObj = { - y: date.getFullYear(), - m: date.getMonth() + 1, - d: date.getDate(), - h: date.getHours(), - i: date.getMinutes(), - s: date.getSeconds(), - a: date.getDay() + y: date.getFullYear(), + m: date.getMonth() + 1, + d: date.getDate(), + h: date.getHours(), + i: date.getMinutes(), + s: date.getSeconds(), + a: date.getDay() } const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { - let value = formatObj[key] - // Note: getDay() returns 0 on Sunday - if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] } - if (result.length > 0 && value < 10) { - value = '0' + value - } - return value || 0 + let value = formatObj[key] + // Note: getDay() returns 0 on Sunday + if (key === 'a') { + return ['日', '一', '二', '三', '四', '五', '六'][value] + } + if (result.length > 0 && value < 10) { + value = '0' + value + } + return value || 0 }) return time_str } diff --git a/snowy-admin-web/src/views/biz/group/form.vue b/snowy-admin-web/src/views/biz/group/form.vue index 1be0f789..70f4bb58 100644 --- a/snowy-admin-web/src/views/biz/group/form.vue +++ b/snowy-admin-web/src/views/biz/group/form.vue @@ -14,7 +14,13 @@ - +