diff --git a/back/src/views/modules/sys/log-data-modification-log.vue b/back/src/views/modules/sys/log-data-modification-log.vue
index 8f5f7c0c..37079a4d 100644
--- a/back/src/views/modules/sys/log-data-modification-log.vue
+++ b/back/src/views/modules/sys/log-data-modification-log.vue
@@ -322,7 +322,7 @@ export default {
}
diff --git a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
index ca179210..bd29eef3 100644
--- a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
@@ -232,34 +232,26 @@
}
.bottom {
- margin-top: 0.4rem;
+ margin-top: 40px;
display: flex;
-
.ant-btn {
- height: 0.5rem;
- margin-right: 0.2rem;
- background: #ffffff;
- border-radius: 0.06rem;
- font-size: 0.2rem;
+ height: 50px;
+ margin-right: 20px;
+ background: #ff8b55;
+ border-radius: 6px;
+ font-size: 20px;
display: flex;
justify-content: center;
align-items: center;
}
-
- .ant-btn-primary {
- color: #1890ff;
- }
-
.ant-btn:nth-of-type(1) {
- width: 1.8rem;
+ width: 180px;
}
-
.ant-btn:nth-of-type(2) {
- width: 2.2rem;
+ width: 220px;
}
-
.ant-btn:nth-of-type(3) {
- width: 1.45rem;
+ width: 145px;
background: #fff;
color: #526aff;
}
diff --git a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
index 06a2f533..698980e5 100644
--- a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
@@ -207,11 +207,7 @@
(item) => item.attrType === '技术文档'
)[0]
if (obj) {
- window.open(
- window.SITE_CONFIG.previewUrl +
- 'hisense_office/onlinePreview?url=' +
- btoa(encodeURI(obj.attrValue))
- )
+ window.open(window.SITE_CONFIG.frontUrl + obj.attrValue)
} else {
message.config({
top: '100px', // 距离顶部的位置
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue b/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue
index 016bb3ee..436aec93 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue
@@ -35,7 +35,7 @@
-
+
item.attrType === '技术文档'
)[0]
- debugger
console.log('dataFrom.value.link', obj.attrValue)
window.open(
- window.SITE_CONFIG.previewUrl +
+ window.SITE_CONFIG.frontUrl +
'hisense_office/onlinePreview?url=' +
btoa(encodeURI(obj.attrValue))
)
@@ -150,7 +149,6 @@
let obj = props.dataList.infoList.filter(
(item) => item.attrType === '使用手册'
)[0]
- debugger
console.log('dataFrom.value.link', obj.attrValue)
window.open(
window.SITE_CONFIG.previewUrl +
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue
index 4ba703cb..436aec93 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue
@@ -1,10 +1,10 @@
-
+
-
+
-
-
-
+
+
+
{{ itemSonTitle.name }}
{{ itemSonTitle.desc }}
{{ itemSonTitle.desc }}
@@ -97,11 +97,15 @@
}
}
)
+ const { log } = console
//滚动条样式
function tabIndexClass(index, title, content) {
if (title == '应用场景' && index == 0 && content.length > 6) {
return 'tab-son-class'
}
+ if (title == '应用案例' && index == 0 && content.length > 6) {
+ return 'tab-son-class-two'
+ }
}
//初始化tab切换(判断标题不同,点击事件的判断变量不同)
function tabInitialize() {
@@ -112,10 +116,27 @@
tabindex.value = name
return tabindex.value
}
+ //内容位置初始化
+ function contentLocation(index, title) {
+ log(index, title)
+ if (index == 0) {
+ if (title == '应用场景') {
+ return 'content-left'
+ } else {
+ return 'content-left'
+ }
+ } else {
+ if (title == '应用场景') {
+ return 'content-right'
+ } else {
+ return 'content-right'
+ }
+ }
+ }
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue b/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue
index 8611e43d..df9022ea 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue
@@ -9,12 +9,15 @@
@@ -37,7 +40,7 @@
} else {
props.dataList.infoList.map((item) => {
if (item.attrType === '预览服务地址') {
- img.value = imgindex.attrValue || '--'
+ img.value = item.attrValue.replace(/amp;/g, '') || '--'
}
})
}
@@ -54,7 +57,7 @@
} else {
val.infoList.map((item) => {
if (item.attrType === '预览服务地址') {
- img.value = imgindex.attrValue || '--'
+ img.value = item.attrValue.replace(/amp;/g, '') || '--'
}
})
}
@@ -64,14 +67,23 @@
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
index f6f7b1c8..a0702fc7 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
@@ -215,11 +215,7 @@
(item) => item.attrType === '技术文档'
)[0]
if (obj) {
- window.open(
- window.SITE_CONFIG.previewUrl +
- 'hisense_office/onlinePreview?url=' +
- btoa(encodeURI(obj.attrValue))
- )
+ window.open(window.SITE_CONFIG.frontUrl + obj.attrValue)
} else {
message.config({
top: '100px', // 距离顶部的位置
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index eaac12de..2f67446f 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -113,7 +113,7 @@
import { ref, onMounted, onBeforeUnmount, defineProps } from 'vue'
import { recordRoute } from '@/config'
import { useRoute, useRouter } from 'vue-router'
- import { getUser, mynotice } from '@/api/home'
+ import { mynotice } from '@/api/home'
import { useStore } from 'vuex'
import { getSgcTotal } from '@/api/home'
import mybus from '@/myplugins/mybus'
@@ -132,22 +132,25 @@
// // { name: '后台管理', key: 'houtaiguanli' },
// { name: '赋能案例', key: 'assignCase' },
// ])
- const user = ref({})
+ const user = ref({
+ username: store.getters['user/username'],
+ })
+ // user.username.value = store.getters(['user/username'])
const select = ref(router.currentRoute.value.name)
const mynoticeFlag = ref(false)
const mynoticeData = ref([])
- console.log('navListManagement------------>', navListManagement);
+ console.log('navListManagement------------>', navListManagement)
// eslint-disable-next-line no-undef
const navList = ref(navListManagement.navList)
const props = defineProps({
showView: { type: String, default: '' },
})
- // 获取用户信息
- getUser().then((res) => {
- user.value = res.data.data
- // console.log('user===============>', user.value)
- })
+ // // 获取用户信息
+ // getUser().then((res) => {
+ // user.value = res.data.data
+ // // console.log('user===============>', user.value)
+ // })
// 退出登录
const logout = async () => {
await store.dispatch('user/logout')
@@ -221,9 +224,9 @@
router.push({
path: '/integrationServices',
// path: '/DetailsPageconetent',
- query: {
- select: '融合服务',
- },
+ query: {
+ select: '融合服务',
+ },
})
break
default:
@@ -323,7 +326,7 @@
display: flex;
justify-content: center;
align-items: center;
- padding: 0 1rem;
+ // padding: 0 1rem;
background-color: rgba(0, 0, 25, 0.7);
position: fixed;
z-index: 1000;
@@ -362,7 +365,7 @@
color: #fff !important;
}
.info {
- width: 2rem;
+ // width: 2rem;
margin-left: 0.2rem;
display: flex;
justify-content: center;
@@ -381,7 +384,11 @@
font-size: 0.16rem;
}
.name {
- max-width: 0.75rem;
+ max-width: 3.3rem;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 1;
+ -webkit-box-orient: vertical;
overflow: hidden;
}
.out {
diff --git a/front/src/views/personalCenter/VueTemplateDemo.vue b/front/src/views/personalCenter/VueTemplateDemo.vue
index 6808a71d..10f12b37 100644
--- a/front/src/views/personalCenter/VueTemplateDemo.vue
+++ b/front/src/views/personalCenter/VueTemplateDemo.vue
@@ -16,6 +16,7 @@