diff --git a/main/src/components/custom-rich-editor/index.vue b/main/src/components/custom-rich-editor/index.vue index 21cd188..1e4bad9 100644 --- a/main/src/components/custom-rich-editor/index.vue +++ b/main/src/components/custom-rich-editor/index.vue @@ -87,7 +87,7 @@ export default { }, }, }, - emits: ['focus', 'blur', 'change'], + emits: ['focus', 'blur', 'change', 'update:value'], setup(props, cxt) { const refEditor = shallowRef(); const valueHtml = ref(''); @@ -112,6 +112,7 @@ export default { */ const handleChange = (editor) => { cxt.emit('change', editor); + cxt.emit('update:value', valueHtml.value); }; /** * 组件销毁 diff --git a/sub-government-affairs-service/src/apis/inputSuppliesApi/index.js b/sub-government-affairs-service/src/apis/inputSuppliesApi/index.js index 5346cfb..b9ec383 100644 --- a/sub-government-affairs-service/src/apis/inputSuppliesApi/index.js +++ b/sub-government-affairs-service/src/apis/inputSuppliesApi/index.js @@ -1,3 +1,7 @@ -import * as redBlack from './redAndBlank'; +import * as redBlackApi from './redAndBlank'; +import * as materialApi from './material'; -export { redBlack }; +export default { + ...materialApi, + ...redBlackApi, +}; diff --git a/sub-government-affairs-service/src/apis/inputSuppliesApi/material.js b/sub-government-affairs-service/src/apis/inputSuppliesApi/material.js new file mode 100644 index 0000000..330aacd --- /dev/null +++ b/sub-government-affairs-service/src/apis/inputSuppliesApi/material.js @@ -0,0 +1,9 @@ +import request from '@/utils/axios'; + +/* 获取物资类型 */ +export function getMaterailTypes(params) { + return request({ + url: '/input/common/getList', + params, + }); +} diff --git a/sub-government-affairs-service/src/apis/inputSuppliesApi/redAndBlank.js b/sub-government-affairs-service/src/apis/inputSuppliesApi/redAndBlank.js index 503f164..d624f21 100644 --- a/sub-government-affairs-service/src/apis/inputSuppliesApi/redAndBlank.js +++ b/sub-government-affairs-service/src/apis/inputSuppliesApi/redAndBlank.js @@ -1 +1 @@ -import request from '@/utils/request'; +import request from '@/utils/axios'; diff --git a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js index fe35113..40fa851 100644 --- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js +++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js @@ -123,12 +123,12 @@ const inputSuppliesRoutes = [ component: () => import('@/views/inputSuppliesManage/redBlackRank/index.vue'), meta: { title: '企业红黑榜', icon: 'Document' }, }, - // { - // path: '/sub-government-affairs-service/knowledgeManage', - // name: 'knowledgeManage', - // component: () => import('@/views/inputSuppliesManage/knowledgeManage/index.vue'), - // meta: { title: '知识库', icon: 'Document' }, - // }, + { + path: '/sub-government-affairs-service/knowledgeManage', + name: 'knowledgeManage', + component: () => import('@/views/inputSuppliesManage/knowledgeManage/index.vue'), + meta: { title: '知识库', icon: 'Document' }, + }, // { // path: '/sub-government-affairs-service/patrolCaseManage', // name: 'patrolCaseManage', diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/knowledgeManage/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/knowledgeManage/index.vue index 08c26cb..976db00 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/knowledgeManage/index.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/knowledgeManage/index.vue @@ -1,19 +1,195 @@ diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/materialManage/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/materialManage/index.vue index dfc2ff9..62667d5 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/materialManage/index.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/materialManage/index.vue @@ -1,12 +1,50 @@