{{ item.name }}
@@ -741,7 +775,13 @@
orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分 collectCount 收藏量
orderType: 'DESC', // ASC 升序 DESC 降序
}
-
+ //西海岸查询参数
+ let paramsGetResources2 = ref({
+ regionId: '70be8c5b664f4bcf869d82f2e8335051',
+ pageNum: 1,
+ pageSize: currentPageSize.value,
+ name: '',
+ })
// 查询
const onSearch = () => {
loading.value = true
@@ -820,6 +860,12 @@
currentPage.value = 1
currentPageSize.value = 5
// 重置查询条件
+ paramsGetResources2.value = {
+ regionId: '70be8c5b664f4bcf869d82f2e8335051',
+ pageNum: 1,
+ pageSize: currentPageSize.value,
+ name: '',
+ }
paramsGetResources.districtId = ''
paramsGetResources.deptIds = []
paramsGetResources.pageNum = 1
@@ -955,12 +1001,18 @@
searchValue.value,
searchValue.value.length
)
- if (searchValue.value.length >= 2) {
+ if (
+ searchValue.value.length >= 2 &&
+ paramsGetResources.type !== '基础设施'
+ ) {
str = searchValue.value.substring(0, 2)
console.log('str================>', str)
r = re.test(str)
}
- if (searchValue.value.length > 1 && r) {
+ if (
+ (searchValue.value.length > 1 && r) ||
+ paramsGetResources.type === '基础设施'
+ ) {
//switchIndex这个参数是下面的分页传过来的参数
paramsGetResources.name = searchValue.value
paramsGetResources.type = Cardsname.value
@@ -1016,7 +1068,11 @@
loading.value = false
}
})
- } else if (paramsGetResources.type !== '数据资源') {
+ } else if (
+ paramsGetResources.type !== '数据资源' &&
+ (paramsGetResources.type !== '基础设施' ||
+ !whoShow1.value.itShowXiHaiAn)
+ ) {
if (switchIndex != '分页查询') {
paramsGetResources.pageNum = 1
}
@@ -1038,6 +1094,16 @@
// getShoppingCartList(res.data.data.records)
}
})
+ } else if (
+ paramsGetResources.type === '基础设施' &&
+ whoShow1.value.itShowXiHaiAn
+ ) {
+ if (switchIndex != '分页查询') {
+ paramsGetResources.pageNum = 1
+ }
+ paramsGetResources2.value.pageNum = paramsGetResources.pageNum
+ paramsGetResources2.value.pageSize = paramsGetResources.pageSize
+ paramsGetResources2.value.name = paramsGetResources.name
}
} else {
message.error('请以两位以上汉字或数字开头')
@@ -1098,7 +1164,11 @@
loading.value = false
}
})
- } else if (paramsGetResources.type !== '数据资源') {
+ } else if (
+ paramsGetResources.type !== '数据资源' &&
+ (paramsGetResources.type !== '基础设施' ||
+ !whoShow1.value.itShowXiHaiAn)
+ ) {
if (switchIndex != '分页查询') {
paramsGetResources.pageNum = 1
}
@@ -1116,6 +1186,15 @@
// getShoppingCartList(res.data.data.records)
}
})
+ } else if (
+ paramsGetResources.type === '基础设施' ||
+ whoShow1.value.itShowXiHaiAn
+ ) {
+ if (switchIndex != '分页查询') {
+ paramsGetResources.pageNum = 1
+ }
+ paramsGetResources2.value.pageNum = paramsGetResources.pageNum
+ paramsGetResources2.value.pageSize = paramsGetResources.pageSize
}
}
}
@@ -1141,6 +1220,10 @@
resourceList.data = list
})
}
+ mybus.on('getCameraByParentId', (ids) => {
+ paramsGetResources2.value.regionId = ids
+ getAppResources()
+ })
mybus.on('paramsGetResources', (ids) => {
if (ids && ids.length > 0) {
paramsGetResources.deptIds = ids
@@ -1333,6 +1416,7 @@
detailsPageInfrastructureTree,
},
beforeUnmount() {
+ mybus.off('getCameraByParentId')
mybus.off('selectCardsitem')
mybus.off('paramsGetResources')
mybus.off('changeCondition')
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index c58a256b..74cfa2f4 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -459,7 +459,17 @@
obj.system.push({
resourceId: sxt.idtCameraChannel + '',
resourceName: sxt.channelName,
- cameraId: sxt.channelId,
+ cameraId: sxt.channelId, // 改接口后删除
+ channelCode: sxt.channelCode,
+ channelId: sxt.channelId,
+ channelName: sxt.channelName,
+ checkStatus: sxt.checkStatus + '',
+ gpsX: sxt.gpsX,
+ gpsY: sxt.gpsY,
+ idtCameraChannel: sxt.idtCameraChannel + '',
+ nodeName: sxt.nodeName,
+ parentId: sxt.parentId,
+ status: sxt.status + '',
})
})
submitApply(obj).then((res) => {
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 36fd4337..bb59648a 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -122,6 +122,7 @@
import { mynotice } from '@/api/home'
import { useStore } from 'vuex'
import { getSgcTotal } from '@/api/home'
+ import Cookies from 'js-cookie'
import mybus from '@/myplugins/mybus'
const store = useStore()
const router = useRouter()
@@ -201,12 +202,12 @@
path: '/capabilityCloud',
})
break
- case '开发指南':
- router.push({
- path: '/developmentGuide',
- })
- break
- case '指导手册':
+ // case '技术文档':
+ // router.push({
+ // path: '/developmentGuide',
+ // })
+ // break
+ case '技术文档':
router.push({
path: '/instructionManual',
})
@@ -222,6 +223,7 @@
})
break
case '后台管理':
+ Cookies.remove('JSESSIONID')
window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
// window.reload('http://15.2.21.238:9797')
break
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index cb4ddee6..e7510cd5 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -67,6 +67,16 @@
"
/>
+
-
+
+
+
+ {{data}}
+
+
+
+
发布时间：
@@ -936,6 +957,17 @@
div {
margin-right: 24px;
}
+ .label-content {
+ flex: 1;
+ display: flex;
+ justify-content: flex-end;
+ .label {
+ padding: 0.01rem 0.1rem;
+ margin-right: 0.1rem;
+ border-radius: 0.13rem;
+ background: #0087ff;
+ }
+ }
}
.header-right:last-child {
div {
diff --git a/front/src/views/home/detailsPageInfrastructureTree.vue b/front/src/views/home/detailsPageInfrastructureTree.vue
index 6b3c80de..a4aaab3b 100644
--- a/front/src/views/home/detailsPageInfrastructureTree.vue
+++ b/front/src/views/home/detailsPageInfrastructureTree.vue
@@ -93,10 +93,10 @@
-
@@ -969,6 +976,14 @@
color: #0087ff;
}
}
+ .name {
+ max-width: 4.15rem;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
+ word-break: break-all;
+ }
.name:hover {
color: #0087ff;
}
@@ -1044,5 +1059,10 @@
:deep(.ant-list-item-meta-title) {
display: flex;
justify-content: space-between;
+ align-items: center;
+ div {
+ display: flex;
+ align-items: center;
+ }
}