Merge remote-tracking branch 'origin/master' into master

frontend_web/src/api/client.js

@@ -1,21 +1,21 @@
-import request from '@/plugin/axios'
-// 客户管理
-export default {
-  // 获取客户列表
-  getClientList(params) {
-    return request({
-      url: process.env.VUE_APP_API02 + 'client/getclientlist',
-      method: 'get',
-      params: params
-    })
-  },
-  // 保存更新客户
-  saveClient(formData, params) {
-    return request({
-      url: process.env.VUE_APP_API02 + 'client/saveclient',
-      method: 'post',
-      data: formData,
-      params: params
-    })
-  }
-}
+import request from '@/plugin/axios'
+// 客户管理
+export default {
+  // 获取客户列表
+  getClientList (params) {
+    return request({
+      url: process.env.VUE_APP_API02 + 'client/getclientlist',
+      method: 'get',
+      params: params
+    })
+  },
+  // 保存更新客户
+  saveClient (formData, params) {
+    return request({
+      url: process.env.VUE_APP_API02 + 'client/saveclient',
+      method: 'post',
+      data: formData,
+      params: params
+    })
+  }
+}

frontend_web/src/api/infocenter.js

@@ -2,7 +2,7 @@ import request from '@/plugin/axios'
 // 引物管理
 export default {
   // 获取质粒提取编码列表
-  getPlasCodeList(params) {
+  getPlasCodeList (params) {
     return request({
       url: process.env.VUE_APP_API02 + 'plascode/getplascodelist',
       method: 'get',
@@ -10,7 +10,7 @@ export default {
     })
   },
   // 获取质粒提取编码
-  getAllPlsCodeList(params) {
+  getAllPlsCodeList (params) {
     return request({
       url: process.env.VUE_APP_API02 + 'plascode/getallplascodelist',
       method: 'get',
@@ -18,15 +18,16 @@ export default {
     })
   },
   // 删除
-  PlasCodeDel(params) {
+  PlasCodeDel (params) {
     return request({
       url: process.env.VUE_APP_API02 + 'plascode/plascodedel',
       method: 'get',
       params: params
+
     })
   },
   // 修改+新建
-  PlasUpdata(params) {
+  PlasUpdata (params) {
     return request({
       url: process.env.VUE_APP_API02 + 'plascode/plasupdata',
       method: 'get',
@@ -34,21 +35,21 @@ export default {
     })
   },
   // 获取预检结果编码
-  getPreCodeList(params) {
+  getPreCodeList (params) {
     return request({
       url: process.env.VUE_APP_API02 + 'previewcode/getprecodelist',
       method: 'get',
       params: params
     })
   },
-  getAllPreCodeList() {
+  getAllPreCodeList () {
     return request({
       url: process.env.VUE_APP_API02 + 'previewcode/getallprecodelist',
       method: 'get'
     })
   },
   // 删除
-  PreCodeDel(params) {
+  PreCodeDel (params) {
     return request({
       url: process.env.VUE_APP_API02 + 'previewcode/precodedel',
       method: 'get',
@@ -56,7 +57,7 @@ export default {
     })
   },
   // 修改+新建
-  PreCodeUpdata(params) {
+  PreCodeUpdata (params) {
     return request({
       url: process.env.VUE_APP_API02 + 'previewcode/precodeupdata',
       method: 'get',
@@ -64,6 +65,4 @@ export default {
     })
   }
 
-
-  
 }

frontend_web/src/api/personnel.js

@@ -1,33 +1,33 @@
 import request from '@/plugin/axios'
 
 export default {
-   // 产品方案 ----获取产品信息列表
-  getAllPersonnel(params) {
+  // 产品方案 ----获取产品信息列表
+  getAllPersonnel (params) {
     return request({
       url: process.env.VUE_APP_API + 'personnel/getallpersonnel',
-      method: 'get', 
+      method: 'get',
       params: params
     })
   },
 
-  getOnePersonnel(params) {
+  getOnePersonnel (params) {
     return request({
       url: process.env.VUE_APP_API + 'personnel/getonepersonnel',
-      method: 'get', 
+      method: 'get',
       params: params
     })
   },
 
-  //删除产品信息
-   deletePersonnel(params) {
+  // 删除产品信息
+  deletePersonnel (params) {
     return request({
       url: process.env.VUE_APP_API + 'personnel/deletepersonnel',
       method: 'delete',
       params: params
     })
   },
-  
-   // 保存产品方案
+
+  // 保存产品方案
   AddPersonnel (data) {
     return request({
       url: process.env.VUE_APP_API + 'personnel/addpersonnel',
@@ -35,14 +35,13 @@ export default {
       data: data
     })
   },
-  
+
   UpdatePersonnel (data) {
     return request({
       url: process.env.VUE_APP_API + 'personnel/updatepersonnel',
       method: 'post',
       data: data
     })
-  },
- 
-  
-}
+  }
+
+}

frontend_web/src/api/react.js

@@ -2,7 +2,7 @@ import request from '@/plugin/axios'
 // 反应转板api
 export default {
   // 动态获取转板数据
-  GetBoardList(params) {
+  GetBoardList (params) {
     return request({
       url: process.env.VUE_APP_API02 + 'reaction/getchangeblist',
       method: 'get',
@@ -10,7 +10,7 @@ export default {
     })
   },
   // 转板页面获取样品板样品数据
-  getChangeSList(params) {
+  getChangeSList (params) {
     return request({
       url: process.env.VUE_APP_API02 + 'reaction/getchaholelist',
       method: 'get',
@@ -18,7 +18,7 @@ export default {
     })
   },
   // 转板页面保存方法
-  saveChangeB(formData, params) {
+  saveChangeB (formData, params) {
     return request({
       url: process.env.VUE_APP_API02 + 'reaction/savechangeboard',
       method: 'post',
@@ -27,7 +27,7 @@ export default {
     })
   },
   // 转板页面获取反应板数据
-  getRBoardList(params) {
+  getRBoardList (params) {
     return request({
       url: process.env.VUE_APP_API02 + 'reaction/getrholelist',
       method: 'get',

frontend_web/src/api/sample.js

@@ -2,7 +2,7 @@ import request from '@/plugin/axios'
 // 样品管理
 export default {
   // 获取样品列表
-  getReactList(params) {
+  getReactList (params) {
     return request({
       url: process.env.VUE_APP_API02 + 'samples/getreactlist',
       method: 'get',
@@ -10,7 +10,7 @@ export default {
     })
   },
   // 保存样品 新增
-  saveSample(formData, params) {
+  saveSample (formData, params) {
     return request({
       url: process.env.VUE_APP_API02 + 'samples/addsamples',
       method: 'post',
@@ -19,7 +19,7 @@ export default {
     })
   },
   // 保存样品 修改
-  UpdateSampleById(formData) {
+  UpdateSampleById (formData) {
     return request({
       url: process.env.VUE_APP_API02 + 'samples/updatesamplebyid',
       method: 'post',
@@ -27,7 +27,7 @@ export default {
     })
   },
   // 生成反应清单 新增
-  saveSampleAndPrimer(formData, params) {
+  saveSampleAndPrimer (formData, params) {
     return request({
       url: process.env.VUE_APP_API02 + 'samples/addsamplesandprimer',
       method: 'post',
@@ -36,7 +36,7 @@ export default {
     })
   },
   // 生成反应清单 修改
-  updateSampleAndPrimer(formData, params) {
+  updateSampleAndPrimer (formData, params) {
     return request({
       url: process.env.VUE_APP_API02 + 'samples/updatesampleandprimer',
       method: 'post',
@@ -45,14 +45,14 @@ export default {
     })
   },
   // 删除样品
-  deleteSample(params) {
+  deleteSample (params) {
     return request({
       url: process.env.VUE_APP_API02 + 'samples/deletesamplesbyid',
       method: 'delete',
       params: params
     })
   },
-  deleteSampleReact(params) {
+  deleteSampleReact (params) {
     return request({
       url: process.env.VUE_APP_API02 + 'samples/deletesamplereact',
       method: 'delete',

frontend_web/src/router/routes.js

@@ -126,7 +126,7 @@ const frameIn = [
           auth: true,
           cache: true
         },
-        component: _import('course/detail/index')
+        component: _import('course/detail/index'),
       },
       // 系统 前端日志
       {

frontend_web/src/views/course/index.vue

@@ -327,7 +327,7 @@ export default {
     },
     // 详情
     handleDetail (course) {
-      this.$router.push({ path: '/course/detail', query: { CourseId: course.Id, Year: course.Year, Term: course.Term, Class: course.ClassId } })
+      this.$router.push({ name: 'courseDetailEdit', query: { CourseId: course.Id, Year: course.Year, Term: course.Term, Class: course.ClassId } })
     },
     //  删除课程
     deleteCourse (val) {