diff --git a/src/api/basic/locate.ts b/src/api/basic/locate.ts index 8b19246..b0fd7c3 100644 --- a/src/api/basic/locate.ts +++ b/src/api/basic/locate.ts @@ -9,6 +9,17 @@ data, }) } + +// 导出 +export function exportLocate(data: object) { + return request({ + url: `${prefix}/batchExport`, + responseType: 'blob', + method: 'post', + data, + }) +} + // 查询产品详情 export function detailProduct(data: object) { return request({ @@ -17,21 +28,6 @@ data, }) } -// 资源树列表 -export function getResourceTreeList() { - return request({ - url: `${prefix}/resource/tree`, - method: 'get', - }) -} - -// 资源类型列表 -export function getResourceTypeList() { - return request({ - url: `${prefix}/dict/code/resourceType`, - method: 'get', - }) -} // 添加产品 export function addProduct(data: object) { @@ -49,13 +45,11 @@ data, }) } -// 删除产品 -export function delProduct(id: string) { +// 删除点位 +export function deleteLocate(data: object) { return request({ url: `${prefix}/delete`, method: 'post', - data: { - ids: [id], - }, + data, }) } diff --git a/src/api/basic/locate.ts b/src/api/basic/locate.ts index 8b19246..b0fd7c3 100644 --- a/src/api/basic/locate.ts +++ b/src/api/basic/locate.ts @@ -9,6 +9,17 @@ data, }) } + +// 导出 +export function exportLocate(data: object) { + return request({ + url: `${prefix}/batchExport`, + responseType: 'blob', + method: 'post', + data, + }) +} + // 查询产品详情 export function detailProduct(data: object) { return request({ @@ -17,21 +28,6 @@ data, }) } -// 资源树列表 -export function getResourceTreeList() { - return request({ - url: `${prefix}/resource/tree`, - method: 'get', - }) -} - -// 资源类型列表 -export function getResourceTypeList() { - return request({ - url: `${prefix}/dict/code/resourceType`, - method: 'get', - }) -} // 添加产品 export function addProduct(data: object) { @@ -49,13 +45,11 @@ data, }) } -// 删除产品 -export function delProduct(id: string) { +// 删除点位 +export function deleteLocate(data: object) { return request({ url: `${prefix}/delete`, method: 'post', - data: { - ids: [id], - }, + data, }) } diff --git a/src/utils/composables/useDictCheck.ts b/src/utils/composables/useDictCheck.ts new file mode 100644 index 0000000..7846a3e --- /dev/null +++ b/src/utils/composables/useDictCheck.ts @@ -0,0 +1,11 @@ +import type { IDictType } from '@/views/basic/common-interface' + +export function findDictNameByCode(code: string, dict: IDictType[]) { + const target = dict.filter(item => item.value === code) + if (target.length > 0) { + return target[0].name + } + else { + return code + } +} diff --git a/src/api/basic/locate.ts b/src/api/basic/locate.ts index 8b19246..b0fd7c3 100644 --- a/src/api/basic/locate.ts +++ b/src/api/basic/locate.ts @@ -9,6 +9,17 @@ data, }) } + +// 导出 +export function exportLocate(data: object) { + return request({ + url: `${prefix}/batchExport`, + responseType: 'blob', + method: 'post', + data, + }) +} + // 查询产品详情 export function detailProduct(data: object) { return request({ @@ -17,21 +28,6 @@ data, }) } -// 资源树列表 -export function getResourceTreeList() { - return request({ - url: `${prefix}/resource/tree`, - method: 'get', - }) -} - -// 资源类型列表 -export function getResourceTypeList() { - return request({ - url: `${prefix}/dict/code/resourceType`, - method: 'get', - }) -} // 添加产品 export function addProduct(data: object) { @@ -49,13 +45,11 @@ data, }) } -// 删除产品 -export function delProduct(id: string) { +// 删除点位 +export function deleteLocate(data: object) { return request({ url: `${prefix}/delete`, method: 'post', - data: { - ids: [id], - }, + data, }) } diff --git a/src/utils/composables/useDictCheck.ts b/src/utils/composables/useDictCheck.ts new file mode 100644 index 0000000..7846a3e --- /dev/null +++ b/src/utils/composables/useDictCheck.ts @@ -0,0 +1,11 @@ +import type { IDictType } from '@/views/basic/common-interface' + +export function findDictNameByCode(code: string, dict: IDictType[]) { + const target = dict.filter(item => item.value === code) + if (target.length > 0) { + return target[0].name + } + else { + return code + } +} diff --git a/src/views/basic/locate/detail.vue b/src/views/basic/locate/detail.vue index 73785dc..dd3c5cd 100644 --- a/src/views/basic/locate/detail.vue +++ b/src/views/basic/locate/detail.vue @@ -1,10 +1,12 @@ - - @@ -171,71 +118,77 @@ - + - - {{ deviceInfo.devcode }} + + {{ locateInfo.wellCode }} - - {{ deviceInfo.imei }} + + {{ locateInfo.deptName }} - - {{ deviceInfo.productName }} + + {{ locateInfo.wellName }} - - {{ deviceInfo.iccid }} + + {{ locateInfo.responsibleDeptName }} - - {{ deviceInfo.deviceTypeName }} + + {{ locateInfo.wellTypeName }} - - {{ deviceInfo.encipherTypeName }} + + {{ locateInfo.staff }} - - {{ deviceInfo.modelName }} + + {{ findDictNameByCode(locateInfo.bfzt!, bfztDict) }} - - {{ deviceInfo.createTime }} + + {{ locateInfo.tel }} + + + + + + + + {{ locateInfo.position }} - - - - - - - - - - + + + + + + + -./locate-info diff --git a/src/api/basic/locate.ts b/src/api/basic/locate.ts index 8b19246..b0fd7c3 100644 --- a/src/api/basic/locate.ts +++ b/src/api/basic/locate.ts @@ -9,6 +9,17 @@ data, }) } + +// 导出 +export function exportLocate(data: object) { + return request({ + url: `${prefix}/batchExport`, + responseType: 'blob', + method: 'post', + data, + }) +} + // 查询产品详情 export function detailProduct(data: object) { return request({ @@ -17,21 +28,6 @@ data, }) } -// 资源树列表 -export function getResourceTreeList() { - return request({ - url: `${prefix}/resource/tree`, - method: 'get', - }) -} - -// 资源类型列表 -export function getResourceTypeList() { - return request({ - url: `${prefix}/dict/code/resourceType`, - method: 'get', - }) -} // 添加产品 export function addProduct(data: object) { @@ -49,13 +45,11 @@ data, }) } -// 删除产品 -export function delProduct(id: string) { +// 删除点位 +export function deleteLocate(data: object) { return request({ url: `${prefix}/delete`, method: 'post', - data: { - ids: [id], - }, + data, }) } diff --git a/src/utils/composables/useDictCheck.ts b/src/utils/composables/useDictCheck.ts new file mode 100644 index 0000000..7846a3e --- /dev/null +++ b/src/utils/composables/useDictCheck.ts @@ -0,0 +1,11 @@ +import type { IDictType } from '@/views/basic/common-interface' + +export function findDictNameByCode(code: string, dict: IDictType[]) { + const target = dict.filter(item => item.value === code) + if (target.length > 0) { + return target[0].name + } + else { + return code + } +} diff --git a/src/views/basic/locate/detail.vue b/src/views/basic/locate/detail.vue index 73785dc..dd3c5cd 100644 --- a/src/views/basic/locate/detail.vue +++ b/src/views/basic/locate/detail.vue @@ -1,10 +1,12 @@ - - @@ -171,71 +118,77 @@ - + - - {{ deviceInfo.devcode }} + + {{ locateInfo.wellCode }} - - {{ deviceInfo.imei }} + + {{ locateInfo.deptName }} - - {{ deviceInfo.productName }} + + {{ locateInfo.wellName }} - - {{ deviceInfo.iccid }} + + {{ locateInfo.responsibleDeptName }} - - {{ deviceInfo.deviceTypeName }} + + {{ locateInfo.wellTypeName }} - - {{ deviceInfo.encipherTypeName }} + + {{ locateInfo.staff }} - - {{ deviceInfo.modelName }} + + {{ findDictNameByCode(locateInfo.bfzt!, bfztDict) }} - - {{ deviceInfo.createTime }} + + {{ locateInfo.tel }} + + + + + + + + {{ locateInfo.position }} - - - - - - - - - - + + + + + + + -./locate-info diff --git a/src/views/basic/locate/list.vue b/src/views/basic/locate/list.vue index 59c5c6f..01b0f3f 100644 --- a/src/views/basic/locate/list.vue +++ b/src/views/basic/locate/list.vue @@ -1,18 +1,16 @@ @@ -190,10 +191,7 @@ @@ -218,6 +216,12 @@ 查看 + + 编辑 + + + 删除 + diff --git a/src/api/basic/locate.ts b/src/api/basic/locate.ts index 8b19246..b0fd7c3 100644 --- a/src/api/basic/locate.ts +++ b/src/api/basic/locate.ts @@ -9,6 +9,17 @@ data, }) } + +// 导出 +export function exportLocate(data: object) { + return request({ + url: `${prefix}/batchExport`, + responseType: 'blob', + method: 'post', + data, + }) +} + // 查询产品详情 export function detailProduct(data: object) { return request({ @@ -17,21 +28,6 @@ data, }) } -// 资源树列表 -export function getResourceTreeList() { - return request({ - url: `${prefix}/resource/tree`, - method: 'get', - }) -} - -// 资源类型列表 -export function getResourceTypeList() { - return request({ - url: `${prefix}/dict/code/resourceType`, - method: 'get', - }) -} // 添加产品 export function addProduct(data: object) { @@ -49,13 +45,11 @@ data, }) } -// 删除产品 -export function delProduct(id: string) { +// 删除点位 +export function deleteLocate(data: object) { return request({ url: `${prefix}/delete`, method: 'post', - data: { - ids: [id], - }, + data, }) } diff --git a/src/utils/composables/useDictCheck.ts b/src/utils/composables/useDictCheck.ts new file mode 100644 index 0000000..7846a3e --- /dev/null +++ b/src/utils/composables/useDictCheck.ts @@ -0,0 +1,11 @@ +import type { IDictType } from '@/views/basic/common-interface' + +export function findDictNameByCode(code: string, dict: IDictType[]) { + const target = dict.filter(item => item.value === code) + if (target.length > 0) { + return target[0].name + } + else { + return code + } +} diff --git a/src/views/basic/locate/detail.vue b/src/views/basic/locate/detail.vue index 73785dc..dd3c5cd 100644 --- a/src/views/basic/locate/detail.vue +++ b/src/views/basic/locate/detail.vue @@ -1,10 +1,12 @@ - - @@ -171,71 +118,77 @@ - + - - {{ deviceInfo.devcode }} + + {{ locateInfo.wellCode }} - - {{ deviceInfo.imei }} + + {{ locateInfo.deptName }} - - {{ deviceInfo.productName }} + + {{ locateInfo.wellName }} - - {{ deviceInfo.iccid }} + + {{ locateInfo.responsibleDeptName }} - - {{ deviceInfo.deviceTypeName }} + + {{ locateInfo.wellTypeName }} - - {{ deviceInfo.encipherTypeName }} + + {{ locateInfo.staff }} - - {{ deviceInfo.modelName }} + + {{ findDictNameByCode(locateInfo.bfzt!, bfztDict) }} - - {{ deviceInfo.createTime }} + + {{ locateInfo.tel }} + + + + + + + + {{ locateInfo.position }} - - - - - - - - - - + + + + + + + -./locate-info diff --git a/src/views/basic/locate/list.vue b/src/views/basic/locate/list.vue index 59c5c6f..01b0f3f 100644 --- a/src/views/basic/locate/list.vue +++ b/src/views/basic/locate/list.vue @@ -1,18 +1,16 @@ @@ -190,10 +191,7 @@ @@ -218,6 +216,12 @@ 查看 + + 编辑 + + + 删除 + diff --git a/src/views/basic/locate/locate-info.ts b/src/views/basic/locate/locate-info.ts index d493f7c..54c86f1 100644 --- a/src/views/basic/locate/locate-info.ts +++ b/src/views/basic/locate/locate-info.ts @@ -8,28 +8,31 @@ order?: string } -export interface IDeviceInfo { - id: string - groupId: string - devcode: string - deviceName?: string - deviceType: string - deviceTypeName?: string - status?: string - statusName?: string - cell?: string - imei: string - iccid: string - model: string - modelName?: string - productId: string - productName?: string - encipherType: string - encipherTypeName?: string - createTime: string - createUserId: string - createUserName?: string - dataValue?: string +export interface ILocateInfo { + id: number | string + wellCode: string + wellName: string + wellType: string + wellTypeName?: string + area?: string + bfzt?: string + coordinateX?: string + coordinateY?: string + deep?: string + deptid: string + deptName?: string + latBaidu?: string + latGaode?: string + lngBaidu?: string + lngGaode?: string + notes?: string + photos?: string + position: string + responsibleDept?: string + responsibleDeptName?: string + staff?: string + tel?: string + ts: string } export interface IConfigListQuery {