瀏覽代碼

Merge branch 'dev-rmd' into develop_Allen

allen 11 月之前
父節點
當前提交
f8ec13772d
共有 5 個文件被更改,包括 42 次插入47 次删除
  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

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <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" />
     <title><%= title %></title>
   </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

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

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

@@ -162,28 +162,28 @@ const columns = reactive<ColumnProps<any>[]>([
   //   prop: 'parameters',
   //   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' }
 ])
 // 表单配置项

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