From 3ff55112d15f75eca791558d1eee778c89fe0a04 Mon Sep 17 00:00:00 2001
From: JYX <jiaoyuanxiang@126.com>
Date: Sat, 31 Jul 2021 17:35:41 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90feat=E3=80=91=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Content/StudentProjects.vue | 453 +++++++++++++-------------
 1 file changed, 220 insertions(+), 233 deletions(-)

diff --git a/src/views/Content/StudentProjects.vue b/src/views/Content/StudentProjects.vue
index 3fb5a0f..cd65027 100644
--- a/src/views/Content/StudentProjects.vue
+++ b/src/views/Content/StudentProjects.vue
@@ -10,41 +10,33 @@
     </el-breadcrumb>
     <!-- 搜索筛选 -->
     <el-form :inline="true" :model="formInline" class="user-search">
-      <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-form-item label="项目等级：">
+        <el-select size="small" v-model="selectlevel" placeholder="项目等级">
+          <el-option
+            v-for="item in selectlevel_project"
+            :key="item.value"
+            :label="item.label"
+            :value="item.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 sortable prop="name" label="项目名称" width="120" show-overflow-tooltip/>
-      <el-table-column sortable prop="participants" label="参与者" width="120" show-overflow-tooltip/>
-      <el-table-column sortable prop="level" label="项目等级" width="120" show-overflow-tooltip/>
-      <el-table-column sortable prop="setup_time" label="立项时间" width="120" show-overflow-tooltip/>
+      <el-table-column sortable align="center" prop="name" label="项目名称" width="250" show-overflow-tooltip/>
+      <el-table-column sortable align="center" prop="participants" label="参与者" width="200" show-overflow-tooltip/>
+      <el-table-column sortable align="center" prop="level" label="项目等级" width="120" :formatter="level_projectMapping" show-overflow-tooltip/>
+      <el-table-column sortable align="center" prop="setup_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>
@@ -54,21 +46,28 @@
     <el-dialog :title="title" :visible.sync="editFormVisible" width="50%" @click="closeDialog('editForm')">
       <el-form label-width="120px" :model="editForm" :rules="rules" ref="editForm">
         <el-form-item label="项目名称" prop="name">
-          <el-input size="small" v-model="editForm.name" auto-complete="off" placeholder="请输入新闻标题"></el-input>
+          <el-input size="small" v-model="editForm.name" auto-complete="off" placeholder="请输入项目名称"></el-input>
         </el-form-item>
         <el-form-item label="参与者" prop="participants">
-          <el-input size="small" v-model="editForm.participants" auto-complete="off" placeholder="请输入新闻正文内容"></el-input>
+          <el-input size="small" v-model="editForm.participants" auto-complete="off" placeholder="请输入参与者"></el-input>
         </el-form-item>
         <el-form-item label="项目等级" prop="level">
-          <el-input size="small" v-model="editForm.level" auto-complete="off" placeholder="请输入新闻附件路径"></el-input>
+          <el-select size="small" v-model="editForm.level" placeholder="项目等级">
+            <el-option
+              v-for="item in level_project"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="立项时间" prop="setup_time">
-          <el-input size="small" v-model="editForm.setup_time" auto-complete="off" placeholder="请选择新闻种类"></el-input>
+          <el-input size="small" v-model="editForm.setup_time" auto-complete="off" placeholder="请输入立项时间"></el-input>
         </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>
@@ -76,224 +75,212 @@
 </template>
 
 <script>
-import Pagination from '../../components/Pagination'
+  import Pagination from '../../components/Pagination'
+  import { Delete, get, put } from '../../utils/http'
 
-export default {
-  data () {
-    return {
-      loading: false, //是显示加载
-      editFormVisible: false, //控制编辑页面显示与隐藏
-      title: '编辑',
-      editForm: {
+  export default {
+    data () {
+      return {
+        selectlevel:'',
+        selectlevel_project: [
+          {
+            value: 0,
+            label: '0',
+          },
+          {
+            value: 1,
+            label: '1',
+          },
+          {
+            value: 2,
+            label: '2',
+          },
+          {
+            value: 3,
+            label:'3'
+          }
+        ],
+        level_project: [
+          {
+            value: 0,
+            label: '0',
+          },
+          {
+            value: 1,
+            label: '1',
+          },
+          {
+            value: 2,
+            label: '2',
+          },
+          {
+            value: 3,
+            label:'3'
+          }
+        ],
+        loading: false, //是显示加载
+        editFormVisible: false, //控制编辑页面显示与隐藏
         title: '',
-        content: '',
-        file: '',
-        type: '',
-        token: localStorage.getItem('logintoken'),
-      },
-      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' }],
-      },
-      formInline: {
-        page: 1,
-        limit: 10,
-        machineNo: '',
-        orderNo: '',
-        transId: '',
-        payType: 0,
-        orderStatus: 0,
-        token: localStorage.getItem('logintoken'),
-      },
-      // 删除部门
-      seletedata: {
-        ids: '',
-        token: localStorage.getItem('logintoken'),
-      },
-      userparm: [], //搜索权限
-      listData: [
-        {
-          name: '猪肉研究',
-          participants: '张三, 李四',
-          level: '省级',
-          setup_time: '2021-7-4',
+        editForm: {
+          name: '',
+          participants: '',
+          level: '',
+          setup_time: '',
         },
-        {
-          name: '狗肉研究',
-          participants: '张三, 李四',
-          level: '省级',
-          setup_time: '2021-7-3',
+        editId: 0,
+        rules: {
+          name: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
+          participants: [{ required: true, message: '请输入参与者', trigger: 'blur' }],
+          level: [{ required: true, message: '请输入项目等级', trigger: 'blur' }],
+          setup_time: [{ required: true, message: '请输入立项时间', trigger: 'blur' }],
+        },
+        formInline: {
+          page: 1,
+          limit: 10,
+        },
+        listData: [
+          {
+            name: '',
+            participants: '',
+            level: '',
+            setup_time: '',
+          },
+        ], //用户数据
+        // 分页参数
+        pageparm: {
+          currentPage: 1,
+          pageSize: 10,
+          total: 10,
         },
-      ], //用户数据
-      // 分页参数
-      pageparm: {
-        currentPage: 1,
-        pageSize: 10,
-        total: 10,
-      },
-    }
-  },
-  // 注册组件
-  components: {
-    Pagination,
-  },
-  /**
-   * 数据发生改变
-   */
-
-  /**
-   * 创建完毕
-   */
-  created () {
-    this.getdata(this.formInline)
-  },
-
-  /**
-   * 里面的方法只有被调用才会执行
-   */
-  methods: {
-    // 获取公司列表
-    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('菜单加载失败，请稍后再试！')
-      //   })
-    },
-    // 分页插件事件
-    callFather (parm) {
-      this.formInline.page = parm.currentPage
-      this.formInline.limit = parm.pageSize
-      this.getdata(this.formInline)
-    },
-    // 搜索事件
-    search () {
-      this.getdata(this.formInline)
-    },
-    //显示编辑界面
-    handleEdit: function (index, row) {
-      this.editFormVisible = true
-      if (row !== undefined && row !== 'undefined') {
-        this.title = '修改'
-        this.editForm.name = row.name
-        this.editForm.participants = row.participants
-        this.editForm.level = row.level
-        this.editForm.setup_time = row.setup_time
-      } else {
-        this.title = '添加'
-        this.editForm.name = ''
-        this.editForm.participants = ''
-        this.editForm.level = ''
-        this.editForm.setup_time = ''
       }
     },
-    // 编辑、增加页面保存方法
-    submitForm (editData) {
-      this.$message({
-        type: 'success',
-        message: '添加/修改操作成功',
-      })
-      // 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
-      //   }
-      // })
+    // 注册组件
+    components: {
+      Pagination,
     },
-    // 删除公司
-    deleteUser (index, row) {
-      this.$message({
-        type: 'success',
-        message: '删除操作成功',
-      })
-      // 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: '已取消删除',
-      //   })
-      // })
+    /**
+     * 数据发生改变
+     */
+
+    /**
+     * 创建完毕
+     */
+    created () {
+      this.getdata(this.formInline)
     },
-    // 关闭编辑、增加弹出框
-    closeDialog (formName) {
-      this.editFormVisible = false
-      this.$refs[formName].resetFields()
+
+    /**
+     * 里面的方法只有被调用才会执行
+     */
+    methods: {
+      level_projectMapping (row) {
+        let n = parseInt(row.level)
+        switch (n) {
+          case 0:
+            return '0'
+          case 1:
+            return '1'
+          case 2:
+            return '2'
+          case 3:
+            return '3'
+          default:
+            return ''
+        }
+      },
+
+      // 获取公司列表
+      getdata (parameter) {
+        this.loading = true
+        let that = this
+        let params = {
+          page: parameter.page,
+          page_size: parameter.limit,
+        }
+        get(`/student_project/`, 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) {
+        this.formInline.page = parm.currentPage
+        this.formInline.limit = parm.pageSize
+        this.getdata(this.formInline)
+      },
+      // 搜索事件
+      search () {
+        this.getdata(this.formInline)
+      },
+      //显示编辑界面
+      handleEdit: function (index, row) {
+        this.editFormVisible = true
+        if (row !== undefined && row !== 'undefined') {
+          this.title = '修改'
+          this.editForm.name = row.name
+          this.editForm.participants = row.participants
+          this.editForm.level = row.level
+          this.editForm.setup_time = row.setup_time
+        } else {
+          this.title = '添加'
+          this.editForm.name = ''
+          this.editForm.participants = ''
+          this.editForm.level = ''
+          this.editForm.setup_time = ''
+        }
+      },
+      // 编辑、增加页面保存方法
+      submitForm (editData) {
+        this.$refs[editData].validate(valid => {
+          if (!valid || this.title === undefined || this.title !== '修改') {
+            return false
+          }
+          put(`/student_project/${this.editId}/`, { ...this.editForm }).then(() => {
+            this.editFormVisible = false
+            this.$message.success('修改成功')
+            this.getdata(this.formInline)
+          })
+        }).catch(error => this.$message.error('修改失败'))
+      },
+      // 删除
+      deleteUser (index, row) {
+        this.$confirm('确定要删除该项目?', '信息', {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          if (row.id) {
+            Delete(`/student_project/${row.id}/`).then(() => {
+              this.$message.success('删除成功')
+              this.getdata(this.formInline)
+            }).catch(err => this.$message.error('删除失败'))
+          } else {
+            this.$message.error('删除失败')
+          }
+        })
+      },
+      // 关闭编辑、增加弹出框
+      closeDialog (formName) {
+        this.editFormVisible = false
+        this.$refs[formName].resetFields()
+      },
     },
-  },
-}
+  }
 </script>
 
 <style scoped>
-.user-search {
-  margin-top: 20px;
-}
+  .user-search {
+    margin-top: 20px;
+  }
 
-.userRole {
-  width: 100%;
-}
+  .userRole {
+    width: 100%;
+  }
 </style>
 
 
-- 
Gitee


From 83733af35423011ad65162e96d8bb17bcf7c8434 Mon Sep 17 00:00:00 2001
From: 15619301878 <username@email.com>
Date: Sat, 31 Jul 2021 18:53:49 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=86=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=E8=8D=A3=E8=AA=89=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E6=89=80=E6=9C=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                   |   5 +
 package.json                        |   1 +
 src/main.js                         |   6 +-
 src/views/Content/StudentHonors.vue | 184 +++++++++++++---------------
 4 files changed, 94 insertions(+), 102 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fc514f5..7c93d82 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10617,6 +10617,11 @@
       "resolved": "https://registry.nlark.com/vue/download/vue-2.6.14.tgz",
       "integrity": "sha1-5RqlJQJQ1Wmj+606ilpofWA24jU="
     },
+    "vue-axios": {
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/vue-axios/-/vue-axios-3.2.5.tgz",
+      "integrity": "sha512-V7XUzu0v3WOzd8PEF9m/ZoVivap+ToBPOXrhI8AsnczD93YXvGG+HkeQhJHAF/jeav8CsPDF3X/Z2vCqBbjsMQ=="
+    },
     "vue-hot-reload-api": {
       "version": "2.3.4",
       "resolved": "https://registry.npm.taobao.org/vue-hot-reload-api/download/vue-hot-reload-api-2.3.4.tgz",
diff --git a/package.json b/package.json
index e839aa2..dd095f6 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "http-proxy-middleware": "^0.18.0",
     "js-md5": "^0.7.3",
     "vue": "^2.5.2",
+    "vue-axios": "^3.2.5",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1"
   },
diff --git a/src/main.js b/src/main.js
index a4959d9..e6423ee 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,11 +15,15 @@ import './assets/icon/iconfont.css'
 
 // 引入echarts
 import echarts from 'echarts'
-
+import axios from 'axios'
+import VueAxios from 'vue-axios'
 Vue.prototype.$echarts = echarts
 
 Vue.config.productionTip = false
+Vue.prototype.$axios=axios
 
+Vue.prototype.axios=axios;
+Vue.use(VueAxios, axios);
 // 使用element UI
 Vue.use(ElementUI)
 // 过滤器
diff --git a/src/views/Content/StudentHonors.vue b/src/views/Content/StudentHonors.vue
index 9b60ac4..0408007 100644
--- a/src/views/Content/StudentHonors.vue
+++ b/src/views/Content/StudentHonors.vue
@@ -11,19 +11,19 @@
     <!-- 搜索筛选 -->
     <el-form :inline="true" :model="formInline" class="user-search">
       <el-form-item label="搜索：">
-        <el-input size="small" v-model="formInline.machineNo" placeholder="输入终端编号"></el-input>
+        <el-input size="small" v-model="formInline.info" 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-input size="small" v-model="formInline.honor_date" 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-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>
@@ -48,10 +48,10 @@
     <el-dialog :title="title" :visible.sync="editFormVisible" width="50%" @click="closeDialog('editForm')">
       <el-form label-width="120px" :model="editForm" :rules="rules" ref="editForm">
         <el-form-item label="获奖信息" prop="info">
-          <el-input size="small" v-model="editForm.info" auto-complete="off" placeholder="请输入新闻标题"></el-input>
+          <el-input size="small" v-model="editForm.info" auto-complete="off" placeholder="请输入获奖信息"></el-input>
         </el-form-item>
         <el-form-item label="获奖日期" prop="honor_date">
-          <el-input size="small" v-model="editForm.honor_date" auto-complete="off" placeholder="请输入新闻正文内容"></el-input>
+          <el-input size="small" v-model="editForm.honor_date" auto-complete="off" placeholder="请输入获奖日期"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -65,6 +65,7 @@
 
 <script>
 import Pagination from '../../components/Pagination'
+import {put} from "../../utils/http";
 
 export default {
   data () {
@@ -73,6 +74,8 @@ export default {
       editFormVisible: false, //控制编辑页面显示与隐藏
       title: '编辑',
       editForm: {
+        info: '',
+        honor_date:'',
         title: '',
         content: '',
         file: '',
@@ -88,11 +91,8 @@ export default {
       formInline: {
         page: 1,
         limit: 10,
-        machineNo: '',
-        orderNo: '',
-        transId: '',
-        payType: 0,
-        orderStatus: 0,
+        info:'',
+        honor_date:'',
         token: localStorage.getItem('logintoken'),
       },
       // 删除部门
@@ -102,20 +102,13 @@ export default {
       },
       userparm: [], //搜索权限
       listData: [
-        {
-          info: '最佳养猪奖',
-          honor_date: '2021-5-3',
-        },
-        {
-          info: '最佳养牛奖',
-          honor_date: '2021-2-1',
-        },
+
       ], //用户数据
       // 分页参数
       pageparm: {
         currentPage: 1,
         pageSize: 10,
-        total: 10,
+        total:0,
       },
     }
   },
@@ -130,21 +123,45 @@ export default {
   /**
    * 创建完毕
    */
-  created () {
-    this.getdata(this.formInline)
-  },
+  // created () {
+  //   this.getdata(this.formInline)
+  // },
 
   /**
    * 里面的方法只有被调用才会执行
    */
   methods: {
+    getList(){
+      let that =this
+      this.$axios.get('http://175.27.138.106:3001/student_honor/?page='+this.formInline.page+'&&page_size='+this.formInline.limit).then(
+        function (res) {
+          let array=res.results;
+          that.pageparm.total=res.count;
+          that.listData=array.map((item)=>{
+            return{info:item.info,honor_date:item.honor_date}
+          })
+        }).catch(function () {
+      })
+    },
+    searchList(para){
+      let that =this
+      this.$axios.get('http://175.27.138.106:3001/student_honor/?page='+this.formInline.page+'&&page_size='+this.formInline.limit+'&search='+para.info).then(
+        function (res) {
+          let array=res.results;
+          that.pageparm.total=res.count;
+          that.listData=array.map((item)=>{
+            return{info:item.info,honor_date:item.honor_date}
+          })
+        }).catch(function () {
+      })
+    },
     // 获取公司列表
-    getdata (parameter) {
-      this.loading = true
-      this.loading = false
-      /***
-       * 调用接口，注释上面模拟数据 取消下面注释
-       */
+    // getdata (parameter) {
+    //   this.loading = true
+    //   this.loading = false
+    //   /***
+    //    * 调用接口，注释上面模拟数据 取消下面注释
+    //    */
       // OrderList(parameter)
       //   .then(res => {
       //     this.loading = false
@@ -164,17 +181,17 @@ export default {
       //   .catch(err => {
       //     this.loading = false
       //     this.$message.error('菜单加载失败，请稍后再试！')
-      //   })
-    },
+    //   //   })
+    // },
     // 分页插件事件
     callFather (parm) {
       this.formInline.page = parm.currentPage
       this.formInline.limit = parm.pageSize
-      this.getdata(this.formInline)
+      this.getList()
     },
     // 搜索事件
     search () {
-      this.getdata(this.formInline)
+      this.searchList(this.formInline)
     },
     //显示编辑界面
     handleEdit: function (index, row) {
@@ -191,71 +208,33 @@ export default {
     },
     // 编辑、增加页面保存方法
     submitForm (editData) {
-      this.$message({
-        type: 'success',
-        message: '添加/修改操作成功',
-      })
-      // 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
-      //   }
-      // })
-    },
+        this.$refs[editData].validate(valid => {
+          if (!valid || this.title === undefined || this.title !== '修改') {
+            return false
+          }
+          put(`/students_honor/${this.editId}/`, { ...this.editForm }).then(() => {
+            this.editFormVisible = false
+            this.$message.success('修改成功')
+            this.getList()
+          }).catch(error => this.$message.error('修改失败'))
+        })
+      },
     // 删除公司
     deleteUser (index, row) {
-      this.$message({
-        type: 'success',
-        message: '删除操作成功',
+      this.$confirm('确定要删除该文章?', '信息', {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        if (row.id) {
+          Delete(`/student_honor/${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) {
@@ -263,6 +242,9 @@ export default {
       this.$refs[formName].resetFields()
     },
   },
+  mounted() {
+    this.getList()
+  }
 }
 </script>
 
-- 
Gitee


From 85fbefbf669a25c334950fb3c9cf18a24d461c36 Mon Sep 17 00:00:00 2001
From: 15619301878 <username@email.com>
Date: Sat, 31 Jul 2021 19:01:42 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=86=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=E8=8D=A3=E8=AA=89=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E6=89=80=E6=9C=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Content/StudentHonors.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/Content/StudentHonors.vue b/src/views/Content/StudentHonors.vue
index 0408007..be6cced 100644
--- a/src/views/Content/StudentHonors.vue
+++ b/src/views/Content/StudentHonors.vue
@@ -74,6 +74,7 @@ export default {
       editFormVisible: false, //控制编辑页面显示与隐藏
       title: '编辑',
       editForm: {
+        count:'',
         info: '',
         honor_date:'',
         title: '',
-- 
Gitee


From 9f5b585d9a5dcf6ef57d6ca492957a302c80f62e Mon Sep 17 00:00:00 2001
From: Riollee <530377286@qq.com>
Date: Sun, 1 Aug 2021 00:21:35 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90feat=E3=80=91=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=B7=A5=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                   |   5 -
 package.json                        |   1 -
 src/main.js                         |   6 +-
 src/views/Content/Patents.vue       |   2 +-
 src/views/Content/StudentHonors.vue | 159 ++++++++++++----------------
 5 files changed, 69 insertions(+), 104 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7c93d82..fc514f5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10617,11 +10617,6 @@
       "resolved": "https://registry.nlark.com/vue/download/vue-2.6.14.tgz",
       "integrity": "sha1-5RqlJQJQ1Wmj+606ilpofWA24jU="
     },
-    "vue-axios": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/vue-axios/-/vue-axios-3.2.5.tgz",
-      "integrity": "sha512-V7XUzu0v3WOzd8PEF9m/ZoVivap+ToBPOXrhI8AsnczD93YXvGG+HkeQhJHAF/jeav8CsPDF3X/Z2vCqBbjsMQ=="
-    },
     "vue-hot-reload-api": {
       "version": "2.3.4",
       "resolved": "https://registry.npm.taobao.org/vue-hot-reload-api/download/vue-hot-reload-api-2.3.4.tgz",
diff --git a/package.json b/package.json
index dd095f6..e839aa2 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,6 @@
     "http-proxy-middleware": "^0.18.0",
     "js-md5": "^0.7.3",
     "vue": "^2.5.2",
-    "vue-axios": "^3.2.5",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1"
   },
diff --git a/src/main.js b/src/main.js
index e6423ee..a4959d9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,15 +15,11 @@ import './assets/icon/iconfont.css'
 
 // 引入echarts
 import echarts from 'echarts'
-import axios from 'axios'
-import VueAxios from 'vue-axios'
+
 Vue.prototype.$echarts = echarts
 
 Vue.config.productionTip = false
-Vue.prototype.$axios=axios
 
-Vue.prototype.axios=axios;
-Vue.use(VueAxios, axios);
 // 使用element UI
 Vue.use(ElementUI)
 // 过滤器
diff --git a/src/views/Content/Patents.vue b/src/views/Content/Patents.vue
index 9d72e37..3302a41 100644
--- a/src/views/Content/Patents.vue
+++ b/src/views/Content/Patents.vue
@@ -208,7 +208,7 @@ export default {
       this.editFormVisible = true
       if (row !== undefined && row !== 'undefined') {
         this.title = '修改'
-        this.editId = row.id
+        this.editForm.editId = row.id
         this.editForm.patent_id = row.patent_id
         this.editForm.title = row.title
         this.editForm.inventors = row.inventors
diff --git a/src/views/Content/StudentHonors.vue b/src/views/Content/StudentHonors.vue
index be6cced..61eb523 100644
--- a/src/views/Content/StudentHonors.vue
+++ b/src/views/Content/StudentHonors.vue
@@ -16,14 +16,6 @@
       <el-form-item>
         <el-input size="small" v-model="formInline.honor_date" 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-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>
@@ -65,7 +57,7 @@
 
 <script>
 import Pagination from '../../components/Pagination'
-import {put} from "../../utils/http";
+import { Delete, get, put } from '../../utils/http'
 
 export default {
   data () {
@@ -74,9 +66,9 @@ export default {
       editFormVisible: false, //控制编辑页面显示与隐藏
       title: '编辑',
       editForm: {
-        count:'',
+        count: '',
         info: '',
-        honor_date:'',
+        honor_date: '',
         title: '',
         content: '',
         file: '',
@@ -92,24 +84,16 @@ export default {
       formInline: {
         page: 1,
         limit: 10,
-        info:'',
-        honor_date:'',
-        token: localStorage.getItem('logintoken'),
-      },
-      // 删除部门
-      seletedata: {
-        ids: '',
-        token: localStorage.getItem('logintoken'),
+        info: '',
+        honor_date: '',
       },
       userparm: [], //搜索权限
-      listData: [
-
-      ], //用户数据
+      listData: [], //用户数据
       // 分页参数
       pageparm: {
         currentPage: 1,
         pageSize: 10,
-        total:0,
+        total: 0,
       },
     }
   },
@@ -124,81 +108,75 @@ export default {
   /**
    * 创建完毕
    */
-  // created () {
-  //   this.getdata(this.formInline)
-  // },
+  created () {
+    this.getdata(this.formInline)
+  },
 
   /**
    * 里面的方法只有被调用才会执行
    */
   methods: {
-    getList(){
-      let that =this
-      this.$axios.get('http://175.27.138.106:3001/student_honor/?page='+this.formInline.page+'&&page_size='+this.formInline.limit).then(
-        function (res) {
-          let array=res.results;
-          that.pageparm.total=res.count;
-          that.listData=array.map((item)=>{
-            return{info:item.info,honor_date:item.honor_date}
-          })
-        }).catch(function () {
-      })
-    },
-    searchList(para){
-      let that =this
-      this.$axios.get('http://175.27.138.106:3001/student_honor/?page='+this.formInline.page+'&&page_size='+this.formInline.limit+'&search='+para.info).then(
-        function (res) {
-          let array=res.results;
-          that.pageparm.total=res.count;
-          that.listData=array.map((item)=>{
-            return{info:item.info,honor_date:item.honor_date}
-          })
-        }).catch(function () {
+    // getList () {
+    //   let that = this
+    //   this.$axios.get('http://175.27.138.106:3001/student_honor/?page=' + this.formInline.page + '&&page_size=' +
+    //     this.formInline.limit).then(
+    //     function (res) {
+    //       let array = res.results
+    //       that.pageparm.total = res.count
+    //       that.listData = array.map((item) => {
+    //         return { info: item.info, honor_date: item.honor_date }
+    //       })
+    //     }).catch(function () {
+    //   })
+    // },
+    // searchList (para) {
+    //   let that = this
+    //   this.$axios.get('http://175.27.138.106:3001/student_honor/?page=' + this.formInline.page + '&&page_size=' +
+    //     this.formInline.limit + '&search=' + para.info).then(
+    //     function (res) {
+    //       let array = res.results
+    //       that.pageparm.total = res.count
+    //       that.listData = array.map((item) => {
+    //         return { info: item.info, honor_date: item.honor_date }
+    //       })
+    //     }).catch(function () {
+    //   })
+    // },
+    getdata (parameter) {
+      this.loading = true
+      let that = this
+      let params = {
+        page: parameter.page,
+        page_size: parameter.limit,
+        search: parameter.info,
+      }
+      get(`/student_honor/`, params).then(res => {
+        let array = res.results
+        that.pageparm.total = res.count
+        that.listData = array.map((item) => {
+          return { info: item.info, honor_date: item.honor_date, id: item.id }
+        })
+        this.loading = false
+      }).catch(err => {
+        this.$message.error('加载失败')
       })
     },
-    // 获取公司列表
-    // 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('菜单加载失败，请稍后再试！')
-    //   //   })
-    // },
     // 分页插件事件
     callFather (parm) {
       this.formInline.page = parm.currentPage
       this.formInline.limit = parm.pageSize
-      this.getList()
+      this.getdata(this.formInline)
     },
     // 搜索事件
     search () {
-      this.searchList(this.formInline)
+      this.getdata(this.formInline)
     },
     //显示编辑界面
     handleEdit: function (index, row) {
       this.editFormVisible = true
       if (row !== undefined && row !== 'undefined') {
         this.title = '修改'
+        this.editForm.editId = row.id
         this.editForm.info = row.info
         this.editForm.honor_date = row.honor_date
       } else {
@@ -209,17 +187,17 @@ export default {
     },
     // 编辑、增加页面保存方法
     submitForm (editData) {
-        this.$refs[editData].validate(valid => {
-          if (!valid || this.title === undefined || this.title !== '修改') {
-            return false
-          }
-          put(`/students_honor/${this.editId}/`, { ...this.editForm }).then(() => {
-            this.editFormVisible = false
-            this.$message.success('修改成功')
-            this.getList()
-          }).catch(error => this.$message.error('修改失败'))
-        })
-      },
+      this.$refs[editData].validate(valid => {
+        if (!valid || this.title === undefined || this.title !== '修改') {
+          return false
+        }
+        put(`/student_honor/${this.editForm.editId}/`, { ...this.editForm }).then(() => {
+          this.editFormVisible = false
+          this.$message.success('修改成功')
+          this.getdata(this.formInline)
+        }).catch(error => this.$message.error('修改失败'))
+      })
+    },
     // 删除公司
     deleteUser (index, row) {
       this.$confirm('确定要删除该文章?', '信息', {
@@ -243,9 +221,6 @@ export default {
       this.$refs[formName].resetFields()
     },
   },
-  mounted() {
-    this.getList()
-  }
 }
 </script>
 
-- 
Gitee