From c21fb5b063207288661bc9b553e37d4c7b7001cd Mon Sep 17 00:00:00 2001 From: monkeyhouyi Date: Mon, 22 Jul 2024 14:57:29 +0800 Subject: [PATCH] 巡查上报页面 --- package.json | 1 + src/api/permission/authorize.js | 43 +++++++++++++++++++++++++++++++++++++++++++ src/api/permission/department.js | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/api/permission/onlineUser.js | 17 +++++++++++++++++ src/api/permission/organize.js | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/api/permission/position.js | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/api/permission/role.js | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/api/permission/user.js | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/api/permission/userRelation.js | 19 +++++++++++++++++++ src/api/permission/userSetting.js | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/api/systemData/commonFields.js | 10 +++++----- src/api/systemData/dataBackup.js | 6 +++--- src/api/systemData/dataInterface.js | 32 +++++++++++++++++++++----------- src/api/systemData/dataModel.js | 16 ++++++++-------- src/api/systemData/dataSource.js | 16 ++++++++-------- src/api/systemData/dictionary.js | 32 ++++++++++++++++---------------- src/components/NCC-treeSelect/index.vue | 254 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/Screenfull/index.vue | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/index.js | 7 +++++++ src/store/index.js | 2 ++ src/store/modules/generator.js | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/baseComapnyInfo/index.vue | 14 +++++++++++--- src/views/baseInspectionReport/ExportBox.vue | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/baseInspectionReport/Form.vue | 242 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/baseInspectionReport/FormPage.vue | 242 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/baseInspectionReport/index.vue | 235 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/baseSystemInfo/index.vue | 12 ++++++------ 27 files changed, 1812 insertions(+), 60 deletions(-) create mode 100644 src/api/permission/authorize.js create mode 100644 src/api/permission/department.js create mode 100644 src/api/permission/onlineUser.js create mode 100644 src/api/permission/organize.js create mode 100644 src/api/permission/position.js create mode 100644 src/api/permission/role.js create mode 100644 src/api/permission/user.js create mode 100644 src/api/permission/userRelation.js create mode 100644 src/api/permission/userSetting.js create mode 100644 src/components/NCC-treeSelect/index.vue create mode 100644 src/components/Screenfull/index.vue create mode 100644 src/store/modules/generator.js create mode 100644 src/views/baseInspectionReport/ExportBox.vue create mode 100644 src/views/baseInspectionReport/Form.vue create mode 100644 src/views/baseInspectionReport/FormPage.vue create mode 100644 src/views/baseInspectionReport/index.vue diff --git a/package.json b/package.json index 28f6a19..0b04ba3 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "nprogress": "^0.2.0", "reconnecting-websocket": "^4.4.0", "sass-loader": "^14.2.1", + "screenfull": "^4.2.0", "style-loader": "^4.0.0", "vue": "^2.6.14", "vue-i18n": "^7.3.2", diff --git a/src/api/permission/authorize.js b/src/api/permission/authorize.js new file mode 100644 index 0000000..ac08d20 --- /dev/null +++ b/src/api/permission/authorize.js @@ -0,0 +1,43 @@ +import request from '@/utils/request' + +// 获取岗位/角色/用户权限树形结构及数据 +export const getAuthorizeValues = (objectId, data) => { + return request({ + url: `/permission/Authority/Data/${objectId}/Values`, + method: 'POST', + data + }) +} + +// 更新岗位/角色/用户权限 +export const updateAuthorizeList = (objectId, data) => { + return request({ + url: `/permission/Authority/Data/${objectId}`, + method: 'PUT', + data + }) +} + +// 批量设置权限 +export const updateBatchAuthorize = (data) => { + return request({ + url: `/permission/Authority/Data/Batch`, + method: 'POST', + data + }) +} +// 获取功能权限数据 +export const getModelData = (id, ObjectType) => { + return request({ + url: `/permission/Authority/Model/${id}/${ObjectType}`, + method: 'GET' + }) +} +// 设置/更新功能权限 +export const setModelData = (id, data) => { + return request({ + url: `/permission/Authority/Model/${id}`, + method: 'PUT', + data + }) +} diff --git a/src/api/permission/department.js b/src/api/permission/department.js new file mode 100644 index 0000000..1581710 --- /dev/null +++ b/src/api/permission/department.js @@ -0,0 +1,60 @@ +import request from '@/utils/request' + +// 获取部门列表 +export const getDepartmentList = (companyId, data) => { + return request({ + url: `/permission/Organize/${companyId}/Department`, + method: 'GET', + data + }) +} + +// 获取部门下拉框列表(公司+部门) +export const getDepartmentSelector = (id) => { + return request({ + url: '/permission/Organize/Department/Selector/' + (!!id ? id : 0), + method: 'GET' + }) +} + +// 新建部门 +export const createDepartment = (data) => { + return request({ + url: '/permission/Organize/Department', + method: 'POST', + data + }) +} + +// 修改部门 +export const updateDepartment = (data) => { + return request({ + url: `/permission/Organize/Department/${data.id}`, + method: 'PUT', + data + }) +} + +// 获取部门信息 +export const getDepartmentInfo = (id) => { + return request({ + url: `/permission/Organize/Department/${id}`, + method: 'GET' + }) +} + +// 删除部门 +export const delDepartment = (id) => { + return request({ + url: `/permission/Organize/Department/${id}`, + method: 'DELETE' + }) +} + +// 更新部门状态 +export const updateDepartmentState = (id) => { + return request({ + url: `/permission/Organize/Department/${id}/Actions/State`, + method: 'PUT' + }) +} \ No newline at end of file diff --git a/src/api/permission/onlineUser.js b/src/api/permission/onlineUser.js new file mode 100644 index 0000000..a15e0c1 --- /dev/null +++ b/src/api/permission/onlineUser.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' + +// 获取在线用户列表 +export const getOnlineUser = (data) => { + return request({ + url: '/system/OnlineUser', + method: 'GET', + data + }) +} +// 强制下线 +export const deleteOnlineUser = (id) => { + return request({ + url: `/system/OnlineUser/${id}`, + method: 'DELETE' + }) +} diff --git a/src/api/permission/organize.js b/src/api/permission/organize.js new file mode 100644 index 0000000..a18606b --- /dev/null +++ b/src/api/permission/organize.js @@ -0,0 +1,83 @@ +import request from '@/utils/request' + +// 获取组织/公司列表 +export const getOrganizeList = (data) => { + return request({ + url: '/permission/Organize', + method: 'GET', + data + }) +} + +// 获取组织/公司下拉框列表 +export const getOrganizeSelector = (id) => { + return request({ + url: '/permission/Organize/Selector/' + (!!id ? id : 0), + method: 'GET' + }) +} + +// 获取组织/公司树形 +export const getOrganizeTree = () => { + return request({ + url: '/permission/Organize/Tree', + method: 'GET' + }) +} + +// 新建组织/公司 +export const createOrganize = (data) => { + return request({ + url: '/permission/Organize', + method: 'POST', + data + }) +} + +// 修改组织/公司 +export const updateOrganize = (data) => { + return request({ + url: `/permission/Organize/${data.id}`, + method: 'PUT', + data + }) +} + +// 获取组织/公司信息 +export const getOrganizeInfo = (id) => { + return request({ + url: `/permission/Organize/${id}`, + method: 'GET' + }) +} + +// 删除组织/公司 +export const delOrganize = (id) => { + return request({ + url: `/permission/Organize/${id}`, + method: 'DELETE' + }) +} + +// 更新组织/公司状态 +export const updateOrganizeState = (id) => { + return request({ + url: `/permission/Organize/${id}/Actions/State`, + method: 'PUT' + }) +} +// 获取分级管理 +export const getOrganizeTrator = (organizeId) => { + return request({ + url: `/permission/organizeAdminIsTrator/${organizeId}`, + method: 'get' + }) +} +// 更新分级管理 +export const setOrganizeTrator = (data) => { + return request({ + url: `/permission/organizeAdminIsTrator/${data.organizeId}`, + method: 'PUT', + data + }) +} \ No newline at end of file diff --git a/src/api/permission/position.js b/src/api/permission/position.js new file mode 100644 index 0000000..7063113 --- /dev/null +++ b/src/api/permission/position.js @@ -0,0 +1,68 @@ +import request from '@/utils/request' + +// 获取岗位列表（分页） +export const getPositionList = (data) => { + return request({ + url: '/permission/Position', + method: 'GET', + data + }) +} + +// 获取岗位下拉列表（公司+部门+岗位） +export const getPositionSelector = () => { + return request({ + url: '/permission/Position/Selector', + method: 'GET' + }) +} + +// 新建岗位 +export const createPosition = (data) => { + return request({ + url: '/permission/Position', + method: 'POST', + data + }) +} + +// 修改岗位 +export const updatePosition = (data) => { + return request({ + url: `/permission/Position/${data.id}`, + method: 'PUT', + data + }) +} + +// 获取岗位信息 +export const getPositionInfo = (id) => { + return request({ + url: `/permission/Position/${id}`, + method: 'GET' + }) +} + +// 删除岗位 +export const delPosition = (id) => { + return request({ + url: `/permission/Position/${id}`, + method: 'DELETE' + }) +} + +// 更新岗位状态 +export const updatePositionState = (id) => { + return request({ + url: `/permission/Position/${id}/Actions/State`, + method: 'PUT' + }) +} + +// 获取全部岗位管理信息列表 +export const getPositionListAll = () => { + return request({ + url: '/permission/Position/All', + method: 'GET' + }) +} diff --git a/src/api/permission/role.js b/src/api/permission/role.js new file mode 100644 index 0000000..36f984e --- /dev/null +++ b/src/api/permission/role.js @@ -0,0 +1,68 @@ +import request from '@/utils/request' + +// 获取角色列表 +export const getRoleList = (data) => { + return request({ + url: '/permission/Role', + method: 'GET', + data + }) +} + +// 获取角色下拉框列表 +export const getRoleSelector = () => { + return request({ + url: '/permission/Role/Selector', + method: 'GET' + }) +} + +// 新建角色 +export const createRole = (data) => { + return request({ + url: '/permission/Role', + method: 'POST', + data + }) +} + +// 修改角色 +export const updateRole = (data) => { + return request({ + url: `/permission/Role/${data.id}`, + method: 'PUT', + data + }) +} + +// 获取角色信息 +export const getRoleInfo = (id) => { + return request({ + url: `/permission/Role/${id}`, + method: 'GET' + }) +} + +// 删除角色 +export const delRole = (id) => { + return request({ + url: `/permission/Role/${id}`, + method: 'DELETE' + }) +} + +// 更新角色状态 +export const updateRoleState = (id) => { + return request({ + url: `/permission/Role/${id}/Actions/State`, + method: 'PUT' + }) +} + +// 获取角色类型 +export const getRoleTypeSelector = () => { + return request({ + url: '/system/DictionaryData/4501f6f26a384757bce12d4c4b03342c/Data/Selector', + method: 'GET' + }) +} diff --git a/src/api/permission/user.js b/src/api/permission/user.js new file mode 100644 index 0000000..f5b92d5 --- /dev/null +++ b/src/api/permission/user.js @@ -0,0 +1,104 @@ +import request from '@/utils/request' + +// 获取用户列表 +export const getUserList = (data) => { + return request({ + url: '/permission/Users', + method: 'GET', + data + }) +} + +// 获取所有用户列表 +export const UserListAll = () => { + return request({ + url: '/permission/Users/All', + method: 'GET' + }) +} + +// 获取用户下拉框列表(公司+部门+用户) +export const getUserSelector = () => { + return request({ + url: '/permission/Users/Selector', + method: 'GET' + }) +} + +// 新建用户 +export const createUser = (data) => { + return request({ + url: '/permission/Users', + method: 'POST', + data + }) +} + +// 修改用户 +export const updateUser = (data) => { + return request({ + url: `/permission/Users/${data.id}`, + method: 'PUT', + data + }) +} + +// 获取用户信息 +export const getUserInfo = (id) => { + return request({ + url: `/permission/Users/${id}`, + method: 'GET' + }) +} + +// 删除用户 +export const delUser = (id) => { + return request({ + url: `/permission/Users/${id}`, + method: 'DELETE' + }) +} + +// 修改用户密码 +export const resetUserPassword = (data) => { + return request({ + url: `/permission/Users/${data.id}/Actions/ResetPassword`, + method: 'POST', + data + }) +} + +// 更新用户状态 +export const updateUserState = (id) => { + return request({ + url: `/permission/Users/${id}/Actions/State`, + method: 'PUT' + }) +} + +// IM通讯获取用户 +export const getImUser = data => { + return request({ + url: '/permission/Users/ImUser', + method: 'GET', + data + }) +} + +// 获取用户下拉框列表 +export const getImUserSelector = (organizeId, keyword) => { + return request({ + url: `/permission/Users/ImUser/Selector/${organizeId}`, + method: 'post', + data: { keyword } + }) +} + +// 获取用户基本信息 +export const getUserInfoList = userId => { + return request({ + url: '/permission/Users/getUserList', + method: 'post', + data: { userId } + }) +} \ No newline at end of file diff --git a/src/api/permission/userRelation.js b/src/api/permission/userRelation.js new file mode 100644 index 0000000..1878e5c --- /dev/null +++ b/src/api/permission/userRelation.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +// 获取岗位/角色成员列表 +export const getUserRelationList = (objectId) => { + return request({ + url: `/permission/UserRelation/${objectId}`, + method: 'GET' + }) +} + + +// 添加/更新岗位或角色成员 +export const createUserRelation = (data) => { + return request({ + url: `/permission/UserRelation/${data.objectId}`, + method: 'POST', + data + }) +} diff --git a/src/api/permission/userSetting.js b/src/api/permission/userSetting.js new file mode 100644 index 0000000..5657ab9 --- /dev/null +++ b/src/api/permission/userSetting.js @@ -0,0 +1,70 @@ +import request from '@/utils/request' + +// 更新当前用户头像 +export function UpdateAvatar(name) { + return request({ + url: `/permission/Users/Current/Avatar/${name}`, + method: 'PUT' + }) +} +// 获取当前用户个人资料 +export function UserSettingInfo() { + return request({ + url: '/permission/Users/Current/BaseInfo', + method: 'GET' + }) +} +// 更新当前用户个人资料 +export function UpdateUser(data) { + return request({ + url: '/permission/Users/Current/BaseInfo', + method: 'PUT', + data + }) +} +// 修改当前用户密码 +export function UpdatePassword(data) { + return request({ + url: '/permission/Users/Current/Actions/ModifyPassword', + method: 'POST', + data + }) +} +// 更新当前用户系统主题 +export function UpdateTheme(data) { + return request({ + url: '/permission/Users/Current/SystemTheme', + method: 'PUT', + data + }) +} +// 更新当前用户系统语言配置 +export function UpdateLanguage(data) { + return request({ + url: `/permission/Users/Current/SystemLanguage`, + method: 'PUT', + data + }) +} +// 获取我的下属 +export function getSubordinate() { + return request({ + url: `/permission/Users/Current/Subordinate`, + method: 'GET' + }) +} +// 获取当前用户系统权限 +export function AuthorizeList() { + return request({ + url: '/permission/Users/Current/Authorize', + method: 'GET' + }) +} +// 获取系统日志 +export function LogList(data) { + return request({ + url: `/permission/Users/Current/SystemLog`, + method: 'GET', + data + }) +} \ No newline at end of file diff --git a/src/api/systemData/commonFields.js b/src/api/systemData/commonFields.js index 18066e5..238c6c0 100644 --- a/src/api/systemData/commonFields.js +++ b/src/api/systemData/commonFields.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 获取字段列表 export function getList(data) { return request({ - url: '/api/system/CommonFields', + url: '/system/CommonFields', method: 'get', data }) @@ -11,21 +11,21 @@ export function getList(data) { // 获取字段信息 export function getInfo(id) { return request({ - url: `/api/system/CommonFields/${id}`, + url: `/system/CommonFields/${id}`, method: 'get' }) } // 删除字段 export function Delete(id) { return request({ - url: `/api/system/CommonFields/${id}`, + url: `/system/CommonFields/${id}`, method: 'DELETE' }) } // 修改字段 export function Update(data) { return request({ - url: `/api/system/CommonFields/${data.id}`, + url: `/system/CommonFields/${data.id}`, method: 'PUT', data }) @@ -33,7 +33,7 @@ export function Update(data) { // 新建字段 export function Create(data) { return request({ - url: '/api/system/CommonFields', + url: '/system/CommonFields', method: 'post', data }) diff --git a/src/api/systemData/dataBackup.js b/src/api/systemData/dataBackup.js index 63d8ba0..2b7eb34 100644 --- a/src/api/systemData/dataBackup.js +++ b/src/api/systemData/dataBackup.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 获取数据备份列表(带分页) export function getDataBackupList(data) { return request({ - url: '/api/system/DataBackup', + url: '/system/DataBackup', method: 'GET', data }) @@ -12,7 +12,7 @@ export function getDataBackupList(data) { // 添加数据备份 export function createDataBackup() { return request({ - url: '/api/system/DataBackup', + url: '/system/DataBackup', method: 'POST' }) } @@ -20,7 +20,7 @@ export function createDataBackup() { // 删除数据备份 export function delDataBackup(id) { return request({ - url: `/api/system/DataBackup/${id}`, + url: `/system/DataBackup/${id}`, method: 'DELETE' }) } \ No newline at end of file diff --git a/src/api/systemData/dataInterface.js b/src/api/systemData/dataInterface.js index ee8a7e2..3568e5d 100644 --- a/src/api/systemData/dataInterface.js +++ b/src/api/systemData/dataInterface.js @@ -1,9 +1,19 @@ import request from '@/utils/request' +// 获取字段列表 +export function getList(data) { + return request({ + url: `/Extend/BaseInspectionReport`, + method: 'GET', + data + }) +} + + // 获取接口列表(分页) export function getDataInterfaceList(data) { return request({ - url: '/api/system/DataInterface', + url: '/system/DataInterface', method: 'GET', data }) @@ -12,7 +22,7 @@ export function getDataInterfaceList(data) { // 获取接口列表下拉框 export function getDataInterfaceSelector() { return request({ - url: '/api/system/DataInterface/Selector', + url: '/system/DataInterface/Selector', method: 'GET' }) } @@ -20,7 +30,7 @@ export function getDataInterfaceSelector() { // 添加接口 export function createDataInterface(data) { return request({ - url: '/api/system/DataInterface', + url: '/system/DataInterface', method: 'POST', data }) @@ -29,7 +39,7 @@ export function createDataInterface(data) { // 修改接口 export function updateDataInterface(data) { return request({ - url: `/api/system/DataInterface/${data.id}`, + url: `/system/DataInterface/${data.id}`, method: 'PUT', data }) @@ -38,7 +48,7 @@ export function updateDataInterface(data) { // 获取接口数据 export function getDataInterfaceInfo(id) { return request({ - url: `/api/system/DataInterface/${id}`, + url: `/system/DataInterface/${id}`, method: 'GET' }) } @@ -46,7 +56,7 @@ export function getDataInterfaceInfo(id) { // 删除接口数据 export function delDataInterface(id) { return request({ - url: `/api/system/DataInterface/${id}`, + url: `/system/DataInterface/${id}`, method: 'DELETE' }) } @@ -54,7 +64,7 @@ export function delDataInterface(id) { // 更新接口状态 export function updateDataInterfaceState(id) { return request({ - url: `/api/system/DataInterface/${id}/Actions/State`, + url: `/system/DataInterface/${id}/Actions/State`, method: 'PUT' }) } @@ -62,7 +72,7 @@ export function updateDataInterfaceState(id) { // 获取接口分类 export function getDataInterfaceTypeSelector() { return request({ - url: '/api/system/DictionaryData/9c43287481364d348c0ea0d0f64b38be/Data/Selector', + url: '/system/DictionaryData/9c43287481364d348c0ea0d0f64b38be/Data/Selector', method: 'GET' }) } @@ -70,7 +80,7 @@ export function getDataInterfaceTypeSelector() { // 获取接口数据 export function previewDataInterface(id) { return request({ - url: `/api/system/DataInterface/${id}/Actions/Response`, + url: `/system/DataInterface/${id}/Actions/Response`, method: 'GET' }) } @@ -78,7 +88,7 @@ export function previewDataInterface(id) { // 导出数据接口数据 export function exportData(id) { return request({ - url: `/api/system/DataInterface/${id}/Action/Export`, + url: `/system/DataInterface/${id}/Action/Export`, method: 'GET' }) } @@ -86,7 +96,7 @@ export function exportData(id) { // 获取数据接口调用日志列表 export function getDataInterfaceLog(id, data) { return request({ - url: `/api/system/DataInterfaceLog/${id}`, + url: `/system/DataInterfaceLog/${id}`, method: 'GET', data }) diff --git a/src/api/systemData/dataModel.js b/src/api/systemData/dataModel.js index 9b29b01..62a8e95 100644 --- a/src/api/systemData/dataModel.js +++ b/src/api/systemData/dataModel.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 获取数据库表列表 export function DataModelList(id, data) { return request({ - url: `/api/system/DataModel/${id}/Tables`, + url: `/system/DataModel/${id}/Tables`, method: 'get', data }) @@ -11,7 +11,7 @@ export function DataModelList(id, data) { // 添加数据表 export function DataModelCreate(linkId, data) { return request({ - url: `/api/system/DataModel/${linkId}/Table`, + url: `/system/DataModel/${linkId}/Table`, method: 'post', data }) @@ -19,7 +19,7 @@ export function DataModelCreate(linkId, data) { // 预览数据库表 export function DataModelData(linkId, table, data) { return request({ - url: `/api/system/DataModel/${linkId}/Table/${table}/Preview`, + url: `/system/DataModel/${linkId}/Table/${table}/Preview`, method: 'get', data }) @@ -27,28 +27,28 @@ export function DataModelData(linkId, table, data) { // 删除数据表 export function DataModelDelete(linkId, id) { return request({ - url: `/api/system/DataModel/${linkId}/Table/${id}`, + url: `/system/DataModel/${linkId}/Table/${id}`, method: 'delete', }) } // 获取数据库表字段列表 export function DataModelFieldList(linkId, table, type) { return request({ - url: `/api/system/DataModel/${linkId}/Tables/${table}/Fields?type=${type}`, + url: `/system/DataModel/${linkId}/Tables/${table}/Fields?type=${type}`, method: 'get' }) } // 获取数据表 export function DataModelInfo(linkId, id) { return request({ - url: `/api/system/DataModel/${linkId}/Table/${id}`, + url: `/system/DataModel/${linkId}/Table/${id}`, method: 'get', }) } // 修改数据表 export function DataModelUpdate(linkId, data) { return request({ - url: `/api/system/DataModel/${linkId}/Table`, + url: `/system/DataModel/${linkId}/Table`, method: 'put', data }) @@ -56,7 +56,7 @@ export function DataModelUpdate(linkId, data) { // 导出 export function exportTpl(linkId, id) { return request({ - url: `/api/system/DataModel/${linkId}/Table/${id}/Action/Export`, + url: `/system/DataModel/${linkId}/Table/${id}/Action/Export`, method: 'get' }) } \ No newline at end of file diff --git a/src/api/systemData/dataSource.js b/src/api/systemData/dataSource.js index 2b49f03..b3b4097 100644 --- a/src/api/systemData/dataSource.js +++ b/src/api/systemData/dataSource.js @@ -2,53 +2,53 @@ import request from '@/utils/request' export function getDataSourceList(data) { return request({ - url: '/api/system/DataSource', + url: '/system/DataSource', method: 'get', data }) } export function DataSourceCreate(data) { return request({ - url: '/api/system/DataSource', + url: '/system/DataSource', method: 'post', data }) } export function DataSourceDelete(id) { return request({ - url: `/api/system/DataSource/${id}`, + url: `/system/DataSource/${id}`, method: 'delete', }) } export function DataSourceInfo(id) { return request({ - url: `/api/system/DataSource/${id}`, + url: `/system/DataSource/${id}`, method: 'get', }) } export function DataSourceUpdate(data) { return request({ - url: `/api/system/DataSource/${data.id}`, + url: `/system/DataSource/${data.id}`, method: 'put', data }) } export function TestDbConnection(data) { return request({ - url: `/api/system/DataSource/Actions/Test`, + url: `/system/DataSource/Actions/Test`, method: 'post', data }) } export function getDataSourceListAll() { return request({ - url: '/api/system/DataSource/Selector', + url: '/system/DataSource/Selector', method: 'get', }) } export function Execute(data) { return request({ - url: `/api/system/DataSync/Actions/Execute`, + url: `/system/DataSync/Actions/Execute`, method: 'post', data }) diff --git a/src/api/systemData/dictionary.js b/src/api/systemData/dictionary.js index 6045255..77b3c59 100644 --- a/src/api/systemData/dictionary.js +++ b/src/api/systemData/dictionary.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 获取数据字典分类 export function getDictionaryType() { return request({ - url: '/api/system/DictionaryType', + url: '/system/DictionaryType', method: 'GET' }) } @@ -11,7 +11,7 @@ export function getDictionaryType() { // 获取字典分类下拉框列表 export function getDictionaryTypeSelector(id) { return request({ - url: '/api/system/DictionaryType/Selector/' + (!!id ? id : 0), + url: '/system/DictionaryType/Selector/' + (!!id ? id : 0), method: 'GET' }) } @@ -19,7 +19,7 @@ export function getDictionaryTypeSelector(id) { // 添加数据字典分类 export function createDictionaryType(data) { return request({ - url: `/api/system/DictionaryType`, + url: `/system/DictionaryType`, method: 'POST', data }) @@ -28,7 +28,7 @@ export function createDictionaryType(data) { // 修改数据字典分类 export function updateDictionaryType(data) { return request({ - url: `/api/system/DictionaryType/${data.id}`, + url: `/system/DictionaryType/${data.id}`, method: 'PUT', data }) @@ -37,7 +37,7 @@ export function updateDictionaryType(data) { // 获取数据字典分类信息 export function getDictionaryTypeInfo(id) { return request({ - url: `/api/system/DictionaryType/${id}`, + url: `/system/DictionaryType/${id}`, method: 'GET' }) } @@ -45,7 +45,7 @@ export function getDictionaryTypeInfo(id) { // 删除数据字典分类 export function delDictionaryType(id) { return request({ - url: `/api/system/DictionaryType/${id}`, + url: `/system/DictionaryType/${id}`, method: 'DELETE' }) } @@ -53,7 +53,7 @@ export function delDictionaryType(id) { // 获取数据字典列表 export function getDictionaryDataList(typeId, data) { return request({ - url: `/api/system/DictionaryData/${typeId}`, + url: `/system/DictionaryData/${typeId}`, method: 'GET', data }) @@ -62,7 +62,7 @@ export function getDictionaryDataList(typeId, data) { // 获取数据字典列表(分类+内容) export function getDictionaryAll() { return request({ - url: `/api/system/DictionaryData/All`, + url: `/system/DictionaryData/All`, method: 'GET' }) } @@ -70,7 +70,7 @@ export function getDictionaryAll() { // 获取字典分类下拉框(项目上级) export function getDictionaryDataTypeSelector(dictionaryTypeId, isTree, id) { return request({ - url: `/api/system/DictionaryData/${dictionaryTypeId}/Selector/` + (!!id ? id : 0), + url: `/system/DictionaryData/${dictionaryTypeId}/Selector/` + (!!id ? id : 0), method: 'GET', data: { isTree } }) @@ -79,7 +79,7 @@ export function getDictionaryDataTypeSelector(dictionaryTypeId, isTree, id) { // 获取字典数据下拉框列表 export function getDictionaryDataSelector(dictionaryTypeId) { return request({ - url: `/api/system/DictionaryData/${dictionaryTypeId}/Data/Selector`, + url: `/system/DictionaryData/${dictionaryTypeId}/Data/Selector`, method: 'GET' }) } @@ -87,7 +87,7 @@ export function getDictionaryDataSelector(dictionaryTypeId) { // 添加数据字典 export function createDictionaryData(data) { return request({ - url: '/api/system/DictionaryData', + url: '/system/DictionaryData', method: 'POST', data }) @@ -96,7 +96,7 @@ export function createDictionaryData(data) { // 修改数据字典 export function updateDictionaryData(data) { return request({ - url: `/api/system/DictionaryData/${data.id}`, + url: `/system/DictionaryData/${data.id}`, method: 'PUT', data }) @@ -105,7 +105,7 @@ export function updateDictionaryData(data) { // 获取数据字典信息 export function getDictionaryDataInfo(id) { return request({ - url: `/api/system/DictionaryData/${id}/Info`, + url: `/system/DictionaryData/${id}/Info`, method: 'GET' }) } @@ -113,7 +113,7 @@ export function getDictionaryDataInfo(id) { // 删除数据字典信息 export function delDictionaryData(id) { return request({ - url: `/api/system/DictionaryData/${id}`, + url: `/system/DictionaryData/${id}`, method: 'DELETE' }) } @@ -121,7 +121,7 @@ export function delDictionaryData(id) { // 更新字典状态 export function updateDictionaryState(id) { return request({ - url: `/api/system/DictionaryData/${id}/Actions/State`, + url: `/system/DictionaryData/${id}/Actions/State`, method: 'PUT' }) } @@ -129,7 +129,7 @@ export function updateDictionaryState(id) { // 导出数据字典数据 export function exportData(id) { return request({ - url: `/api/system/DictionaryData/${id}/Action/Export`, + url: `/system/DictionaryData/${id}/Action/Export`, method: 'GET' }) } \ No newline at end of file diff --git a/src/components/NCC-treeSelect/index.vue b/src/components/NCC-treeSelect/index.vue new file mode 100644 index 0000000..da3c8dc --- /dev/null +++ b/src/components/NCC-treeSelect/index.vue @@ -0,0 +1,254 @@ + + + + + \ No newline at end of file diff --git a/src/components/Screenfull/index.vue b/src/components/Screenfull/index.vue new file mode 100644 index 0000000..fbfccf7 --- /dev/null +++ b/src/components/Screenfull/index.vue @@ -0,0 +1,64 @@ + + + \ No newline at end of file diff --git a/src/components/index.js b/src/components/index.js index 87593dd..f86e14b 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -7,6 +7,9 @@ import Pagination from '@/components/Pagination' import NCCTable from '@/components/NCC-table' import NCCUploadFz from '@/components/Generator/components/Upload/UploadFz' import NCCQuill from '@/components/NCCEditor/quill' +import DepSelect from '@/components/Generator/components/DepSelect' +import Screenfull from '@/components/Screenfull' +import NCCTreeSelect from '@/components/NCC-treeSelect' export default { install(Vue, options) { @@ -19,6 +22,10 @@ export default { Vue.component('NCCTable', NCCTable) Vue.component('NCCUploadFz', NCCUploadFz) Vue.component('NCCQuill', NCCQuill) + Vue.component('DepSelect', DepSelect) + Vue.component('NCCTreeSelect', NCCTreeSelect) + Vue.component('Screenfull', Screenfull) + } } \ No newline at end of file diff --git a/src/store/index.js b/src/store/index.js index ca26d60..c636f2d 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -4,6 +4,7 @@ import user from './modules/user' import meta from './modules/meta' import getters from './getters' import permission from './modules/permission' +import generator from './modules/generator' Vue.use(Vuex) @@ -12,6 +13,7 @@ const store = new Vuex.Store({ user, meta, permission, + generator }, getters }) diff --git a/src/store/modules/generator.js b/src/store/modules/generator.js new file mode 100644 index 0000000..5087189 --- /dev/null +++ b/src/store/modules/generator.js @@ -0,0 +1,89 @@ +import { getOrganizeTree } from '@/api/permission/organize' +import { getDepartmentSelector } from '@/api/permission/department' +import { getDictionaryType } from '@/api/systemData/dictionary' + +const state = { + companyTree: [], + depTree: [], + dicTree: [], + formItemList: [], + subTable: [], + hasTable: false, + relationData: {} +} + +const mutations = { + SET_COMPANY_TREE: (state, companyTree) => { + state.companyTree = companyTree + }, + SET_DEP_TREE: (state, depTree) => { + state.depTree = depTree + }, + SET_DIC_TREE: (state, dicTree) => { + state.dicTree = dicTree + }, + UPDATE_FORMITEM_LIST(state, list) { + state.formItemList = list + }, + UPDATE_SUB_TABLE(state, subTable) { + state.subTable = subTable + }, + SET_TABLE(state, val) { + state.hasTable = val + }, + UPDATE_RELATION_DATA(state, val) { + state.relationData = val + } +} + +const actions = { + getCompanyTree({ state, commit }) { + return new Promise((resolve, reject) => { + if (!state.companyTree.length) { + getOrganizeTree().then(res => { + commit('SET_COMPANY_TREE', res.data.list) + resolve(res.data.list) + }).catch(error => { + reject(error) + }) + } else { + resolve(state.companyTree) + } + }) + }, + getDepTree({ state, commit }) { + return new Promise((resolve, reject) => { + if (!state.depTree.length) { + getDepartmentSelector().then(res => { + commit('SET_DEP_TREE', res.data.list) + resolve(res.data.list) + }).catch(error => { + reject(error) + }) + } else { + resolve(state.depTree) + } + }) + }, + getDicTree({ state, commit }) { + return new Promise((resolve, reject) => { + if (!state.dicTree.length) { + getDictionaryType().then(res => { + commit('SET_DIC_TREE', res.data.list) + resolve(res.data.list) + }).catch(error => { + reject(error) + }) + } else { + resolve(state.dicTree) + } + }) + }, +} + +export default { + namespaced: true, + state, + mutations, + actions +} \ No newline at end of file diff --git a/src/views/baseComapnyInfo/index.vue b/src/views/baseComapnyInfo/index.vue index 79d3b55..e56a72e 100644 --- a/src/views/baseComapnyInfo/index.vue +++ b/src/views/baseComapnyInfo/index.vue @@ -7,7 +7,7 @@ - + - + - + 新增 @@ -70,21 +71,25 @@ @@ -257,5 +262,8 @@ export default { height: calc(100% - 47px); overflow-y: scroll; } + .item-body { + height: calc(100% - 35px); + } } diff --git a/src/views/baseInspectionReport/ExportBox.vue b/src/views/baseInspectionReport/ExportBox.vue new file mode 100644 index 0000000..4fc5c07 --- /dev/null +++ b/src/views/baseInspectionReport/ExportBox.vue @@ -0,0 +1,66 @@ + + + + \ No newline at end of file diff --git a/src/views/baseInspectionReport/Form.vue b/src/views/baseInspectionReport/Form.vue new file mode 100644 index 0000000..b7a0045 --- /dev/null +++ b/src/views/baseInspectionReport/Form.vue @@ -0,0 +1,242 @@ + + diff --git a/src/views/baseInspectionReport/FormPage.vue b/src/views/baseInspectionReport/FormPage.vue new file mode 100644 index 0000000..328b65d --- /dev/null +++ b/src/views/baseInspectionReport/FormPage.vue @@ -0,0 +1,242 @@ + + diff --git a/src/views/baseInspectionReport/index.vue b/src/views/baseInspectionReport/index.vue new file mode 100644 index 0000000..e4068b3 --- /dev/null +++ b/src/views/baseInspectionReport/index.vue @@ -0,0 +1,235 @@ + + + \ No newline at end of file diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue index 826241b..adc42e9 100644 --- a/src/views/baseSystemInfo/index.vue +++ b/src/views/baseSystemInfo/index.vue @@ -75,12 +75,12 @@
- - - - - - + + + + + + -- libgit2 0.21.4