diff --git a/src/views/boardGenerate/index.vue b/src/views/boardGenerate/index.vue index d70b96b..3b8e271 100644 --- a/src/views/boardGenerate/index.vue +++ b/src/views/boardGenerate/index.vue @@ -237,6 +237,8 @@ start-placeholder="开始时间" end-placeholder="结束时间" style="width: 100%;height: 100%" + :value-format="nodeAttrForm?.format||'YYYY/MM/DD HH:mm:ss'" + :format="nodeAttrForm?.format||'YYYY/MM/DD HH:mm:ss'" /> diff --git a/src/views/boardGenerate/nodes/board/lineNode.vue b/src/views/boardGenerate/nodes/board/lineNode.vue index 061770c..d6bf8e2 100644 --- a/src/views/boardGenerate/nodes/board/lineNode.vue +++ b/src/views/boardGenerate/nodes/board/lineNode.vue @@ -194,7 +194,7 @@ const getOption = () => { item.push(e[i]); }); yData.forEach(e => { - item.push(e[i]); + item.push(parseFloat(e[i])); }); source.push(item); }); diff --git a/src/views/boardGenerate/nodes/form/timeNode.vue b/src/views/boardGenerate/nodes/form/timeNode.vue index 7271d47..c3bb996 100644 --- a/src/views/boardGenerate/nodes/form/timeNode.vue +++ b/src/views/boardGenerate/nodes/form/timeNode.vue @@ -13,6 +13,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" style="width: 100%;height: 100%" + :value-format="props.data.options.format||'YYYY/MM/DD HH:mm:ss'" :format="props.data.options.format||'YYYY/MM/DD HH:mm:ss'" /> diff --git a/src/views/boardGenerate/tool.js b/src/views/boardGenerate/tool.js index 9074022..278dfba 100644 --- a/src/views/boardGenerate/tool.js +++ b/src/views/boardGenerate/tool.js @@ -120,5 +120,5 @@ const tool = () => { }; export default tool; export const options = { - isD: false + isD: true };