diff --git a/chenhai-ui/package.json b/chenhai-ui/package.json index d113430..20fe953 100644 --- a/chenhai-ui/package.json +++ b/chenhai-ui/package.json @@ -24,6 +24,7 @@ "url": "https://gitee.com/y_project/RuoYi-Vue.git" }, "dependencies": { + "@element-plus/icons-vue": "^2.3.2", "@riophae/vue-treeselect": "0.4.0", "axios": "0.28.1", "clipboard": "2.0.8", diff --git a/chenhai-ui/src/api/vet/article.js b/chenhai-ui/src/api/vet/article.js index 96dc4d0..6e0156a 100644 --- a/chenhai-ui/src/api/vet/article.js +++ b/chenhai-ui/src/api/vet/article.js @@ -1,136 +1,159 @@ import request from '@/utils/request' -// 获取论坛首页文章列表 -export function getForumHome(params) { +// 查询兽医经验文章列表(论坛首页) +export function listArticle(query) { return request({ - url: '/vet/article/forum/home', + url: '/vet/article/list', method: 'get', - params - }); -} - -// 获取文章详情(自动增加浏览数) -export function getForumDetail(id) { - return request({ - url: `/vet/article/forum/detail/${id}`, - method: 'get' - }); + params: query + }) } -// 发布论坛文章 -export function publishForumArticle(data) { +// 查询我的文章列表 +export function listMyArticle(query) { return request({ - url: '/vet/article/forum/publish', - method: 'post', - data - }); + url: '/vet/article/myList', + method: 'get', + params: query + }) } -// 获取当前用户的文章列表 -export function getMyForumArticles(params) { +// 查询兽医经验文章详细(包含相关文章) +export function getArticle(id) { return request({ - url: '/vet/article/forum/myArticles', - method: 'get', - params - }); + url: '/vet/article/' + id, + method: 'get' + }) } -// 点赞文章 -export function likeForumArticle(id) { +// 新增兽医经验文章(发布文章) +export function addArticle(data) { return request({ - url: `/forum/${id}/like`, - method: 'post' - }); + url: '/vet/article', + method: 'post', + data: data + }) } -// 收藏文章 -export function collectForumArticle(id) { +// 修改兽医经验文章 +export function updateArticle(data) { return request({ - url: `/forum/${id}/collect`, - method: 'post' - }); + url: '/vet/article', + method: 'put', + data: data + }) } -// 搜索论坛文章 -export function searchForumArticle(params) { +// 删除兽医经验文章 +export function delArticle(id) { return request({ - url: '/forum/search', - method: 'get', - params: params - }); + url: '/vet/article/' + id, + method: 'delete' + }) } -// 获取热门标签 -export function getForumHotTags() { +// 获取分类选项 +export function getCategoryOptions() { return request({ - url: '/forum/hotTags', + url: '/vet/article/options', method: 'get' - }); + }) } -// 根据分类查询文章 -export function getArticlesByCategory(categoryId) { +// 获取标签选项 +export function getTagOptions() { return request({ - url: '/vet/article/' + categoryId + '/articles', + url: '/vet/article/tags/options', method: 'get' - }); + }) } -// 获取分类列表 -export function getArticleOptions() { +// 点赞文章 +export function likeArticle(id) { return request({ - url: '/vet/article/options', - method: 'get' - }); + url: '/vet/article/' + id + '/like', + method: 'post' + }) } -// 获取文章统计信息 -export function getMySimpleStats() { +// 收藏文章 +export function collectArticle(id) { return request({ - url: '/vet/article/my/simpleStats', - method: 'get' - }); + url: '/vet/article/' + id + '/collect', + method: 'post' + }) } -// 查询兽医经验文章列表 -export function listArticle(query) { +// 获取我的收藏文章列表 +export function getMyCollections(query) { return request({ - url: '/vet/article/list', + url: '/vet/article/myCollections', method: 'get', params: query }) } -// 查询兽医经验文章详细 -export function getArticle(id) { +// 获取论坛统计信息 +export function getStatistics() { return request({ - url: '/vet/article/' + id, + url: '/vet/article/statistics', method: 'get' }) } -// 新增兽医经验文章 -export function addArticle(data) { + +// 获取最新文章 +export function getLatestArticles(limit = 10) { return request({ - url: '/vet/article', - method: 'post', - data: data + url: '/vet/article/latest', + method: 'get', + params: { limit } }) } -// 修改兽医经验文章 -export function updateArticle(data) { + +// 搜索文章 +export function searchArticles(keyword) { return request({ - url: '/vet/article', - method: 'put', - data: data + url: '/vet/article/search', + method: 'get', + params: { keyword } }) } -// 删除兽医经验文章 -export function delArticle(id) { +export function getForumHome() { return request({ - url: '/vet/article/' + id, - method: 'delete' + url: '/vet/article/statistics', + method: 'get' }) } + +// 论坛文章详情 +export function getForumDetail(id) { + return getArticle(id) +} + +// 发布论坛文章 +export function publishForumArticle(data) { + return addArticle(data) +} + +// 我的文章 +export function getMyForumArticles(query) { + return listMyArticle(query) +} + +// 点赞文章 +export function likeForumArticle(id) { + return likeArticle(id) +} + +// 收藏文章 +export function collectForumArticle(id) { + return collectArticle(id) +} + +// 搜索文章 +export function searchForumArticles(query) { + return searchArticles(query.keyword) +} diff --git a/chenhai-ui/src/api/vet/qualification.js b/chenhai-ui/src/api/vet/qualification.js index 89c255f..1eb029c 100644 --- a/chenhai-ui/src/api/vet/qualification.js +++ b/chenhai-ui/src/api/vet/qualification.js @@ -9,6 +9,23 @@ export function submitAuditQualification(data) { }) } +// 获取兽医资质审核状态 +export function getQualificationStatus() { + return request({ + url: '/vet/qualification/checkNeedQualification', + method: 'get' + }) +} + +// 重新提交 +export function resubmitQualification(data) { + return request({ + url: '/vet/qualification/resubmit', + method: 'post', + data: data, + }) +} + // 兽医资质提交审核 // export function submitAuditQualification(qualificationId) { // return request({ @@ -26,6 +43,14 @@ export function auditQualification(data) { }) } +// 获取证书列表 +export function getQualificationCertificates() { + return request({ + url: '/vet/qualification/certificate/list', + method: 'get', + }) +} + // 获取资质类型列表 export function getQualificationTypeOptions() { return request({ @@ -42,14 +67,12 @@ export function getScopeOptions() { }) } +// 资质上传 export function uploadQualification(data) { return request({ url: '/vet/qualification/upload', method: 'post', data: data, - headers: { - 'Content-Type': 'multipart/form-data' - }, }) } @@ -63,9 +86,20 @@ export function listQualification(query) { } // 查询兽医资质详细 -export function getQualification(qualificationId) { +export function getQualification(qualificationId, certId) { return request({ url: '/vet/qualification/' + qualificationId, + method: 'get', + params: { + certId: certId + } + }) +} + +// 证书详情 +export function getQualificationCertificate(certId) { + return request({ + url: '/vet/qualification/certificate/' + certId, method: 'get' }) } @@ -96,7 +130,7 @@ export function delQualification(qualificationId) { }) } - +// 提交审核 export function submitQualification(data) { return request({ url: '/vet/qualification/submit', @@ -105,5 +139,14 @@ export function submitQualification(data) { }) } +// 重新提交 +export function updateAndSubmitQualification(data) { + return request({ + url: '/vet/qualification/certificate/updateAndSubmit', + method: 'post', + data: data + }) +} + diff --git a/chenhai-ui/src/assets/images/tz.png b/chenhai-ui/src/assets/images/tz.png new file mode 100644 index 0000000..c8da7ab Binary files /dev/null and b/chenhai-ui/src/assets/images/tz.png differ diff --git a/chenhai-ui/src/assets/images/tz1.png b/chenhai-ui/src/assets/images/tz1.png new file mode 100644 index 0000000..62b0020 Binary files /dev/null and b/chenhai-ui/src/assets/images/tz1.png differ diff --git a/chenhai-ui/src/views/syd.vue b/chenhai-ui/src/views/syd.vue index 8edfd6f..d86ccdb 100644 --- a/chenhai-ui/src/views/syd.vue +++ b/chenhai-ui/src/views/syd.vue @@ -1,6 +1,5 @@ - - diff --git a/chenhai-ui/src/views/vet/article/index.vue b/chenhai-ui/src/views/vet/article/index.vue index a9ac69f..2b48166 100644 --- a/chenhai-ui/src/views/vet/article/index.vue +++ b/chenhai-ui/src/views/vet/article/index.vue @@ -1,821 +1,1716 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/chenhai-ui/src/views/vet/info/index.vue b/chenhai-ui/src/views/vet/info/index.vue index 7791f3c..11c4092 100644 --- a/chenhai-ui/src/views/vet/info/index.vue +++ b/chenhai-ui/src/views/vet/info/index.vue @@ -446,6 +446,7 @@ export default { this.$message.error('获取详情失败') }) }, + /** 新增按钮操作 */ handleAdd() { this.reset() diff --git a/chenhai-ui/src/views/vet/qualification/index.vue b/chenhai-ui/src/views/vet/qualification/index.vue index f35ea29..773fd98 100644 --- a/chenhai-ui/src/views/vet/qualification/index.vue +++ b/chenhai-ui/src/views/vet/qualification/index.vue @@ -18,21 +18,36 @@ /> - - - - + > + + + + + + + + + + + + + + + + + + 删除 - - 导出 - + + + + + + + + + + - - - - - - - - - - - - - + + + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -210,26 +269,141 @@ @pagination="getList" /> + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+ + +
+ +
+
+ + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - @@ -254,22 +428,26 @@ style="width: 100%">
- - + + + + + + - - - - @@ -277,16 +455,19 @@