@@ -200,6 +207,10 @@
v-if="!whoShow1.itShowBaoTou"
>
查看详情
+
+
+ 一键申请
', typeObj);
+ if(!typeObj) {
+ selData.value = 'total'
+ }
+ if(typeObj.type === '融合服务') {
+ orderList.value = [
+ {
+ value: 'collectCount',
+ name: '收藏量',
+ orderType: 'DESC'
+ },
+ {
+ value: 'create_date',
+ name: '发布时间',
+ orderType: 'DESC'
+ },
+ {
+ value: 'update_date',
+ name: '更新时间',
+ orderType: 'DESC'
+ },
+ ]
+ }
+
+
})
let videoUrl = ref('')
const options = reactive({
@@ -610,6 +714,9 @@
goComparePk,
whoShow1,
showKey,
+ orderList,
+ handleAKeyApplication,
+ changeOrder,
}
},
beforeUnmount() {
@@ -623,7 +730,6 @@
width: 1088px;
padding: 0 20px;
background: #f3f5f9;
-
.detail-content {
// 超出
white-space: nowrap;
@@ -632,7 +738,6 @@
width: 130px;
display: inline-block;
}
-
.shai-xuan {
width: 1047px;
height: 36px;
@@ -642,7 +747,6 @@
display: flex;
align-items: center;
position: relative;
-
.circle {
width: 16px;
height: 16px;
@@ -653,30 +757,24 @@
line-height: 16px;
margin-right: 21px;
}
-
.result {
font-size: 14px;
font-weight: 500;
color: #212121;
-
span {
font-size: 18px;
color: #0087ff;
}
}
-
.condition {
position: absolute;
right: 20px;
top: 10px;
-
ul li {
list-style-type: none;
}
-
ul {
display: flex;
-
li {
width: 90px;
height: 12px;
@@ -685,7 +783,6 @@
display: flex;
justify-content: center;
align-items: center;
-
.arrow {
display: inline-block;
width: 12px;
@@ -693,7 +790,6 @@
background: url('~@/assets/newHome/arrow.png');
margin-left: 10px;
}
-
.down {
background: url('~@/assets/newHome/down.png');
margin-top: 6px;
@@ -702,7 +798,6 @@
}
}
}
-
.result-list {
width: 1048px;
display: flex;
@@ -711,29 +806,24 @@
border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
border-top: 1px rgba(150, 144, 144, 0.3) solid;
padding: 10px 0;
-
.item {
width: 100%;
margin-top: 10px;
display: flex;
align-items: center;
-
.left {
display: inline-block;
width: 120px;
height: 110px;
margin-right: 16px;
}
-
.right {
width: 100%;
}
-
.yyzy {
background: url('~@/assets/home/yyzy_square.png') no-repeat;
background-size: 100%;
}
-
.sjzy {
background: url('~@/assets/home/sjzy_square.png') no-repeat;
background-size: 100%;
@@ -754,41 +844,38 @@
background: url('~@/assets/home/ywzj_square.png') no-repeat;
background-size: 100%;
}
-
+ .rhfw {
+ background: url('~@/assets/home/rhfw_square.png') no-repeat;
+ background-size: 100%;
+ }
.header {
display: flex;
justify-content: space-between;
align-items: center;
margin: 0 10px 0 0;
-
.header-right {
display: flex;
font-size: 14px;
color: #212121;
-
span {
font-size: 14px;
color: #212121;
}
-
div {
margin-right: 24px;
}
}
-
.header-right:last-child {
div {
margin-right: 16px;
}
}
-
span {
font-size: 20px;
font-weight: 600;
// color: #0087ff;
}
}
-
.dec {
overflow: hidden;
text-overflow: ellipsis;
@@ -796,14 +883,12 @@
color: #0058e1;
display: flex;
margin-top: 10px;
-
div {
margin-right: 10px;
background: rgba(0, 88, 225, 0.1);
padding-left: 10px;
padding-right: 10px;
}
-
div:nth-child(3) {
max-width: 200px;
display: -webkit-box;
@@ -817,13 +902,11 @@
-webkit-box-orient: vertical;
}
}
-
.btn {
display: flex;
justify-content: space-between;
font-size: 14px;
margin: 5px 0;
-
// .left {
// width: 600px;
// display: flex;
@@ -843,7 +926,6 @@
justify-content: flex-end;
margin: 0 10px;
align-items: center;
-
.shopping {
span {
display: inline-block;
@@ -852,17 +934,14 @@
margin-right: 10px;
margin-top: 5px;
}
-
.shopping-on {
background: url('~@/assets/newHome/shopping-on.png');
cursor: pointer;
}
-
.shopping-down {
background: url('~@/assets/newHome/shopping-down.png');
}
}
-
.pk-on {
display: inline-block;
height: 32px;
@@ -873,20 +952,17 @@
background: url('~@/assets/newHome/pk-on.png');
cursor: pointer;
}
-
.sc {
// margin-top: 4px;
cursor: pointer;
display: flex;
align-items: center;
-
.sc-down {
display: inline-block;
height: 32px;
width: 32px;
background: url('~@/assets/newHome/sc-down.png');
}
-
.sc-on {
display: inline-block;
height: 32px;
@@ -894,7 +970,6 @@
background: url('~@/assets/newHome/sc-on.png');
}
}
-
.ant-btn {
background: transparent;
background: #0058e1;
@@ -909,38 +984,31 @@
justify-content: center;
margin-left: 10px;
}
-
.ant-btn:last-child {
background: #0058e1;
color: white;
}
}
}
-
.bottom {
display: flex;
justify-content: space-between;
margin-top: 10px;
align-items: center;
-
& > div {
display: flex;
align-items: center;
-
& > div {
margin: 0 10px;
}
}
-
.pingfen {
:deep(span) {
display: flex;
align-items: center;
-
:deep(ul) {
display: flex;
align-items: center;
-
:deep(.ant-rate-star:not(:last-child)) {
margin-right: 4px;
}
@@ -949,7 +1017,6 @@
}
}
}
-
.item:nth-of-type(1) {
margin-top: 0;
}
diff --git a/front/src/views/home/constantData/showData.js b/front/src/views/home/constantData/showData.js
new file mode 100644
index 00000000..69218b34
--- /dev/null
+++ b/front/src/views/home/constantData/showData.js
@@ -0,0 +1,68 @@
+export const titleNameArray = [
+ {
+ photo: require('@/assets/newHome/banner-zj.png'),
+ name: '组件服务',
+ },
+ {
+ photo: require('@/assets/newHome/banner-yy.png'),
+ name: '应用资源',
+ },
+ {
+ photo: require('@/assets/newHome/banner-jc.png'),
+ name: '基础设施',
+ },
+ {
+ photo: require('@/assets/newHome/banner-sj.png'),
+ name: '数据资源',
+ },
+ {
+ photo: require('@/assets/newHome/banner-zs.png'),
+ name: '知识库',
+ },
+]
+
+// 模糊查询
+export const keyongziyuanqingkaungArray = [
+ {
+ name: 'CPU/核：',
+ value: 2102,
+ },
+ {
+ name: '内存/T：',
+ value: 6.68,
+ },
+ {
+ name: '存储/T：',
+ value: 2102,
+ },
+ {
+ name: 'RDS for Mysql/G：',
+ value: 982.82,
+ },
+ {
+ name: 'RDS for SqlServer/G：',
+ value: 997.17,
+ },
+]
+
+export const shujuziyuanqingkuangArray = [
+ {
+ name: '已上线目录：',
+ value: 10372,
+ danwei: '条',
+ },
+ {
+ name: '已发布服务：',
+ value: 1080,
+ danwei: '条',
+ },
+ {
+ name: '已发布接口：',
+ value: 976,
+ danwei: '条',
+ },
+ {
+ name: '更新时间：',
+ value: '2022-05-06',
+ },
+]
\ No newline at end of file
diff --git a/front/src/views/home/detailsPageconetentTree.vue b/front/src/views/home/detailsPageconetentTree.vue
index a192a4af..08e8c04d 100644
--- a/front/src/views/home/detailsPageconetentTree.vue
+++ b/front/src/views/home/detailsPageconetentTree.vue
@@ -152,6 +152,7 @@
}
switch (val.type) {
case '市级':
+ case '企业':
case '其他':
generateChildren(val, obj)
break
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index e860c9c8..a7de5707 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -138,7 +138,7 @@
muted: false, //静音
webFullScreen: false,
speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
- autoPlay: true, //自动播放
+ autoPlay: false, //自动播放
loop: false, //循环播放
mirror: false, //镜像画面
ligthOff: false, //关灯模式
@@ -253,6 +253,12 @@
let tableHeight = ref('600')
//tab切换点击事件
const tabClick = (indexFather, name) => {
+ console.log(
+ '点击tab================>',
+ indexFather,
+ name,
+ clickList.value[indexFather]
+ )
selectedRowKeys.value = []
selectedList.value = []
if (clickList.value[indexFather].content.indexOf(name) != -1) {
@@ -338,22 +344,22 @@
})
console.log('选中的标签code', mapSearchParam.value)
mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
- let fatherName = ref('视频资源')
- if (name == '视频资源' || name == '云资源' || name == '感知资源') {
- fatherName.value == name
- }
- if (fatherName.value == '视频资源') {
- getCamera()
- } else {
- dataSource.value = []
- pagination.value.total = 0
- }
- // if (name == '视频资源') {
+ // let fatherName = ref('视频资源')
+ // if (name == '视频资源' || name == '云资源' || name == '感知资源') {
+ // fatherName.value == name
+ // }
+ // if (fatherName.value == '视频资源') {
// getCamera()
// } else {
// dataSource.value = []
// pagination.value.total = 0
// }
+ if (name == '云资源' || name == '感知资源') {
+ dataSource.value = []
+ pagination.value.total = 0
+ } else {
+ getCamera()
+ }
}
// 清空
const nullClick = () => {
diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue
new file mode 100644
index 00000000..14b1cf29
--- /dev/null
+++ b/front/src/views/home/integrationServices.vue
@@ -0,0 +1,319 @@
+
+
+
+
+
+
+
diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue
new file mode 100644
index 00000000..e4faf4a4
--- /dev/null
+++ b/front/src/views/home/integrationServicesDetails.vue
@@ -0,0 +1,452 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ nav.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index 0a49b255..9e520325 100644
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@@ -52,7 +52,7 @@
v-for="(item, index) in sjList"
:key="item.id"
:class="index == 4 ? 'name-last' : ''"
- @click="selectOne(item.id)"
+ @click="selectOne3(item.name)"
>
{{ index + 1 }}-{{ item.name }}
@@ -162,7 +162,7 @@
} else {
let type = paramsGetResources.type
if (type == '基础设施') {
- selectInfrastructureList().then((res) => {
+ selectInfrastructureList().then((res) => {
console.log('基础设施==========>', res.data.data)
for (const key in res.data.data) {
jcList.value.push({
@@ -243,6 +243,16 @@
},
})
}
+ const selectOne3 = (name) => {
+ console.log('点击===============》', name)
+ router.push({
+ path: '/DetailsPageconetent',
+ query: {
+ str: name,
+ select: '数据资源',
+ },
+ })
+ }
+
\ No newline at end of file
diff --git a/front/vue.config.js b/front/vue.config.js
index 4e1f7814..34ebe1d2 100644
--- a/front/vue.config.js
+++ b/front/vue.config.js
@@ -52,7 +52,7 @@ module.exports = {
transpileDependencies,
devServer: {
// host: 'localhost',
- // // hot: true,
+ hot: true,
// port: 9999,
// // open: true,
// // noInfo: false,