Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

src/utils/request.js

@@ -7,12 +7,16 @@ export const wsuri = `ws://192.168.1.149:61101//WebMoudule//websocket`
 export const name = `OP8888`
 
 // 创建axios实例
-export const upload = `http://123.56.95.229:8411/submit/uploadFile.ashx`
-export const download = `http://123.56.95.229:8411/submit/downloadFile.ashx`
+export const upload = `http://localhost:8411/submit/uploadFile.ashx`
+export const download = `http://localhost:8411/submit/downloadFile.ashx`
 const service = axios.create({
+<<<<<<< HEAD
+  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
+=======
 
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
+>>>>>>> 7cdb10d153358b72f95165dd7f3a12ad7675f14d
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
 
   baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,

src/views/BasicData/PersonnelManagement/index.vue

@@ -538,9 +538,21 @@ export default {
     },
     addPeople() {
       if (this.id) {
+<<<<<<< HEAD
+        addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => {
+          if (response.data[0].result === '1') {
+            this.i = 1
+            this.handleNodeClick()
+            this.$message.success('添加成功')
+          } else {
+            this.$message.error('添加失败')
+          }
+        })
+=======
         this.people_title = '新增人员'
         this.people_DFV = true
         this.addForm('people_form')
+>>>>>>> 7cdb10d153358b72f95165dd7f3a12ad7675f14d
       } else {
         this.$message.warning(`请选择部门名称`)
       }