diff --git a/src/components/leftnav.vue b/src/components/leftnav.vue
index d0cebfef28cc6a73669d700d11d98d9b14d6f9c3..2f08e268a4dc0e529e7c57ca7beb573c03e61e5b 100644
--- a/src/components/leftnav.vue
+++ b/src/components/leftnav.vue
@@ -116,7 +116,7 @@ export default {
               icon: 'icon-order-manage',
               menuname: '学生管理',
               hasThird: 'N',
-              url: 'user/students',
+              url: 'content/students',
               menus: null,
             },
             {
@@ -124,7 +124,7 @@ export default {
               icon: 'icon-order-manage',
               menuname: '教师管理',
               hasThird: 'N',
-              url: 'user/teachers',
+              url: 'content/teachers',
               menus: null,
             },
           ],
diff --git a/src/router/index.js b/src/router/index.js
index 6f6719360f419186b5af3c19b51de66ffd849584..8e7fa5790dac5893c481b08fe55f7d7a9f0e2c28 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,8 +10,6 @@ import statistics from '@/views/charts/statistics'
 
 // 用户管理
 import UsersManage from '@/views/user/UsersManage'
-import Students from '@/views/user/Students'
-import Teachers from '@/views/user/Teachers'
 
 // 网页管理
 import News from '@/views/Content/News'
@@ -20,6 +18,8 @@ import Patents from '@/views/Content/Patents'
 import Achievements from '@/views/Content/Achievements'
 import StudentHonors from '@/views/Content/StudentHonors'
 import StudentProjects from '@/views/Content/StudentProjects'
+import Students from '@/views/Content/Students'
+import Teachers from '@/views/Content/Teachers'
 
 // 启用路由
 Vue.use(Router)
@@ -57,14 +57,14 @@ export default new Router({
             requireAuth: true,
           },
         }, {
-          path: '/user/students',
+          path: '/content/students',
           name: '学生管理',
           component: Students,
           meta: {
             requireAuth: true,
           },
         }, {
-          path: '/user/teachers',
+          path: '/content/teachers',
           name: '教师管理',
           component: Teachers,
           meta: {
diff --git a/src/views/Content/News.vue b/src/views/Content/News.vue
index 7149312eae8de0b1dfd62c8e1756c25b38a2e548..16c2af4f9aeb9902733e3c6ed733e6d1d167683b 100644
--- a/src/views/Content/News.vue
+++ b/src/views/Content/News.vue
@@ -38,7 +38,8 @@
     <!-- 分页组件 -->
     <Pagination v-bind:child-msg="pageparm" @callFather="callFather"></Pagination>
     <!-- 编辑界面 -->
-    <el-dialog :title="title" :visible.sync="editFormVisible" width="50%" @click="closeDialog('editForm')">
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="editFormVisible" width="50%"
+               :before-close="closeDialog">
       <el-form label-width="120px" :model="editForm" :rules="rules" ref="editForm">
         <el-form-item label="标题" prop="title">
           <el-input size="small" v-model="editForm.title" auto-complete="off" placeholder="请输入新闻标题"></el-input>
@@ -221,12 +222,12 @@ export default {
           this.editFormVisible = false
           this.$message.success('修改成功')
           this.getdata(this.formInline)
-        })
-      }).catch(error => this.$message.error('修改失败'))
+        }).catch(error => this.$message.error('修改失败'))
+      })
     },
     // 删除公司
     deleteUser (index, row) {
-      this.$confirm('确定要删除该新闻?', '信息', {
+      this.$confirm('确定要删除该新闻?', '删除', {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
         type: 'warning',
@@ -244,7 +245,7 @@ export default {
     // 关闭编辑、增加弹出框
     closeDialog (formName) {
       this.editFormVisible = false
-      this.$refs[formName].resetFields()
+      this.$refs['editForm'].resetFields()
     },
   },
 }
diff --git a/src/views/Content/Patents.vue b/src/views/Content/Patents.vue
index f9e35cc26997154311d7a0bfe0695aa1984f0a04..9d72e376ed0f4d75092611ce56c5e8e08e7643fc 100644
--- a/src/views/Content/Patents.vue
+++ b/src/views/Content/Patents.vue
@@ -13,66 +13,65 @@
       <el-form-item label="搜索：">
         <el-input size="small" v-model="formInline.machineNo" placeholder="输入终端编号"></el-input>
       </el-form-item>
-      <el-form-item>
-        <el-input size="small" v-model="formInline.orderNo" placeholder="输入订单号"></el-input>
-      </el-form-item>
-      <el-form-item>
-        <el-input size="small" v-model="formInline.transId" placeholder="输入交易单号"></el-input>
-      </el-form-item>
-      <el-form-item>
-        <el-select size="small" v-model="formInline.payType" placeholder="请选择">
-          <el-option v-for="type in payType" :label="type.key" :value="type.value" :key="type.value"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-select size="small" v-model="formInline.orderStatus" placeholder="请选择">
-          <el-option v-for="type in payway" :label="type.key" :value="type.value" :key="type.value"></el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button size="small" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        <el-button size="small" type="primary" icon="el-icon-plus" @click="handleEdit()">添加</el-button>
       </el-form-item>
     </el-form>
     <!--列表-->
     <el-table size="small" :data="listData" highlight-current-row v-loading="loading" border
               element-loading-text="拼命加载中" style="width: 100%;">
-      <el-table-column align="center" type="selection" width="60"/>
+      <el-table-column align="center" type="index" width="60"/>
       <el-table-column sortable prop="patent_id" label="专利号" width="120" show-overflow-tooltip/>
       <el-table-column sortable prop="title" label="专利题目" width="120" show-overflow-tooltip/>
       <el-table-column sortable prop="inventors" label="专利发明者" width="120" show-overflow-tooltip/>
-      <el-table-column sortable prop="area" label="所处地区" width="120" show-overflow-tooltip/>
+      <el-table-column sortable prop="area" label="所处地区" width="120" :formatter="patentAreaMapping"
+                       show-overflow-tooltip/>
       <el-table-column sortable prop="grand_auth_time" label="授权日期" width="120" show-overflow-tooltip/>
       <el-table-column align="center" label="操作" min-width="150">
         <template slot-scope="scope">
-          <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">预览</el-button>
-          <el-button size="mini" type="danger" @click="deleteUser(scope.$index, scope.row)">退款</el-button>
+          <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">修改</el-button>
+          <el-button size="mini" type="danger" @click="deleteUser(scope.$index, scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
     <Pagination v-bind:child-msg="pageparm" @callFather="callFather"></Pagination>
     <!-- 编辑界面 -->
-    <el-dialog :title="title" :visible.sync="editFormVisible" width="50%" @click="closeDialog('editForm')">
-      <el-form label-width="120px" :model="editForm" :rules="rules" ref="editForm">
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="editFormVisible" width="50%"
+               :before-close="closeDialog">
+      <el-form label-width="120px" :model="editForm" :rules="rules" ref="editForm" :validate-on-rule-change="false">
         <el-form-item label="专利号" prop="patent_id">
-          <el-input size="small" v-model="editForm.patent_id" auto-complete="off" placeholder="请输入新闻标题"></el-input>
+          <el-input size="small" v-model="editForm.patent_id" auto-complete="off" placeholder="请输入专利号"></el-input>
         </el-form-item>
         <el-form-item label="专利题目" prop="title">
-          <el-input size="small" v-model="editForm.title" auto-complete="off" placeholder="请输入新闻正文内容"></el-input>
+          <el-input size="small" v-model="editForm.title" auto-complete="off" placeholder="请输入专利题目"></el-input>
         </el-form-item>
         <el-form-item label="专利发明者" prop="inventors">
-          <el-input size="small" v-model="editForm.inventors" auto-complete="off" placeholder="请输入新闻附件路径"></el-input>
+          <el-input size="small" v-model="editForm.inventors" auto-complete="off"
+                    placeholder="请输入专利发明者(英文逗号隔开)"></el-input>
         </el-form-item>
         <el-form-item label="所处地区" prop="area">
-          <el-input size="small" v-model="editForm.area" auto-complete="off" placeholder="请选择新闻种类"></el-input>
+          <el-select size="small" v-model="editForm.area" placeholder="请选择专利授权地区">
+            <el-option
+              v-for="item in areaOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="授权日期" prop="grand_auth_time">
-          <el-input size="small" v-model="editForm.grand_auth_time" auto-complete="off" placeholder="请选择新闻种类"></el-input>
+          <el-date-picker
+            v-model="editForm.grand_auth_time"
+            type="date"
+            placeholder="请选择专利授权日期">
+          </el-date-picker>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="closeDialog">取消</el-button>
-        <el-button size="small" type="primary" :loading="loading" class="title" @click="submitForm('editForm')">保存
+        <el-button size="small" type="primary" :loading="loading" class="title" @click="submitForm('editForm')">提交
         </el-button>
       </div>
     </el-dialog>
@@ -81,25 +80,41 @@
 
 <script>
 import Pagination from '../../components/Pagination'
+import { Delete, get, put } from '../../utils/http'
 
 export default {
   data () {
     return {
+      areaOptions: [
+        {
+          value: 0,
+          label: '未知',
+        },
+        {
+          value: 1,
+          label: '中国',
+        },
+        {
+          value: 2,
+          label: '国外',
+        },
+      ],
       loading: false, //是显示加载
       editFormVisible: false, //控制编辑页面显示与隐藏
       title: '编辑',
       editForm: {
+        patent_id: '',
         title: '',
-        content: '',
-        file: '',
-        type: '',
-        token: localStorage.getItem('logintoken'),
+        inventors: '',
+        area: '',
+        grand_auth_time: '',
       },
       rules: {
-        name: [{ required: true, message: '请输入学生姓名', trigger: 'blur' }],
-        join_year: [{ required: true, message: '请输入学生入学年份', trigger: 'blur' }],
-        is_graduated: [{ required: true, message: '请输入学生是否毕业', trigger: 'blur' }],
-        is_school: [{ required: true, message: '请输入学生是否在校', trigger: 'blur' }],
+        patent_id: [{ required: true, message: '请输入专利号', trigger: 'blur' }],
+        title: [{ required: true, message: '请输入专利题目', trigger: 'blur' }],
+        inventors: [{ required: true, message: '请输入专利发明人(英文逗号隔开)', trigger: 'blur' }],
+        area: [{ required: true, message: '请选择专利授权地区', trigger: 'blur' }],
+        grand_auth_time: [{ required: true, message: '请选择专利授权日期', trigger: 'blur' }],
       },
       formInline: {
         page: 1,
@@ -109,28 +124,15 @@ export default {
         transId: '',
         payType: 0,
         orderStatus: 0,
-        token: localStorage.getItem('logintoken'),
-      },
-      // 删除部门
-      seletedata: {
-        ids: '',
-        token: localStorage.getItem('logintoken'),
       },
       userparm: [], //搜索权限
       listData: [
         {
-          patent_id: 'C41242152GFWAF',
-          title : '猪肉又涨价了论',
-          inventors : '张三, 李四',
-          area: '中国',
-          grand_auth_time : '2021-5-4',
-        },
-        {
-          patent_id: 'C412421524214FVAV',
-          title : '牛肉又涨价了论',
-          inventors : '张三, 李四',
-          area: '中国',
-          grand_auth_time : '2021-2-6',
+          patent_id: '',
+          title: '',
+          inventors: '',
+          area: '',
+          grand_auth_time: '',
         },
       ], //用户数据
       // 分页参数
@@ -160,33 +162,36 @@ export default {
    * 里面的方法只有被调用才会执行
    */
   methods: {
+    patentAreaMapping (row) {
+      let n = parseInt(row.area)
+      switch (n) {
+        case 0:
+          return '未知'
+        case 1:
+          return '中国'
+        case 2:
+          return '国外'
+        default:
+          return ''
+      }
+    },
     // 获取公司列表
     getdata (parameter) {
       this.loading = true
-      this.loading = false
-      /***
-       * 调用接口，注释上面模拟数据 取消下面注释
-       */
-      // OrderList(parameter)
-      //   .then(res => {
-      //     this.loading = false
-      //     if (res.success == false) {
-      //       this.$message({
-      //         type: 'info',
-      //         message: res.msg
-      //       })
-      //     } else {
-      //       this.listData = res.data
-      //       // 分页赋值
-      //       this.pageparm.currentPage = this.formInline.page
-      //       this.pageparm.pageSize = this.formInline.limit
-      //       this.pageparm.total = res.count
-      //     }
-      //   })
-      //   .catch(err => {
-      //     this.loading = false
-      //     this.$message.error('菜单加载失败，请稍后再试！')
-      //   })
+      let that = this
+      let params = {
+        page: parameter.page,
+        page_size: parameter.limit,
+      }
+      get(`/patent/`, params).then(value => {
+        this.listData = value.results
+        that.pageparm.currentPage = that.formInline.page
+        that.pageparm.pageSize = that.formInline.pageSize
+        that.pageparm.total = value.count
+        this.loading = false
+      }).catch(err => {
+        this.$message.error('加载失败')
+      })
     },
     // 分页插件事件
     callFather (parm) {
@@ -203,6 +208,7 @@ export default {
       this.editFormVisible = true
       if (row !== undefined && row !== 'undefined') {
         this.title = '修改'
+        this.editId = row.id
         this.editForm.patent_id = row.patent_id
         this.editForm.title = row.title
         this.editForm.inventors = row.inventors
@@ -219,76 +225,38 @@ export default {
     },
     // 编辑、增加页面保存方法
     submitForm (editData) {
-      this.$message({
-        type: 'success',
-        message: '添加/修改操作成功',
+      this.$refs[editData].validate(valid => {
+        if (!valid || this.title === undefined || this.title !== '修改') {
+          return false
+        }
+        put(`/patent/${this.editId}/`, { ...this.editForm }).then(() => {
+          this.editFormVisible = false
+          this.$message.success('修改成功')
+          this.getdata(this.formInline)
+        }).catch(error => this.$message.error('修改失败'))
       })
-      // this.$refs[editData].validate(valid => {
-      //   if (valid) {
-      //     ConfigSave(this.editForm).then(res => {
-      //       this.editFormVisible = false
-      //       this.loading = false
-      //       if (res.success) {
-      //         this.getdata(this.formInline)
-      //         this.$message({
-      //           type: 'success',
-      //           message: '公司保存成功！',
-      //         })
-      //       } else {
-      //         this.$message({
-      //           type: 'info',
-      //           message: res.msg,
-      //         })
-      //       }
-      //     }).catch(err => {
-      //       this.editFormVisible = false
-      //       this.loading = false
-      //       this.$message.error('支付配置信息保存失败，请稍后再试！')
-      //     })
-      //   } else {
-      //     return false
-      //   }
-      // })
     },
     // 删除公司
     deleteUser (index, row) {
-      this.$message({
-        type: 'success',
-        message: '删除操作成功',
+      this.$confirm('确定要删除该专利?', '删除', {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        if (row.id) {
+          Delete(`/patent/${row.id}/`).then(() => {
+            this.$message.success('删除成功')
+            this.getdata(this.formInline)
+          }).catch(err => this.$message.error('删除失败'))
+        } else {
+          this.$message.error('删除失败')
+        }
       })
-      // this.$confirm('确定要删除吗?', '信息', {
-      //   confirmButtonText: '确定',
-      //   cancelButtonText: '取消',
-      //   type: 'warning',
-      // }).then(() => {
-      //   ConfigDelete(row.deptId).then(res => {
-      //     if (res.success) {
-      //       this.$message({
-      //         type: 'success',
-      //         message: '公司已删除!',
-      //       })
-      //       this.getdata(this.formInline)
-      //     } else {
-      //       this.$message({
-      //         type: 'info',
-      //         message: res.msg,
-      //       })
-      //     }
-      //   }).catch(err => {
-      //     this.loading = false
-      //     this.$message.error('支付配置信息删除失败，请稍后再试！')
-      //   })
-      // }).catch(() => {
-      //   this.$message({
-      //     type: 'info',
-      //     message: '已取消删除',
-      //   })
-      // })
     },
     // 关闭编辑、增加弹出框
     closeDialog (formName) {
       this.editFormVisible = false
-      this.$refs[formName].resetFields()
+      this.$refs['editForm'].resetFields()
     },
   },
 }
diff --git a/src/views/user/Students.vue b/src/views/Content/Students.vue
similarity index 100%
rename from src/views/user/Students.vue
rename to src/views/Content/Students.vue
diff --git a/src/views/user/Teachers.vue b/src/views/Content/Teachers.vue
similarity index 100%
rename from src/views/user/Teachers.vue
rename to src/views/Content/Teachers.vue