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

src/views/taskManagement/aiList/taskList.vue

@@ -165,33 +165,17 @@ export default {
   methods: {
     getDeployInstanceList() {
       getAiTaskList({ pageNum: 1, pageSize: 10 }).then(e => {
-        this.tableData = e.data.list
+        this.tableData = []
+        e.data.list.forEach(i => {
+          i.instances.forEach(p => {
+            this.tableData.push({ ...p, name: i.name, mainId: i.id })
+          })
+        })
+        console.log(this.tableData)
       })
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 0 || columnIndex === 1 || columnIndex === 9) {
-        // const currentValue = row[column.modelType]
-        // const preRow=this.tableData[rowIndex-1]
-        // const preValue = preRow ?preRow[column.modelType]: null;
-        // if(currentValue === preValue){
-        //   return { rowspan:0,colspan:0};
-        // } else {
-        //   let rowspan =1;
-        //   for (let i=rowIndex + 1;i< this.tableData.length; i++){
-        //     const nextRow = this.tableData[i]
-        //     const nextValue = nextRow[column.modelType];
-        //     if(nextValue === currentValue){
-        //       rowspan++
-        //     } else {
-        //       break
-        //     }
-        //   }
-        //   return{rowspan,colspan:1}
-        // }
-        // if (columnIndex !== 0 && columnIndex !== 1) {
-        //   return { rowspan: 1, colspan: 1 };
-        // }
-
+      if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2 || columnIndex === 10) {
         if (
           rowIndex === 0 ||
           row.deployTaskId !== this.tableData[rowIndex - 1].deployTaskId
@@ -206,6 +190,10 @@ export default {
     },
     setColumn() {
       return [
+        {
+          prop: 'name',
+          label: this.$t('page.instanceName')
+        },
         { prop: 'modelName', label: this.$t('page.modelName'), formatter: (row) => { return <a onClick={() => this.viewDetail(row)}>{row.modelName}</a> } },
         { prop: 'modelType', label: this.$t('page.modelType') },
         {
@@ -287,7 +275,7 @@ export default {
         id: row.id,
         instanceId: row.instanceId
       }
-      const allId = { deployTaskId: row.deployTaskId }
+      const allId = { id: row.mainId }
 
       if (type === 1 || type === 3) {
         this.$confirm('<p>确定要启动么？</p>', '温馨提示', {

vue.config.js

@@ -57,7 +57,7 @@ module.exports = {
       '^/pcm': {
         ws: false,
         // target: 'https://jcos.jointcloud.net:443/',
-        target: 'https://pcm.jointcloud.net/',
+        target: 'https://comnet.jointcloud.net/',
         // target: 'https://mock.apifox.com/m1/4000164-0-default/',
         // target: 'https://jointcloud.net/apis',
         changeOrigin: true,
@@ -65,7 +65,7 @@ module.exports = {
       },
       '^/auth': {
         ws: false,
-        target: 'https://pcm.jointcloud.net/',
+        target: 'https://comnet.jointcloud.net/',
         changeOrigin: true,
         secure: false
       }