Home Explore Help
Register Sign In
www
/
taais-web
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'dev-rmd' into develop_Allen

allen 11 months ago
parent
949727a4a2 742d40ff1f
commit
f8ec13772d
5 changed files with 42 additions and 47 deletions
Unified View Show Diff Stats
  1. 1 1
      index.html
  2. 0 0
      public/logo.svg
  3. 0 1
      src/assets/images/logo.svg
  4. 19 23
      src/views/task/bizProcess/index.vue
  5. 22 22
      src/views/task/subtask/index.vue

+ 1 - 1
index.html
View File 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
 <html lang="en">
 
   <head>
 
   <head>
 
     <meta charset="UTF-8" />
 
     <meta charset="UTF-8" />
 
-    <link rel="icon" type="image/svg+xml" href="/vue.svg" />
 
+    <link rel="icon" type="image/svg+xml" href="/logo.svg" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <title><%= title %></title>
 
     <title><%= title %></title>
 
   </head>
 
   </head>

File diff suppressed because it is too large
+ 0 - 0
public/logo.svg


File diff suppressed because it is too large
+ 0 - 1
src/assets/images/logo.svg


+ 19 - 23
src/views/task/bizProcess/index.vue
View File 

@@ -391,43 +391,39 @@ const columns = reactive<ColumnProps<any>[]>([
 
   // },
 
   // },
 
   {
 
   {
 
     prop: 'parameters',
 
     prop: 'parameters',
 
-    label: '调用算法时所用的参数',
 
-    width: 120
 
+    label: '调用算法时所用的参数'
 
   },
 
   },
 
   {
 
   {
 
     prop: 'preprocessPath',
 
     prop: 'preprocessPath',
 
-    label: '预处理数据路径',
 
-    width: 120
 
+    label: '预处理数据路径'
 
   },
 
   },
 
   {
 
   {
 
     prop: 'resultPath',
 
     prop: 'resultPath',
 
-    label: '结果数据路径',
 
-    width: 120
 
+    label: '结果数据路径'
 
   },
 
   },
 
   {
 
   {
 
     prop: 'index',
 
     prop: 'index',
 
     label: '序号',
 
     label: '序号',
 
     width: 120
 
     width: 120
 
   },
 
   },
 
-  {
 
-    prop: 'startTime',
 
-    label: '开始时间',
 
-    width: 120
 
-  },
 
-  {
 
-    prop: 'endTime',
 
-    label: '结束时间',
 
-    width: 120
 
-  },
 
-  {
 
-    prop: 'costSecond',
 
-    label: '耗时',
 
-    width: 120
 
-  },
 
+  // {
 
+  //   prop: 'startTime',
 
+  //   label: '开始时间',
 
+  //   width: 120
 
+  // },
 
+  // {
 
+  //   prop: 'endTime',
 
+  //   label: '结束时间',
 
+  //   width: 120
 
+  // },
 
+  // {
 
+  //   prop: 'costSecond',
 
+  //   label: '耗时',
 
+  //   width: 120
 
+  // },
 
   {
 
   {
 
     prop: 'log',
 
     prop: 'log',
 
-    label: '日志',
 
-    width: 120
 
+    label: '日志'
 
   },
 
   },
 
   { prop: 'operation', label: '操作', width: 230, fixed: 'right' }
 
   { prop: 'operation', label: '操作', width: 230, fixed: 'right' }
 
 ])
 
 ])

+ 22 - 22
src/views/task/subtask/index.vue
View File 

@@ -162,28 +162,28 @@ const columns = reactive<ColumnProps<any>[]>([
 
   //   prop: 'parameters',
 
   //   prop: 'parameters',
 
   //   label: '调用算法时所用的参数'
 
   //   label: '调用算法时所用的参数'
 
   // },
 
   // },
 
-  {
 
-    prop: 'startTime',
 
-    label: '开始时间',
 
-    search: {
 
-      el: 'date-picker',
 
-      props: { type: 'datetimerange', valueFormat: 'YYYY-MM-DD HH:mm:ss' }
 
-    },
 
-    width: 120
 
-  },
 
-  {
 
-    prop: 'endTime',
 
-    label: '结束时间',
 
-    search: {
 
-      el: 'date-picker',
 
-      props: { type: 'datetimerange', valueFormat: 'YYYY-MM-DD HH:mm:ss' }
 
-    },
 
-    width: 120
 
-  },
 
-  {
 
-    prop: 'costSecond',
 
-    label: '耗时'
 
-  },
 
+  // {
 
+  //   prop: 'startTime',
 
+  //   label: '开始时间',
 
+  //   search: {
 
+  //     el: 'date-picker',
 
+  //     props: { type: 'datetimerange', valueFormat: 'YYYY-MM-DD HH:mm:ss' }
 
+  //   },
 
+  //   width: 120
 
+  // },
 
+  // {
 
+  //   prop: 'endTime',
 
+  //   label: '结束时间',
 
+  //   search: {
 
+  //     el: 'date-picker',
 
+  //     props: { type: 'datetimerange', valueFormat: 'YYYY-MM-DD HH:mm:ss' }
 
+  //   },
 
+  //   width: 120
 
+  // },
 
+  // {
 
+  //   prop: 'costSecond',
 
+  //   label: '耗时'
 
+  // },
 
   { prop: 'operation', label: '操作', width: 270, fixed: 'right' }
 
   { prop: 'operation', label: '操作', width: 270, fixed: 'right' }
 
 ])
 
 ])
 
 // 表单配置项
 
 // 表单配置项

Some files were not shown because too many files changed in this diff