本机id

src/app/HsEdi/system.vue

@@ -153,6 +153,7 @@
 <script>
 import axios from 'axios'
 import utilSingeUc from '@basicClass/util_singe_uc.js'
+import API from '@/utils/sha256/myHttpClient'
 import { Loading } from 'element-ui'
 export default {
   mixins: [utilSingeUc],
@@ -199,7 +200,6 @@ export default {
     // 安装runner
     install_runner() {
       this.openFullScreen('正在安装runner,请稍等')
-      this.percentage = 5
       axios.get(`mesAPI/install/runner/step1/`).then(res => {
         this.percentage = 33
         this.install_runner2()
@@ -210,6 +210,7 @@ export default {
     },
     install_runner2() {
       axios.get(`mesAPI/install/runner/step2/`).then(res => {
+        console.log(res)
         this.percentage = 66
         this.install_runner3()
       }).catch(res => {
@@ -234,7 +235,6 @@ export default {
       this.openFullScreen('正在推送升级,请稍等')
       this.percentage = 5
       axios.get(`mesAPI/upgrade/remote/step1/`).then(res => {
-        this.percentage = 33
         this.upgrade2()
       }).catch(res => {
         this.percentage = 0
@@ -243,21 +243,57 @@ export default {
     },
     upgrade2() {
       axios.get(`mesAPI/upgrade/remote/step2/`).then(res => {
-        this.percentage = 66
-        this.upgrade3()
+        this.percentage = 10
+        this.upgrade3(res.data.app_cout)
       }).catch(res => {
         this.percentage = 0
         this.closeFullScreen(this.openFullScreen())
       })
     },
-    upgrade3() {
-      axios.get(`mesAPI/upgrade/remote/step3/`).then(res => {
-        this.percentage = 100
+    async upgrade3(app_count) {
+      for (let i = 1; i <= app_count; i++) {
+        console.log(i)
+        await axios.get(`mesAPI/upgrade/remote/step3/${i}`).then(res => {
+          if (app_count > 10) { this.percentage = this.percentage + 2 } else {
+            this.percentage = this.percentage + 4
+          }
+        }).catch(res => {
+          this.percentage = 0
+          this.closeFullScreen(this.openFullScreen())
+        })
+      }
+      this.upgrade4()
+    },
+    upgrade4() {
+      axios.get(`mesAPI/upgrade/remote/step4/`).then(res => {
+        this.percentage = this.percentage + 5
+        this.upgrade5(res.data.app_cout)
+      }).catch(res => {
+        this.percentage = 0
+        this.closeFullScreen(this.openFullScreen())
+      })
+    },
+    async upgrade5(app_count) {
+      for (let i = 1; i <= app_count; i++) {
+        await axios.get(`mesAPI/upgrade/remote/step5/${i}`).then(res => {
+          if (app_count > 10) { this.percentage = this.percentage + 2 } else {
+            this.percentage = this.percentage + 4
+          }
+        }).catch(res => {
+          this.percentage = 0
+          this.closeFullScreen(this.openFullScreen())
+        })
+      }
+      this.upgrade6()
+    },
+    upgrade6() {
+      API.get(`mesAPI/upgrade/remote/step6/`).then(res => {
         setTimeout(_ => {
+          this.percentage = 100
           this.closeFullScreen(this.openFullScreen())
-          this.$message.success('推送成功')
+          this.$message.success('安装成功')
           this.percentage = 0
-        }, 1000)
+        }, 1500)
       }).catch(res => {
         this.percentage = 0
         this.closeFullScreen(this.openFullScreen())
@@ -271,7 +307,9 @@ export default {
     updata() {
     },
     test(str) {
-      console.log(11)
+      if (!this.ruleForm.id) {
+        this.$message.error('请先系统配置')
+      }
       var url = `${this.ruleForm.project_no}/${str}`
       this.$API.get(`mesAPI/connection/${url}/`).then(res => {
         if (res.data.message === '连接成功') { this.$message.success(res.data.message) } else {
@@ -317,6 +355,7 @@ export default {
       this.$API.post(`mesAPI/connection/`, {}, {}, this.ruleForm).then(res => {
         if (res.data.message === '保存成功') { this.$message.success(res.data.message) } else {
           this.$message.error(res.data.message)
+          this.get_project()
         }
       })
     },

src/utils/sha256/HSHttpClient.js

@@ -102,7 +102,7 @@ class HSHttpClient {
       baseURL: process.env.BASE_API,
       url,
       data: qs.stringify(params),
-      timeout: 15000,
+      timeout: 600000,
       headers: {
         // 'X-Requested-With': 'XMLHttpRequest',
         'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
@@ -139,7 +139,7 @@ const clint = {
       baseURL: process.env.BASE_API,
       url,
       data: qs.stringify(data),
-      timeout: 15000,
+      timeout: 600000,
       headers: {
         // 'X-Requested-With': 'XMLHttpRequest',
         'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'

src/utils/sha256/myHttpClient.js

@@ -6,7 +6,7 @@ const _getHeaderUrl = Symbol('_getHeaderUrl')
 // import { Loading } from 'element-ui'
 import axios from 'axios'
 import store from '../../store/storeAll'
-import NProgress from 'nprogress' // 引入nprogress插件
+// import NProgress from 'nprogress' // 引入nprogress插件
 import 'nprogress/nprogress.css'  // 这个nprogress样式必须引入
 axios.defaults.timeout = 600000 // 超时时间
 // 生成一个时间戳
@@ -54,7 +54,7 @@ axios.interceptors.request.use(
       } else {
         config.url = config.url.replace('//', '/')
       }
-      NProgress.start()
+      // NProgress.start()
       show_full_screen_loading()
     }
     return config
@@ -97,7 +97,7 @@ function response_error_del(error) {
   let error_detail = ''
   if (!response && !code) {
     // 没网的情况
-    error_title = '网络连接失败，请检查网络！'
+    error_title = '网络连接网络连接失败，请检查网络！'
     error_detail = '尝试关闭网站重新登陆！'
   } else if (code === 'ECONNABORTED') {
     error_title = '请求超时ECONNABORTED'
@@ -157,7 +157,7 @@ axios.interceptors.response.use(
         }
       }
     }
-    NProgress.done() // 设置加载进度条(结束..)
+    // NProgress.done() // 设置加载进度条(结束..)
     return response
   },
   function(error) {