合 panxiandiao

src/apiConfig/api.js

@@ -2,9 +2,4 @@
 export const mockUrl = 'http://10.179.24.176:8980' // 线下
 // export const mockUrl = 'http://10.179.24.123:8980' // 线上
 
-<<<<<<< HEAD
 // export const mockUrl = 'http://172.23.162.48:8980' // 美双姐本地
-
-=======
-// export const mockUrl = 'http://172.23.162.48:8980' // 美双姐本地
->>>>>>> test

src/views/Platform/projectQuery/taskQuery.vue

@@ -505,11 +505,7 @@ export default {
             this.$router.push({ path: '/Platform/presentation/ClientAcceptance', query: { task: ele }}) // 客户端准出
             break
           case 4:
-<<<<<<< HEAD
-            this.$router.push({ path: '/Platform/defectManagement', query: { id: ele.id, code: 4 }}) // 缺陷报告
-=======
             this.$router.push({ path: '/Platform/defectManagement/bugCreate', query: { id: ele.id }}) // 缺陷报告
->>>>>>> test
             break
         }
       } else {
@@ -524,11 +520,7 @@ export default {
             this.$router.push({ path: '/Platform/presentation/Acceptance', query: { task: ele }}) // 服务端准出
             break
           case 4:
-<<<<<<< HEAD
-            this.$router.push({ path: '/Platform/defectManagement', query: { id: ele.id, code: 4 }}) // 缺陷报告
-=======
             this.$router.push({ path: '/Platform/defectManagement/bugCreate', query: { id: ele.id }}) // 缺陷报告
->>>>>>> test
             break
         }
       }