diff --git a/src/api/article.js b/src/api/article.js new file mode 100644 index 0000000..eb3d30a --- /dev/null +++ b/src/api/article.js @@ -0,0 +1,35 @@ +import request from '@/utils/request' + +export function index(params) { + return request({ + method: 'get', + url: '/api/article/index', + params + }) +} + +export function show(params) { + return request({ + method: 'get', + url: '/api/article/show', + params + }) +} + +export function save(data, isLoading = true) { + return request({ + method: 'post', + url: '/api/article/save', + data, + isLoading + }) +} + +export function destroy(params, isLoading = true) { + return request({ + method: 'get', + url: '/api/article/destroy', + params, + isLoading + }) +} diff --git a/src/api/articleType.js b/src/api/articleType.js new file mode 100644 index 0000000..7cd6726 --- /dev/null +++ b/src/api/articleType.js @@ -0,0 +1,35 @@ +import request from '@/utils/request' + +export function index(params) { + return request({ + method: 'get', + url: '/api/article-type/index', + params + }) +} + +export function show(params) { + return request({ + method: 'get', + url: '/api/article-type/show', + params + }) +} + +export function save(data, isLoading = true) { + return request({ + method: 'post', + url: '/api/article-type/save', + data, + isLoading + }) +} + +export function destroy(params, isLoading = true) { + return request({ + method: 'get', + url: '/api/article-type/destroy', + params, + isLoading + }) +} diff --git a/src/api/config.js b/src/api/config.js index 9d8eaf3..695d7b9 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -8,11 +8,12 @@ export function index(params) { }) } -export function show(params) { +export function show(params,isLoading = true) { return request({ method: 'get', url: '/api/oa/config/show', - params + params, + isLoading }) } diff --git a/src/components/ThemePicker/index.vue b/src/components/ThemePicker/index.vue index 8ea5768..e71bf5c 100644 --- a/src/components/ThemePicker/index.vue +++ b/src/components/ThemePicker/index.vue @@ -10,7 +10,7 @@ diff --git a/src/views/system/DashboardComponents/articles.vue b/src/views/system/DashboardComponents/articles.vue new file mode 100644 index 0000000..2e6f8b8 --- /dev/null +++ b/src/views/system/DashboardComponents/articles.vue @@ -0,0 +1,129 @@ + + + + + diff --git a/src/views/system/DashboardComponents/department.vue b/src/views/system/DashboardComponents/department.vue index 5d6c56a..c6370e0 100644 --- a/src/views/system/DashboardComponents/department.vue +++ b/src/views/system/DashboardComponents/department.vue @@ -38,7 +38,7 @@ import ElementResize from 'element-resize-detector' import SvgIcon from '@/components/SvgIcon/index.vue' export default { - name: 'Card3', + name: 'Department', components: { SvgIcon }, @@ -47,7 +47,7 @@ export default { y: 5, w: 8, h: 5, - i: '3', + i: 'Department', name: '科室执行情况' }, data() { diff --git a/src/views/system/DashboardComponents/quickMenu.vue b/src/views/system/DashboardComponents/quickMenu.vue index efe3ef8..2f74cf1 100644 --- a/src/views/system/DashboardComponents/quickMenu.vue +++ b/src/views/system/DashboardComponents/quickMenu.vue @@ -47,7 +47,7 @@ :multiple="false" no-children-text="无子菜单" :normalizer="node => ({ - id: node.path, + id: /^#+/g.test(node.path) ? node.id : node.path, key: node.id, label: node.name, children: node.children, @@ -86,7 +86,7 @@ import { deepCopy } from '@/utils' import { permissions } from '@/api/me' import SvgIcon from '@/components/SvgIcon/index.vue' export default { - name: 'Card7', + name: 'QuickMenu', components: { SvgIcon }, @@ -95,7 +95,7 @@ export default { y: 0, w: 4, h: 5, - i: '8', + i: 'QuickMenu', name: '快捷菜单' }, data() { diff --git a/src/views/system/DashboardComponents/toDo.vue b/src/views/system/DashboardComponents/toDo.vue index e766e77..3b397aa 100644 --- a/src/views/system/DashboardComponents/toDo.vue +++ b/src/views/system/DashboardComponents/toDo.vue @@ -73,7 +73,7 @@ import axios from 'axios' import { getToken } from '@/utils/auth' export default { - name: 'Card2', + name: 'ToDo', components: { SvgIcon }, @@ -82,7 +82,7 @@ export default { y: 0, w: 6, h: 4, - i: '2', + i: 'ToDo', name: '待办事项' }, data() { @@ -159,7 +159,7 @@ export default { init() { const cardDom = document.getElementById('todo-card') - const cardTitleH = 58 + const cardTitleH = 59 const elementResize = ElementResize({ strategy: 'scroll' }) diff --git a/src/views/system/DashboardComponents/total.vue b/src/views/system/DashboardComponents/total.vue index 6c6cca3..541cd84 100644 --- a/src/views/system/DashboardComponents/total.vue +++ b/src/views/system/DashboardComponents/total.vue @@ -7,6 +7,7 @@ >预算总体执行情况 预算类型执行情况 +
+ + + + + + + + + + + + + + + + + + +
+ + + + + diff --git a/src/views/system/components/AddArticle.vue b/src/views/system/components/AddArticle.vue new file mode 100644 index 0000000..d05b870 --- /dev/null +++ b/src/views/system/components/AddArticle.vue @@ -0,0 +1,185 @@ + + + + + diff --git a/src/views/system/components/ArticleType.vue b/src/views/system/components/ArticleType.vue new file mode 100644 index 0000000..6935c2b --- /dev/null +++ b/src/views/system/components/ArticleType.vue @@ -0,0 +1,204 @@ + + + + + diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue index 3027e2a..e0ba90e 100644 --- a/src/views/system/menu.vue +++ b/src/views/system/menu.vue @@ -145,6 +145,9 @@ export default { this.tableData = res console.log(this.tableData) this.loading = false + this.$nextTick(() => { + this.$refs['table'].setAllTreeExpand(true) + }) } catch (err) { console.error(err) this.loading = false