diff --git a/config/index.js b/config/index.js index 8c6eb2a..02c56f5 100644 --- a/config/index.js +++ b/config/index.js @@ -21,7 +21,7 @@ // Various Dev Server settings host: '0.0.0.0', // can be overwritten by process.env.HOST - port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, notifyOnErrors: false, diff --git a/config/index.js b/config/index.js index 8c6eb2a..02c56f5 100644 --- a/config/index.js +++ b/config/index.js @@ -21,7 +21,7 @@ // Various Dev Server settings host: '0.0.0.0', // can be overwritten by process.env.HOST - port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, notifyOnErrors: false, diff --git a/src/router/index.js b/src/router/index.js index 1c80473..b700dc8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -13,6 +13,7 @@ import { commenetRouters } from './modules/comment' import { suphandleRouters } from './modules/suphandle' import { commonRouters } from './modules/common' +import { controlRouters } from './modules/control' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) diff --git a/config/index.js b/config/index.js index 8c6eb2a..02c56f5 100644 --- a/config/index.js +++ b/config/index.js @@ -21,7 +21,7 @@ // Various Dev Server settings host: '0.0.0.0', // can be overwritten by process.env.HOST - port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, notifyOnErrors: false, diff --git a/src/router/index.js b/src/router/index.js index 1c80473..b700dc8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -13,6 +13,7 @@ import { commenetRouters } from './modules/comment' import { suphandleRouters } from './modules/suphandle' import { commonRouters } from './modules/common' +import { controlRouters } from './modules/control' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) diff --git a/src/router/modules/control.js b/src/router/modules/control.js new file mode 100644 index 0000000..c39b1cd --- /dev/null +++ b/src/router/modules/control.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const controlRouters = [ + { + path: '/control', + name: 'control', + redirect: '/supControl', + hidden: true, + meta: { + title: '监督指挥子系统', + permission: ['/control'], + isSys: true + } + }, + { + path: '/supControl', + component: Layout, + redirect: '/supControlDetail', + name: 'SupControl', + alwaysShow: true, + meta: { + title: '监督指挥', + permission: ['/supControl'], + sys: '/control' + }, + children: [ + { + path: '/supControlDetail', + component: () => import('@/views/supControl/supControl'), + name: 'SupControlDetail', + meta: { title: '监督指挥', icon: '', belongSys: '', permission: '/supControlDetail' } + } + ] + } +] diff --git a/config/index.js b/config/index.js index 8c6eb2a..02c56f5 100644 --- a/config/index.js +++ b/config/index.js @@ -21,7 +21,7 @@ // Various Dev Server settings host: '0.0.0.0', // can be overwritten by process.env.HOST - port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, notifyOnErrors: false, diff --git a/src/router/index.js b/src/router/index.js index 1c80473..b700dc8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -13,6 +13,7 @@ import { commenetRouters } from './modules/comment' import { suphandleRouters } from './modules/suphandle' import { commonRouters } from './modules/common' +import { controlRouters } from './modules/control' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) diff --git a/src/router/modules/control.js b/src/router/modules/control.js new file mode 100644 index 0000000..c39b1cd --- /dev/null +++ b/src/router/modules/control.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const controlRouters = [ + { + path: '/control', + name: 'control', + redirect: '/supControl', + hidden: true, + meta: { + title: '监督指挥子系统', + permission: ['/control'], + isSys: true + } + }, + { + path: '/supControl', + component: Layout, + redirect: '/supControlDetail', + name: 'SupControl', + alwaysShow: true, + meta: { + title: '监督指挥', + permission: ['/supControl'], + sys: '/control' + }, + children: [ + { + path: '/supControlDetail', + component: () => import('@/views/supControl/supControl'), + name: 'SupControlDetail', + meta: { title: '监督指挥', icon: '', belongSys: '', permission: '/supControlDetail' } + } + ] + } +] diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js index 331836f..f5d3918 100644 --- a/src/store/modules/tagsView.js +++ b/src/store/modules/tagsView.js @@ -153,7 +153,6 @@ }, // 关闭全部 delAllViews({ dispatch, state }, delAll = false) { - debugger return new Promise(resolve => { dispatch('delAllVisitedViews', delAll) dispatch('delAllCachedViews', delAll) diff --git a/config/index.js b/config/index.js index 8c6eb2a..02c56f5 100644 --- a/config/index.js +++ b/config/index.js @@ -21,7 +21,7 @@ // Various Dev Server settings host: '0.0.0.0', // can be overwritten by process.env.HOST - port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, notifyOnErrors: false, diff --git a/src/router/index.js b/src/router/index.js index 1c80473..b700dc8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -13,6 +13,7 @@ import { commenetRouters } from './modules/comment' import { suphandleRouters } from './modules/suphandle' import { commonRouters } from './modules/common' +import { controlRouters } from './modules/control' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) diff --git a/src/router/modules/control.js b/src/router/modules/control.js new file mode 100644 index 0000000..c39b1cd --- /dev/null +++ b/src/router/modules/control.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const controlRouters = [ + { + path: '/control', + name: 'control', + redirect: '/supControl', + hidden: true, + meta: { + title: '监督指挥子系统', + permission: ['/control'], + isSys: true + } + }, + { + path: '/supControl', + component: Layout, + redirect: '/supControlDetail', + name: 'SupControl', + alwaysShow: true, + meta: { + title: '监督指挥', + permission: ['/supControl'], + sys: '/control' + }, + children: [ + { + path: '/supControlDetail', + component: () => import('@/views/supControl/supControl'), + name: 'SupControlDetail', + meta: { title: '监督指挥', icon: '', belongSys: '', permission: '/supControlDetail' } + } + ] + } +] diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js index 331836f..f5d3918 100644 --- a/src/store/modules/tagsView.js +++ b/src/store/modules/tagsView.js @@ -153,7 +153,6 @@ }, // 关闭全部 delAllViews({ dispatch, state }, delAll = false) { - debugger return new Promise(resolve => { dispatch('delAllVisitedViews', delAll) dispatch('delAllCachedViews', delAll) diff --git a/src/views/assessRegion/assessOverview.vue b/src/views/assessRegion/assessOverview.vue index e3f5813..31b9dab 100644 --- a/src/views/assessRegion/assessOverview.vue +++ b/src/views/assessRegion/assessOverview.vue @@ -126,7 +126,7 @@ { text: '按期处理率', value: 'proOntimeRate', - width: 70 + width: 80 }, { text: '处理数', @@ -135,7 +135,7 @@ { text: '处理率', value: 'proRate', - width: 60 + width: 80 }, { text: '按期结案数', @@ -144,7 +144,7 @@ { text: '按期结案率', value: 'closeOntimeRate', - width: 70 + width: 80 }, { text: '结案数', @@ -154,7 +154,7 @@ { text: '结案率', value: 'closeRate', - width: 60 + width: 80 } ], listQuery: { @@ -201,8 +201,8 @@ this.listQuery.endDate = this.timeRange[1] } assessOverview(this.listQuery).then(res => { - this.list = res.data - this.total = res.data.length + this.list = [res.data] + this.total = 1 this.listLoading = false }) this.listLoading = false diff --git a/config/index.js b/config/index.js index 8c6eb2a..02c56f5 100644 --- a/config/index.js +++ b/config/index.js @@ -21,7 +21,7 @@ // Various Dev Server settings host: '0.0.0.0', // can be overwritten by process.env.HOST - port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, notifyOnErrors: false, diff --git a/src/router/index.js b/src/router/index.js index 1c80473..b700dc8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -13,6 +13,7 @@ import { commenetRouters } from './modules/comment' import { suphandleRouters } from './modules/suphandle' import { commonRouters } from './modules/common' +import { controlRouters } from './modules/control' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) diff --git a/src/router/modules/control.js b/src/router/modules/control.js new file mode 100644 index 0000000..c39b1cd --- /dev/null +++ b/src/router/modules/control.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const controlRouters = [ + { + path: '/control', + name: 'control', + redirect: '/supControl', + hidden: true, + meta: { + title: '监督指挥子系统', + permission: ['/control'], + isSys: true + } + }, + { + path: '/supControl', + component: Layout, + redirect: '/supControlDetail', + name: 'SupControl', + alwaysShow: true, + meta: { + title: '监督指挥', + permission: ['/supControl'], + sys: '/control' + }, + children: [ + { + path: '/supControlDetail', + component: () => import('@/views/supControl/supControl'), + name: 'SupControlDetail', + meta: { title: '监督指挥', icon: '', belongSys: '', permission: '/supControlDetail' } + } + ] + } +] diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js index 331836f..f5d3918 100644 --- a/src/store/modules/tagsView.js +++ b/src/store/modules/tagsView.js @@ -153,7 +153,6 @@ }, // 关闭全部 delAllViews({ dispatch, state }, delAll = false) { - debugger return new Promise(resolve => { dispatch('delAllVisitedViews', delAll) dispatch('delAllCachedViews', delAll) diff --git a/src/views/assessRegion/assessOverview.vue b/src/views/assessRegion/assessOverview.vue index e3f5813..31b9dab 100644 --- a/src/views/assessRegion/assessOverview.vue +++ b/src/views/assessRegion/assessOverview.vue @@ -126,7 +126,7 @@ { text: '按期处理率', value: 'proOntimeRate', - width: 70 + width: 80 }, { text: '处理数', @@ -135,7 +135,7 @@ { text: '处理率', value: 'proRate', - width: 60 + width: 80 }, { text: '按期结案数', @@ -144,7 +144,7 @@ { text: '按期结案率', value: 'closeOntimeRate', - width: 70 + width: 80 }, { text: '结案数', @@ -154,7 +154,7 @@ { text: '结案率', value: 'closeRate', - width: 60 + width: 80 } ], listQuery: { @@ -201,8 +201,8 @@ this.listQuery.endDate = this.timeRange[1] } assessOverview(this.listQuery).then(res => { - this.list = res.data - this.total = res.data.length + this.list = [res.data] + this.total = 1 this.listLoading = false }) this.listLoading = false diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue index b515f61..e4066f1 100644 --- a/src/views/layout/components/Sidebar/Item.vue +++ b/src/views/layout/components/Sidebar/Item.vue @@ -1,7 +1,14 @@ + diff --git a/config/index.js b/config/index.js index 8c6eb2a..02c56f5 100644 --- a/config/index.js +++ b/config/index.js @@ -21,7 +21,7 @@ // Various Dev Server settings host: '0.0.0.0', // can be overwritten by process.env.HOST - port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, notifyOnErrors: false, diff --git a/src/router/index.js b/src/router/index.js index 1c80473..b700dc8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -13,6 +13,7 @@ import { commenetRouters } from './modules/comment' import { suphandleRouters } from './modules/suphandle' import { commonRouters } from './modules/common' +import { controlRouters } from './modules/control' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) diff --git a/src/router/modules/control.js b/src/router/modules/control.js new file mode 100644 index 0000000..c39b1cd --- /dev/null +++ b/src/router/modules/control.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const controlRouters = [ + { + path: '/control', + name: 'control', + redirect: '/supControl', + hidden: true, + meta: { + title: '监督指挥子系统', + permission: ['/control'], + isSys: true + } + }, + { + path: '/supControl', + component: Layout, + redirect: '/supControlDetail', + name: 'SupControl', + alwaysShow: true, + meta: { + title: '监督指挥', + permission: ['/supControl'], + sys: '/control' + }, + children: [ + { + path: '/supControlDetail', + component: () => import('@/views/supControl/supControl'), + name: 'SupControlDetail', + meta: { title: '监督指挥', icon: '', belongSys: '', permission: '/supControlDetail' } + } + ] + } +] diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js index 331836f..f5d3918 100644 --- a/src/store/modules/tagsView.js +++ b/src/store/modules/tagsView.js @@ -153,7 +153,6 @@ }, // 关闭全部 delAllViews({ dispatch, state }, delAll = false) { - debugger return new Promise(resolve => { dispatch('delAllVisitedViews', delAll) dispatch('delAllCachedViews', delAll) diff --git a/src/views/assessRegion/assessOverview.vue b/src/views/assessRegion/assessOverview.vue index e3f5813..31b9dab 100644 --- a/src/views/assessRegion/assessOverview.vue +++ b/src/views/assessRegion/assessOverview.vue @@ -126,7 +126,7 @@ { text: '按期处理率', value: 'proOntimeRate', - width: 70 + width: 80 }, { text: '处理数', @@ -135,7 +135,7 @@ { text: '处理率', value: 'proRate', - width: 60 + width: 80 }, { text: '按期结案数', @@ -144,7 +144,7 @@ { text: '按期结案率', value: 'closeOntimeRate', - width: 70 + width: 80 }, { text: '结案数', @@ -154,7 +154,7 @@ { text: '结案率', value: 'closeRate', - width: 60 + width: 80 } ], listQuery: { @@ -201,8 +201,8 @@ this.listQuery.endDate = this.timeRange[1] } assessOverview(this.listQuery).then(res => { - this.list = res.data - this.total = res.data.length + this.list = [res.data] + this.total = 1 this.listLoading = false }) this.listLoading = false diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue index b515f61..e4066f1 100644 --- a/src/views/layout/components/Sidebar/Item.vue +++ b/src/views/layout/components/Sidebar/Item.vue @@ -1,7 +1,14 @@ + diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue index 988d662..6c2d5ad 100644 --- a/src/views/layout/components/Sidebar/SidebarItem.vue +++ b/src/views/layout/components/Sidebar/SidebarItem.vue @@ -26,7 +26,7 @@ - + @@ -56,6 +56,16 @@ basePath: { type: String, default: '' + }, + tempData: { + type: Object, + default() { + return { + // '/supWork': 5, + // '/supToRegister': 2, + // '/toAdjust': 1 + } + } } }, data() { @@ -105,3 +115,22 @@ } } + + diff --git a/config/index.js b/config/index.js index 8c6eb2a..02c56f5 100644 --- a/config/index.js +++ b/config/index.js @@ -21,7 +21,7 @@ // Various Dev Server settings host: '0.0.0.0', // can be overwritten by process.env.HOST - port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, notifyOnErrors: false, diff --git a/src/router/index.js b/src/router/index.js index 1c80473..b700dc8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -13,6 +13,7 @@ import { commenetRouters } from './modules/comment' import { suphandleRouters } from './modules/suphandle' import { commonRouters } from './modules/common' +import { controlRouters } from './modules/control' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) diff --git a/src/router/modules/control.js b/src/router/modules/control.js new file mode 100644 index 0000000..c39b1cd --- /dev/null +++ b/src/router/modules/control.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const controlRouters = [ + { + path: '/control', + name: 'control', + redirect: '/supControl', + hidden: true, + meta: { + title: '监督指挥子系统', + permission: ['/control'], + isSys: true + } + }, + { + path: '/supControl', + component: Layout, + redirect: '/supControlDetail', + name: 'SupControl', + alwaysShow: true, + meta: { + title: '监督指挥', + permission: ['/supControl'], + sys: '/control' + }, + children: [ + { + path: '/supControlDetail', + component: () => import('@/views/supControl/supControl'), + name: 'SupControlDetail', + meta: { title: '监督指挥', icon: '', belongSys: '', permission: '/supControlDetail' } + } + ] + } +] diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js index 331836f..f5d3918 100644 --- a/src/store/modules/tagsView.js +++ b/src/store/modules/tagsView.js @@ -153,7 +153,6 @@ }, // 关闭全部 delAllViews({ dispatch, state }, delAll = false) { - debugger return new Promise(resolve => { dispatch('delAllVisitedViews', delAll) dispatch('delAllCachedViews', delAll) diff --git a/src/views/assessRegion/assessOverview.vue b/src/views/assessRegion/assessOverview.vue index e3f5813..31b9dab 100644 --- a/src/views/assessRegion/assessOverview.vue +++ b/src/views/assessRegion/assessOverview.vue @@ -126,7 +126,7 @@ { text: '按期处理率', value: 'proOntimeRate', - width: 70 + width: 80 }, { text: '处理数', @@ -135,7 +135,7 @@ { text: '处理率', value: 'proRate', - width: 60 + width: 80 }, { text: '按期结案数', @@ -144,7 +144,7 @@ { text: '按期结案率', value: 'closeOntimeRate', - width: 70 + width: 80 }, { text: '结案数', @@ -154,7 +154,7 @@ { text: '结案率', value: 'closeRate', - width: 60 + width: 80 } ], listQuery: { @@ -201,8 +201,8 @@ this.listQuery.endDate = this.timeRange[1] } assessOverview(this.listQuery).then(res => { - this.list = res.data - this.total = res.data.length + this.list = [res.data] + this.total = 1 this.listLoading = false }) this.listLoading = false diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue index b515f61..e4066f1 100644 --- a/src/views/layout/components/Sidebar/Item.vue +++ b/src/views/layout/components/Sidebar/Item.vue @@ -1,7 +1,14 @@ + diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue index 988d662..6c2d5ad 100644 --- a/src/views/layout/components/Sidebar/SidebarItem.vue +++ b/src/views/layout/components/Sidebar/SidebarItem.vue @@ -26,7 +26,7 @@ - + @@ -56,6 +56,16 @@ basePath: { type: String, default: '' + }, + tempData: { + type: Object, + default() { + return { + // '/supWork': 5, + // '/supToRegister': 2, + // '/toAdjust': 1 + } + } } }, data() { @@ -105,3 +115,22 @@ } } + + diff --git a/src/views/supControl/supControl.vue b/src/views/supControl/supControl.vue new file mode 100644 index 0000000..e8c3a09 --- /dev/null +++ b/src/views/supControl/supControl.vue @@ -0,0 +1,478 @@ + + + + + +