|
@@ -107,11 +107,11 @@ import { DICT_TYPE } from '@/utils/dict'
|
|
|
import { dateFormatter } from '@/utils/formatTime'
|
|
import { dateFormatter } from '@/utils/formatTime'
|
|
|
import * as MapPointApi from '@/api/basic/mappoint'
|
|
import * as MapPointApi from '@/api/basic/mappoint'
|
|
|
import * as MapApi from '@/api/basic/mapconfig'
|
|
import * as MapApi from '@/api/basic/mapconfig'
|
|
|
-// import * as PostApi from '@/api/system/post'
|
|
|
|
|
import * as SpmApi from '@/api/dv/spm/index'
|
|
import * as SpmApi from '@/api/dv/spm/index'
|
|
|
import MapPointForm from './MapPointForm.vue'
|
|
import MapPointForm from './MapPointForm.vue'
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+import * as MarsDeptApi from '@/api/system/marsdept/index'
|
|
|
|
|
+import { handleTree } from '@/utils/tree'
|
|
|
|
|
+import {listMarsDept} from "@/api/system/marsdept/index";
|
|
|
|
|
|
|
|
defineOptions({ name: 'SystemMapPoint' })
|
|
defineOptions({ name: 'SystemMapPoint' })
|
|
|
|
|
|
|
@@ -150,25 +150,30 @@ const getList = async () => {
|
|
|
|
|
|
|
|
/** 获取其他列表数据 */
|
|
/** 获取其他列表数据 */
|
|
|
const getOtherList = async () => {
|
|
const getOtherList = async () => {
|
|
|
- const params = { current: 1, size: -1 }
|
|
|
|
|
|
|
+ const params = { pageNo: 1, pageSize: 99 }
|
|
|
try {
|
|
try {
|
|
|
const [mapRes, deptRes, spmRes] = await Promise.all([
|
|
const [mapRes, deptRes, spmRes] = await Promise.all([
|
|
|
MapApi.getIsMapPage(params),
|
|
MapApi.getIsMapPage(params),
|
|
|
MarsDeptApi.listMarsDept(params),
|
|
MarsDeptApi.listMarsDept(params),
|
|
|
SpmApi.getIsIsolationPointPage(params)
|
|
SpmApi.getIsIsolationPointPage(params)
|
|
|
])
|
|
])
|
|
|
- mapOptions.value = mapRes.data.records
|
|
|
|
|
- deptOptions.value = handleTree(deptRes.data.records, 'workstationId', 'parentId')
|
|
|
|
|
- spmOptions.value = spmRes.data.records
|
|
|
|
|
|
|
+ console.log(mapRes,'地图名称哒哒哒')
|
|
|
|
|
+ mapOptions.value = mapRes.list
|
|
|
|
|
+ console.log(mapOptions.value,'地图名称')
|
|
|
|
|
+ deptOptions.value = handleTree(deptRes.list)
|
|
|
|
|
+ spmOptions.value = spmRes.list
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
|
console.error('获取下拉选项数据失败:', error)
|
|
console.error('获取下拉选项数据失败:', error)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
/** 搜索按钮操作 */
|
|
/** 搜索按钮操作 */
|
|
|
const handleQuery = () => {
|
|
const handleQuery = () => {
|
|
|
queryParams.pageNo = 1
|
|
queryParams.pageNo = 1
|
|
|
getList()
|
|
getList()
|
|
|
|
|
+ getOtherList()
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/** 重置按钮操作 */
|
|
/** 重置按钮操作 */
|