diff --git a/public/index.html b/public/index.html index 1add1b0c..a477c018 100644 --- a/public/index.html +++ b/public/index.html @@ -1,15 +1,15 @@ - - - - - - - - - <%= webpackConfig.name %> - - -
- - - + + + + + + + + + <%= webpackConfig.name %> + + +
+ + + diff --git a/public/logo.png b/public/logo.png new file mode 100644 index 00000000..1fb18d11 Binary files /dev/null and b/public/logo.png differ diff --git a/public/portrait.jpg b/public/portrait.jpg deleted file mode 100644 index 3ec5b7ad..00000000 Binary files a/public/portrait.jpg and /dev/null differ diff --git a/src/api/public.js b/src/api/public.js index 14971e2b..1911d87c 100644 --- a/src/api/public.js +++ b/src/api/public.js @@ -1,25 +1,28 @@ -import request from '@/utils/request' - -export default { - getButtons(funid) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=queryevent&eventcode=query_loadtb&selpfunid=&selfunid=${funid}&selpagetype=editgrid&user_id=administrator&dataType=json&query_type=0&has_page=0` - }).then(response => response.data) - }, - getFormBtn(funid) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=queryevent&eventcode=query_loadtb&selpfunid=&selfunid=${funid}&selpagetype=form&user_id=administrator&dataType=json&query_type=0&has_page=0` - }).then(response => response.data) - }, - getTypeSel(funid) { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_control&user_id=administrator`, - method: 'post', - data: `start=0&limit=50&where_sql=(funall_control.control_code = ? )&where_value=${funid}&where_type=string&is_query=1&query_type=0&sort=funall_control__control_code` - }).then(response => response.data) - } -} +import request from '@/utils/request' +import store from '@/store/modules/user' + +var roles = store.state.roles.replace(/;/g, '') + +export default { + getButtons(funid) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=queryevent&eventcode=query_loadtb&selpfunid=&selfunid=${funid}&selpagetype=editgrid&user_id=${roles}&dataType=json&query_type=0&has_page=0` + }).then(response => response.data) + }, + getFormBtn(funid) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=queryevent&eventcode=query_loadtb&selpfunid=&selfunid=${funid}&selpagetype=form&user_id=${roles}&dataType=json&query_type=0&has_page=0` + }).then(response => response.data) + }, + getTypeSel(funid) { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_control&user_id=${roles}`, + method: 'post', + data: `start=0&limit=50&where_sql=(funall_control.control_code = ? )&where_value=${funid}&where_type=string&is_query=1&query_type=0&sort=funall_control__control_code` + }).then(response => response.data) + } +} diff --git a/src/components/check_attach/api/index.js b/src/components/check_attach/api/index.js index 0efbf891..c05ab670 100644 --- a/src/components/check_attach/api/index.js +++ b/src/components/check_attach/api/index.js @@ -1,36 +1,39 @@ -import request from '@/utils/request' - -export default { - getDate(pageSize, pageNo, data_id, table_name) { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_attach&user_id=administrator`, - method: 'post', - data: `start=${pageNo}&limit=${pageSize}&where_sql=sys_attach.data_id = ? and sys_attach.table_name = ?&where_type=string;string&where_value=${data_id};${table_name}` - }).then(response => response.data) - }, - Delete(ids) { - let keys = '' - ids.forEach(d => { - keys += 'keyid=' + d + '&' - }) - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=sys_attach&${keys}pagetype=editgrid&eventcode=delete&user_id=administrator&dataType=json` - }).then(response => response.data) - }, - getFormDate(id) { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=safe_insp&user_id=administrator`, - method: 'post', - data: `start=0&limit=10&where_sql=safe_insp.safe_insp_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0` - }).then(response => response.data) - }, - downLoad(keys) { - return request({ - url: `fileAction.do?funid=sys_attach&keyid=${keys}&pagetype=editgrid&eventcode=down&user_id=administrator&dataType=byte&_dc=`, - method: 'post', - data: `funid=sys_attach&keyid=${keys}&pagetype=editgrid&eventcode=down&user_id=administrator&dataType=byte&_dc=` - }).then(response => response.data) - } -} +import request from '@/utils/request' +import store from '@/store/modules/user' + +var roles = store.state.roles.replace(/;/g, '') + +export default { + getDate(pageSize, pageNo, data_id, table_name) { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_attach&user_id=${roles}`, + method: 'post', + data: `start=${pageNo}&limit=${pageSize}&where_sql=sys_attach.data_id = ? and sys_attach.table_name = ?&where_type=string;string&where_value=${data_id};${table_name}` + }).then(response => response.data) + }, + Delete(ids) { + let keys = '' + ids.forEach(d => { + keys += 'keyid=' + d + '&' + }) + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=sys_attach&${keys}pagetype=editgrid&eventcode=delete&user_id=${roles}&dataType=json` + }).then(response => response.data) + }, + getFormDate(id) { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=safe_insp&user_id=${roles}`, + method: 'post', + data: `start=0&limit=10&where_sql=safe_insp.safe_insp_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0` + }).then(response => response.data) + }, + downLoad(keys) { + return request({ + url: `fileAction.do?funid=sys_attach&keyid=${keys}&pagetype=editgrid&eventcode=down&user_id=${roles}&dataType=byte&_dc=`, + method: 'post', + data: `funid=sys_attach&keyid=${keys}&pagetype=editgrid&eventcode=down&user_id=${roles}&dataType=byte&_dc=` + }).then(response => response.data) + } +} diff --git a/src/components/selDept/api/index.js b/src/components/selDept/api/index.js index 864cf6e4..433ad0df 100644 --- a/src/components/selDept/api/index.js +++ b/src/components/selDept/api/index.js @@ -1,49 +1,52 @@ -import request from '@/utils/request' - -export default { - getDept(pageSize, pageNo, isWhereSql, whereValue) { - let whereSql = '' - let whereType = '' - if (isWhereSql) { - whereSql = `sys_dept.dept_id like ?` - whereType = 'string' - } - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=administrator`, - method: 'post', - data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0` - }).then(response => response.data) - }, - getDeptTree() { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=administrator`, - method: 'post', - data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0` - }).then(response => response.data) - }, - Crerte(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `${data}` - }).then(response => response.data) - }, - auditSave(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `${data}` - }).then(response => response.data) - }, - Delete(ids) { - let keys = '' - ids.forEach(d => { - keys += 'keyid=' + d + '&' - }) - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=sys_dept&${keys}pagetype=editgrid&eventcode=delete_eg&user_id=administrator&dataType=json` - }).then(response => response.data) - } -} +import request from '@/utils/request' +import store from '@/store/modules/user' + +var roles = store.state.roles.replace(/;/g, '') + +export default { + getDept(pageSize, pageNo, isWhereSql, whereValue) { + let whereSql = '' + let whereType = '' + if (isWhereSql) { + whereSql = `sys_dept.dept_id like ?` + whereType = 'string' + } + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=${roles}`, + method: 'post', + data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0` + }).then(response => response.data) + }, + getDeptTree() { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=${roles}`, + method: 'post', + data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0` + }).then(response => response.data) + }, + Crerte(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `${data}` + }).then(response => response.data) + }, + auditSave(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `${data}` + }).then(response => response.data) + }, + Delete(ids) { + let keys = '' + ids.forEach(d => { + keys += 'keyid=' + d + '&' + }) + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=sys_dept&${keys}pagetype=editgrid&eventcode=delete_eg&user_id=${roles}&dataType=json` + }).then(response => response.data) + } +} diff --git a/src/components/selUser/api/index.js b/src/components/selUser/api/index.js index 1b934115..86a8ec7a 100644 --- a/src/components/selUser/api/index.js +++ b/src/components/selUser/api/index.js @@ -1,56 +1,59 @@ -import request from '@/utils/request' - -export default { - getUser(pageSize, pageNo, isWhereSql, whereValue) { - let whereSql = '' - let whereType = '' - if (isWhereSql) { - whereSql = `sys_dept.dept_id like ?` - whereType = 'string' - } - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_user&user_id=administrator`, - method: 'post', - data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0` - }).then(response => response.data) - }, - getDeptTree() { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=administrator`, - method: 'post', - data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0` - }).then(response => response.data) - }, - Crerte(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `${data}` - }).then(response => response.data) - }, - auditSave(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `${data}` - }).then(response => response.data) - }, - Delete(ids) { - let keys = '' - ids.forEach(d => { - keys += 'keyid=' + d + '&' - }) - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=sys_user&${keys}pagetype=editgrid&eventcode=delete_eg&user_id=administrator&dataType=json` - }).then(response => response.data) - }, - getSelect(control_code) { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_control&user_id=administrator`, - method: 'post', - data: `start=0&limit=50&where_sql=(funall_control.control_code = ? )&where_value=${control_code}&where_type=string&is_query=1&query_type=0` - }).then(response => response.data) - } -} +import request from '@/utils/request' +import store from '@/store/modules/user' + +var roles = store.state.roles.replace(/;/g, '') + +export default { + getUser(pageSize, pageNo, isWhereSql, whereValue) { + let whereSql = '' + let whereType = '' + if (isWhereSql) { + whereSql = `sys_dept.dept_id like ?` + whereType = 'string' + } + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_user&user_id=${roles}`, + method: 'post', + data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0` + }).then(response => response.data) + }, + getDeptTree() { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=${roles}`, + method: 'post', + data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0` + }).then(response => response.data) + }, + Crerte(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `${data}` + }).then(response => response.data) + }, + auditSave(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `${data}` + }).then(response => response.data) + }, + Delete(ids) { + let keys = '' + ids.forEach(d => { + keys += 'keyid=' + d + '&' + }) + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=sys_user&${keys}pagetype=editgrid&eventcode=delete_eg&user_id=${roles}&dataType=json` + }).then(response => response.data) + }, + getSelect(control_code) { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_control&user_id=${roles}`, + method: 'post', + data: `start=0&limit=50&where_sql=(funall_control.control_code = ? )&where_value=${control_code}&where_type=string&is_query=1&query_type=0` + }).then(response => response.data) + } +} diff --git a/src/components/sys_attach/api/index.js b/src/components/sys_attach/api/index.js index 0efbf891..c05ab670 100644 --- a/src/components/sys_attach/api/index.js +++ b/src/components/sys_attach/api/index.js @@ -1,36 +1,39 @@ -import request from '@/utils/request' - -export default { - getDate(pageSize, pageNo, data_id, table_name) { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_attach&user_id=administrator`, - method: 'post', - data: `start=${pageNo}&limit=${pageSize}&where_sql=sys_attach.data_id = ? and sys_attach.table_name = ?&where_type=string;string&where_value=${data_id};${table_name}` - }).then(response => response.data) - }, - Delete(ids) { - let keys = '' - ids.forEach(d => { - keys += 'keyid=' + d + '&' - }) - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=sys_attach&${keys}pagetype=editgrid&eventcode=delete&user_id=administrator&dataType=json` - }).then(response => response.data) - }, - getFormDate(id) { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=safe_insp&user_id=administrator`, - method: 'post', - data: `start=0&limit=10&where_sql=safe_insp.safe_insp_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0` - }).then(response => response.data) - }, - downLoad(keys) { - return request({ - url: `fileAction.do?funid=sys_attach&keyid=${keys}&pagetype=editgrid&eventcode=down&user_id=administrator&dataType=byte&_dc=`, - method: 'post', - data: `funid=sys_attach&keyid=${keys}&pagetype=editgrid&eventcode=down&user_id=administrator&dataType=byte&_dc=` - }).then(response => response.data) - } -} +import request from '@/utils/request' +import store from '@/store/modules/user' + +var roles = store.state.roles.replace(/;/g, '') + +export default { + getDate(pageSize, pageNo, data_id, table_name) { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_attach&user_id=${roles}`, + method: 'post', + data: `start=${pageNo}&limit=${pageSize}&where_sql=sys_attach.data_id = ? and sys_attach.table_name = ?&where_type=string;string&where_value=${data_id};${table_name}` + }).then(response => response.data) + }, + Delete(ids) { + let keys = '' + ids.forEach(d => { + keys += 'keyid=' + d + '&' + }) + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=sys_attach&${keys}pagetype=editgrid&eventcode=delete&user_id=${roles}&dataType=json` + }).then(response => response.data) + }, + getFormDate(id) { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=safe_insp&user_id=${roles}`, + method: 'post', + data: `start=0&limit=10&where_sql=safe_insp.safe_insp_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0` + }).then(response => response.data) + }, + downLoad(keys) { + return request({ + url: `fileAction.do?funid=sys_attach&keyid=${keys}&pagetype=editgrid&eventcode=down&user_id=${roles}&dataType=byte&_dc=`, + method: 'post', + data: `funid=sys_attach&keyid=${keys}&pagetype=editgrid&eventcode=down&user_id=${roles}&dataType=byte&_dc=` + }).then(response => response.data) + } +} diff --git a/src/permission.js b/src/permission.js index a63e56fd..e758b5db 100644 --- a/src/permission.js +++ b/src/permission.js @@ -1,86 +1,89 @@ -import router from './router' -import store from './store' -import { Message } from 'element-ui' -import NProgress from 'nprogress' // progress bar -import 'nprogress/nprogress.css' // progress bar style -import { getToken } from '@/utils/auth' // get token from cookie -import getPageTitle from '@/utils/get-page-title' - -NProgress.configure({ showSpinner: false }) // NProgress Configuration - -const whiteList = ['/login', '/auth-redirect'] // no redirect whitelist - -router.beforeEach(async(to, from, next) => { - // start progress bar - NProgress.start() - - // set page title - document.title = getPageTitle(to.meta.title) - - // determine whether the user has logged in - const hasToken = getToken() - if (hasToken) { - if (to.path === '/login') { - // if is logged in, redirect to the home page - next({ path: '/' }) - NProgress.done() // hack: https://github.com/PanJiaChen/vue-element-admin/pull/2939 - } else { - // determine whether the user has obtained his permission roles through getInfo - const hasRoles = store.getters.roles && store.getters.roles.length > 0 - const sessionRoles = sessionStorage.getItem('ROLES') - if (hasRoles) { - // generate accessible routes map based on roles - const accessRoutes = await store.dispatch('permission/generateRoutes', store.getters.roles) - - // dynamically add accessible routes - router.addRoutes(accessRoutes) - next() - } else if (sessionRoles) { - // generate accessible routes map based on roles - const accessRoutes = await store.dispatch('permission/generateRoutes', store.getters.roles) - - // dynamically add accessible routes - router.addRoutes(accessRoutes) - next() - } else { - try { - // get user info - // note: roles must be a object array! such as: ['admin'] or ,['developer','editor'] - const { roles } = await store.dispatch('user/getInfo') - - // generate accessible routes map based on roles - const accessRoutes = await store.dispatch('permission/generateRoutes', roles) - - // dynamically add accessible routes - router.addRoutes(accessRoutes) - - // hack method to ensure that addRoutes is complete - // set the replace: true, so the navigation will not leave a history record - next({ ...to, replace: true }) - } catch (error) { - // remove token and go to login page to re-login - await store.dispatch('user/resetToken') - Message.error(error || 'Has Error') - next(`/login?redirect=${to.path}`) - NProgress.done() - } - } - } - } else { - /* has no token*/ - - if (whiteList.indexOf(to.path) !== -1) { - // in the free login whitelist, go directly - next() - } else { - // other pages that do not have permission to access are redirected to the login page. - next(`/login?redirect=${to.path}`) - NProgress.done() - } - } -}) - -router.afterEach(() => { - // finish progress bar - NProgress.done() -}) +import router from './router' +import store from './store' +import { Message } from 'element-ui' +import NProgress from 'nprogress' // progress bar +import 'nprogress/nprogress.css' // progress bar style +import { getToken } from '@/utils/auth' // get token from cookie +import getPageTitle from '@/utils/get-page-title' + +NProgress.configure({ showSpinner: false }) // NProgress Configuration + +const whiteList = ['/login', '/auth-redirect'] // no redirect whitelist + +router.beforeEach(async(to, from, next) => { + // start progress bar + NProgress.start() + + // set page title + document.title = getPageTitle(to.meta.title) + + // determine whether the user has logged in + const hasToken = getToken() + if (hasToken) { + if (to.path === '/login') { + // if is logged in, redirect to the home page + next({ path: '/' }) + NProgress.done() // hack: https://github.com/PanJiaChen/vue-element-admin/pull/2939 + } else { + // determine whether the user has obtained his permission roles through getInfo + const hasRoles = store.getters.roles && store.getters.roles.length > 0 + const sessionRoles = sessionStorage.getItem('ROLES') + if (hasRoles) { + // generate accessible routes map based on roles + const accessRoutes = await store.dispatch('permission/generateRoutes', store.getters.roles) + + // dynamically add accessible routes + router.addRoutes(accessRoutes) + next() + } else if (sessionRoles) { + // generate accessible routes map based on roles + const accessRoutes = await store.dispatch('permission/generateRoutes', sessionRoles) + + // dynamically add accessible routes + router.addRoutes(accessRoutes) + + // 刷新页面获取当前账号权限 + store.dispatch('user/getRoles', sessionRoles) + next() + } else { + try { + // get user info + // note: roles must be a object array! such as: ['admin'] or ,['developer','editor'] + const { roles } = await store.dispatch('user/getInfo') + + // generate accessible routes map based on roles + const accessRoutes = await store.dispatch('permission/generateRoutes', roles) + + // dynamically add accessible routes + router.addRoutes(accessRoutes) + + // hack method to ensure that addRoutes is complete + // set the replace: true, so the navigation will not leave a history record + next({ ...to, replace: true }) + } catch (error) { + // remove token and go to login page to re-login + await store.dispatch('user/resetToken') + Message.error(error || 'Has Error') + next(`/login?redirect=${to.path}`) + NProgress.done() + } + } + } + } else { + /* has no token*/ + + if (whiteList.indexOf(to.path) !== -1) { + // in the free login whitelist, go directly + next() + } else { + // other pages that do not have permission to access are redirected to the login page. + next(`/login?redirect=${to.path}`) + NProgress.done() + } + } +}) + +router.afterEach(() => { + // finish progress bar + NProgress.done() +}) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 3a710a1e..c7aef027 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,139 +1,147 @@ -import Vue from 'vue' -import { login, getInfo } from '@/api/user' -import { getToken, setToken, removeToken } from '@/utils/auth' -import router, { resetRouter } from '@/router' - -const state = { - token: getToken(), - name: '', - avatar: '', - introduction: '', - roles: [] -} - -const mutations = { - SET_TOKEN: (state, token) => { - state.token = token - }, - SET_INTRODUCTION: (state, introduction) => { - state.introduction = introduction - }, - SET_NAME: (state, name) => { - state.name = name - }, - SET_AVATAR: (state, avatar) => { - state.avatar = avatar - }, - SET_ROLES: (state, roles) => { - state.roles = roles - } -} - -const actions = { - // user login - login({ commit }, userInfo) { - const { username, password } = userInfo - return new Promise((resolve, reject) => { - login(`funid=login&eventcode=login&pagetype=login&user_code=${username.trim()}&user_pass=${password}`).then(res => { - if (res.data.success) { - commit('SET_ROLES', res.data.data.role_id) - // const { data } = res.data - commit('SET_TOKEN', '123') - setToken('123') - sessionStorage.setItem('ROLES', res.data.data.role_id) - resolve() - } else { - Vue.prototype.$message.error(res.data.message) - } - }).catch(err => { - reject(err) - }) - }) - }, - - // get user info - getInfo({ commit, state }) { - return new Promise((resolve, reject) => { - getInfo(state.token).then(response => { - const { data } = response - - if (!data) { - reject('Verification failed, please Login again.') - } - - const { roles, name, avatar, introduction } = data - - // roles must be a non-empty array - if (!roles || roles.length <= 0) { - reject('getInfo: roles must be a non-null array!') - } - - commit('SET_ROLES', roles) - commit('SET_NAME', name) - commit('SET_AVATAR', avatar) - commit('SET_INTRODUCTION', introduction) - resolve(data) - }).catch(error => { - reject(error) - }) - }) - }, - - // user logout - logout({ commit, state, dispatch }) { - return new Promise((resolve, reject) => { - // logout(state.token).then(() => { - commit('SET_TOKEN', '') - commit('SET_ROLES', []) - sessionStorage.clear - removeToken() - resetRouter() - - // reset visited views and cached views - // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2485 - dispatch('tagsView/delAllViews', null, { root: true }) - - resolve() - // }).catch(error => { - // reject(error) - // }) - }) - }, - - // remove token - resetToken({ commit }) { - return new Promise(resolve => { - commit('SET_TOKEN', '') - commit('SET_ROLES', []) - removeToken() - resolve() - }) - }, - - // dynamically modify permissions - async changeRoles({ commit, dispatch }, role) { - const token = role + '-token' - - commit('SET_TOKEN', token) - setToken(token) - - const { roles } = await dispatch('getInfo') - - resetRouter() - - // generate accessible routes map based on roles - const accessRoutes = await dispatch('permission/generateRoutes', roles, { root: true }) - // dynamically add accessible routes - router.addRoutes(accessRoutes) - - // reset visited views and cached views - dispatch('tagsView/delAllViews', null, { root: true }) - } -} - -export default { - namespaced: true, - state, - mutations, - actions -} +import Vue from 'vue' +import { login, getInfo } from '@/api/user' +import { getToken, setToken, removeToken } from '@/utils/auth' +import router, { resetRouter } from '@/router' + +const state = { + token: getToken(), + name: '', + avatar: '', + introduction: '', + roles: [] +} + +const mutations = { + SET_TOKEN: (state, token) => { + state.token = token + }, + SET_INTRODUCTION: (state, introduction) => { + state.introduction = introduction + }, + SET_NAME: (state, name) => { + state.name = name + }, + SET_AVATAR: (state, avatar) => { + state.avatar = avatar + }, + SET_ROLES: (state, roles) => { + state.roles = roles + } +} + +const actions = { + // user login + login({ commit }, userInfo) { + const { username, password } = userInfo + return new Promise((resolve, reject) => { + login(`funid=login&eventcode=login&pagetype=login&user_code=${username.trim()}&user_pass=${password}`).then(res => { + if (res.data.success) { + commit('SET_ROLES', res.data.data.role_id) + // const { data } = res.data + commit('SET_TOKEN', 'bwhse') + setToken('bwhse') + sessionStorage.setItem('ROLES', res.data.data.role_id) + resolve() + } else { + Vue.prototype.$message.error(res.data.message) + } + }).catch(err => { + reject(err) + }) + }) + }, + + // get user info + getInfo({ commit, state }) { + return new Promise((resolve, reject) => { + getInfo(state.token).then(response => { + const { data } = response + + if (!data) { + reject('Verification failed, please Login again.') + } + + const { roles, name, avatar, introduction } = data + + // roles must be a non-empty array + if (!roles || roles.length <= 0) { + reject('getInfo: roles must be a non-null array!') + } + + commit('SET_ROLES', roles) + commit('SET_NAME', name) + commit('SET_AVATAR', avatar) + commit('SET_INTRODUCTION', introduction) + resolve(data) + }).catch(error => { + reject(error) + }) + }) + }, + + // user logout + logout({ commit, state, dispatch }) { + return new Promise((resolve, reject) => { + // logout(state.token).then(() => { + commit('SET_TOKEN', '') + commit('SET_ROLES', []) + sessionStorage.clear + removeToken() + resetRouter() + + // reset visited views and cached views + // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2485 + dispatch('tagsView/delAllViews', null, { root: true }) + + resolve() + // }).catch(error => { + // reject(error) + // }) + }) + }, + + // remove token + getRoles({ commit }, roles) { + return new Promise(resolve => { + commit('SET_ROLES', roles) + resolve() + }) + }, + + // remove token + resetToken({ commit }) { + return new Promise(resolve => { + commit('SET_TOKEN', '') + commit('SET_ROLES', []) + removeToken() + resolve() + }) + }, + + // dynamically modify permissions + async changeRoles({ commit, dispatch }, role) { + const token = role + '-token' + + commit('SET_TOKEN', token) + setToken(token) + + const { roles } = await dispatch('getInfo') + + resetRouter() + + // generate accessible routes map based on roles + const accessRoutes = await dispatch('permission/generateRoutes', roles, { root: true }) + // dynamically add accessible routes + router.addRoutes(accessRoutes) + + // reset visited views and cached views + dispatch('tagsView/delAllViews', null, { root: true }) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} diff --git a/src/views/hidden_check/api/index.js b/src/views/hidden_check/api/index.js index 211ea059..67d49411 100644 --- a/src/views/hidden_check/api/index.js +++ b/src/views/hidden_check/api/index.js @@ -1,70 +1,73 @@ -import request from '@/utils/request' - -export default { - getDate(pageSize, pageNo, isWhereSql, whereValue) { - let whereSql = '' - let whereType = '' - if (isWhereSql) { - whereSql = `dept_id like ?` - whereType = 'string' - } - return request({ - url: `commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=hidden_check&user_id=administrator`, - method: 'post', - data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0` - }).then(response => response.data) - }, - getDeptTree() { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=administrator`, - method: 'post', - data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0` - }).then(response => response.data) - }, - Crerte(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=hidden_check&keyid=${data.hidden_danger__hidden_danger_id}&hidden_danger__hidden_code=${data.hidden_danger__hidden_code}&hidden_danger__hidden_state=${data.hidden_danger__hidden_state}&hidden_danger__check_man=${data.hidden_danger__check_man}&hidden_danger__check_dept=${data.hidden_danger__check_dept}&hidden_danger__check_date=${data.hidden_danger__check_date}&hidden_danger__check_location=${data.hidden_danger__check_location}&hidden_danger__check_content=${data.hidden_danger__check_content}&hidden_danger__check_problem=${data.hidden_danger__check_problem}&hidden_danger__org_id=${data.hidden_danger__org_id}&hidden_danger__insp_det_id=${data.hidden_danger__insp_det_id}&hidden_danger__dept_id=${data.hidden_danger__dept_id}&hidden_danger__hidden_danger_id=${data.hidden_danger__hidden_danger_id}&hidden_danger__reform_man=${data.hidden_danger__reform_man}&hidden_danger__reform_dept=${data.hidden_danger__reform_dept}&hidden_danger__reform_limit=${data.hidden_danger__reform_limit}&hidden_danger__check_photo=${data.hidden_danger__check_photo}&hidden_danger__more_flag=${data.hidden_danger__more_flag}&hidden_danger__check_man_id=${data.hidden_danger__check_man_id}&hidden_danger__check_dept_id=${data.hidden_danger__check_dept_id}&hidden_danger__reform_dept_id=${data.hidden_danger__reform_dept_id}&hidden_danger__reform_man_id=${data.hidden_danger__reform_man_id}&hidden_danger__safe_insp_id=${data.hidden_danger__safe_insp_id}&pagetype=form&eventcode=create&fkValue=&user_id=administrator&dataType=json` - }).then(response => response.data) - }, - Save(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=hidden_check&keyid=${data.hidden_danger__hidden_danger_id}&hidden_danger__hidden_code=${data.hidden_danger__hidden_code}&hidden_danger__hidden_state=${data.hidden_danger__hidden_state}&hidden_danger__check_man=${data.hidden_danger__check_man}&hidden_danger__check_dept=${data.hidden_danger__check_dept}&hidden_danger__check_date=${data.hidden_danger__check_date}&hidden_danger__check_location=${data.hidden_danger__check_location}&hidden_danger__check_content=${data.hidden_danger__check_content}&hidden_danger__check_problem=${data.hidden_danger__check_problem}&hidden_danger__org_id=${data.hidden_danger__org_id}&hidden_danger__insp_det_id=${data.hidden_danger__insp_det_id}&hidden_danger__dept_id=${data.hidden_danger__dept_id}&hidden_danger__hidden_danger_id=${data.hidden_danger__hidden_danger_id}&hidden_danger__reform_man=${data.hidden_danger__reform_man}&hidden_danger__reform_dept=${data.hidden_danger__reform_dept}&hidden_danger__reform_limit=${data.hidden_danger__reform_limit}&hidden_danger__check_photo=${data.hidden_danger__check_photo}&hidden_danger__more_flag=${data.hidden_danger__more_flag}&hidden_danger__check_man_id=${data.hidden_danger__check_man_id}&hidden_danger__check_dept_id=${data.hidden_danger__check_dept_id}&hidden_danger__reform_dept_id=${data.hidden_danger__reform_dept_id}&hidden_danger__reform_man_id=${data.hidden_danger__reform_man_id}&hidden_danger__safe_insp_id=${data.hidden_danger__safe_insp_id}&pagetype=form&eventcode=save&dirtyfields=hidden_danger.check_man;hidden_danger.reform_man;hidden_danger.reform_dept;hidden_danger.check_dept;hidden_danger.check_date;hidden_danger.check_location;hidden_danger.check_content;hidden_danger.check_problem;hidden_danger.dept_id;hidden_danger.reform_dept_id;hidden_danger.reform_limit;hidden_danger.check_dept_id;hidden_danger.check_man_id;hidden_danger.reform_man_id&fkValue=&user_id=administrator&dataType=json` - }).then(response => response.data) - }, - auditSave(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `${data}` - }).then(response => response.data) - }, - Delete(ids) { - let keys = '' - ids.forEach(d => { - keys += 'keyid=' + d + '&' - }) - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=hidden_check&${keys}pagetype=editgrid&eventcode=delete&user_id=administrator&dataType=json` - }).then(response => response.data) - }, - getFormDate(id) { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=hidden_check&user_id=administrator`, - method: 'post', - data: `start=0&limit=10&where_sql=hidden_danger.hidden_danger_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0` - }).then(response => response.data) - }, - queryAttach(keyids) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=queryevent&pagetype=grid&eventcode=query_attach&tablename=hidden_danger&keyids=${keyids}&is_queryrelat=0&user_id=administrator&dataType=json&query_type=0&has_page=0` - }).then(response => response.data) - } -} +import request from '@/utils/request' +import store from '@/store/modules/user' + +var roles = store.state.roles.replace(/;/g, '') + +export default { + getDate(pageSize, pageNo, isWhereSql, whereValue) { + let whereSql = '' + let whereType = '' + if (isWhereSql) { + whereSql = `dept_id like ?` + whereType = 'string' + } + return request({ + url: `commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=hidden_check&user_id=${roles}`, + method: 'post', + data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0` + }).then(response => response.data) + }, + getDeptTree() { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=${roles}`, + method: 'post', + data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0` + }).then(response => response.data) + }, + Crerte(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=hidden_check&keyid=${data.hidden_danger__hidden_danger_id}&hidden_danger__hidden_code=${data.hidden_danger__hidden_code}&hidden_danger__hidden_state=${data.hidden_danger__hidden_state}&hidden_danger__check_man=${data.hidden_danger__check_man}&hidden_danger__check_dept=${data.hidden_danger__check_dept}&hidden_danger__check_date=${data.hidden_danger__check_date}&hidden_danger__check_location=${data.hidden_danger__check_location}&hidden_danger__check_content=${data.hidden_danger__check_content}&hidden_danger__check_problem=${data.hidden_danger__check_problem}&hidden_danger__org_id=${data.hidden_danger__org_id}&hidden_danger__insp_det_id=${data.hidden_danger__insp_det_id}&hidden_danger__dept_id=${data.hidden_danger__dept_id}&hidden_danger__hidden_danger_id=${data.hidden_danger__hidden_danger_id}&hidden_danger__reform_man=${data.hidden_danger__reform_man}&hidden_danger__reform_dept=${data.hidden_danger__reform_dept}&hidden_danger__reform_limit=${data.hidden_danger__reform_limit}&hidden_danger__check_photo=${data.hidden_danger__check_photo}&hidden_danger__more_flag=${data.hidden_danger__more_flag}&hidden_danger__check_man_id=${data.hidden_danger__check_man_id}&hidden_danger__check_dept_id=${data.hidden_danger__check_dept_id}&hidden_danger__reform_dept_id=${data.hidden_danger__reform_dept_id}&hidden_danger__reform_man_id=${data.hidden_danger__reform_man_id}&hidden_danger__safe_insp_id=${data.hidden_danger__safe_insp_id}&pagetype=form&eventcode=create&fkValue=&user_id=${roles}&dataType=json` + }).then(response => response.data) + }, + Save(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=hidden_check&keyid=${data.hidden_danger__hidden_danger_id}&hidden_danger__hidden_code=${data.hidden_danger__hidden_code}&hidden_danger__hidden_state=${data.hidden_danger__hidden_state}&hidden_danger__check_man=${data.hidden_danger__check_man}&hidden_danger__check_dept=${data.hidden_danger__check_dept}&hidden_danger__check_date=${data.hidden_danger__check_date}&hidden_danger__check_location=${data.hidden_danger__check_location}&hidden_danger__check_content=${data.hidden_danger__check_content}&hidden_danger__check_problem=${data.hidden_danger__check_problem}&hidden_danger__org_id=${data.hidden_danger__org_id}&hidden_danger__insp_det_id=${data.hidden_danger__insp_det_id}&hidden_danger__dept_id=${data.hidden_danger__dept_id}&hidden_danger__hidden_danger_id=${data.hidden_danger__hidden_danger_id}&hidden_danger__reform_man=${data.hidden_danger__reform_man}&hidden_danger__reform_dept=${data.hidden_danger__reform_dept}&hidden_danger__reform_limit=${data.hidden_danger__reform_limit}&hidden_danger__check_photo=${data.hidden_danger__check_photo}&hidden_danger__more_flag=${data.hidden_danger__more_flag}&hidden_danger__check_man_id=${data.hidden_danger__check_man_id}&hidden_danger__check_dept_id=${data.hidden_danger__check_dept_id}&hidden_danger__reform_dept_id=${data.hidden_danger__reform_dept_id}&hidden_danger__reform_man_id=${data.hidden_danger__reform_man_id}&hidden_danger__safe_insp_id=${data.hidden_danger__safe_insp_id}&pagetype=form&eventcode=save&dirtyfields=hidden_danger.check_man;hidden_danger.reform_man;hidden_danger.reform_dept;hidden_danger.check_dept;hidden_danger.check_date;hidden_danger.check_location;hidden_danger.check_content;hidden_danger.check_problem;hidden_danger.dept_id;hidden_danger.reform_dept_id;hidden_danger.reform_limit;hidden_danger.check_dept_id;hidden_danger.check_man_id;hidden_danger.reform_man_id&fkValue=&user_id=${roles}&dataType=json` + }).then(response => response.data) + }, + auditSave(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `${data}` + }).then(response => response.data) + }, + Delete(ids) { + let keys = '' + ids.forEach(d => { + keys += 'keyid=' + d + '&' + }) + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=hidden_check&${keys}pagetype=editgrid&eventcode=delete&user_id=${roles}&dataType=json` + }).then(response => response.data) + }, + getFormDate(id) { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=hidden_check&user_id=${roles}`, + method: 'post', + data: `start=0&limit=10&where_sql=hidden_danger.hidden_danger_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0` + }).then(response => response.data) + }, + queryAttach(keyids) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=queryevent&pagetype=grid&eventcode=query_attach&tablename=hidden_danger&keyids=${keyids}&is_queryrelat=0&user_id=${roles}&dataType=json&query_type=0&has_page=0` + }).then(response => response.data) + } +} diff --git a/src/views/hidden_reform/api/index.js b/src/views/hidden_reform/api/index.js index 0cf3e9a3..32875421 100644 --- a/src/views/hidden_reform/api/index.js +++ b/src/views/hidden_reform/api/index.js @@ -1,63 +1,66 @@ -import request from '@/utils/request' - -export default { - getDate(pageSize, pageNo, isWhereSql, whereValue) { - let whereSql = '' - let whereType = '' - if (isWhereSql) { - whereSql = `dept_id like ?` - whereType = 'string' - } - return request({ - url: `commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=hidden_reform&user_id=administrator`, - method: 'post', - data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0` - }).then(response => response.data) - }, - getDeptTree() { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=administrator`, - method: 'post', - data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0` - }).then(response => response.data) - }, - Crerte(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=hidden_reform&keyid=${data.hidden_danger__hidden_danger_id}&hidden_danger__hidden_code=${data.hidden_danger__hidden_code}&hidden_danger__hidden_state=${data.hidden_danger__hidden_state}&hidden_danger__check_man=${data.hidden_danger__check_man}&hidden_danger__check_dept=${data.hidden_danger__check_dept}&hidden_danger__check_date=${data.hidden_danger__check_date}&hidden_danger__check_location=${data.hidden_danger__check_location}&hidden_danger__check_content=${data.hidden_danger__check_content}&hidden_danger__check_problem=${data.hidden_danger__check_problem}&hidden_danger__org_id=${data.hidden_danger__org_id}&hidden_danger__insp_det_id=${data.hidden_danger__insp_det_id}&hidden_danger__dept_id=${data.hidden_danger__dept_id}&hidden_danger__hidden_danger_id=${data.hidden_danger__hidden_danger_id}&hidden_danger__reform_man=${data.hidden_danger__reform_man}&hidden_danger__reform_dept=${data.hidden_danger__reform_dept}&hidden_danger__reform_limit=${data.hidden_danger__reform_limit}&hidden_danger__check_photo=${data.hidden_danger__check_photo}&hidden_danger__more_flag=${data.hidden_danger__more_flag}&hidden_danger__check_man_id=${data.hidden_danger__check_man_id}&hidden_danger__check_dept_id=${data.hidden_danger__check_dept_id}&hidden_danger__reform_dept_id=${data.hidden_danger__reform_dept_id}&hidden_danger__reform_man_id=${data.hidden_danger__reform_man_id}&hidden_danger__safe_insp_id=${data.hidden_danger__safe_insp_id}&pagetype=form&eventcode=create&fkValue=&user_id=administrator&dataType=json` - }).then(response => response.data) - }, - Save(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=hidden_reform&keyid=${data.hidden_danger__hidden_danger_id}&hidden_danger__hidden_danger_id=${data.hidden_danger__hidden_danger_id}&hidden_danger__reform_date=${data.hidden_danger__reform_date}&hidden_danger__reform_money=${data.hidden_danger__reform_money}&hidden_danger__reform_desc=${data.hidden_danger__reform_desc}&pagetype=form&eventcode=save&dirtyfields=hidden_danger.reform_date;hidden_danger.reform_money;hidden_danger.reform_desc&fkValue=&user_id=administrator&dataType=json` - }).then(response => response.data) - }, - auditSave(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `${data}` - }).then(response => response.data) - }, - Delete(ids) { - let keys = '' - ids.forEach(d => { - keys += 'keyid=' + d + '&' - }) - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=hidden_reform&${keys}pagetype=editgrid&eventcode=delete&user_id=administrator&dataType=json` - }).then(response => response.data) - }, - getFormDate(id) { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=hidden_reform&user_id=administrator`, - method: 'post', - data: `start=0&limit=10&where_sql=hidden_danger.hidden_danger_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0` - }).then(response => response.data) - } -} +import request from '@/utils/request' +import store from '@/store/modules/user' + +var roles = store.state.roles.replace(/;/g, '') + +export default { + getDate(pageSize, pageNo, isWhereSql, whereValue) { + let whereSql = '' + let whereType = '' + if (isWhereSql) { + whereSql = `dept_id like ?` + whereType = 'string' + } + return request({ + url: `commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=hidden_reform&user_id=${roles}`, + method: 'post', + data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0` + }).then(response => response.data) + }, + getDeptTree() { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=${roles}`, + method: 'post', + data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0` + }).then(response => response.data) + }, + Crerte(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=hidden_reform&keyid=${data.hidden_danger__hidden_danger_id}&hidden_danger__hidden_code=${data.hidden_danger__hidden_code}&hidden_danger__hidden_state=${data.hidden_danger__hidden_state}&hidden_danger__check_man=${data.hidden_danger__check_man}&hidden_danger__check_dept=${data.hidden_danger__check_dept}&hidden_danger__check_date=${data.hidden_danger__check_date}&hidden_danger__check_location=${data.hidden_danger__check_location}&hidden_danger__check_content=${data.hidden_danger__check_content}&hidden_danger__check_problem=${data.hidden_danger__check_problem}&hidden_danger__org_id=${data.hidden_danger__org_id}&hidden_danger__insp_det_id=${data.hidden_danger__insp_det_id}&hidden_danger__dept_id=${data.hidden_danger__dept_id}&hidden_danger__hidden_danger_id=${data.hidden_danger__hidden_danger_id}&hidden_danger__reform_man=${data.hidden_danger__reform_man}&hidden_danger__reform_dept=${data.hidden_danger__reform_dept}&hidden_danger__reform_limit=${data.hidden_danger__reform_limit}&hidden_danger__check_photo=${data.hidden_danger__check_photo}&hidden_danger__more_flag=${data.hidden_danger__more_flag}&hidden_danger__check_man_id=${data.hidden_danger__check_man_id}&hidden_danger__check_dept_id=${data.hidden_danger__check_dept_id}&hidden_danger__reform_dept_id=${data.hidden_danger__reform_dept_id}&hidden_danger__reform_man_id=${data.hidden_danger__reform_man_id}&hidden_danger__safe_insp_id=${data.hidden_danger__safe_insp_id}&pagetype=form&eventcode=create&fkValue=&user_id=${roles}&dataType=json` + }).then(response => response.data) + }, + Save(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=hidden_reform&keyid=${data.hidden_danger__hidden_danger_id}&hidden_danger__hidden_danger_id=${data.hidden_danger__hidden_danger_id}&hidden_danger__reform_date=${data.hidden_danger__reform_date}&hidden_danger__reform_money=${data.hidden_danger__reform_money}&hidden_danger__reform_desc=${data.hidden_danger__reform_desc}&pagetype=form&eventcode=save&dirtyfields=hidden_danger.reform_date;hidden_danger.reform_money;hidden_danger.reform_desc&fkValue=&user_id=${roles}&dataType=json` + }).then(response => response.data) + }, + auditSave(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `${data}` + }).then(response => response.data) + }, + Delete(ids) { + let keys = '' + ids.forEach(d => { + keys += 'keyid=' + d + '&' + }) + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=hidden_reform&${keys}pagetype=editgrid&eventcode=delete&user_id=${roles}&dataType=json` + }).then(response => response.data) + }, + getFormDate(id) { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=hidden_reform&user_id=${roles}`, + method: 'post', + data: `start=0&limit=10&where_sql=hidden_danger.hidden_danger_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0` + }).then(response => response.data) + } +} diff --git a/src/views/hidden_review/api/index.js b/src/views/hidden_review/api/index.js index fa18be36..c7b9b1d3 100644 --- a/src/views/hidden_review/api/index.js +++ b/src/views/hidden_review/api/index.js @@ -1,63 +1,66 @@ -import request from '@/utils/request' - -export default { - getDate(pageSize, pageNo, isWhereSql, whereValue) { - let whereSql = '' - let whereType = '' - if (isWhereSql) { - whereSql = `dept_id like ?` - whereType = 'string' - } - return request({ - url: `commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=hidden_review&user_id=administrator`, - method: 'post', - data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0` - }).then(response => response.data) - }, - getDeptTree() { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=administrator`, - method: 'post', - data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0` - }).then(response => response.data) - }, - Crerte(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=hidden_review&keyid=${data.hidden_danger__hidden_danger_id}&hidden_danger__hidden_code=${data.hidden_danger__hidden_code}&hidden_danger__hidden_state=${data.hidden_danger__hidden_state}&hidden_danger__check_man=${data.hidden_danger__check_man}&hidden_danger__check_dept=${data.hidden_danger__check_dept}&hidden_danger__check_date=${data.hidden_danger__check_date}&hidden_danger__check_location=${data.hidden_danger__check_location}&hidden_danger__check_content=${data.hidden_danger__check_content}&hidden_danger__check_problem=${data.hidden_danger__check_problem}&hidden_danger__org_id=${data.hidden_danger__org_id}&hidden_danger__insp_det_id=${data.hidden_danger__insp_det_id}&hidden_danger__dept_id=${data.hidden_danger__dept_id}&hidden_danger__hidden_danger_id=${data.hidden_danger__hidden_danger_id}&hidden_danger__reform_man=${data.hidden_danger__reform_man}&hidden_danger__reform_dept=${data.hidden_danger__reform_dept}&hidden_danger__reform_limit=${data.hidden_danger__reform_limit}&hidden_danger__check_photo=${data.hidden_danger__check_photo}&hidden_danger__more_flag=${data.hidden_danger__more_flag}&hidden_danger__check_man_id=${data.hidden_danger__check_man_id}&hidden_danger__check_dept_id=${data.hidden_danger__check_dept_id}&hidden_danger__reform_dept_id=${data.hidden_danger__reform_dept_id}&hidden_danger__reform_man_id=${data.hidden_danger__reform_man_id}&hidden_danger__safe_insp_id=${data.hidden_danger__safe_insp_id}&pagetype=form&eventcode=create&fkValue=&user_id=administrator&dataType=json` - }).then(response => response.data) - }, - Save(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=hidden_review&keyid=${data.hidden_danger__hidden_danger_id}&hidden_danger__hidden_danger_id=${data.hidden_danger__hidden_danger_id}&hidden_danger__review_date=${data.hidden_danger__review_date}&hidden_danger__review_man=${data.hidden_danger__review_man}&hidden_danger__review_man_id=${data.hidden_danger__review_man_id}&hidden_danger__review_desc=${data.hidden_danger__review_desc}&pagetype=form&eventcode=save&dirtyfields=hidden_danger.review_date;hidden_danger.review_man;hidden_danger.review_man_id;hidden_danger.review_desc&fkValue=&user_id=administrator&dataType=json` - }).then(response => response.data) - }, - auditSave(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `${data}` - }).then(response => response.data) - }, - Delete(ids) { - let keys = '' - ids.forEach(d => { - keys += 'keyid=' + d + '&' - }) - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=hidden_review&${keys}pagetype=editgrid&eventcode=delete&user_id=administrator&dataType=json` - }).then(response => response.data) - }, - getFormDate(id) { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=hidden_review&user_id=administrator`, - method: 'post', - data: `start=0&limit=10&where_sql=hidden_danger.hidden_danger_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0` - }).then(response => response.data) - } -} +import request from '@/utils/request' +import store from '@/store/modules/user' + +var roles = store.state.roles.replace(/;/g, '') + +export default { + getDate(pageSize, pageNo, isWhereSql, whereValue) { + let whereSql = '' + let whereType = '' + if (isWhereSql) { + whereSql = `dept_id like ?` + whereType = 'string' + } + return request({ + url: `commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=hidden_review&user_id=${roles}`, + method: 'post', + data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0` + }).then(response => response.data) + }, + getDeptTree() { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=${roles}`, + method: 'post', + data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0` + }).then(response => response.data) + }, + Crerte(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=hidden_review&keyid=${data.hidden_danger__hidden_danger_id}&hidden_danger__hidden_code=${data.hidden_danger__hidden_code}&hidden_danger__hidden_state=${data.hidden_danger__hidden_state}&hidden_danger__check_man=${data.hidden_danger__check_man}&hidden_danger__check_dept=${data.hidden_danger__check_dept}&hidden_danger__check_date=${data.hidden_danger__check_date}&hidden_danger__check_location=${data.hidden_danger__check_location}&hidden_danger__check_content=${data.hidden_danger__check_content}&hidden_danger__check_problem=${data.hidden_danger__check_problem}&hidden_danger__org_id=${data.hidden_danger__org_id}&hidden_danger__insp_det_id=${data.hidden_danger__insp_det_id}&hidden_danger__dept_id=${data.hidden_danger__dept_id}&hidden_danger__hidden_danger_id=${data.hidden_danger__hidden_danger_id}&hidden_danger__reform_man=${data.hidden_danger__reform_man}&hidden_danger__reform_dept=${data.hidden_danger__reform_dept}&hidden_danger__reform_limit=${data.hidden_danger__reform_limit}&hidden_danger__check_photo=${data.hidden_danger__check_photo}&hidden_danger__more_flag=${data.hidden_danger__more_flag}&hidden_danger__check_man_id=${data.hidden_danger__check_man_id}&hidden_danger__check_dept_id=${data.hidden_danger__check_dept_id}&hidden_danger__reform_dept_id=${data.hidden_danger__reform_dept_id}&hidden_danger__reform_man_id=${data.hidden_danger__reform_man_id}&hidden_danger__safe_insp_id=${data.hidden_danger__safe_insp_id}&pagetype=form&eventcode=create&fkValue=&user_id=${roles}&dataType=json` + }).then(response => response.data) + }, + Save(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=hidden_review&keyid=${data.hidden_danger__hidden_danger_id}&hidden_danger__hidden_danger_id=${data.hidden_danger__hidden_danger_id}&hidden_danger__review_date=${data.hidden_danger__review_date}&hidden_danger__review_man=${data.hidden_danger__review_man}&hidden_danger__review_man_id=${data.hidden_danger__review_man_id}&hidden_danger__review_desc=${data.hidden_danger__review_desc}&pagetype=form&eventcode=save&dirtyfields=hidden_danger.review_date;hidden_danger.review_man;hidden_danger.review_man_id;hidden_danger.review_desc&fkValue=&user_id=${roles}&dataType=json` + }).then(response => response.data) + }, + auditSave(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `${data}` + }).then(response => response.data) + }, + Delete(ids) { + let keys = '' + ids.forEach(d => { + keys += 'keyid=' + d + '&' + }) + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=hidden_review&${keys}pagetype=editgrid&eventcode=delete&user_id=${roles}&dataType=json` + }).then(response => response.data) + }, + getFormDate(id) { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=hidden_review&user_id=${roles}`, + method: 'post', + data: `start=0&limit=10&where_sql=hidden_danger.hidden_danger_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0` + }).then(response => response.data) + } +} diff --git a/src/views/insp_name/api/index.js b/src/views/insp_name/api/index.js index 888f549c..ac0af57a 100644 --- a/src/views/insp_name/api/index.js +++ b/src/views/insp_name/api/index.js @@ -1,56 +1,59 @@ -import request from '@/utils/request' - -export default { - getDate(pageSize, pageNo, isWhereSql, whereValue) { - let whereSql = '' - let whereType = '' - if (isWhereSql) { - whereSql = `dept_id like ?` - whereType = 'string' - } - return request({ - url: `commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=insp_name&user_id=administrator`, - method: 'post', - data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0` - }).then(response => response.data) - }, - Crerte(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `${data}` - }).then(response => response.data) - }, - auditSave(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `${data}` - }).then(response => response.data) - }, - Delete(ids) { - let keys = '' - ids.forEach(d => { - keys += 'keyid=' + d + '&' - }) - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=insp_name&${keys}pagetype=editgrid&eventcode=delete_eg&user_id=administrator&dataType=json` - }).then(response => response.data) - }, - getFormDate(id) { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=insp_name&user_id=administrator`, - method: 'post', - data: `start=0&limit=10&where_sql=safe_insp.safe_insp_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0` - }).then(response => response.data) - }, - Save(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=safe_insp&keyid=${data.safe_insp__safe_insp_id}&safe_insp__insp_code=${data.safe_insp__insp_code}&safe_insp__insp_name=${data.safe_insp__insp_name}&safe_insp__insp_man=${data.safe_insp__insp_man}&safe_insp__insp_times=${data.safe_insp__insp_times}&safe_insp__insp_name_id=${data.safe_insp__insp_name_id}&safe_insp__org_id=${data.safe_insp__org_id}&safe_insp__insp_state=${data.safe_insp__insp_state}&safe_insp__insp_date=${data.safe_insp__insp_date}&safe_insp__insp_memo=${data.safe_insp__insp_memo}&safe_insp__safe_insp_id=${data.safe_insp__safe_insp_id}&safe_insp__dept_id=${data.safe_insp__dept_id}&safe_insp__insp_man_id=${data.safe_insp__insp_man_id}&safe_insp__insp_ed=&safe_insp__insp_ing=${data.safe_insp__insp_ing}&safe_insp__insp_non=&pagetype=form&eventcode=save&dirtyfields=safe_insp.insp_man;safe_insp.insp_times;safe_insp.insp_date;safe_insp.insp_memo;safe_insp.insp_man_id;safe_insp.insp_name;safe_insp.insp_name_id;&fkValue=&user_id=administrator&dataType=json` - }).then(response => response.data) - } -} +import request from '@/utils/request' +import store from '@/store/modules/user' + +var roles = store.state.roles.replace(/;/g, '') + +export default { + getDate(pageSize, pageNo, isWhereSql, whereValue) { + let whereSql = '' + let whereType = '' + if (isWhereSql) { + whereSql = `dept_id like ?` + whereType = 'string' + } + return request({ + url: `commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=insp_name&user_id=${roles}`, + method: 'post', + data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0` + }).then(response => response.data) + }, + Crerte(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `${data}` + }).then(response => response.data) + }, + auditSave(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `${data}` + }).then(response => response.data) + }, + Delete(ids) { + let keys = '' + ids.forEach(d => { + keys += 'keyid=' + d + '&' + }) + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=insp_name&${keys}pagetype=editgrid&eventcode=delete_eg&user_id=${roles}&dataType=json` + }).then(response => response.data) + }, + getFormDate(id) { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=insp_name&user_id=${roles}`, + method: 'post', + data: `start=0&limit=10&where_sql=safe_insp.safe_insp_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0` + }).then(response => response.data) + }, + Save(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=safe_insp&keyid=${data.safe_insp__safe_insp_id}&safe_insp__insp_code=${data.safe_insp__insp_code}&safe_insp__insp_name=${data.safe_insp__insp_name}&safe_insp__insp_man=${data.safe_insp__insp_man}&safe_insp__insp_times=${data.safe_insp__insp_times}&safe_insp__insp_name_id=${data.safe_insp__insp_name_id}&safe_insp__org_id=${data.safe_insp__org_id}&safe_insp__insp_state=${data.safe_insp__insp_state}&safe_insp__insp_date=${data.safe_insp__insp_date}&safe_insp__insp_memo=${data.safe_insp__insp_memo}&safe_insp__safe_insp_id=${data.safe_insp__safe_insp_id}&safe_insp__dept_id=${data.safe_insp__dept_id}&safe_insp__insp_man_id=${data.safe_insp__insp_man_id}&safe_insp__insp_ed=&safe_insp__insp_ing=${data.safe_insp__insp_ing}&safe_insp__insp_non=&pagetype=form&eventcode=save&dirtyfields=safe_insp.insp_man;safe_insp.insp_times;safe_insp.insp_date;safe_insp.insp_memo;safe_insp.insp_man_id;safe_insp.insp_name;safe_insp.insp_name_id;&fkValue=&user_id=${roles}&dataType=json` + }).then(response => response.data) + } +} diff --git a/src/views/safe_insp/api/index.js b/src/views/safe_insp/api/index.js index b7ec1424..ac954e15 100644 --- a/src/views/safe_insp/api/index.js +++ b/src/views/safe_insp/api/index.js @@ -1,63 +1,66 @@ -import request from '@/utils/request' - -export default { - getDate(pageSize, pageNo, isWhereSql, whereValue) { - let whereSql = '' - let whereType = '' - if (isWhereSql) { - whereSql = `dept_id like ?` - whereType = 'string' - } - return request({ - url: `commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=safe_insp&user_id=administrator`, - method: 'post', - data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0` - }).then(response => response.data) - }, - getDeptTree() { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=administrator`, - method: 'post', - data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0` - }).then(response => response.data) - }, - Crerte(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=safe_insp&keyid=${data.safe_insp__safe_insp_id}&safe_insp__insp_code=${data.safe_insp__insp_code}&safe_insp__insp_name=${data.safe_insp__insp_name}&safe_insp__insp_man=${data.safe_insp__insp_man}&safe_insp__insp_times=${data.safe_insp__insp_times}&safe_insp__insp_name_id=${data.safe_insp__insp_name_id}&safe_insp__org_id=${data.safe_insp__org_id}&safe_insp__insp_state=${data.safe_insp__insp_state}&safe_insp__insp_date=${data.safe_insp__insp_date}&safe_insp__insp_memo=${data.safe_insp__insp_memo}&safe_insp__safe_insp_id=${data.safe_insp__safe_insp_id}&safe_insp__dept_id=${data.safe_insp__dept_id}&safe_insp__insp_man_id=${data.safe_insp__insp_man_id}&safe_insp__insp_ed=&safe_insp__insp_ing=${data.safe_insp__insp_ing}&safe_insp__insp_non=&pagetype=form&eventcode=create&dirtyfields=safe_insp.insp_man;safe_insp.insp_times;safe_insp.insp_date;safe_insp.insp_memo;safe_insp.insp_man_id;safe_insp.insp_name;safe_insp.insp_name_id;&fkValue=&user_id=administrator&dataType=json` - }).then(response => response.data) - }, - Save(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=safe_insp&keyid=${data.safe_insp__safe_insp_id}&safe_insp__insp_code=${data.safe_insp__insp_code}&safe_insp__insp_name=${data.safe_insp__insp_name}&safe_insp__insp_man=${data.safe_insp__insp_man}&safe_insp__insp_times=${data.safe_insp__insp_times}&safe_insp__insp_name_id=${data.safe_insp__insp_name_id}&safe_insp__org_id=${data.safe_insp__org_id}&safe_insp__insp_state=${data.safe_insp__insp_state}&safe_insp__insp_date=${data.safe_insp__insp_date}&safe_insp__insp_memo=${data.safe_insp__insp_memo}&safe_insp__safe_insp_id=${data.safe_insp__safe_insp_id}&safe_insp__dept_id=${data.safe_insp__dept_id}&safe_insp__insp_man_id=${data.safe_insp__insp_man_id}&safe_insp__insp_ed=&safe_insp__insp_ing=${data.safe_insp__insp_ing}&safe_insp__insp_non=&pagetype=form&eventcode=save&dirtyfields=safe_insp.insp_man;safe_insp.insp_times;safe_insp.insp_date;safe_insp.insp_memo;safe_insp.insp_man_id;safe_insp.insp_name;safe_insp.insp_name_id;&fkValue=&user_id=administrator&dataType=json` - }).then(response => response.data) - }, - auditSave(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `${data}` - }).then(response => response.data) - }, - Delete(ids) { - let keys = '' - ids.forEach(d => { - keys += 'keyid=' + d + '&' - }) - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=sys_dept&${keys}pagetype=editgrid&eventcode=delete_eg&user_id=administrator&dataType=json` - }).then(response => response.data) - }, - getFormDate(id) { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=safe_insp&user_id=administrator`, - method: 'post', - data: `start=0&limit=10&where_sql=safe_insp.safe_insp_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0` - }).then(response => response.data) - } -} +import request from '@/utils/request' +import store from '@/store/modules/user' + +var roles = store.state.roles.replace(/;/g, '') + +export default { + getDate(pageSize, pageNo, isWhereSql, whereValue) { + let whereSql = '' + let whereType = '' + if (isWhereSql) { + whereSql = `dept_id like ?` + whereType = 'string' + } + return request({ + url: `commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=safe_insp&user_id=${roles}`, + method: 'post', + data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0` + }).then(response => response.data) + }, + getDeptTree() { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=${roles}`, + method: 'post', + data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0` + }).then(response => response.data) + }, + Crerte(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=safe_insp&keyid=${data.safe_insp__safe_insp_id}&safe_insp__insp_code=${data.safe_insp__insp_code}&safe_insp__insp_name=${data.safe_insp__insp_name}&safe_insp__insp_man=${data.safe_insp__insp_man}&safe_insp__insp_times=${data.safe_insp__insp_times}&safe_insp__insp_name_id=${data.safe_insp__insp_name_id}&safe_insp__org_id=${data.safe_insp__org_id}&safe_insp__insp_state=${data.safe_insp__insp_state}&safe_insp__insp_date=${data.safe_insp__insp_date}&safe_insp__insp_memo=${data.safe_insp__insp_memo}&safe_insp__safe_insp_id=${data.safe_insp__safe_insp_id}&safe_insp__dept_id=${data.safe_insp__dept_id}&safe_insp__insp_man_id=${data.safe_insp__insp_man_id}&safe_insp__insp_ed=&safe_insp__insp_ing=${data.safe_insp__insp_ing}&safe_insp__insp_non=&pagetype=form&eventcode=create&dirtyfields=safe_insp.insp_man;safe_insp.insp_times;safe_insp.insp_date;safe_insp.insp_memo;safe_insp.insp_man_id;safe_insp.insp_name;safe_insp.insp_name_id;&fkValue=&user_id=${roles}&dataType=json` + }).then(response => response.data) + }, + Save(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=safe_insp&keyid=${data.safe_insp__safe_insp_id}&safe_insp__insp_code=${data.safe_insp__insp_code}&safe_insp__insp_name=${data.safe_insp__insp_name}&safe_insp__insp_man=${data.safe_insp__insp_man}&safe_insp__insp_times=${data.safe_insp__insp_times}&safe_insp__insp_name_id=${data.safe_insp__insp_name_id}&safe_insp__org_id=${data.safe_insp__org_id}&safe_insp__insp_state=${data.safe_insp__insp_state}&safe_insp__insp_date=${data.safe_insp__insp_date}&safe_insp__insp_memo=${data.safe_insp__insp_memo}&safe_insp__safe_insp_id=${data.safe_insp__safe_insp_id}&safe_insp__dept_id=${data.safe_insp__dept_id}&safe_insp__insp_man_id=${data.safe_insp__insp_man_id}&safe_insp__insp_ed=&safe_insp__insp_ing=${data.safe_insp__insp_ing}&safe_insp__insp_non=&pagetype=form&eventcode=save&dirtyfields=safe_insp.insp_man;safe_insp.insp_times;safe_insp.insp_date;safe_insp.insp_memo;safe_insp.insp_man_id;safe_insp.insp_name;safe_insp.insp_name_id;&fkValue=&user_id=${roles}&dataType=json` + }).then(response => response.data) + }, + auditSave(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `${data}` + }).then(response => response.data) + }, + Delete(ids) { + let keys = '' + ids.forEach(d => { + keys += 'keyid=' + d + '&' + }) + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=sys_dept&${keys}pagetype=editgrid&eventcode=delete_eg&user_id=${roles}&dataType=json` + }).then(response => response.data) + }, + getFormDate(id) { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=safe_insp&user_id=${roles}`, + method: 'post', + data: `start=0&limit=10&where_sql=safe_insp.safe_insp_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0` + }).then(response => response.data) + } +} diff --git a/src/views/sys_dept/api/index.js b/src/views/sys_dept/api/index.js index 864cf6e4..433ad0df 100644 --- a/src/views/sys_dept/api/index.js +++ b/src/views/sys_dept/api/index.js @@ -1,49 +1,52 @@ -import request from '@/utils/request' - -export default { - getDept(pageSize, pageNo, isWhereSql, whereValue) { - let whereSql = '' - let whereType = '' - if (isWhereSql) { - whereSql = `sys_dept.dept_id like ?` - whereType = 'string' - } - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=administrator`, - method: 'post', - data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0` - }).then(response => response.data) - }, - getDeptTree() { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=administrator`, - method: 'post', - data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0` - }).then(response => response.data) - }, - Crerte(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `${data}` - }).then(response => response.data) - }, - auditSave(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `${data}` - }).then(response => response.data) - }, - Delete(ids) { - let keys = '' - ids.forEach(d => { - keys += 'keyid=' + d + '&' - }) - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=sys_dept&${keys}pagetype=editgrid&eventcode=delete_eg&user_id=administrator&dataType=json` - }).then(response => response.data) - } -} +import request from '@/utils/request' +import store from '@/store/modules/user' + +var roles = store.state.roles.replace(/;/g, '') + +export default { + getDept(pageSize, pageNo, isWhereSql, whereValue) { + let whereSql = '' + let whereType = '' + if (isWhereSql) { + whereSql = `sys_dept.dept_id like ?` + whereType = 'string' + } + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=${roles}`, + method: 'post', + data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0` + }).then(response => response.data) + }, + getDeptTree() { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=${roles}`, + method: 'post', + data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0` + }).then(response => response.data) + }, + Crerte(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `${data}` + }).then(response => response.data) + }, + auditSave(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `${data}` + }).then(response => response.data) + }, + Delete(ids) { + let keys = '' + ids.forEach(d => { + keys += 'keyid=' + d + '&' + }) + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=sys_dept&${keys}pagetype=editgrid&eventcode=delete_eg&user_id=${roles}&dataType=json` + }).then(response => response.data) + } +} diff --git a/src/views/sys_user/api/index.js b/src/views/sys_user/api/index.js index 1b934115..8bb4399e 100644 --- a/src/views/sys_user/api/index.js +++ b/src/views/sys_user/api/index.js @@ -1,56 +1,58 @@ -import request from '@/utils/request' - -export default { - getUser(pageSize, pageNo, isWhereSql, whereValue) { - let whereSql = '' - let whereType = '' - if (isWhereSql) { - whereSql = `sys_dept.dept_id like ?` - whereType = 'string' - } - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_user&user_id=administrator`, - method: 'post', - data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0` - }).then(response => response.data) - }, - getDeptTree() { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=administrator`, - method: 'post', - data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0` - }).then(response => response.data) - }, - Crerte(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `${data}` - }).then(response => response.data) - }, - auditSave(data) { - return request({ - url: `/commonAction.do`, - method: 'post', - data: `${data}` - }).then(response => response.data) - }, - Delete(ids) { - let keys = '' - ids.forEach(d => { - keys += 'keyid=' + d + '&' - }) - return request({ - url: `/commonAction.do`, - method: 'post', - data: `funid=sys_user&${keys}pagetype=editgrid&eventcode=delete_eg&user_id=administrator&dataType=json` - }).then(response => response.data) - }, - getSelect(control_code) { - return request({ - url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_control&user_id=administrator`, - method: 'post', - data: `start=0&limit=50&where_sql=(funall_control.control_code = ? )&where_value=${control_code}&where_type=string&is_query=1&query_type=0` - }).then(response => response.data) - } -} +import request from '@/utils/request' +import store from '@/store/modules/user' + +var roles = store.state.roles.replace(/;/g, '') +export default { + getUser(pageSize, pageNo, isWhereSql, whereValue) { + let whereSql = '' + let whereType = '' + if (isWhereSql) { + whereSql = `sys_dept.dept_id like ?` + whereType = 'string' + } + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_user&user_id=${roles}`, + method: 'post', + data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0` + }).then(response => response.data) + }, + getDeptTree() { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=${roles}`, + method: 'post', + data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0` + }).then(response => response.data) + }, + Crerte(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `${data}` + }).then(response => response.data) + }, + auditSave(data) { + return request({ + url: `/commonAction.do`, + method: 'post', + data: `${data}` + }).then(response => response.data) + }, + Delete(ids) { + let keys = '' + ids.forEach(d => { + keys += 'keyid=' + d + '&' + }) + return request({ + url: `/commonAction.do`, + method: 'post', + data: `funid=sys_user&${keys}pagetype=editgrid&eventcode=delete_eg&user_id=${roles}&dataType=json` + }).then(response => response.data) + }, + getSelect(control_code) { + return request({ + url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_control&user_id=${roles}`, + method: 'post', + data: `start=0&limit=50&where_sql=(funall_control.control_code = ? )&where_value=${control_code}&where_type=string&is_query=1&query_type=0` + }).then(response => response.data) + } +} diff --git a/src/views/sys_user/index.vue b/src/views/sys_user/index.vue index b1a7ad14..4eadfa8a 100644 --- a/src/views/sys_user/index.vue +++ b/src/views/sys_user/index.vue @@ -1,473 +1,469 @@ - - - - + + + +