Merge branch 'master' of http://1.13.177.47:3000/xins/hwmom-ui

src/router/index.ts

@@ -342,7 +342,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [
     permissions: ['dms:dmsPlanMaint:add'],
     children: [
       {
-        path: 'index/:lubeInstanceId',
+        path: 'index/:planMaintId/:planMaintCode',
         component: () => import('@/views/dms/dmsPlanMaintDetail/index.vue'),
         name: 'dmsPlanMaintDetail',
         meta: { title: '润滑工单明细', activeMenu: '/dms/dmsPlanMaint', icon: '' }

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'"
         />
       </el-form-item>
       <el-form-item label="日期格式" v-if="Object.keys(nodeAttrForm).includes('format')">

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);
   });

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'"
       />
     </div>

src/views/boardGenerate/tool.js

@@ -120,5 +120,5 @@ const tool = () => {
 };
 export default tool;
 export const options = {
-  isD: false
+  isD: true
 };