Merge branch 'master' of https://git.lgzn.space/chengdandan/TransFlow

src/api/aboutMachine.js

@@ -5,9 +5,3 @@ export const getHostInfoApi = params => {
         params
     });
 };
-//保存主机名称
-export const getSetHostName = params => {
-    return axios.get('api/SetHostName', {
-        params
-    });
-};

src/api/iPSetting.js

@@ -5,9 +5,9 @@ export const getHostInfoApi = params => {
         params
     });
 };
-//保存主机名称
+//获取配置信息
-export const getSetHostName = params => {
+export const getFtppzApi = params => {
-    return axios.get('api/SetHostName', {
+    return axios.get('api/GetFtppz', {
         params
     });
 };

src/config/apiurl.js

@@ -7,15 +7,13 @@ export default {
     //   addFigure: "http://172.16.1.22:8080/api/AddJianktx",
     //   //编辑图形名称
     //   editFigure: "http://172.16.1.22:8080/api/EditTuxmc",
-   
-
     dataUrl: 'http://172.16.1.168:5000/api/AddShipjk',
     getSpareElementOrder: 'http://172.16.1.168:5000/api/Upload',
     postSetQuanjsz: 'http://172.16.1.168:5000/api/SetQuanjsz',
     saveRoleApi: 'http://172.16.1.168:5000/api/AddZhangh',
-    editRoleApi: 'http://172.16.1.168:5000/api/EditZhangh',
+    saveSetFtppz: 'http://172.16.1.168:5000/api/SetFtppz',
-     //   //编辑保存组件弹窗传参
+    //编辑保存组件弹窗传参
-      editComponent: "http://172.16.1.22:8080/api/SetMonqjkzjcs",
+    editComponent: 'http://172.16.1.22:8080/api/SetMonqjkzjcs',
     //保存主机名称
     editRoleApi: 'http://172.16.1.168:5000/api/EditZhangh',
     //新增图形接口
@@ -23,7 +21,8 @@ export default {
     //编辑图形名称
     editFigure: 'http://172.16.1.168:5000/api/EditTuxmc',
     //编辑保存组件弹窗传参
-    setHostName: 'http://172.16.1.168:5000/api/SetHostName'
+    setHostName: 'http://172.16.1.168:5000/api/SetHostName',
+    setHostTime: 'http://172.16.1.168:5000/api/SetHostTime'
 
     // `http://${ipUurl}:5000/api/AddShipjk`
     // dataUrl: `http://${ipUurl}:5000/api/AddShipjk`,

src/views/IPSetting.vue

@@ -4,36 +4,82 @@
             <p class="title">FTP设置</p>
             <el-form :model="form" label-position="left" label-width="110px" style="width:50%">
                 <el-form-item label="账号：">
-                    <el-input placeholder="请输入账号名" v-model="form.ComponentPropsname" clearable></el-input>
+                    <el-input placeholder="请输入账号名" v-model="form.userName" clearable></el-input>
                 </el-form-item>
                 <el-form-item label="密码：">
-                    <el-input placeholder="请输入密码" v-model="form.password" show-password></el-input>
+                    <el-input placeholder="请输入密码" v-model="form.passWord" show-passWord></el-input>
                 </el-form-item>
                 <el-form-item label="FTP：">
-                    <el-input placeholder="请输入账号名" v-model="form.FTP" clearable></el-input>
+                    <el-input placeholder="请输入ip" v-model="form.ip" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="端口：">
+                    <el-input placeholder="请输入端口号" v-model="form.port" clearable></el-input>
                 </el-form-item>
             </el-form>
 
-            <el-button type="primary" @cilck="Submit">修改</el-button>
+            <el-button size="small" type="primary" @click="saveSubmit">修改保存</el-button>
         </div>
     </div>
 </template>
 
 <script>
+import { getFtppzApi } from '@/api/iPSetting';
+import serverUrl from '../config/apiurl.js';
+import axios from 'axios';
+
 export default {
     data() {
         return {
             form: {
-                name: '',
+                userName: '',
-                password: '',
+                passWord: '',
-                FTP: ''
+                ip: '',
+                userName: ''
             }
         };
     },
     methods: {
-        Submit() {
+        //获取配置信息
-            this.form;
+        getFtppzApiMessage() {
+            getFtppzApi().then(res => {
+                if (res.data.code == 200) {
+                    this.form = res.data.data;
+                    console.log(this.form);
+                } else {
+                    this.$message.error(res.data.msg);
                 }
+            });
+        },
+        saveSubmit() {
+            let formData = new FormData();
+            formData.append('Id', this.form.id);
+            formData.append('Port', this.form.port);
+            formData.append('IP', this.form.ip);
+            formData.append('UserName', this.form.userName);
+            formData.append('PassWord', this.form.passWord);
+            axios({
+                method: 'post',
+                url: serverUrl.saveSetFtppz,
+                data: formData
+            }).then(res => {
+                if (res.data.code == 200) {
+                    this.$message({
+                        message: res.data.msg,
+                        type: 'success'
+                    });
+                    this.addAccountDialog = false;
+                    this.getFtppzApiMessage();
+                } else {
+                    this.$message({
+                        message: res.data.msg,
+                        type: 'warning'
+                    });
+                }
+            });
+        }
+    },
+    mounted() {
+        this.getFtppzApiMessage();
     }
 };
 </script>

src/views/general/AboutMachine.vue

@@ -17,7 +17,7 @@
                         autocomplete="off"
                     ></el-date-picker>
 
-                    <el-button type="primary" style="margin-left:10px" size="small">自动校验</el-button>
+                    <el-button @click="saveTime" type="primary" style="margin-left:10px" size="small">自动校验</el-button>
                 </el-form-item>
                 <p>备份&恢复</p>
                 <el-form-item label="备份服务器设置：">
@@ -121,6 +121,28 @@ export default {
         this.getInfo();
     },
     methods: {
+        //保存主机时间
+        saveTime() {
+            let formData = new FormData();
+            formData.append('HostTime', this.sizeForm.date1);
+            axios({
+                method: 'post',
+                url: serverUrl.setHostTime,
+                data: formData
+            }).then(res => {
+                if (res.data.code == 200) {
+                    this.$message({
+                        message: res.data.msg,
+                        type: 'success'
+                    });
+                } else {
+                    this.$message({
+                        message: res.data.msg,
+                        type: 'warning'
+                    });
+                }
+            });
+        },
         //保存主机名称
         saveHostName(value) {
             let formData = new FormData();
@@ -130,7 +152,6 @@ export default {
                 url: serverUrl.setHostName,
                 data: formData
             }).then(res => {
-                console.log('res', res);
                 if (res.data.code == 200) {
                     this.$message({
                         message: res.data.msg,