BUG修改
This commit is contained in:
parent
61bb1291c2
commit
493151d9f0
|
@ -461,6 +461,7 @@
|
||||||
},
|
},
|
||||||
yAxis: {
|
yAxis: {
|
||||||
name: '部门数量(个)',
|
name: '部门数量(个)',
|
||||||
|
minInterval: 1,
|
||||||
},
|
},
|
||||||
grid: {
|
grid: {
|
||||||
height: '65%',
|
height: '65%',
|
||||||
|
|
|
@ -1190,6 +1190,7 @@
|
||||||
const re = /^[0-9\u4E00-\u9FA5]*$/
|
const re = /^[0-9\u4E00-\u9FA5]*$/
|
||||||
const getAppResources2 = () => {
|
const getAppResources2 = () => {
|
||||||
globalFlag.value = false
|
globalFlag.value = false
|
||||||
|
mybus.emit('changeRoomInput', searchValue.value)
|
||||||
if (
|
if (
|
||||||
whoShow1.value.itShowQingDao &&
|
whoShow1.value.itShowQingDao &&
|
||||||
paramsGetResources.type == '基础设施'
|
paramsGetResources.type == '基础设施'
|
||||||
|
|
|
@ -857,7 +857,11 @@ const meetingPagination = ref({
|
||||||
const meetingSelect = reactive({ data: [] })
|
const meetingSelect = reactive({ data: [] })
|
||||||
const meetingSelectOld = reactive({ data: [] })
|
const meetingSelectOld = reactive({ data: [] })
|
||||||
const meetingOnSelectChange = (selectedRowKeys) => {
|
const meetingOnSelectChange = (selectedRowKeys) => {
|
||||||
console.log('selectedRowKeys changed: ', selectedRowKeys, meetingSelect.data)
|
console.log(
|
||||||
|
'selectedRowKeys changed: ',
|
||||||
|
selectedRowKeys,
|
||||||
|
meetingSelect.data
|
||||||
|
)
|
||||||
meetingSelect.data = selectedRowKeys
|
meetingSelect.data = selectedRowKeys
|
||||||
meetingSelectOld.data[meetingPagination.value.current - 1] =
|
meetingSelectOld.data[meetingPagination.value.current - 1] =
|
||||||
meetingSelect.data
|
meetingSelect.data
|
||||||
|
@ -1054,6 +1058,12 @@ onMounted(() => {
|
||||||
mapSearchParam.value.parentId = parentId
|
mapSearchParam.value.parentId = parentId
|
||||||
getCamera()
|
getCamera()
|
||||||
})
|
})
|
||||||
|
mybus.off('changeRoomInput')
|
||||||
|
mybus.on('changeRoomInput', (val) => {
|
||||||
|
console.log('更改=======》')
|
||||||
|
roomInput.value = val
|
||||||
|
onSearch()
|
||||||
|
})
|
||||||
mybus.off('getListByMap')
|
mybus.off('getListByMap')
|
||||||
mybus.on('getListByMap', (param) => {
|
mybus.on('getListByMap', (param) => {
|
||||||
mapSearchParam.value.gpsX = param.gpsX
|
mapSearchParam.value.gpsX = param.gpsX
|
||||||
|
@ -2143,7 +2153,13 @@ const columns2 = ref([
|
||||||
align: 'center',
|
align: 'center',
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
const onSelectChange = (record, selected, selectedRows, nativeEvent, type) => {
|
const onSelectChange = (
|
||||||
|
record,
|
||||||
|
selected,
|
||||||
|
selectedRows,
|
||||||
|
nativeEvent,
|
||||||
|
type
|
||||||
|
) => {
|
||||||
record = JSON.parse(JSON.stringify(record))
|
record = JSON.parse(JSON.stringify(record))
|
||||||
if (selected) {
|
if (selected) {
|
||||||
if (selectedRowKeys.value.length == 1000) {
|
if (selectedRowKeys.value.length == 1000) {
|
||||||
|
@ -2166,7 +2182,13 @@ const onSelectChange = (record, selected, selectedRows, nativeEvent, type) => {
|
||||||
mybus.emit('selectTablePoint', selectedList.value)
|
mybus.emit('selectTablePoint', selectedList.value)
|
||||||
console.log('已选中======================>', selectedList.value)
|
console.log('已选中======================>', selectedList.value)
|
||||||
}
|
}
|
||||||
const onSelectChange2 = (record, selected, selectedRows, nativeEvent, type) => {
|
const onSelectChange2 = (
|
||||||
|
record,
|
||||||
|
selected,
|
||||||
|
selectedRows,
|
||||||
|
nativeEvent,
|
||||||
|
type
|
||||||
|
) => {
|
||||||
console.log(
|
console.log(
|
||||||
'已选中======================>',
|
'已选中======================>',
|
||||||
record,
|
record,
|
||||||
|
@ -2179,7 +2201,10 @@ const onSelectChange2 = (record, selected, selectedRows, nativeEvent, type) => {
|
||||||
selectedRowKeys.value.push(record.name)
|
selectedRowKeys.value.push(record.name)
|
||||||
selectedRows.value.push(record.name)
|
selectedRows.value.push(record.name)
|
||||||
} else {
|
} else {
|
||||||
selectedRowKeys.value.splice(selectedRowKeys.value.indexOf(record.name), 1)
|
selectedRowKeys.value.splice(
|
||||||
|
selectedRowKeys.value.indexOf(record.name),
|
||||||
|
1
|
||||||
|
)
|
||||||
selectedRows.value.splice(selectedRowKeys.value.indexOf(record.name), 1)
|
selectedRows.value.splice(selectedRowKeys.value.indexOf(record.name), 1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue