From 04d9c4ab1186a9c0490fad8093fbf7fac8bd871a Mon Sep 17 00:00:00 2001
From: Riollee <530377286@qq.com>
Date: Sat, 7 Aug 2021 14:31:11 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90feat=E3=80=91=E9=87=8D=E6=9E=84http?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/navcon.vue       |   8 +--
 src/utils/http.js               | 123 ++++++++++++--------------------
 src/views/Content/News.vue      |  66 ++++-------------
 src/views/Content/Patents.vue   |  22 +++---
 src/views/Editor/EditorPage.vue |  44 ++++++------
 src/views/user/UsersManage.vue  |  20 +++---
 6 files changed, 109 insertions(+), 174 deletions(-)

diff --git a/src/components/navcon.vue b/src/components/navcon.vue
index 02b9678..3789b13 100644
--- a/src/components/navcon.vue
+++ b/src/components/navcon.vue
@@ -1,6 +1,6 @@
 /**
 * 头部菜单
-*/ 
+*/
 <template>
   <el-menu class="el-menu-demo" mode="horizontal" background-color="#334157" text-color="#fff" active-text-color="#fff">
     <el-button class="buttonimg">
@@ -9,8 +9,8 @@
     <el-submenu index="2" class="submenu">
       <!-- <template slot="title">{{user.userRealName}}</template> -->
       <template slot="title">超级管理员</template>
-      <el-menu-item index="2-1">设置</el-menu-item>
-      <el-menu-item @click="content()" index="2-2">个人中心</el-menu-item>
+      <el-menu-item index="2-1" style="display: none">设置</el-menu-item>
+      <el-menu-item @click="content()" index="2-2" style="display: none">个人中心</el-menu-item>
       <el-menu-item @click="exit()" index="2-3">退出</el-menu-item>
     </el-submenu>
   </el-menu>
@@ -110,4 +110,4 @@ export default {
 .showimg:active {
   border: none;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/utils/http.js b/src/utils/http.js
index ac8693f..13524c4 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -30,7 +30,6 @@ export const warning = async msg => {
  */
 axios.defaults.timeout = 5000 //请求超时5秒
 // axios.defaults.baseURL = '/api'  //请求base url
-// axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded' //设置post请求是的header信息
 
 /**
  * 请求头Token
@@ -57,17 +56,15 @@ axios.interceptors.request.use(
 axios.interceptors.response.use(
   response => {
     console.log('httpBack', response)
-    if(response.data.code === undefined) {
+    if (response.data.code === undefined) {
       return response.data
     }
     switch (response.data.code) {
-      case AUTH_ERROR: {
-        Router.push({
-          path: '/login',
-          // query: { redirect:  },
-        })
-        return Promise.reject()
-      }
+      case OK:
+        return response.data
+      case AUTH_ERROR:
+        Router.push({ path: '/login' })
+        return Promise.reject(response.data.details)
       case FAIL:
         return Promise.reject(response.data.details)
       default:
@@ -82,54 +79,55 @@ axios.interceptors.response.use(
 )
 
 /**
- * 封装get请求
+ * 封装ajax请求
+ * @param method
  * @param url
- * @param data 请求参数
- * @returns {Promise}
+ * @param data
+ * @param params
+ * @param headers
+ * @returns {Promise<unknown>}
  */
-export function get (url, params = {}, headers = {}) {
+function request (method, url, data = {}, params = {}, headers = {}) {
+  let config = {
+    method,
+    url,
+    params,
+    headers,
+  }
+  if (method === 'post' || method === 'put') {
+    config.data = data
+  }
   return new Promise((resolve, reject) => {
-    axios.get(url, {
-      params: params,
-      headers: headers,
-    }).then(response => {
-      console.log('response', response)
-      // if(response.code !== 1) {
-      //   reject(response.msg)
-      // }
-      resolve(response)
+    axios(config).then(value => {
+      console.log('response', value)
+      resolve(value)
     }, reason => {
+      console.log('请求失败', reason)
       reject(reason)
-    }).catch(err => {
-      reject(err)
     })
   })
 }
 
+/**
+ * 封装get请求
+ * @param url
+ * @param params
+ * @param headers
+ * @returns {Promise}
+ */
+export const get = (url, params = {}, headers = {}) => request('get', url, {},
+  params, headers)
+
 /**
  * 封装post请求
  * @param url
  * @param data
+ * @param params
+ * @param headers
  * @returns {Promise}
  */
-export function post (url, data = {}, params = {}, headers = {}) {
-  return new Promise((resolve, reject) => {
-    axios.post(url, data, {
-      params: params,
-      headers: headers,
-    }).then(response => {
-      console.log('response', response)
-      // if(response.code !== 1) {
-      //   reject(response.msg)
-      // }
-      resolve(response)
-    }, reason => {
-      reject(reason)
-    }).catch(err => {
-      reject(err)
-    })
-  })
-}
+export const post = (url, data = {}, params = {}, headers = {}) => request(
+  'post', url, data, params, headers)
 
 /**
  * 封装delete请求
@@ -138,24 +136,8 @@ export function post (url, data = {}, params = {}, headers = {}) {
  * @param headers
  * @returns {Promise<unknown>}
  */
-export function Delete (url, params = {}, headers = {}) {
-  return new Promise((resolve, reject) => {
-    axios.delete(url, {
-      params: params,
-      headers: headers,
-    }).then(response => {
-      console.log('response', response)
-      // if(response.code !== 1) {
-      //   reject(response.msg)
-      // }
-      resolve(response)
-    }, reason => {
-      reject(reason)
-    }).catch(err => {
-      reject(err)
-    })
-  })
-}
+export const Delete = (url, params = {}, headers = {}) => request('delete', url,
+  {}, params, headers)
 
 /**
  * 封装put请求
@@ -165,21 +147,6 @@ export function Delete (url, params = {}, headers = {}) {
  * @param headers
  * @returns {Promise<unknown>}
  */
-export function put (url, data = {}, params = {}, headers = {}) {
-  return new Promise((resolve, reject) => {
-    axios.put(url, data, {
-      params: params,
-      headers: headers,
-    }).then(response => {
-      console.log('response', response)
-      // if(response.code !== 1) {
-      //   reject(response.msg)
-      // }
-      resolve(response)
-    }, reason => {
-      reject(reason)
-    }).catch(err => {
-      reject(err)
-    })
-  })
-}
+export const put = (url, data = {}, params = {}, headers = {}) => request('put',
+  url, data, params, headers)
+
diff --git a/src/views/Content/News.vue b/src/views/Content/News.vue
index fd19b81..07c7313 100644
--- a/src/views/Content/News.vue
+++ b/src/views/Content/News.vue
@@ -40,46 +40,13 @@
                        show-overflow-tooltip/>
       <el-table-column align="center" label="操作" width="200">
         <template slot-scope="scope">
-          <el-button size="mini" @click="handleEdit(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 :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-form-item>
-        <el-form-item label="新闻正文" prop="content">
-          <el-input disabled size="small" v-model="editForm.content" auto-complete="off"
-                    placeholder="请输入新闻正文内容"></el-input>
-        </el-form-item>
-        <el-form-item label="新闻附件路径" prop="file">
-          <el-input disabled size="small" v-model="editForm.file" auto-complete="off"
-                    placeholder="请输入新闻附件路径"></el-input>
-        </el-form-item>
-        <el-form-item label="新闻种类" prop="type">
-          <el-select size="small" v-model="editForm.type" placeholder="请选择新闻种类">
-            <el-option
-              v-for="item in newsOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </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>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
@@ -131,7 +98,6 @@ export default {
         },
       ],
       loading: false, //是显示加载
-      editFormVisible: false, //控制编辑页面显示与隐藏
       title: '',
       editForm: {
         title: '',
@@ -167,7 +133,7 @@ export default {
   },
 
   watch: {
-    'formInline.type': function (newVal, oldVal) {
+    'formInline.type': function () {
       this.getdata(this.formInline)
     },
   },
@@ -210,7 +176,7 @@ export default {
         page: parameter.page,
         page_size: parameter.limit,
       }
-      if (parameter.type >= 0 && parameter.type <= 3) {
+      if (parameter.type !== '' && parameter.type >= 0 && parameter.type <= 3) {
         params.type = parameter.type
       }
       if (parameter.search !== '') {
@@ -222,13 +188,17 @@ export default {
         that.pageparm.pageSize = that.formInline.pageSize
         that.pageparm.total = value.count
         this.loading = false
-      }).catch(err => {
-        this.$message.error('加载失败')
+      }, reason => this.$message.warning(reason)).catch(() => {
+        this.$message.error('未知错误，加载失败')
       })
     },
 
     callFather (parm) {
-      this.formInline.page = parm.currentPage
+      if (this.formInline.limit !== parm.pageSize) {
+        this.formInline.page = 1
+      } else {
+        this.formInline.page = parm.currentPage
+      }
       this.formInline.limit = parm.pageSize
       this.getdata(this.formInline)
     },
@@ -238,12 +208,11 @@ export default {
     },
 
     handleEdit: function (index, row) {
-      // this.editFormVisible = true
       if (row !== undefined && row !== 'undefined') {
         this.editId = row.id
-        this.$router.push({ name: 'newsEditor', params: { newsId: this.editId.toString() }})
+        this.$router.push({ name: 'newsEditor', params: { newsId: this.editId.toString() } })
       } else {
-        this.$router.push({ name: 'newsEditor', params: { newsId: '0' }})
+        this.$router.push({ name: 'newsEditor', params: { newsId: '0' } })
       }
     },
 
@@ -253,10 +222,9 @@ export default {
           return false
         }
         put(`/news/${this.editForm.editId}/`, { ...this.editForm }).then(() => {
-          this.editFormVisible = false
           this.$message.success('修改成功')
           this.getdata(this.formInline)
-        }).catch(error => this.$message.error('修改失败'))
+        }, reason => this.$message.warning(reason)).catch(() => this.$message.error('未知错误，修改失败'))
       })
     },
 
@@ -270,17 +238,13 @@ export default {
           Delete(`/news/${row.id}/`).then(() => {
             this.$message.success('删除成功')
             this.getdata(this.formInline)
-          }).catch(err => this.$message.error('删除失败'))
+          }, reason => this.$message.warning(reason)).catch(() => this.$message.error('未知错误，删除失败'))
         } else {
-          this.$message.error('删除失败')
+          this.$message.error('未知错误，删除失败')
         }
       })
     },
 
-    closeDialog (formName) {
-      this.editFormVisible = false
-      this.$refs['editForm'].resetFields()
-    },
   },
 }
 </script>
diff --git a/src/views/Content/Patents.vue b/src/views/Content/Patents.vue
index 7d873a6..99fa231 100644
--- a/src/views/Content/Patents.vue
+++ b/src/views/Content/Patents.vue
@@ -228,13 +228,16 @@ export default {
         that.pageparm.pageSize = that.formInline.pageSize
         that.pageparm.total = value.count
         this.loading = false
-      }).catch(() => {
-        this.$message.error('加载失败')
-      })
+      }, reason => this.$message.warning(reason)).catch(() =>
+        this.$message.error('未知错误，加载失败'))
     },
 
     callFather (parm) {
-      this.formInline.page = parm.currentPage
+      if (this.formInline.limit !== parm.pageSize) {
+        this.formInline.page = 1
+      } else {
+        this.formInline.page = parm.currentPage
+      }
       this.formInline.limit = parm.pageSize
       this.getdata(this.formInline)
     },
@@ -273,13 +276,13 @@ export default {
             this.editFormVisible = false
             this.$message.success('修改成功')
             this.getdata(this.formInline)
-          }).catch(error => this.$message.error('修改失败'))
+          }, reason => this.$message.warning(reason)).catch(() => this.$message.error('未知错误，修改失败'))
         } else if (this.title === '添加') {
           post(`/patent/`, { ...this.editForm }).then(() => {
             this.editFormVisible = false
             this.$message.success('添加成功')
             this.getdata(this.formInline)
-          }).catch(() => this.$message.error('添加失败'))
+          }, reason => this.$message.warning(reason)).catch(() => this.$message.error('未知错误，添加失败'))
         }
       })
     },
@@ -294,9 +297,9 @@ export default {
           Delete(`/patent/${row.id}/`).then(() => {
             this.$message.success('删除成功')
             this.getdata(this.formInline)
-          }).catch(err => this.$message.error('删除失败'))
+          }, reason => this.$message.warning(reason)).catch(() => this.$message.error('未知错误，删除失败'))
         } else {
-          this.$message.error('删除失败')
+          this.$message.error('未知错误，删除失败')
         }
       })
     },
@@ -314,9 +317,6 @@ export default {
   margin-top: 20px;
 }
 
-.userRole {
-  width: 100%;
-}
 </style>
 
 
diff --git a/src/views/Editor/EditorPage.vue b/src/views/Editor/EditorPage.vue
index 0a603f4..fdfb09b 100644
--- a/src/views/Editor/EditorPage.vue
+++ b/src/views/Editor/EditorPage.vue
@@ -77,7 +77,7 @@ export default {
       addArr: [],
       fileName: '',
       fileFormat: '.zip,.rar,.7z',
-      newsFileExist: false
+      newsFileExist: false,
     }
   },
 
@@ -96,27 +96,25 @@ export default {
       let formData = new FormData()
       formData.append('image', resultFiles[0])
       post(`/image/`, formData).then(value => {
-        console.log('value', value)
-        insertImgFn(value.data.image)
-      }, reason => {
-        this.$message.error(reason)
-      }).catch(err => this.$message.error(err))
+          console.log('value', value)
+          insertImgFn(value.data.image)
+        }, reason => this.$message.warning(reason),
+      ).catch(err => this.$message.error(err))
     }
 
     // 创建编辑器
     editor.create()
     this.editor = editor
 
-    if(this.newsId > 0) {
+    if (this.newsId > 0) {
       get(`/news/${this.newsId}`).then(value => {
-        this.editForm.newsTitle = value.title
-        this.editForm.newsType = value.type
-        editor.txt.html(value.content)
-        this.fileName = '该新闻已有文件'
-        this.newsFileExist = true
-      }, reason => {
-        this.$message.error(reason)
-      }).catch(error => this.$message.error(error))
+          this.editForm.newsTitle = value.title
+          this.editForm.newsType = value.type
+          editor.txt.html(value.content)
+          this.fileName = '该新闻已有附件'
+          this.newsFileExist = true
+        }, reason => this.$message.warning(reason),
+      ).catch(() => this.$message.error('未知错误，获取新闻失败'))
     }
   },
 
@@ -148,7 +146,7 @@ export default {
         formData.append('title', this.editForm.newsTitle)
         formData.append('content', newsContent.toString())
         formData.append('type', this.editForm.newsType)
-        if(!this.newsFileExist) {
+        if (!this.newsFileExist) {
           formData.append('file ', this.addArr[0])
         }
         let headers = {
@@ -156,14 +154,16 @@ export default {
         }
         if (this.newsId <= 0) {
           post(`/news/`, formData, {}, headers).then(() => {
-            this.$message.success('新闻发布成功')
-            this.$router.push({ name: 'NewsManage' })
-          }, reason => {this.$message.error(reason)}).catch(err => this.$message.error('新闻发布失败'))
+              this.$message.success('新闻发布成功')
+              this.$router.push({ name: 'NewsManage' })
+            }, reason => {this.$message.error(reason)},
+          ).catch(err => this.$message.error('未知错误，新闻发布失败'))
         } else {
           put(`/news/${this.newsId}/`, formData, {}, headers).then(() => {
-            this.$message.success('新闻修改成功')
-            this.$router.push({ name: 'NewsManage' })
-          }, reason => {this.$message.error(reason)}).catch(error => this.$message.error('修改失败'))
+              this.$message.success('新闻修改成功')
+              this.$router.push({ name: 'NewsManage' })
+            }, reason => {this.$message.error(reason)},
+          ).catch(error => this.$message.error('未知错误，新闻修改失败'))
         }
       })
     },
diff --git a/src/views/user/UsersManage.vue b/src/views/user/UsersManage.vue
index 14a4d21..6d802cc 100644
--- a/src/views/user/UsersManage.vue
+++ b/src/views/user/UsersManage.vue
@@ -35,7 +35,8 @@
           <el-input size="small" v-model="editForm.username" auto-complete="off" placeholder="请输入用户名"></el-input>
         </el-form-item>
         <el-form-item label="密码" prop="password">
-          <el-input size="small" v-model="editForm.password" auto-complete="off" placeholder="请输入密码" show-password></el-input>
+          <el-input size="small" v-model="editForm.password" auto-complete="off" placeholder="请输入密码"
+                    show-password></el-input>
         </el-form-item>
         <el-form-item label="邮箱" prop="email">
           <el-input size="small" v-model="editForm.email" auto-complete="off" placeholder="请输入邮箱"></el-input>
@@ -114,9 +115,9 @@ export default {
         that.pageparm.pageSize = that.formInline.pageSize
         that.pageparm.total = value.count
         this.loading = false
-      }).catch(() => {
-        this.$message.error('加载失败')
-      })
+      }, reason => this.$message.warning(reason)).catch(() =>
+        this.$message.error('未知错误，加载失败'),
+      )
     },
 
     callFather (parm) {
@@ -155,13 +156,15 @@ export default {
             this.editFormVisible = false
             this.$message.success('修改成功')
             this.getdata(this.formInline)
-          }).catch(error => this.$message.error('修改失败'))
+          }, reason => this.$message.warning(reason)).catch(() =>
+            this.$message.error('未知错误，修改失败'))
         } else if (this.title === '添加') {
           post(`/user/`, { ...this.editForm }).then(() => {
             this.editFormVisible = false
             this.$message.success('添加成功')
             this.getdata(this.formInline)
-          }).catch(() => this.$message.error('添加失败'))
+          }, reason => this.$message.warning(reason)).catch(() =>
+            this.$message.error('未知错误，添加失败'))
         }
       })
     },
@@ -176,9 +179,10 @@ export default {
           Delete(`/user/${row.id}/`).then(() => {
             this.$message.success('删除成功')
             this.getdata(this.formInline)
-          }).catch(err => this.$message.error('删除失败'))
+          }, reason => this.$message.warning(reason)).catch(() =>
+            this.$message.error('未知错误，删除失败'))
         } else {
-          this.$message.error('删除失败')
+          this.$message.error('未知错误，删除失败')
         }
       })
     },
-- 
Gitee