更新 views/devops/machine 和 views/devops/build 模块

src/views/devops/app/AppConfig.vue

@@ -539,27 +539,27 @@ export default {
     }
   },
   created() {
-    const env = this.$route.query.env
-    if (env !== undefined && env !== null) {
-      this.queryInfo.env = env
-    }
-    const appType = this.$route.query.appType
-    if (appType !== undefined && appType !== null) {
-      this.queryInfo.appType = appType
-    }
-    const pageNumber = this.$route.query.pn
-    if (pageNumber !== undefined && pageNumber !== null) {
-      this.currentPage = parseInt(pageNumber)
-      this.queryInfo.pn = parseInt(pageNumber)
-    }
-
-    document.title = '应用配置列表'
     getEnvList().then(resp => {
       if (resp.code === 0) {
         this.queryInfo.env = resp.data.userEnv
         this.queryInfo.appType = resp.data.userAppType
         this.envList = resp.data.envList
         this.appTypeList = resp.data.appTypeList
+
+        const env = this.$route.query.env
+        if (env !== undefined && env !== null) {
+          this.queryInfo.env = env
+        }
+        const appType = this.$route.query.appType
+        if (appType !== undefined && appType !== null) {
+          this.queryInfo.appType = appType
+        }
+        const pageNumber = this.$route.query.pn
+        if (pageNumber !== undefined && pageNumber !== null) {
+          this.currentPage = parseInt(pageNumber)
+          this.queryInfo.pn = parseInt(pageNumber)
+        }
+
         this.getData()
       } else {
         this.$message.error(resp.msg)
@@ -567,6 +567,8 @@ export default {
     }).catch(error => {
       this.$message.error(error.message)
     })
+
+    document.title = '应用配置列表'
   },
   methods: {
     handleCurrentChange(pageNumber) {

src/views/devops/app/AppStat.vue

@@ -205,27 +205,27 @@ export default {
     }
   },
   created() {
-    const env = this.$route.query.env
-    if (env !== undefined && env !== null) {
-      this.queryInfo.env = env
-    }
-    const appType = this.$route.query.appType
-    if (appType !== undefined && appType !== null) {
-      this.queryInfo.appType = appType
-    }
-    const pageNumber = this.$route.query.pn
-    if (pageNumber !== undefined && pageNumber !== null) {
-      this.currentPage = parseInt(pageNumber)
-      this.queryInfo.pn = parseInt(pageNumber)
-    }
-
-    document.title = '运行状态'
     getEnvList().then(resp => {
       if (resp.code === 0) {
         this.queryInfo.env = resp.data.userEnv
         this.queryInfo.appType = resp.data.userAppType
         this.envList = resp.data.envList
         this.appTypeList = resp.data.appTypeList
+
+        const env = this.$route.query.env
+        if (env !== undefined && env !== null) {
+          this.queryInfo.env = env
+        }
+        const appType = this.$route.query.appType
+        if (appType !== undefined && appType !== null) {
+          this.queryInfo.appType = appType
+        }
+        const pageNumber = this.$route.query.pn
+        if (pageNumber !== undefined && pageNumber !== null) {
+          this.currentPage = parseInt(pageNumber)
+          this.queryInfo.pn = parseInt(pageNumber)
+        }
+
         this.getData()
       } else {
         this.$message.error(resp.msg)
@@ -233,6 +233,8 @@ export default {
     }).catch(error => {
       this.$message.error(error.message)
     })
+
+    document.title = '运行状态'
   },
   methods: {
     handleCurrentChange(pageNumber) {

src/views/devops/app/BuildDeploy.vue

@@ -224,27 +224,27 @@ export default {
     }
   },
   created() {
-    const env = this.$route.query.env
-    if (env !== undefined && env !== null) {
-      this.queryInfo.env = env
-    }
-    const appType = this.$route.query.appType
-    if (appType !== undefined && appType !== null) {
-      this.queryInfo.appType = appType
-    }
-    const pageNumber = this.$route.query.pn
-    if (pageNumber !== undefined && pageNumber !== null) {
-      this.currentPage = parseInt(pageNumber)
-      this.queryInfo.pn = parseInt(pageNumber)
-    }
-
-    document.title = '构建部署'
     getEnvList().then(resp => {
       if (resp.code === 0) {
         this.queryInfo.env = resp.data.userEnv
         this.queryInfo.appType = resp.data.userAppType
         this.envList = resp.data.envList
         this.appTypeList = resp.data.appTypeList
+
+        const env = this.$route.query.env
+        if (env !== undefined && env !== null) {
+          this.queryInfo.env = env
+        }
+        const appType = this.$route.query.appType
+        if (appType !== undefined && appType !== null) {
+          this.queryInfo.appType = appType
+        }
+        const pageNumber = this.$route.query.pn
+        if (pageNumber !== undefined && pageNumber !== null) {
+          this.currentPage = parseInt(pageNumber)
+          this.queryInfo.pn = parseInt(pageNumber)
+        }
+
         this.getData()
       } else {
         this.$message.error(resp.msg)
@@ -252,6 +252,8 @@ export default {
     }).catch(error => {
       this.$message.error(error.message)
     })
+
+    document.title = '构建部署'
   },
   methods: {
     handleCurrentChange(pageNumber) {

src/views/devops/build/BuildDir.vue

@@ -76,6 +76,7 @@ export default {
     },
     handleEdit(index, row) {
       eraseBuildDir().then(resp => {
+        this.getData()
         this.$message.info(resp.msg)
       }).catch(error => {
         this.$message.error(error.message)

src/views/devops/build/Compiler.vue

@@ -102,7 +102,7 @@
             <el-input v-model="form.homePath" style="width: 70%; padding-right: 2px" />
           </el-form-item>
           <el-form-item label="编译命令">
-            <el-input v-model="form.versionCmd" type="textarea" autosize style="padding-right: 1px;" />
+            <el-input v-model="form.compileCmd" type="textarea" autosize style="padding-right: 1px;" />
           </el-form-item>
           <el-form-item label="编译器版本命令" style="width: 70%; padding-right: 2px">
             <el-input v-model="form.versionCmd" type="textarea" autosize style="padding-right: 1px;" />
@@ -214,6 +214,11 @@ export default {
     onAddCompiler() {
       const formData = new FormData()
       formData.append('type', this.form.type)
+      formData.append('name', this.form.name)
+      formData.append('homePath', this.form.homePath)
+      formData.append('compileCmd', this.form.compileCmd)
+      formData.append('versionCmd', this.form.versionCmd)
+      formData.append('compilerImage', this.form.compilerImage)
       addCompiler(formData).then(resp => {
         this.$message.info(resp.msg)
         this.getData()
@@ -238,7 +243,7 @@ export default {
       })
     },
     handleEdit(index, row) {
-      this.$confirm('确定要删除 ' + row.machineIpv4 + '?', '提示', {
+      this.$confirm('确定要删除 ' + row.name + '?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/devops/build/DockerRegistry.vue

@@ -147,7 +147,7 @@ export default {
       })
     },
     handleEdit(index, row) {
-      this.$confirm('确定要删除 ' + row.name + '?', '提示', {
+      this.$confirm('确定要删除 ' + row.registryUrl + '?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/devops/build/Packer.vue

@@ -74,7 +74,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="docker 仓库">
+          <el-form-item v-if="form.type === 'docker'" label="docker 仓库">
             <el-select v-model="form.dockerRegistry" placeholder="选择 docker 仓库">
               <el-option
                 v-for="(item, index) in registryList"

src/views/devops/machine/MachineHost.vue

@@ -188,7 +188,7 @@ export default {
     return {
       queryInfo: {
         pn: 1,
-        env: 'test'
+        env: null
       },
       // 屏幕宽度, 为了控制分页条的大小
       screenWidth: document.body.clientWidth,
@@ -209,21 +209,21 @@ export default {
     }
   },
   created() {
-    const env = this.$route.query.env
-    if (env !== undefined && env !== null) {
-      this.queryInfo.env = env
-    }
-    const pageNumber = this.$route.query.pn
-    if (pageNumber !== undefined && pageNumber !== null) {
-      this.currentPage = pageNumber
-      this.queryInfo.pn = pageNumber
-    }
-
-    document.title = '机器列表'
     getEnvList().then(resp => {
       if (resp.code === 0) {
         this.queryInfo.env = resp.data.userEnv
         this.envList = resp.data.envList
+
+        const env = this.$route.query.env
+        if (env !== undefined && env !== null) {
+          this.queryInfo.env = env
+        }
+        const pageNumber = this.$route.query.pn
+        if (pageNumber !== undefined && pageNumber !== null) {
+          this.currentPage = parseInt(pageNumber)
+          this.queryInfo.pn = parseInt(pageNumber)
+        }
+
         this.getData()
       } else {
         this.$message.error(resp.msg)
@@ -231,6 +231,8 @@ export default {
     }).catch(error => {
       this.$message.error(error.message)
     })
+
+    document.title = '机器列表'
   },
   methods: {
     handleCurrentChange(pageNumber) {
@@ -268,6 +270,7 @@ export default {
       formData.append('machineId', this.form.machineId)
       formData.append('env', this.form.env)
       updateMachineEnv(formData).then(resp => {
+        this.getData()
         this.$message.info(resp.msg)
       }).catch(error => {
         this.$message.error(error.message)
@@ -299,6 +302,7 @@ export default {
       const formData = new FormData()
       formData.append('machineId', row.machineId)
       deprecateMachine(formData).then(resp => {
+        this.getData()
         this.$message.info(resp.msg)
       }).catch(error => {
         this.$message.error(error.message)