Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
This commit is contained in:
commit
938ad4cd9b
|
@ -803,7 +803,7 @@
|
||||||
const handleAdd = (value) => {
|
const handleAdd = (value) => {
|
||||||
flag.value = value
|
flag.value = value
|
||||||
}
|
}
|
||||||
const titleName = ref(titleNameArray)
|
const titleName=ref([])
|
||||||
const openMonitor = () => {
|
const openMonitor = () => {
|
||||||
window.open('http://www.qingdao.gov.cn:8083/ghwd/znwdqd/index.html')
|
window.open('http://www.qingdao.gov.cn:8083/ghwd/znwdqd/index.html')
|
||||||
}
|
}
|
||||||
|
@ -903,6 +903,16 @@
|
||||||
pageSize: currentPageSize.value,
|
pageSize: currentPageSize.value,
|
||||||
name: '',
|
name: '',
|
||||||
})
|
})
|
||||||
|
//调整标题顺序 西海岸基础设施放在最前面
|
||||||
|
const setTitle = () => {
|
||||||
|
let title = titleNameArray
|
||||||
|
let whoShow1 = ref(whoShow)
|
||||||
|
if( whoShow1 && whoShow1.value.itShowXiHaiAn){
|
||||||
|
title[0] = title.splice(2, 1, title[0])[0];
|
||||||
|
|
||||||
|
}
|
||||||
|
titleName.value=title
|
||||||
|
}
|
||||||
// 查询
|
// 查询
|
||||||
const onSearch = () => {
|
const onSearch = () => {
|
||||||
loading.value = true
|
loading.value = true
|
||||||
|
@ -1740,6 +1750,8 @@
|
||||||
}
|
}
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
// 从本地读取查询条件,赋值
|
// 从本地读取查询条件,赋值
|
||||||
|
//西海岸基础设施放在最前面
|
||||||
|
setTitle();
|
||||||
handleSetSearchData()
|
handleSetSearchData()
|
||||||
listKey2.value++
|
listKey2.value++
|
||||||
// 获取筛选条件
|
// 获取筛选条件
|
||||||
|
@ -1877,6 +1889,7 @@
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
|
setTitle,
|
||||||
listKey,
|
listKey,
|
||||||
ListContent,
|
ListContent,
|
||||||
searchValue,
|
searchValue,
|
||||||
|
|
Loading…
Reference in New Issue