2.0

src/app/HsEdi/system.vue

@@ -225,12 +225,14 @@
                   </el-dialog>
             </el-tab-pane>
             <el-tab-pane label="客户推送升级" name="third">
-                 <el-form :model="remote_server" :rules="rules" ref="remote_server" label-width="130px" class="demo-ruleForm">
+                 <el-form :model="remote_server" :rules="rules"  label-width="130px" class="demo-ruleForm">
                             <el-form-item label="项目代码" prop="name" >
                                 <el-input disabled="" class="demo" v-model="remote_server.project_no"></el-input>
+                                  <span class="Prompt">此车间从客户服务器配置中的车间中获取</span>
                             </el-form-item>
-                                <el-form-item label="项目代码" prop="name" >
+                                <el-form-item label="车间" prop="name" >
                                 <el-input disabled="" class="demo" v-model="remote_server.work_shop_no"></el-input>
+                                  <span class="Prompt">此项目代码从系统配置项目代码中获取</span>
                             </el-form-item>
                             <el-form-item label="服务器IP" prop="name">
                                 <el-input  class="demo" v-model="remote_server.server_ip"></el-input>
@@ -416,7 +418,10 @@ export default {
         { 'app_code': 'Redis', 'app_name': 'Redis', 'app_image': '47.110.145.204:8084/huansi/redis:latest' },
         { 'app_code': 'Tool', 'app_name': 'tools工具集', 'app_image': '47.110.145.204:8084/huansi/hs_tools:1.1' }],
       rules: {},
-      remote_server: { }
+      remote_server: {
+        project_no: '',
+        work_shop_no: ''
+      }
     }
   },
   methods: {
@@ -730,7 +735,7 @@ export default {
       } else if (e.label === '客户服务器配置') {
         this.get_service_project()
       } else if (e.label === '客户推送升级') {
-        if (this.service_ruleForm.work_shop_no) { this.get_remote_server() }
+        this.get_remote_server()
       } else {
         if (this.ruleForm.project_no) {
           this.get_test()
@@ -823,6 +828,7 @@ export default {
           // this.ruleForm = res.data
         }
         this.service_ruleForm.project_no = this.ruleForm.project_no
+        this.remote_server.project_no = this.ruleForm.project_no
       })
     },
     // 保存远程数据库
@@ -850,13 +856,13 @@ export default {
     // 获取远程服务器连接
     get_remote_server() {
       this.$API.get(`mesAPI/connection/remote_server/${this.service_ruleForm.project_no}/${this.service_ruleForm.work_shop_no}/`).then(res => {
-        if (!res.data.length) {
+        if (!res.data) {
           this.remote_server = {}
-          this.remote_server.project_no = this.service_ruleForm.project_no
+          this.remote_server.project_no = this.ruleForm.project_no
           this.remote_server.work_shop_no = this.service_ruleForm.work_shop_no
         } else {
           this.remote_server = res.data
-          this.remote_server.project_no = this.service_ruleForm.project_no
+          this.remote_server.project_no = this.ruleForm.project_no
           this.remote_server.work_shop_no = this.service_ruleForm.work_shop_no
         }
       })