Merge remote-tracking branch 'origin/rmd-dev'

pdaaphm-ui/src/components/ImagePreview/index.vue

@@ -73,9 +73,9 @@ export default {
   ::v-deep .el-image__inner {
     transition: all 0.3s;
     cursor: pointer;
-    &:hover {
-      transform: scale(1.2);
-    }
+    // &:hover {
+    //   transform: scale(1.2);
+    // }
   }
   ::v-deep .image-slot {
     display: flex;

pdaaphm-ui/src/router/index.js

@@ -98,7 +98,35 @@ export const constantRoutes = [
         path: 'algoRun/:algoID',
         component: () => import('@/views/algoManager/algorithm/algoRun.vue'),
         name: 'AlgoRun',
-        meta: { title: '算法运行', icon: 'user' }
+        meta: { title: '算法运行', icon: 'user',activeMenu: '/algorithm/algorithm' }
+      }
+    ]
+  },
+  {
+    path: '/algoManager',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'algoRun2/:algoID',
+        component: () => import('@/views/algoManager/algorithm/algoRun.vue'),
+        name: 'AlgoRun',
+        meta: { title: '算法运行', icon: 'user',activeMenu: '/algorithm/algorithm2' }
+      }
+    ]
+  },
+  {
+    path: '/algoManager',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'algoRun3/:algoID',
+        component: () => import('@/views/algoManager/algorithm/algoRun.vue'),
+        name: 'AlgoRun',
+        meta: { title: '算法运行', icon: 'user',activeMenu: '/algorithm/algorithm3' }
       }
     ]
   },
@@ -112,7 +140,36 @@ export const constantRoutes = [
         path: 'result/:resultID',
         component: () => import('@/views/algoManager/result'),
         name: 'Result',
-        meta: { title: '查看结果', icon: 'user' }
+        meta: { title: '查看结果', icon: 'user',activeMenu: '/algorithm/algorithm' }
+      }
+    ]
+  },
+  {
+    path: '/result',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'result2/:resultID',
+        component: () => import('@/views/algoManager/result'),
+        name: 'Result2',
+        meta: { title: '查看结果', icon: 'user',activeMenu: '/algorithm/algorithm2' }
+      }
+    ]
+  },
+  
+  {
+    path: '/result',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'result3/:resultID',
+        component: () => import('@/views/algoManager/result'),
+        name: 'Result3',
+        meta: { title: '查看结果', icon: 'user',activeMenu: '/algorithm/algorithm3' }
       }
     ]
   },

pdaaphm-ui/src/views/algoManager/algorithm2/index.vue

@@ -432,7 +432,7 @@ export default {
       // });
       // console.info(this);
       this.$router.push({
-        name: 'Result',
+        name: 'Result2',
         params: {
           resultID: id,
         },
@@ -470,7 +470,7 @@ export default {
     handleRun(row) {
       const id = row.id || this.ids
       this.$router.push({
-        path:`/algoManager/algoRun/${id}`,
+        path:`/algoManager/algoRun2/${id}`,
       })
     },
 

pdaaphm-ui/src/views/algoManager/algorithm3/index.vue

@@ -455,7 +455,7 @@ export default {
       // });
       // console.info(this);
       this.$router.push({
-        name: 'Result',
+        name: 'Result3',
         params: {
           resultID: id,
         },
@@ -494,7 +494,7 @@ export default {
       const id = row.id || this.ids
       // debugger
       this.$router.push({
-        path:`/algoManager/algoRun/${id}`,
+        path:`/algoManager/algoRun3/${id}`,
       })
     },
 

pdaaphm-ui/src/views/algoManager/result.vue

@@ -181,6 +181,6 @@ export default {
   }
 }
 .img {
-  width: 100%;
+  width: 80%;
 }
 </style>