a

src/utils/request.js

@@ -23,11 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-<<<<<<< HEAD
-  baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`,
-=======
   baseURL: `http://192.168.0.104:8005/submit/MESCommonBase.ashx`,
->>>>>>> f8c7e9afc36e00f5106add1477d9f258dbe37ec6
   timeout: 1500000 // 请求超时时间
 })
 

src/views/ManufacturingCenter/RepairTimeEntry/index.vue

@@ -464,7 +464,7 @@ export default {
         if (this.count1 !== 1) {
           this.$refs[formName].resetFields()
         }
-        this.title1 = '新增'+this.personnelNumber+'修补工时'
+        this.title1 = '新增' + this.personnelNumber + '修补工时'
         this.dialogFormVisible = true
       }
     },