课程管理和设备管理页面修改

frontend_web/src/api/course.js

@@ -10,7 +10,7 @@ export default {
     })
   },
 
-  // 新增课程管理信息
+  // 新增、修改课程管理信息
   addCourse (data) {
     return request({
       url: process.env.VUE_APP_API + 'course/addcourse',

frontend_web/src/api/course/detail.js

@@ -1,36 +1,36 @@
 import request from '@/plugin/axios'
 // 课程详情管理
 export default {
-    // 获取课程详情列表
-    getList (params) {
-        return request({
-            url: process.env.VUE_APP_API + 'course/detail/getpagelist',
-            method: 'get',
-            params: params
-        })
-    },
-    // 添加或保存
-    save (formData) {
-        return request({
-            url: process.env.VUE_APP_API + 'course/detail/save',
-            method: 'post',
-            data: formData
-        })
-    },
-    // 获取课程详情
-    getEntityById (params) {
-        return request({
-            url: process.env.VUE_APP_API + 'course/detail/getdetailbyid',
-            method: 'get',
-            params: params
-        })
-    },
-    // 删除课程
-    delete (params) {
-        return request({
-            url: process.env.VUE_APP_API + 'course/detail/deletedetailbyid',
-            method: 'get',
-            params: params
-        })
-    }
+  // 获取课程详情列表
+  getList (params) {
+    return request({
+      url: process.env.VUE_APP_API + 'course/detail/getpagelist',
+      method: 'get',
+      params: params
+    })
+  },
+  // 添加或保存
+  save (formData) {
+    return request({
+      url: process.env.VUE_APP_API + 'course/detail/save',
+      method: 'post',
+      data: formData
+    })
+  },
+  // 获取课程详情
+  getEntityById (params) {
+    return request({
+      url: process.env.VUE_APP_API + 'course/detail/getdetailbyid',
+      method: 'get',
+      params: params
+    })
+  },
+  // 删除课程
+  delete (params) {
+    return request({
+      url: process.env.VUE_APP_API + 'course/detail/deletedetailbyid',
+      method: 'delete',
+      params: params
+    })
+  }
 }

frontend_web/src/views/course/index.vue

@@ -290,7 +290,7 @@ export default {
       CourseApi.getPageList(this.search)
         .then(res => {
           this.activities = res.records
-          this.search.page = res
+          this.search.page.total = res.total
         })
     },
     handleSizeChange (val) {

frontend_web/src/views/instrument/instrumenrunrecord/index.vue

@@ -152,7 +152,7 @@ export default {
           CreateOnstart: this.CreateOn[0] / 1000,
           CreateOnend: this.CreateOn[1] / 1000
         }
-        params = Object.assign(params2)
+        params = Object.assign(params, params2)
       }
       searchdatayx(params)
         .then(function (response) {

frontend_web/src/views/personnel/components/personneladd.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="添加设备管理"
+  <el-dialog title="添加人员管理"
              :visible.sync="dialogvisible"
              width="65%"
              :before-close="handleCloseAdd">

frontend_web/src/views/personnel/components/personneledit.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="编辑设备信息"
+  <el-dialog title="编辑人员信息"
              :visible.sync="dialogvisible"
              width="75%"
              :before-close="handleCloseEdit">