From 9a70fb21dd07188073311f36cd1d3f8577e7ea0d Mon Sep 17 00:00:00 2001 From: yyhouc <792163605@qq.com> Date: Tue, 11 Apr 2023 15:52:50 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/dictbiz.js | 4 +- src/layout/navBars/breadcrumb/user.vue | 2 +- src/router/route.js | 111 ++----------------------- src/utils/request.js | 4 +- src/views/system/dic/dialog.vue | 68 +++++++-------- src/views/system/dic/index.vue | 10 +-- 6 files changed, 54 insertions(+), 145 deletions(-) diff --git a/src/api/system/dictbiz.js b/src/api/system/dictbiz.js index 48cae53..6176ba8 100644 --- a/src/api/system/dictbiz.js +++ b/src/api/system/dictbiz.js @@ -1,5 +1,5 @@ import request from '/@/utils/request'; -var model = 'kn-setting'; +var model = 'system-manager'; export const getList = (params) => { return request({ url: '/api/'+model+'/dict-biz/list', @@ -55,7 +55,7 @@ export const add = (row) => { export const update = (row) => { return request({ - url: '/api/'+model+'/dict-biz/submit', + url: '/api/'+model+'/dict-biz/submit2', method: 'post', data: row }) diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue index 3a36db5..8a5c384 100644 --- a/src/layout/navBars/breadcrumb/user.vue +++ b/src/layout/navBars/breadcrumb/user.vue @@ -241,7 +241,7 @@ onMounted(() => { Session.set('refresh-token', res.refresh_token); }) } - }, 10000); + }, 5*60*1000); }); diff --git a/src/router/route.js b/src/router/route.js index a02d202..12b0d73 100644 --- a/src/router/route.js +++ b/src/router/route.js @@ -190,7 +190,7 @@ export const dynamicRoutes = [ isKeepAlive: true, isAffix: false, isIframe: false, - roles: ['admin'], + roles: ['admin', 'chief'], // icon: 'iconfont icon-xitongshezhi', zh: '系统管理', }, @@ -206,25 +206,24 @@ export const dynamicRoutes = [ isKeepAlive: true, isAffix: false, isIframe: false, - roles: ['admin'], + roles: ['admin', 'chief'], // icon: 'iconfont icon-caidan', zh: '普通管理员管理', }, }, { - path: '/systemManagement/dictionary', - name: 'dictionaryManagement', - component: () => import('/@/views/systemManagement/dictionary/index.vue'), + path: '/system/dic', + name: 'systemDic', + component: () => import('/@/views/system/dic/index.vue'), meta: { - title: 'Dictionary management', + title: '字典管理', isLink: '', isHide: false, isKeepAlive: true, isAffix: false, isIframe: false, - roles: ['admin'], - // icon: 'ele-ColdDrink', - zh: '字典管理', + roles: ['admin', 'chief'], + // icon: 'ele-SetUp', }, }, ], @@ -369,100 +368,6 @@ export const dynamicRoutes = [ // }, // ], // }, - { - path: '/system', - name: 'system', - component: () => import('/@/layout/routerView/parent.vue'), - redirect: '/system/menu', - meta: { - title: '系统设置', - isLink: '', - isHide: false, - isKeepAlive: true, - isAffix: false, - isIframe: false, - roles: ['admin'], - // icon: 'iconfont icon-xitongshezhi', - zh:"系统设置" - }, - children: [ - // { - // path: '/system/menu', - // name: 'systemMenu', - // component: () => import('/@/views/system/menu/index.vue'), - // meta: { - // title: '菜单管理', - // isLink: '', - // isHide: false, - // isKeepAlive: true, - // isAffix: false, - // isIframe: false, - // roles: ['admin'], - // icon: 'iconfont icon-caidan', - // }, - // }, - // { - // path: '/system/role', - // name: 'systemRole', - // component: () => import('/@/views/system/role/index.vue'), - // meta: { - // title: '角色管理', - // isLink: '', - // isHide: false, - // isKeepAlive: true, - // isAffix: false, - // isIframe: false, - // roles: ['admin'], - // icon: 'ele-ColdDrink', - // }, - // }, - // { - // path: '/system/user', - // name: 'systemUser', - // component: () => import('/@/views/system/user/index.vue'), - // meta: { - // title: '用户管理', - // isLink: '', - // isHide: false, - // isKeepAlive: true, - // isAffix: false, - // isIframe: false, - // roles: ['admin'], - // icon: 'iconfont icon-icon-', - // }, - // }, - // { - // path: '/system/dept', - // name: 'systemDept', - // component: () => import('/@/views/system/dept/index.vue'), - // meta: { - // title: '部门管理', - // isLink: '', - // isHide: false, - // isKeepAlive: true, - // isAffix: false, - // isIframe: false, - // roles: ['admin'], - // icon: 'ele-OfficeBuilding', - // }, - // }, - { - path: '/system/dic', - name: 'systemDic', - component: () => import('/@/views/system/dic/index.vue'), - meta: { - title: '字典管理', - isLink: '', - isHide: false, - isKeepAlive: true, - isAffix: false, - isIframe: false, - roles: ['admin'], - // icon: 'ele-SetUp', - }, - }, - ], - }, ], }, ]; diff --git a/src/utils/request.js b/src/utils/request.js index 2ebf7fe..61421f4 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -60,7 +60,9 @@ service.interceptors.response.use( ElMessage.error('网络超时'); } else if (error.message == 'Network Error') { ElMessage.error('网络连接错误'); - } else { + } else if (error.response&&error.response.data.code == '500') { + ElMessage.error(error.response.data.msg); + } else{ if (error.response.data.error_description) ElMessage.error(error.response.data.error_description); else { //if (error.response.data) ElMessage.error(error.response.statusText); diff --git a/src/views/system/dic/dialog.vue b/src/views/system/dic/dialog.vue index 46aabaa..00d0745 100644 --- a/src/views/system/dic/dialog.vue +++ b/src/views/system/dic/dialog.vue @@ -13,8 +13,8 @@ - - + + @@ -23,7 +23,7 @@ - + @@ -13,6 +13,8 @@ import { computed } from 'vue'; import { storeToRefs } from 'pinia'; import { useThemeConfig } from '/@/stores/themeConfig'; import logoMini from '/@/assets/logo-mini.svg'; +import Vordm from '/@/assets/vordm.png'; +import VordmMini from '/@/assets/vordm-mini.png' // 定义变量内容 const storesThemeConfig = useThemeConfig(); @@ -32,17 +34,18 @@ const onThemeConfigChange = () => { \ No newline at end of file diff --git a/src/views/responseManagement/administrator/index.vue b/src/views/responseManagement/administrator/index.vue index 2e76b25..fca4219 100644 --- a/src/views/responseManagement/administrator/index.vue +++ b/src/views/responseManagement/administrator/index.vue @@ -1,25 +1,41 @@ + + + From 5c1c3110848afe952d0803480996f8e19f6cc8d1 Mon Sep 17 00:00:00 2001 From: liyuchen <791867849@qq.com> Date: Wed, 12 Apr 2023 10:08:51 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2-liyuch?= =?UTF-8?q?en?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/systemManagement/administrator/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/systemManagement/administrator/index.vue b/src/views/systemManagement/administrator/index.vue index 78552b4..2b92f44 100644 --- a/src/views/systemManagement/administrator/index.vue +++ b/src/views/systemManagement/administrator/index.vue @@ -2,7 +2,7 @@
- @@ -121,7 +121,7 @@ const auditManager = (row) => { // 初始化表格数据 const getTableData = () => { state.tableData.loading = true; - getAdminManagerPage(state.tableData.param.pageNum,state.tableData.param.pageSize,{}).then(res=>{ + getAdminManagerPage(state.tableData.param.pageNum,state.tableData.param.pageSize,{"managerName":state.searchName}).then(res=>{ console.log("分页数据",res); state.tableData.data = res.records; state.tableData.total = res.total; @@ -133,7 +133,7 @@ const getTableData = () => { }; // 打开新增角色弹窗 const addUser = () => { - administratorRef.value.openDialog(); + //administratorRef.value.openDialog(); }; // 打开修改角色弹窗 const onOpenEditRole = (type, row) => { @@ -147,10 +147,10 @@ const deleteUser = (row) => { type: 'warning', }) .then(() => { - remove(row.id).then(res=>{ + /* remove(row.id).then(res=>{ getTableData(); ElMessage.success('Deleted successfully'); - }) + })*/ }) .catch(() => {}); }; From 49204f6a06f62a8a8f0ad9b04834144146bffaf0 Mon Sep 17 00:00:00 2001 From: yyhouc <792163605@qq.com> Date: Wed, 12 Apr 2023 10:14:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/disasterInfo/index.js | 2 +- src/views/responseManagement/userResponse/index.vue | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/api/disasterInfo/index.js b/src/api/disasterInfo/index.js index 2625925..bee51f0 100644 --- a/src/api/disasterInfo/index.js +++ b/src/api/disasterInfo/index.js @@ -12,7 +12,7 @@ export function getList(params) { export function review(id) { return request({ url: '/api/'+moduleName+'/ui/disasterInfo/review', - method: 'get', + method: 'post', params: { id }, }); } \ No newline at end of file diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue index f6dbd25..b4604db 100644 --- a/src/views/responseManagement/userResponse/index.vue +++ b/src/views/responseManagement/userResponse/index.vue @@ -80,7 +80,8 @@ @@ -125,8 +126,8 @@ import { getDictionary } from '/@/api/system/dictbiz'; const activeName = ref('first'); const handleClick = (tab ,event) => { - console.log(activeName,tab, event); - // getTableData(); + state.selectName=tab.props.name; + getTableData(); }; // 引入组件 const RoleDialog = defineAsyncComponent(() => import('/@/views/system/role/dialog.vue')); @@ -146,16 +147,18 @@ const state = reactive({ }, }, disasterTypeList: [], + selectName: 'first', }); // 初始化表格数据 const getTableData = () => { state.tableData.loading = true; //根据activeName的值来判断是哪个tab页 - if(activeName.value === 'first'){ + if(state.selectName === 'first'){ state.tableData.param.respondStatus = 0; }else{ - state.tableData.param.respondStatus = 1; + state.tableData.param.respondStatus = 2; } + console.log(activeName.value); getList(state.tableData.param).then((res) => { state.tableData.data = res.records; state.tableData.total = res.total;