diff --git a/src/api/knowledge.js b/src/api/knowledge.js index d190bfc..f5c38f1 100644 --- a/src/api/knowledge.js +++ b/src/api/knowledge.js @@ -15,24 +15,26 @@ // 知识库列表 export function knowledgeList(params) { return request({ - url: '/role/list', + url: '/knowledge/listPage', method: 'get', params }) } // 知识库详情 -export function knowledgeDetail(params) { +export function knowledgeDetail(id) { return request({ url: '/knowledge/detail', method: 'get', - params + params: { + kId: id + } }) } // 添加知识 export function addKnowledge(params) { return request({ - url: 'role/add', + url: '/knowledge/add', method: 'post', params }) @@ -40,7 +42,7 @@ // 修改知识 export function updateKnowledge(params) { return request({ - url: 'role/update', + url: '/knowledge/update', method: 'post', params }) @@ -48,23 +50,20 @@ // 审核知识 export function checkKnowledge(params) { return request({ - url: 'role/update', + url: '/knowledge/check', method: 'post', params }) } // 上架知识 -export function groundingKnowledge(type, ids, validPeriod) { +export function groundingKnowledge(type, ids, validPeroid) { return request({ - url: 'role/update', + url: '/knowledge/grounding', method: 'post', params: { groundingStatus: type, ids: ids, - validPeriod: validPeriod - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + validPeroid: validPeroid } }) } @@ -73,7 +72,7 @@ // 获取知识库类别列表 export function getTypeList(params) { return request({ - url: 'role/list', + url: '/ktype/list', method: 'get', params }) @@ -82,7 +81,7 @@ // 添加类别 export function addType(params) { return request({ - url: 'role/add', + url: '/ktype/add', method: 'post', params }) @@ -90,7 +89,7 @@ // 修改类别 export function updateType(params) { return request({ - url: 'role/update', + url: '/ktype/update', method: 'post', params }) @@ -98,7 +97,7 @@ // 删除类别 export function delType(id) { return request({ - url: 'role/delete', + url: '/ktype/delete', method: 'post', params: { id: id diff --git a/src/api/knowledge.js b/src/api/knowledge.js index d190bfc..f5c38f1 100644 --- a/src/api/knowledge.js +++ b/src/api/knowledge.js @@ -15,24 +15,26 @@ // 知识库列表 export function knowledgeList(params) { return request({ - url: '/role/list', + url: '/knowledge/listPage', method: 'get', params }) } // 知识库详情 -export function knowledgeDetail(params) { +export function knowledgeDetail(id) { return request({ url: '/knowledge/detail', method: 'get', - params + params: { + kId: id + } }) } // 添加知识 export function addKnowledge(params) { return request({ - url: 'role/add', + url: '/knowledge/add', method: 'post', params }) @@ -40,7 +42,7 @@ // 修改知识 export function updateKnowledge(params) { return request({ - url: 'role/update', + url: '/knowledge/update', method: 'post', params }) @@ -48,23 +50,20 @@ // 审核知识 export function checkKnowledge(params) { return request({ - url: 'role/update', + url: '/knowledge/check', method: 'post', params }) } // 上架知识 -export function groundingKnowledge(type, ids, validPeriod) { +export function groundingKnowledge(type, ids, validPeroid) { return request({ - url: 'role/update', + url: '/knowledge/grounding', method: 'post', params: { groundingStatus: type, ids: ids, - validPeriod: validPeriod - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + validPeroid: validPeroid } }) } @@ -73,7 +72,7 @@ // 获取知识库类别列表 export function getTypeList(params) { return request({ - url: 'role/list', + url: '/ktype/list', method: 'get', params }) @@ -82,7 +81,7 @@ // 添加类别 export function addType(params) { return request({ - url: 'role/add', + url: '/ktype/add', method: 'post', params }) @@ -90,7 +89,7 @@ // 修改类别 export function updateType(params) { return request({ - url: 'role/update', + url: '/ktype/update', method: 'post', params }) @@ -98,7 +97,7 @@ // 删除类别 export function delType(id) { return request({ - url: 'role/delete', + url: '/ktype/delete', method: 'post', params: { id: id diff --git a/src/views/knowledgeManage/components/TypeTree.vue b/src/views/knowledgeManage/components/TypeTree.vue index facb992..2240c66 100644 --- a/src/views/knowledgeManage/components/TypeTree.vue +++ b/src/views/knowledgeManage/components/TypeTree.vue @@ -45,12 +45,12 @@ fetchTypeTree() { this.treeLoading = true getTypeList().then(response => { - response.data = [ - { typeName: '大类', id: '1', pid: '', deptName: '顶级', num: '1' }, - { typeName: '小类1', id: '2', pid: '1', deptName: '顶级', num: '1' }, - { typeName: '小类2', id: '3', pid: '1', deptName: '顶级', num: '1' } - ] - this.tree = toTreeList(response.data, '', true) + // response.data = [ + // { typeName: '大类', id: '1', pid: '', deptName: '顶级', num: '1' }, + // { typeName: '小类1', id: '2', pid: '1', deptName: '顶级', num: '1' }, + // { typeName: '小类2', id: '3', pid: '1', deptName: '顶级', num: '1' } + // ] + this.tree = toTreeList(response.data, '-1', true) this.treeLoading = false }) }, diff --git a/src/api/knowledge.js b/src/api/knowledge.js index d190bfc..f5c38f1 100644 --- a/src/api/knowledge.js +++ b/src/api/knowledge.js @@ -15,24 +15,26 @@ // 知识库列表 export function knowledgeList(params) { return request({ - url: '/role/list', + url: '/knowledge/listPage', method: 'get', params }) } // 知识库详情 -export function knowledgeDetail(params) { +export function knowledgeDetail(id) { return request({ url: '/knowledge/detail', method: 'get', - params + params: { + kId: id + } }) } // 添加知识 export function addKnowledge(params) { return request({ - url: 'role/add', + url: '/knowledge/add', method: 'post', params }) @@ -40,7 +42,7 @@ // 修改知识 export function updateKnowledge(params) { return request({ - url: 'role/update', + url: '/knowledge/update', method: 'post', params }) @@ -48,23 +50,20 @@ // 审核知识 export function checkKnowledge(params) { return request({ - url: 'role/update', + url: '/knowledge/check', method: 'post', params }) } // 上架知识 -export function groundingKnowledge(type, ids, validPeriod) { +export function groundingKnowledge(type, ids, validPeroid) { return request({ - url: 'role/update', + url: '/knowledge/grounding', method: 'post', params: { groundingStatus: type, ids: ids, - validPeriod: validPeriod - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + validPeroid: validPeroid } }) } @@ -73,7 +72,7 @@ // 获取知识库类别列表 export function getTypeList(params) { return request({ - url: 'role/list', + url: '/ktype/list', method: 'get', params }) @@ -82,7 +81,7 @@ // 添加类别 export function addType(params) { return request({ - url: 'role/add', + url: '/ktype/add', method: 'post', params }) @@ -90,7 +89,7 @@ // 修改类别 export function updateType(params) { return request({ - url: 'role/update', + url: '/ktype/update', method: 'post', params }) @@ -98,7 +97,7 @@ // 删除类别 export function delType(id) { return request({ - url: 'role/delete', + url: '/ktype/delete', method: 'post', params: { id: id diff --git a/src/views/knowledgeManage/components/TypeTree.vue b/src/views/knowledgeManage/components/TypeTree.vue index facb992..2240c66 100644 --- a/src/views/knowledgeManage/components/TypeTree.vue +++ b/src/views/knowledgeManage/components/TypeTree.vue @@ -45,12 +45,12 @@ fetchTypeTree() { this.treeLoading = true getTypeList().then(response => { - response.data = [ - { typeName: '大类', id: '1', pid: '', deptName: '顶级', num: '1' }, - { typeName: '小类1', id: '2', pid: '1', deptName: '顶级', num: '1' }, - { typeName: '小类2', id: '3', pid: '1', deptName: '顶级', num: '1' } - ] - this.tree = toTreeList(response.data, '', true) + // response.data = [ + // { typeName: '大类', id: '1', pid: '', deptName: '顶级', num: '1' }, + // { typeName: '小类1', id: '2', pid: '1', deptName: '顶级', num: '1' }, + // { typeName: '小类2', id: '3', pid: '1', deptName: '顶级', num: '1' } + // ] + this.tree = toTreeList(response.data, '-1', true) this.treeLoading = false }) }, diff --git a/src/views/knowledgeManage/components/setTimeDialog.vue b/src/views/knowledgeManage/components/setTimeDialog.vue index 98eee7a..f7d4438 100644 --- a/src/views/knowledgeManage/components/setTimeDialog.vue +++ b/src/views/knowledgeManage/components/setTimeDialog.vue @@ -6,6 +6,7 @@ @@ -72,7 +73,7 @@ size: 'small', form: { txt: '' - }, // 表单 + } // 表单 } }, methods: { diff --git a/src/api/knowledge.js b/src/api/knowledge.js index d190bfc..f5c38f1 100644 --- a/src/api/knowledge.js +++ b/src/api/knowledge.js @@ -15,24 +15,26 @@ // 知识库列表 export function knowledgeList(params) { return request({ - url: '/role/list', + url: '/knowledge/listPage', method: 'get', params }) } // 知识库详情 -export function knowledgeDetail(params) { +export function knowledgeDetail(id) { return request({ url: '/knowledge/detail', method: 'get', - params + params: { + kId: id + } }) } // 添加知识 export function addKnowledge(params) { return request({ - url: 'role/add', + url: '/knowledge/add', method: 'post', params }) @@ -40,7 +42,7 @@ // 修改知识 export function updateKnowledge(params) { return request({ - url: 'role/update', + url: '/knowledge/update', method: 'post', params }) @@ -48,23 +50,20 @@ // 审核知识 export function checkKnowledge(params) { return request({ - url: 'role/update', + url: '/knowledge/check', method: 'post', params }) } // 上架知识 -export function groundingKnowledge(type, ids, validPeriod) { +export function groundingKnowledge(type, ids, validPeroid) { return request({ - url: 'role/update', + url: '/knowledge/grounding', method: 'post', params: { groundingStatus: type, ids: ids, - validPeriod: validPeriod - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + validPeroid: validPeroid } }) } @@ -73,7 +72,7 @@ // 获取知识库类别列表 export function getTypeList(params) { return request({ - url: 'role/list', + url: '/ktype/list', method: 'get', params }) @@ -82,7 +81,7 @@ // 添加类别 export function addType(params) { return request({ - url: 'role/add', + url: '/ktype/add', method: 'post', params }) @@ -90,7 +89,7 @@ // 修改类别 export function updateType(params) { return request({ - url: 'role/update', + url: '/ktype/update', method: 'post', params }) @@ -98,7 +97,7 @@ // 删除类别 export function delType(id) { return request({ - url: 'role/delete', + url: '/ktype/delete', method: 'post', params: { id: id diff --git a/src/views/knowledgeManage/components/TypeTree.vue b/src/views/knowledgeManage/components/TypeTree.vue index facb992..2240c66 100644 --- a/src/views/knowledgeManage/components/TypeTree.vue +++ b/src/views/knowledgeManage/components/TypeTree.vue @@ -45,12 +45,12 @@ fetchTypeTree() { this.treeLoading = true getTypeList().then(response => { - response.data = [ - { typeName: '大类', id: '1', pid: '', deptName: '顶级', num: '1' }, - { typeName: '小类1', id: '2', pid: '1', deptName: '顶级', num: '1' }, - { typeName: '小类2', id: '3', pid: '1', deptName: '顶级', num: '1' } - ] - this.tree = toTreeList(response.data, '', true) + // response.data = [ + // { typeName: '大类', id: '1', pid: '', deptName: '顶级', num: '1' }, + // { typeName: '小类1', id: '2', pid: '1', deptName: '顶级', num: '1' }, + // { typeName: '小类2', id: '3', pid: '1', deptName: '顶级', num: '1' } + // ] + this.tree = toTreeList(response.data, '-1', true) this.treeLoading = false }) }, diff --git a/src/views/knowledgeManage/components/setTimeDialog.vue b/src/views/knowledgeManage/components/setTimeDialog.vue index 98eee7a..f7d4438 100644 --- a/src/views/knowledgeManage/components/setTimeDialog.vue +++ b/src/views/knowledgeManage/components/setTimeDialog.vue @@ -6,6 +6,7 @@ @@ -72,7 +73,7 @@ size: 'small', form: { txt: '' - }, // 表单 + } // 表单 } }, methods: { diff --git a/src/views/knowledgeManage/editKType.vue b/src/views/knowledgeManage/editKType.vue index 5628a23..6f73f7d 100644 --- a/src/views/knowledgeManage/editKType.vue +++ b/src/views/knowledgeManage/editKType.vue @@ -86,13 +86,13 @@ // 加载类别树形下拉菜单 fetchTypeTree: function() { getTypeList(this.listQuery).then(response => { - response.data = [ - { typeName: '大类', id: '1', pid: '', deptName: '顶级', num: '1' }, - { typeName: '小类1', id: '2', pid: '1', deptName: '顶级', num: '1' }, - { typeName: '小类2', id: '3', pid: '1', deptName: '顶级', num: '1' } - ] + // response.data = [ + // { typeName: '大类', id: '1', pid: '', deptName: '顶级', num: '1' }, + // { typeName: '小类1', id: '2', pid: '1', deptName: '顶级', num: '1' }, + // { typeName: '小类2', id: '3', pid: '1', deptName: '顶级', num: '1' } + // ] if (response.data) { - this.typeTreeList = toTreeList(response.data, '0') + this.typeTreeList = toTreeList(response.data, '-1') console.log(this.typeTreeList) } }) diff --git a/src/api/knowledge.js b/src/api/knowledge.js index d190bfc..f5c38f1 100644 --- a/src/api/knowledge.js +++ b/src/api/knowledge.js @@ -15,24 +15,26 @@ // 知识库列表 export function knowledgeList(params) { return request({ - url: '/role/list', + url: '/knowledge/listPage', method: 'get', params }) } // 知识库详情 -export function knowledgeDetail(params) { +export function knowledgeDetail(id) { return request({ url: '/knowledge/detail', method: 'get', - params + params: { + kId: id + } }) } // 添加知识 export function addKnowledge(params) { return request({ - url: 'role/add', + url: '/knowledge/add', method: 'post', params }) @@ -40,7 +42,7 @@ // 修改知识 export function updateKnowledge(params) { return request({ - url: 'role/update', + url: '/knowledge/update', method: 'post', params }) @@ -48,23 +50,20 @@ // 审核知识 export function checkKnowledge(params) { return request({ - url: 'role/update', + url: '/knowledge/check', method: 'post', params }) } // 上架知识 -export function groundingKnowledge(type, ids, validPeriod) { +export function groundingKnowledge(type, ids, validPeroid) { return request({ - url: 'role/update', + url: '/knowledge/grounding', method: 'post', params: { groundingStatus: type, ids: ids, - validPeriod: validPeriod - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + validPeroid: validPeroid } }) } @@ -73,7 +72,7 @@ // 获取知识库类别列表 export function getTypeList(params) { return request({ - url: 'role/list', + url: '/ktype/list', method: 'get', params }) @@ -82,7 +81,7 @@ // 添加类别 export function addType(params) { return request({ - url: 'role/add', + url: '/ktype/add', method: 'post', params }) @@ -90,7 +89,7 @@ // 修改类别 export function updateType(params) { return request({ - url: 'role/update', + url: '/ktype/update', method: 'post', params }) @@ -98,7 +97,7 @@ // 删除类别 export function delType(id) { return request({ - url: 'role/delete', + url: '/ktype/delete', method: 'post', params: { id: id diff --git a/src/views/knowledgeManage/components/TypeTree.vue b/src/views/knowledgeManage/components/TypeTree.vue index facb992..2240c66 100644 --- a/src/views/knowledgeManage/components/TypeTree.vue +++ b/src/views/knowledgeManage/components/TypeTree.vue @@ -45,12 +45,12 @@ fetchTypeTree() { this.treeLoading = true getTypeList().then(response => { - response.data = [ - { typeName: '大类', id: '1', pid: '', deptName: '顶级', num: '1' }, - { typeName: '小类1', id: '2', pid: '1', deptName: '顶级', num: '1' }, - { typeName: '小类2', id: '3', pid: '1', deptName: '顶级', num: '1' } - ] - this.tree = toTreeList(response.data, '', true) + // response.data = [ + // { typeName: '大类', id: '1', pid: '', deptName: '顶级', num: '1' }, + // { typeName: '小类1', id: '2', pid: '1', deptName: '顶级', num: '1' }, + // { typeName: '小类2', id: '3', pid: '1', deptName: '顶级', num: '1' } + // ] + this.tree = toTreeList(response.data, '-1', true) this.treeLoading = false }) }, diff --git a/src/views/knowledgeManage/components/setTimeDialog.vue b/src/views/knowledgeManage/components/setTimeDialog.vue index 98eee7a..f7d4438 100644 --- a/src/views/knowledgeManage/components/setTimeDialog.vue +++ b/src/views/knowledgeManage/components/setTimeDialog.vue @@ -6,6 +6,7 @@ @@ -72,7 +73,7 @@ size: 'small', form: { txt: '' - }, // 表单 + } // 表单 } }, methods: { diff --git a/src/views/knowledgeManage/editKType.vue b/src/views/knowledgeManage/editKType.vue index 5628a23..6f73f7d 100644 --- a/src/views/knowledgeManage/editKType.vue +++ b/src/views/knowledgeManage/editKType.vue @@ -86,13 +86,13 @@ // 加载类别树形下拉菜单 fetchTypeTree: function() { getTypeList(this.listQuery).then(response => { - response.data = [ - { typeName: '大类', id: '1', pid: '', deptName: '顶级', num: '1' }, - { typeName: '小类1', id: '2', pid: '1', deptName: '顶级', num: '1' }, - { typeName: '小类2', id: '3', pid: '1', deptName: '顶级', num: '1' } - ] + // response.data = [ + // { typeName: '大类', id: '1', pid: '', deptName: '顶级', num: '1' }, + // { typeName: '小类1', id: '2', pid: '1', deptName: '顶级', num: '1' }, + // { typeName: '小类2', id: '3', pid: '1', deptName: '顶级', num: '1' } + // ] if (response.data) { - this.typeTreeList = toTreeList(response.data, '0') + this.typeTreeList = toTreeList(response.data, '-1') console.log(this.typeTreeList) } }) diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue index 8bcb931..c0dcfcc 100644 --- a/src/views/knowledgeManage/editKnowledge.vue +++ b/src/views/knowledgeManage/editKnowledge.vue @@ -1,6 +1,6 @@ @@ -93,8 +93,8 @@ valid: '', // 可用状态 offset: 1, limit: 20, - sort: 'createTime', - order: 'desc' + sort: '', + order: '' }, // 筛选条件 columns: [ { @@ -130,7 +130,7 @@ }, { text: '可用状态', - value: 'validStatusName', + value: 'validStatus', align: 'center' }, { @@ -179,19 +179,19 @@ this.listLoading = true knowledgeList(this.listQuery).then(response => { if (response.code === 200) { - response.data.rows = [ - { - 'kId': '1', - 'kName': '特种设备作业人员操作证怎样办理?', - 'kTypeName': '大类', - 'publisherName': '张三', - 'publishTime': '2020-04-12', - 'checkStatusName': '未审核', - 'groundingStatusName': '未上架', - 'validStatusName': '不可用', - 'validPeroid': '永久' - } - ] + // response.data.rows = [ + // { + // 'kId': '1', + // 'kName': '特种设备作业人员操作证怎样办理?', + // 'kTypeName': '大类', + // 'publisherName': '张三', + // 'publishTime': '2020-04-12', + // 'checkStatusName': '未审核', + // 'groundingStatusName': '未上架', + // 'validStatusName': '不可用', + // 'validPeroid': '永久' + // } + // ] this.list = response.data.rows this.total = response.data.total this.listLoading = false @@ -216,10 +216,17 @@ this.$refs.grounddialog.initDialog() } }, + ground(type, val) { + if (type === 'success') { + this.grounding(val) + } else { + this.ungrounding(val) + } + }, // 上架 grounding(val) { const list = this.multipleSelection.map(item => item.kId) - groundingKnowledge('1', list, val).then(response => { + groundingKnowledge('1', list.join(','), val).then(response => { if (response.code === 200) { this.$message.success('上架成功') } @@ -238,7 +245,7 @@ } ).then(() => { const list = this.multipleSelection.map(item => item.kId) - groundingKnowledge('2', list).then(response => { + groundingKnowledge('2', list.join(',')).then(response => { if (response.code === 200) { this.$message.success('下架成功') } @@ -265,6 +272,7 @@ } else if (type === 'refuse') { this.$message.success('驳回成功') } + this.fetchData() } }) }, diff --git a/src/views/knowledgeManage/knowledgeManage.vue b/src/views/knowledgeManage/knowledgeManage.vue index 730421f..9151116 100644 --- a/src/views/knowledgeManage/knowledgeManage.vue +++ b/src/views/knowledgeManage/knowledgeManage.vue @@ -77,8 +77,8 @@ valid: '', // 可用状态 offset: 1, limit: 20, - sort: 'createTime', - order: 'desc' + sort: '', + order: '' }, // 筛选条件 columns: [ { @@ -114,7 +114,7 @@ }, { text: '可用状态', - value: 'validStatusName', + value: 'validStatus', align: 'center' }, { @@ -148,19 +148,19 @@ this.listLoading = true knowledgeList(this.listQuery).then(response => { if (response.code === 200) { - response.data.rows = [ - { - 'id': '1', - 'kName': '特种设备作业人员操作证怎样办理?', - 'kTypeName': '大类', - 'publisherName': '张三', - 'publishTime': '2020-04-12', - 'checkStatusName': '未审核', - 'groundingStatusName': '未上架', - 'validStatusName': '不可用', - 'validPeroid': '永久' - } - ] + // response.data.rows = [ + // { + // 'id': '1', + // 'kName': '特种设备作业人员操作证怎样办理?', + // 'kTypeName': '大类', + // 'publisherName': '张三', + // 'publishTime': '2020-04-12', + // 'checkStatusName': '未审核', + // 'groundingStatusName': '未上架', + // 'validStatusName': '不可用', + // 'validPeroid': '永久' + // } + // ] this.list = response.data.rows this.total = response.data.total this.listLoading = false