diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index b8fcc4c9..49d2ed6f 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -262,7 +262,7 @@
@@ -409,7 +409,7 @@
+
+ 发布时间:
+
+
+ {{ item.createDate.substring(0, 10) + ' ' }}
+
+ {{ item.createDate.substring(11, 19) }}
+
+ --
+
发布时间:
@@ -989,7 +1004,7 @@
margin: 0 10px 0 0;
.header-right {
- display: flex;
+ // display: flex;
font-size: 14px;
color: #212121;
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 7c45e006..2f108dc6 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -480,6 +480,7 @@ import moment from 'moment'
const props = defineProps({
// 模糊查
searchValue: { type: String, default: '' },
+ searchType: { type: String, default: '' },
})
const current = ref(1)
const videoTotal = ref(0)
@@ -621,6 +622,9 @@ const lookData = ref({})
if (props.searchValue) {
mapSearchParam.value.cameraName = props.searchValue
}
+if (props.searchType) {
+ tabClick(0, props.searchType.value)
+}
// 消息列表页面
let formPage = router.currentRoute.value.query.formPage || ''
// 设施类型--无人机和单兵设备
@@ -834,6 +838,7 @@ const look = (row) => {
}
// 搜索
const onSearch = (searchValue) => {
+ debugger
searchData()
chengguoSearch()
}
@@ -1127,14 +1132,6 @@ const selectType = ref('政务云资源')
let tableHeight = ref('600')
//tab切换点击事件
const tabClick = (indexFather, name) => {
- console.log(
- '点击tab================>',
- indexFather,
- name,
- clickList.value,
- clickList.value[indexFather]
- )
-
selectedRowKeys.value = []
selectedList.value = []
if (clickList.value[indexFather].content.indexOf(name) != -1) {
diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index 6982e05b..8e3d9c3a 100644
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@@ -146,17 +146,18 @@ const getAppResources = (type, obj) => {
num: res.data.data[key],
})
}
- } else if(key !== '云资源') { //云资源--暂时隐藏
+ }
+ else {
jcList.value.push({
name: key,
num: res.data.data[key],
})
}
}
- jcList.value.push({
- name: '会客厅',
- num: 4,
- })
+ // jcList.value.push({
+ // name: '会客厅',
+ // num: 4,
+ // })
// 西海岸-单兵设备、无人机 获取数量
if (whoShow1.value.itShowXiHaiAn) {
getSoldierData('无人机')
@@ -328,11 +329,18 @@ const selectOne11 = (name) => {
})
}
const selectOne2 = (name) => {
- console.log('点击===============》', name)
+ let names=''
+ if(name ==='云资源'){
+ names='政务云资源'
+ } else if(name ==='会客厅'){
+ names='城市云脑会客厅'
+ }else{
+ names=name
+ }
router.push({
path: '/DetailsPageconetent',
query: {
- type: name,
+ type: names,
select: '基础设施',
},
})