Merge branch 'dev-wyf' into 'dev'

fix: 演练执行表单日期选择加上时分秒&审批路由属性修改

See merge request product-group-fe/sfy-safety-group/sfy-safety!160

src/router/routers/emergency.ts

@@ -305,7 +305,7 @@ const emergencyManagementRoute = {
           name: 'emergency-drill-sign',
           path: 'emergency-drill-sign',
           meta: {
-            activeMenu: '/emergency-drill/emergency-drill-sign',
+            // activeMenu: '/emergency-drill/emergency-drill-sign',
             title: '演练会签',
           },
         },

src/router/routers/platform.ts

@@ -102,7 +102,7 @@ const platformRoutes = {
       name: 'SystemApprovalNode',
       component: '/system/approval/PageApprovalNode',
       meta: {
-        activeMenu: '/approval',
+        activeMenu: '/system/approval',
         icon: 'UserOutlined',
         title: '编辑审批流程',
       },

src/views/emergency/emergency-drill/configs/plan/form.ts

@@ -99,10 +99,10 @@ export const DRILL_EXECUTE_FORM_CONFIG = [
     label: '演练时间：',
     component: 'el-date-picker',
     componentProps: {
-      type: 'date',
+      type: 'datetime',
       placeholder: '请选择演练时间',
-      format: 'YYYY-MM-DD',
-      valueFormat: 'YYYY-MM-DD',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
     },
   },
   {