Merge pull request 'fix' (#241) from annzee/JCC-RIP:master into master

src/views/taskManagement/aiList/createInstance.vue

@@ -154,7 +154,7 @@ export default {
       })
     },
     goBack() {
-      this.$router.push({ path: '/taskManagement/aiList' })
+      this.$router.push({ path: '/taskManagement/instanceCenter' })
     },
     saveForm() {
       this.$refs.formData.validate((valid) => {

src/views/taskManagement/taskList/create.vue

@@ -251,7 +251,7 @@ export default {
       taskTypeList: {
         'cloud': {
           'application': 'createApplication',
-          'intervalTask': 'createJob',
+          // 'intervalTask': 'createJob',
           'virtualmachine': 'createVirtualmachine'
         },
         'hpc': {
@@ -366,7 +366,7 @@ export default {
       arr.forEach(i => {
         switch (i) {
           case 'virtualmachine': {
-            list[i] = e.data.list.filter(r => r.type === '3')
+            list[i] = e.data.list.filter(r => r.resourceType === '02')
             break
           }
           case 'hpcBase': {
@@ -386,7 +386,7 @@ export default {
             break
           }
           default: {
-            list[i] = e.data.list.filter(r => r.type === '0')
+            list[i] = e.data.list.filter(r => r.resourceType === '01')
             break
           }
         }