diff --git a/ah-jjzhgd-web/src/api/basic/gt.js b/ah-jjzhgd-web/src/api/basic/gt.js new file mode 100644 index 0000000..77aa50d --- /dev/null +++ b/ah-jjzhgd-web/src/api/basic/gt.js @@ -0,0 +1,46 @@ +import request from '@/utils/request' + +// 查询杆塔列表 +export function getGtList(data) { + return request({ + url: '/background/back/area/getGtList', + method: 'get', + params: data + }) +} + +// 新增杆塔 +export function addGtItem(data) { + return request({ + url: '/background/back/area/addGtData', + method: 'post', + data + }) +} + +// 查看杆塔详情 +export function getGtItemDetail(data) { + return request({ + url: '/background/back/area/getGtById', + method: 'post', + data: data + }) +} + +// 编辑杆塔 +export function updateGtItem(data) { + return request({ + url: '/background/back/area/updateGtData', + method: 'post', + data + }) +} + +// 批量删除杆塔 +export function deleteGtItem(data) { + return request({ + url: '/background/back/area/deleteGt', + method: 'post', + data + }) +} diff --git a/ah-jjzhgd-web/src/api/risk/task.js b/ah-jjzhgd-web/src/api/risk/task.js new file mode 100644 index 0000000..8aeab16 --- /dev/null +++ b/ah-jjzhgd-web/src/api/risk/task.js @@ -0,0 +1,54 @@ +import request from '@/utils/request' + +// 查询待分配用户列表 +export function getUserList(data) { + return request({ + url: '/background/user/pro/getUserList', + method: 'get', + params: data + }) +} + +// 获取用户已分配的工程信息 +export function getAssignedProjectList(data) { + return request({ + url: '/background/user/pro/getFpProList', + method: 'get', + params: data + }) +} + +// 查询待分配的工程信息 +export function getUnassignedProjectList(data) { + return request({ + url: '/background/user/pro/getProList', + method: 'get', + params: data + }) +} + +// 移除已分配的工程 +export function removeAssignedProjectItem(data) { + return request({ + url: '/background/user/pro/delUserPro', + method: 'post', + data + }) +} + +// 用户分配工程 +export function assignProject(data) { + return request({ + url: '/background/user/pro/addUserPro', + method: 'post', + data + }) +} + +// 建管单位下拉选 +export function getBuildList(data) { + return request({ + url: 'system/sys/select/getBuildLists', + method: 'get' + }) +} diff --git a/ah-jjzhgd-web/src/views/basic/area/index.vue b/ah-jjzhgd-web/src/views/basic/area/index.vue index 3076385..88d67a9 100644 --- a/ah-jjzhgd-web/src/views/basic/area/index.vue +++ b/ah-jjzhgd-web/src/views/basic/area/index.vue @@ -45,7 +45,7 @@ > @@ -73,8 +73,8 @@ @@ -148,8 +148,8 @@ export default { total: 0, listLoading: false, listQuery: { - page: 1, - limit: 10, + pageNum: 1, + pageSize: 10, proName: '', areaName: '' }, diff --git a/ah-jjzhgd-web/src/views/basic/project/components/BuildSelect.vue b/ah-jjzhgd-web/src/views/basic/project/components/BuildSelect.vue index d2c2dbf..808d6b6 100644 --- a/ah-jjzhgd-web/src/views/basic/project/components/BuildSelect.vue +++ b/ah-jjzhgd-web/src/views/basic/project/components/BuildSelect.vue @@ -1,5 +1,5 @@ + + diff --git a/ah-jjzhgd-web/src/views/basic/project/index.vue b/ah-jjzhgd-web/src/views/basic/project/index.vue index e64e8c9..8bcb291 100644 --- a/ah-jjzhgd-web/src/views/basic/project/index.vue +++ b/ah-jjzhgd-web/src/views/basic/project/index.vue @@ -103,6 +103,7 @@ @@ -132,13 +133,6 @@ - - - - - - - @@ -309,6 +303,9 @@ + + + @@ -327,6 +324,7 @@ import { import _ from 'lodash/fp' import { downloadFile } from '@/utils/download' import ProjectStatusSelect from '@/views/basic/project/components/ProjectStatusSelect.vue' +import GtTable from '@/views/basic/project/components/GtTable.vue' const defaultTmp = { org: '', @@ -357,7 +355,7 @@ const defaultCompleteTmp = { } export default { - components: { ProjectStatusSelect, Pagination, BuildSelect, ProcessTable }, + components: { GtTable, ProjectStatusSelect, Pagination, BuildSelect, ProcessTable }, directives: { waves }, data() { return { @@ -391,6 +389,7 @@ export default { dialogPvVisible: false, completeModalVisible: false, processModalVisible: false, + gtModalVisible: false, processType: '', bidCode: '', completeForm: _.cloneDeep(defaultCompleteTmp), @@ -604,6 +603,12 @@ export default { this.bidCode = row.bidCode this.processModalVisible = true }, + // 杆塔管理 + handleGT(row) { + this.processType = row.proType + this.bidCode = row.bidCode + this.gtModalVisible = true + }, // 删除数据 handleDelete(row, index) { this.$confirm(`确定要删除该数据吗?`, { diff --git a/ah-jjzhgd-web/src/views/device/deviceMange/index.vue b/ah-jjzhgd-web/src/views/device/deviceMange/index.vue index 35b586d..1a16181 100644 --- a/ah-jjzhgd-web/src/views/device/deviceMange/index.vue +++ b/ah-jjzhgd-web/src/views/device/deviceMange/index.vue @@ -41,7 +41,7 @@ > @@ -68,8 +68,8 @@ @@ -157,8 +157,8 @@ export default { total: 0, listLoading: false, listQuery: { - page: 1, - limit: 10, + pageNum: 1, + pageSize: 10, keyWord: '', onLine: 1 }, diff --git a/ah-jjzhgd-web/src/views/man-car/car/index.vue b/ah-jjzhgd-web/src/views/man-car/car/index.vue index 2ed3408..de93fbb 100644 --- a/ah-jjzhgd-web/src/views/man-car/car/index.vue +++ b/ah-jjzhgd-web/src/views/man-car/car/index.vue @@ -127,12 +127,7 @@ export default { return { tableKey: 0, list: [], - teamList: [], total: 0, - imageList: [], - delFiles: [], - currentImageViewList: [], - imageUploadLimit: 5, listLoading: false, listQuery: { pageNum: 1, diff --git a/ah-jjzhgd-web/src/views/risk/task/components/OrgSelect.vue b/ah-jjzhgd-web/src/views/risk/task/components/OrgSelect.vue new file mode 100644 index 0000000..204f966 --- /dev/null +++ b/ah-jjzhgd-web/src/views/risk/task/components/OrgSelect.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/ah-jjzhgd-web/src/views/risk/task/components/TaskModal.vue b/ah-jjzhgd-web/src/views/risk/task/components/TaskModal.vue new file mode 100644 index 0000000..1252245 --- /dev/null +++ b/ah-jjzhgd-web/src/views/risk/task/components/TaskModal.vue @@ -0,0 +1,242 @@ + + + diff --git a/ah-jjzhgd-web/src/views/risk/task/index.vue b/ah-jjzhgd-web/src/views/risk/task/index.vue new file mode 100644 index 0000000..ea8a931 --- /dev/null +++ b/ah-jjzhgd-web/src/views/risk/task/index.vue @@ -0,0 +1,152 @@ + + +