wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
guoyue 2022-07-14 15:49:52 +08:00
parent a8b91e2788 d8d7b4215a
commit d9ed994429
17 changed files with 290 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
back/src/views/modules/sys/log-data-modification-log.vue
View File

@ -322,7 +322,7 @@ export default {
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.blue-font-color:hover { .blue-font-color {
color: #0058e1; color: #0058e1;
cursor: pointer; cursor: pointer;
} }

4
back/src/views/modules/sys/log-operation.vue
View File

@ -232,7 +232,7 @@ export default {
startDate: '', startDate: '',
endDate: '', endDate: '',
operation: '', operation: '',
operationType: 'all' operationType: ''
} }
this.value1 = '' // 格式化日期 this.value1 = '' // 格式化日期
this.operationType = '' // 操作类型转化 this.operationType = '' // 操作类型转化
@ -281,7 +281,7 @@ export default {
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.blue-font-color:hover { .blue-font-color {
color: #0058e1; color: #0058e1;
cursor: pointer; cursor: pointer;
} }

6
front/public/static/config/location.js
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23 * @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-07-13 18:05:38 * @LastEditTime: 2022-07-14 10:01:08
* @Description: 数据资源参数配置 * @Description: 数据资源参数配置
*/ */
const newLocation = 'qingdao' const newLocation = 'qingdao'
@ -32,12 +32,12 @@ if (newLocation === 'qingdao') {
{ name: '能力统计', key: 'abilityStatistics' }, { name: '能力统计', key: 'abilityStatistics' },
// { name: '开发指南', key: 'developmentGuide' }, // { name: '开发指南', key: 'developmentGuide' },
{ name: '指导手册', key: 'instructionManual' }, { name: '指导手册', key: 'instructionManual' },
{ name: '需求中心', key: 'demandCenter' }, // { name: '需求中心', key: 'demandCenter' },
// { name: '个人中心', key: 'personalCenter' }, // { name: '个人中心', key: 'personalCenter' },
{ name: '区市站点', key: 'mapTest' }, { name: '区市站点', key: 'mapTest' },
// { name: '后台管理', key: 'houtaiguanli' }, // { name: '后台管理', key: 'houtaiguanli' },
{ name: '赋能案例', key: 'assignCase' }, { name: '赋能案例', key: 'assignCase' },
// { name: '融合服务', key: 'integrationServices' }, { name: '融合服务', key: 'integrationServices' },
] ]
footerDataList.footerList = { footerDataList.footerList = {
company: { company: {

2
front/src/store/modules/user.js
View File

@ -120,7 +120,7 @@
return false return false
} }
// debugger // debugger
commit('setUsername', data.data.username) commit('setUsername', data.data.realName)
commit('setRole', data.data.roleIdList.length) commit('setRole', data.data.roleIdList.length)
commit('setUserId', data.data.id) commit('setUserId', data.data.id)
// TODO 获取用户信息，后续执行部分操作 // TODO 获取用户信息，后续执行部分操作

17
front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
View File

@ -162,6 +162,13 @@
@click="showTextFunction()" @click="showTextFunction()"
> >
编辑富文本 编辑富文本
<div
v-show="showText"
class="fuwenbenbianjiqi"
style="position: absolute; z-index: 10000"
>
<VueTemplateDemo :dataFrom="props.dataFrom"></VueTemplateDemo>
</div>
</div> </div>
<upload <upload
v-else-if="item.type == 'video'" v-else-if="item.type == 'video'"
@ -240,13 +247,6 @@
</div> </div>
</template> </template>
</div> </div>
<div
v-show="showText"
class="fuwenbenbianjiqi"
style="width: 100px; height: 100px; z-index: 10000"
>
<VueTemplateDemo></VueTemplateDemo>
</div>
</div> </div>
</template> </template>
<script setup> <script setup>
@ -260,7 +260,7 @@
queryResourceRelByKeyId, queryResourceRelByKeyId,
filesUpload, filesUpload,
} from '@/api/personalCenter' } from '@/api/personalCenter'
import VueTemplateDemo from '@/views/capacityOnTheShelf/FilesUpload.vue' import VueTemplateDemo from '@/views/personalCenter/VueTemplateDemo.vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
const router = useRouter() const router = useRouter()
const abilityToType = router.currentRoute.value.query.abilityToType const abilityToType = router.currentRoute.value.query.abilityToType
@ -417,6 +417,7 @@
} }
mybus.on('showTextFunctionEmit', (show) => { mybus.on('showTextFunctionEmit', (show) => {
console.log('ssdcsd') console.log('ssdcsd')
debugger
showText.value = show showText.value = show
}) })
mybus.off('func') mybus.off('func')

6
front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue
View File

@ -35,7 +35,7 @@
</div> </div>
<template v-for="itemSonTitle in dataFrom.attrValue" :key="itemSonTitle"> <template v-for="itemSonTitle in dataFrom.attrValue" :key="itemSonTitle">
<div class="content" v-if="tabindex == itemSonTitle.name"> <div class="content" v-if="tabindex == itemSonTitle.name">
<div class="content-right"> <div class="content-left">
<div class="content-left-scene" v-if="!itemSonTitle.img"></div> <div class="content-left-scene" v-if="!itemSonTitle.img"></div>
<a-image <a-image
:width="635" :width="635"
@ -121,13 +121,13 @@
log(index, title) log(index, title)
if (index == 0) { if (index == 0) {
if (title == '应用场景') { if (title == '应用场景') {
return 'content-right' return 'content-left'
} else { } else {
return 'content-left' return 'content-left'
} }
} else { } else {
if (title == '应用场景') { if (title == '应用场景') {
return 'content-left' return 'content-right'
} else { } else {
return 'content-right' return 'content-right'
} }

6
front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
View File

@ -187,11 +187,7 @@
)[0] )[0]
// console.log('dataFrom.value.link', obj.attrValue) // console.log('dataFrom.value.link', obj.attrValue)
if (obj) { if (obj) {
window.open( window.open(window.SITE_CONFIG.frontUrl + obj.attrValue)
window.SITE_CONFIG.previewUrl +
'hisense_office/onlinePreview?url=' +
btoa(encodeURI(obj.attrValue))
)
} else { } else {
message.config({ message.config({
top: '100px', // 距离顶部的位置 top: '100px', // 距离顶部的位置

126
front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue
View File

@ -1,10 +1,10 @@
<!-- 应用场景--> <!-- 应用场景-->
<template> <template>
<div class="function-intorduction" v-if="flag"> <div class="application-scenarios-and-case" v-if="flag">
<div class="application-scenarios-and-case-son"> <div class="application-scenarios-and-case-son">
<!-- {{ dataFrom.attrType }} --> <!-- {{ dataFrom.attrType }} -->
<div class="title"> <div class="title">
<DetalsTitle :title="dataFrom.attrType" type="SCENE"></DetalsTitle> <DetalsTitle :title="dataFrom.attrType" :type="SCENE"></DetalsTitle>
</div> </div>
<div class="tab"> <div class="tab">
<div <div
@ -44,9 +44,9 @@
v-if="itemSonTitle.img" v-if="itemSonTitle.img"
></a-image> ></a-image>
</div> </div>
<div class="content-right"> <div :class="contentLocation(1, dataFrom.attrType)">
<div class="content-right-scene"> <div class="content-right-scene" :class="'content-right-case'">
<!-- <div class="content-top">{{ itemSonTitle.name }}</div>--> <div class="content-top">{{ itemSonTitle.name }}</div>
<a-tooltip> <a-tooltip>
<template #title>{{ itemSonTitle.desc }}</template> <template #title>{{ itemSonTitle.desc }}</template>
<div class="content-bottom">{{ itemSonTitle.desc }}</div> <div class="content-bottom">{{ itemSonTitle.desc }}</div>
@ -97,11 +97,15 @@
} }
} }
) )
const { log } = console
//滚动条样式 //滚动条样式
function tabIndexClass(index, title, content) { function tabIndexClass(index, title, content) {
if (title == '应用场景' && index == 0 && content.length > 6) { if (title == '应用场景' && index == 0 && content.length > 6) {
return 'tab-son-class' return 'tab-son-class'
} }
if (title == '应用案例' && index == 0 && content.length > 6) {
return 'tab-son-class-two'
}
} }
//初始化tab切换（判断标题不同，点击事件的判断变量不同） //初始化tab切换（判断标题不同，点击事件的判断变量不同）
function tabInitialize() { function tabInitialize() {
@ -112,10 +116,27 @@
tabindex.value = name tabindex.value = name
return tabindex.value 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'
}
}
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.function-intorduction { .application-scenarios-and-case {
width: 100%; width: 100%;
background: #f7f8fa; background: #f7f8fa;
display: flex; display: flex;
@ -123,63 +144,62 @@
align-items: center; align-items: center;
overflow-x: unset; overflow-x: unset;
.application-scenarios-and-case-son { .application-scenarios-and-case-son {
padding-top: 0.8rem; padding-top: 80px;
padding-bottom: 0.8rem; padding-bottom: 80px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
overflow: unset; overflow: unset;
.tab { .tab {
max-width: 13rem; max-width: 1300px;
overflow-x: auto; overflow-x: auto;
display: flex; display: flex;
justify-content: center; justify-content: center;
color: #808080; color: #808080;
border-bottom: 0.01rem #e4e6f5 solid; border-bottom: 1px #e4e6f5 solid;
margin-top: 0.45rem; margin-top: 45px;
margin-bottom: 0.4rem; margin-bottom: 40px;
cursor: pointer; cursor: pointer;
padding-left: 0.4rem; padding-left: 40px;
padding-right: 0.4rem; padding-right: 40px;
.tab-son { .tab-son {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
text-align: center; margin-right: 100px;
margin-right: 1rem;
.tab-top { .tab-top {
min-width: 1.2rem; min-width: 120px;
font-size: 0.24rem; font-size: 24px;
line-height: 0.24rem; line-height: 24px;
margin-bottom: 0.2rem; margin-bottom: 20px;
max-width: 2rem; max-width: 200px;
height: 0.24rem; height: 24px;
display: -webkit-box; display: -webkit-box;
overflow: hidden; overflow: hidden;
-webkit-line-clamp: 1; -webkit-line-clamp: 1;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.tab-top-down { .tab-top-down {
min-width: 1.2rem; min-width: 120px;
color: #526aff; color: #526aff;
margin-bottom: 0.16rem; margin-bottom: 16px;
} }
.tab-bottom { .tab-bottom {
height: 0.04rem; height: 4px;
width: 0.6rem; width: 60px;
background: #526aff; background: #526aff;
} }
} }
.tab-son-class { .tab-son-class {
margin-left: 4.3rem; margin-left: 430px;
margin-bottom: 0.02rem; margin-bottom: 2px;
} }
.tab-son-class-two { .tab-son-class-two {
margin-left: 2.3rem; margin-left: 230px;
margin-bottom: 0.02rem; margin-bottom: 2px;
} }
.tab-son:last-child { .tab-son:last-child {
margin-right: 0rem; margin-right: 0px;
} }
} }
.tab::-webkit-scrollbar-thumb { .tab::-webkit-scrollbar-thumb {
@ -189,57 +209,57 @@
display: flex; display: flex;
position: relative; position: relative;
width: 100%; width: 100%;
min-width: 13rem; min-width: 1300px;
height: 3.4rem; height: 340px;
.content-left { .content-left {
position: absolute; position: absolute;
left: 0; left: 0;
min-width: 6.2rem; min-width: 620px;
:deep(.ant-image-img) {
width: 100%;
height: 100%;
object-fit: contain;
}
// text-align: center; // text-align: center;
.content-top { .content-top {
text-align: left; text-align: left;
} }
} }
.content-right { .content-right {
width: 6.2rem; width: 620px;
height: 3.4rem; height: 340px;
position: absolute; position: absolute;
right: 0; right: 0;
display: flex; display: flex;
justify-content: center; justify-content: center;
:deep(.ant-image-img) {
width: 100%;
height: 100%;
object-fit: contain;
}
} }
.content-right-scene, .content-right-scene,
.content-right-case { .content-right-case {
width: 6.2rem; width: 620px;
height: 3.4rem; height: 340px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
} }
.content-left-scene, .content-left-scene,
.content-left-case { .content-left-case {
height: 3.4rem; height: 340px;
width: 6.35rem; width: 635px;
border-radius: 0.1rem; border-radius: 10px;
background: url('~@/assets/detailsAll/sf_tupianceshi.png') no-repeat; background: url('~@/assets/detailsAll/sf_tupianceshi.png') no-repeat;
background-position: center; background-position: center;
background-size: 6.35rem 3.4rem; background-size: 635px 340px;
} }
.content-top { .content-top {
font-size: 0.22rem; font-size: 22px;
line-height: 0.22rem; line-height: 22px;
color: #000000; color: #000000;
margin-bottom: 0.35rem; margin-bottom: 35px;
} }
.content-bottom { .content-bottom {
font-size: 0.18rem; font-size: 18px;
color: #999999; color: #999999;
line-height: 0.26rem; line-height: 26px;
display: -webkit-box; display: -webkit-box;
overflow: hidden; overflow: hidden;
-webkit-line-clamp: 6; -webkit-line-clamp: 6;
@ -248,7 +268,7 @@
} }
} }
.application-scenarios-and-case-son:first-child { .application-scenarios-and-case-son:first-child {
padding-top: 1rem; padding-top: 100px;
} }
} }
</style> </style>

26
front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
View File

@ -232,34 +232,26 @@
} }
.bottom { .bottom {
margin-top: 0.4rem; margin-top: 40px;
display: flex; display: flex;
.ant-btn { .ant-btn {
height: 0.5rem; height: 50px;
margin-right: 0.2rem; margin-right: 20px;
background: #ffffff; background: #ff8b55;
border-radius: 0.06rem; border-radius: 6px;
font-size: 0.2rem; font-size: 20px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.ant-btn-primary {
color: #1890ff;
}
.ant-btn:nth-of-type(1) { .ant-btn:nth-of-type(1) {
width: 1.8rem; width: 180px;
} }
.ant-btn:nth-of-type(2) { .ant-btn:nth-of-type(2) {
width: 2.2rem; width: 220px;
} }
.ant-btn:nth-of-type(3) { .ant-btn:nth-of-type(3) {
width: 1.45rem; width: 145px;
background: #fff; background: #fff;
color: #526aff; color: #526aff;
} }

6
front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
View File

@ -207,11 +207,7 @@
(item) => item.attrType === '技术文档' (item) => item.attrType === '技术文档'
)[0] )[0]
if (obj) { if (obj) {
window.open( window.open(window.SITE_CONFIG.frontUrl + obj.attrValue)
window.SITE_CONFIG.previewUrl +
'hisense_office/onlinePreview?url=' +
btoa(encodeURI(obj.attrValue))
)
} else { } else {
message.config({ message.config({
top: '100px', // 距离顶部的位置 top: '100px', // 距离顶部的位置

6
front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue
View File

@ -35,7 +35,7 @@
</div> </div>
<template v-for="itemSonTitle in dataFrom.attrValue" :key="itemSonTitle"> <template v-for="itemSonTitle in dataFrom.attrValue" :key="itemSonTitle">
<div class="content" v-if="tabindex == itemSonTitle.name"> <div class="content" v-if="tabindex == itemSonTitle.name">
<div class="content-right"> <div class="content-left">
<div class="content-left-scene" v-if="!itemSonTitle.img"></div> <div class="content-left-scene" v-if="!itemSonTitle.img"></div>
<a-image <a-image
:width="635" :width="635"
@ -121,13 +121,13 @@
log(index, title) log(index, title)
if (index == 0) { if (index == 0) {
if (title == '应用场景') { if (title == '应用场景') {
return 'content-right' return 'content-left'
} else { } else {
return 'content-left' return 'content-left'
} }
} else { } else {
if (title == '应用场景') { if (title == '应用场景') {
return 'content-left' return 'content-right'
} else { } else {
return 'content-right' return 'content-right'
} }

4
front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
View File

@ -138,10 +138,9 @@
let obj = props.dataList.infoList.filter( let obj = props.dataList.infoList.filter(
(item) => item.attrType === '技术文档' (item) => item.attrType === '技术文档'
)[0] )[0]
debugger
console.log('dataFrom.value.link', obj.attrValue) console.log('dataFrom.value.link', obj.attrValue)
window.open( window.open(
window.SITE_CONFIG.previewUrl + window.SITE_CONFIG.frontUrl +
'hisense_office/onlinePreview?url=' + 'hisense_office/onlinePreview?url=' +
btoa(encodeURI(obj.attrValue)) btoa(encodeURI(obj.attrValue))
) )
@ -150,7 +149,6 @@
let obj = props.dataList.infoList.filter( let obj = props.dataList.infoList.filter(
(item) => item.attrType === '使用手册' (item) => item.attrType === '使用手册'
)[0] )[0]
debugger
console.log('dataFrom.value.link', obj.attrValue) console.log('dataFrom.value.link', obj.attrValue)
window.open( window.open(
window.SITE_CONFIG.previewUrl + window.SITE_CONFIG.previewUrl +

126
front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue
View File

@ -1,10 +1,10 @@
<!-- 应用场景--> <!-- 应用场景-->
<template> <template>
<div class="function-intorduction" v-if="flag"> <div class="application-scenarios-and-case" v-if="flag">
<div class="application-scenarios-and-case-son"> <div class="application-scenarios-and-case-son">
<!-- {{ dataFrom.attrType }} --> <!-- {{ dataFrom.attrType }} -->
<div class="title"> <div class="title">
<DetalsTitle :title="dataFrom.attrType" type="SCENE"></DetalsTitle> <DetalsTitle :title="dataFrom.attrType" :type="SCENE"></DetalsTitle>
</div> </div>
<div class="tab"> <div class="tab">
<div <div
@ -44,9 +44,9 @@
v-if="itemSonTitle.img" v-if="itemSonTitle.img"
></a-image> ></a-image>
</div> </div>
<div class="content-right"> <div :class="contentLocation(1, dataFrom.attrType)">
<div class="content-right-scene"> <div class="content-right-scene" :class="'content-right-case'">
<!-- <div class="content-top">{{ itemSonTitle.name }}</div>--> <div class="content-top">{{ itemSonTitle.name }}</div>
<a-tooltip> <a-tooltip>
<template #title>{{ itemSonTitle.desc }}</template> <template #title>{{ itemSonTitle.desc }}</template>
<div class="content-bottom">{{ itemSonTitle.desc }}</div> <div class="content-bottom">{{ itemSonTitle.desc }}</div>
@ -97,11 +97,15 @@
} }
} }
) )
const { log } = console
//滚动条样式 //滚动条样式
function tabIndexClass(index, title, content) { function tabIndexClass(index, title, content) {
if (title == '应用场景' && index == 0 && content.length > 6) { if (title == '应用场景' && index == 0 && content.length > 6) {
return 'tab-son-class' return 'tab-son-class'
} }
if (title == '应用案例' && index == 0 && content.length > 6) {
return 'tab-son-class-two'
}
} }
//初始化tab切换（判断标题不同，点击事件的判断变量不同） //初始化tab切换（判断标题不同，点击事件的判断变量不同）
function tabInitialize() { function tabInitialize() {
@ -112,10 +116,27 @@
tabindex.value = name tabindex.value = name
return tabindex.value 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'
}
}
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.function-intorduction { .application-scenarios-and-case {
width: 100%; width: 100%;
background: #f7f8fa; background: #f7f8fa;
display: flex; display: flex;
@ -123,63 +144,62 @@
align-items: center; align-items: center;
overflow-x: unset; overflow-x: unset;
.application-scenarios-and-case-son { .application-scenarios-and-case-son {
padding-top: 0.8rem; padding-top: 80px;
padding-bottom: 0.8rem; padding-bottom: 80px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
overflow: unset; overflow: unset;
.tab { .tab {
max-width: 13rem; max-width: 1300px;
overflow-x: auto; overflow-x: auto;
display: flex; display: flex;
justify-content: center; justify-content: center;
color: #808080; color: #808080;
border-bottom: 0.01rem #e4e6f5 solid; border-bottom: 1px #e4e6f5 solid;
margin-top: 0.45rem; margin-top: 45px;
margin-bottom: 0.4rem; margin-bottom: 40px;
cursor: pointer; cursor: pointer;
padding-left: 0.4rem; padding-left: 40px;
padding-right: 0.4rem; padding-right: 40px;
.tab-son { .tab-son {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
text-align: center; margin-right: 100px;
margin-right: 1rem;
.tab-top { .tab-top {
min-width: 1.2rem; min-width: 120px;
font-size: 0.24rem; font-size: 24px;
line-height: 0.24rem; line-height: 24px;
margin-bottom: 0.2rem; margin-bottom: 20px;
max-width: 2rem; max-width: 200px;
height: 0.24rem; height: 24px;
display: -webkit-box; display: -webkit-box;
overflow: hidden; overflow: hidden;
-webkit-line-clamp: 1; -webkit-line-clamp: 1;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.tab-top-down { .tab-top-down {
min-width: 1.2rem; min-width: 120px;
color: #526aff; color: #526aff;
margin-bottom: 0.16rem; margin-bottom: 16px;
} }
.tab-bottom { .tab-bottom {
height: 0.04rem; height: 4px;
width: 0.6rem; width: 60px;
background: #526aff; background: #526aff;
} }
} }
.tab-son-class { .tab-son-class {
margin-left: 4.3rem; margin-left: 430px;
margin-bottom: 0.02rem; margin-bottom: 2px;
} }
.tab-son-class-two { .tab-son-class-two {
margin-left: 2.3rem; margin-left: 230px;
margin-bottom: 0.02rem; margin-bottom: 2px;
} }
.tab-son:last-child { .tab-son:last-child {
margin-right: 0rem; margin-right: 0px;
} }
} }
.tab::-webkit-scrollbar-thumb { .tab::-webkit-scrollbar-thumb {
@ -189,57 +209,57 @@
display: flex; display: flex;
position: relative; position: relative;
width: 100%; width: 100%;
min-width: 13rem; min-width: 1300px;
height: 3.4rem; height: 340px;
.content-left { .content-left {
position: absolute; position: absolute;
left: 0; left: 0;
min-width: 6.2rem; min-width: 620px;
:deep(.ant-image-img) {
width: 100%;
height: 100%;
object-fit: contain;
}
// text-align: center; // text-align: center;
.content-top { .content-top {
text-align: left; text-align: left;
} }
} }
.content-right { .content-right {
width: 6.2rem; width: 620px;
height: 3.4rem; height: 340px;
position: absolute; position: absolute;
right: 0; right: 0;
display: flex; display: flex;
justify-content: center; justify-content: center;
:deep(.ant-image-img) {
width: 100%;
height: 100%;
object-fit: contain;
}
} }
.content-right-scene, .content-right-scene,
.content-right-case { .content-right-case {
width: 6.2rem; width: 620px;
height: 3.4rem; height: 340px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
} }
.content-left-scene, .content-left-scene,
.content-left-case { .content-left-case {
height: 3.4rem; height: 340px;
width: 6.35rem; width: 635px;
border-radius: 0.1rem; border-radius: 10px;
background: url('~@/assets/detailsAll/sf_tupianceshi.png') no-repeat; background: url('~@/assets/detailsAll/sf_tupianceshi.png') no-repeat;
background-position: center; background-position: center;
background-size: 6.35rem 3.4rem; background-size: 635px 340px;
} }
.content-top { .content-top {
font-size: 0.22rem; font-size: 22px;
line-height: 0.22rem; line-height: 22px;
color: #000000; color: #000000;
margin-bottom: 0.35rem; margin-bottom: 35px;
} }
.content-bottom { .content-bottom {
font-size: 0.18rem; font-size: 18px;
color: #999999; color: #999999;
line-height: 0.26rem; line-height: 26px;
display: -webkit-box; display: -webkit-box;
overflow: hidden; overflow: hidden;
-webkit-line-clamp: 6; -webkit-line-clamp: 6;
@ -248,7 +268,7 @@
} }
} }
.application-scenarios-and-case-son:first-child { .application-scenarios-and-case-son:first-child {
padding-top: 1rem; padding-top: 100px;
} }
} }
</style> </style>

32
front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue
View File

@ -9,12 +9,15 @@
<div class="application-presentation" v-if="flag"> <div class="application-presentation" v-if="flag">
<detals-title title="图层预览" type="PREVIEW"></detals-title> <detals-title title="图层预览" type="PREVIEW"></detals-title>
<div class="main"> <div class="main">
<iframe <!-- <iframe
:src="img" :src="img"
width="100%" width="100%"
height="100%" height="100%"
border-radius="0.1rem" border-radius="0.1rem"
></iframe> ></iframe> -->
<div class="iframe-box">
<iframe :src="img" width="100%" height="440"></iframe>
</div>
</div> </div>
</div> </div>
</template> </template>
@ -37,7 +40,7 @@
} else { } else {
props.dataList.infoList.map((item) => { props.dataList.infoList.map((item) => {
if (item.attrType === '预览服务地址') { if (item.attrType === '预览服务地址') {
img.value = imgindex.attrValue || '--' img.value = item.attrValue.replace(/amp;/g, '') || '--'
} }
}) })
} }
@ -54,7 +57,7 @@
} else { } else {
val.infoList.map((item) => { val.infoList.map((item) => {
if (item.attrType === '预览服务地址') { if (item.attrType === '预览服务地址') {
img.value = imgindex.attrValue || '--' img.value = item.attrValue.replace(/amp;/g, '') || '--'
} }
}) })
} }
@ -64,14 +67,23 @@
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.application-presentation { .application-presentation {
padding: 0.8rem 3rem 0; padding: 0.8rem 3rem 0.6rem;
.main { .main {
height: 5rem; // border-radius: 0.1rem;
border-radius: 0.1rem;
margin-top: 0.4rem; margin-top: 0.4rem;
display: flex; // display: flex;
justify-content: center; // justify-content: center;
align-items: center; // align-items: center;
iframe {
border: none;
}
.iframe-box {
width: 100%;
height: 440px;
margin-top: 10px;
display: flex;
justify-content: center;
}
} }
} }
</style> </style>

6
front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
View File

@ -215,11 +215,7 @@
(item) => item.attrType === '技术文档' (item) => item.attrType === '技术文档'
)[0] )[0]
if (obj) { if (obj) {
window.open( window.open(window.SITE_CONFIG.frontUrl + obj.attrValue)
window.SITE_CONFIG.previewUrl +
'hisense_office/onlinePreview?url=' +
btoa(encodeURI(obj.attrValue))
)
} else { } else {
message.config({ message.config({
top: '100px', // 距离顶部的位置 top: '100px', // 距离顶部的位置

35
front/src/views/home/components/header.vue
View File

@ -113,7 +113,7 @@
import { ref, onMounted, onBeforeUnmount, defineProps } from 'vue' import { ref, onMounted, onBeforeUnmount, defineProps } from 'vue'
import { recordRoute } from '@/config' import { recordRoute } from '@/config'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import { getUser, mynotice } from '@/api/home' import { mynotice } from '@/api/home'
import { useStore } from 'vuex' import { useStore } from 'vuex'
import { getSgcTotal } from '@/api/home' import { getSgcTotal } from '@/api/home'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
@ -132,22 +132,25 @@
// // { name: '后台管理', key: 'houtaiguanli' }, // // { name: '后台管理', key: 'houtaiguanli' },
// { name: '赋能案例', key: 'assignCase' }, // { 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 select = ref(router.currentRoute.value.name)
const mynoticeFlag = ref(false) const mynoticeFlag = ref(false)
const mynoticeData = ref([]) const mynoticeData = ref([])
console.log('navListManagement------------>', navListManagement); console.log('navListManagement------------>', navListManagement)
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
const navList = ref(navListManagement.navList) const navList = ref(navListManagement.navList)
const props = defineProps({ const props = defineProps({
showView: { type: String, default: '' }, showView: { type: String, default: '' },
}) })
// 获取用户信息 // // 获取用户信息
getUser().then((res) => { // getUser().then((res) => {
user.value = res.data.data // user.value = res.data.data
// console.log('user===============>', user.value) // // console.log('user===============>', user.value)
}) // })
// 退出登录 // 退出登录
const logout = async () => { const logout = async () => {
await store.dispatch('user/logout') await store.dispatch('user/logout')
@ -221,9 +224,9 @@
router.push({ router.push({
path: '/integrationServices', path: '/integrationServices',
// path: '/DetailsPageconetent', // path: '/DetailsPageconetent',
query: { query: {
select: '融合服务', select: '融合服务',
}, },
}) })
break break
default: default:
@ -323,7 +326,7 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
padding: 0 1rem; // padding: 0 1rem;
background-color: rgba(0, 0, 25, 0.7); background-color: rgba(0, 0, 25, 0.7);
position: fixed; position: fixed;
z-index: 1000; z-index: 1000;
@ -362,7 +365,7 @@
color: #fff !important; color: #fff !important;
} }
.info { .info {
width: 2rem; // width: 2rem;
margin-left: 0.2rem; margin-left: 0.2rem;
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -381,7 +384,11 @@
font-size: 0.16rem; font-size: 0.16rem;
} }
.name { .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; overflow: hidden;
} }
.out { .out {

75
front/src/views/personalCenter/VueTemplateDemo.vue
View File

@ -16,6 +16,7 @@
<script> <script>
import { defineComponent } from 'vue' import { defineComponent } from 'vue'
import mybus from '@/myplugins/mybus'
import { message } from 'ant-design-vue' import { message } from 'ant-design-vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { getDevelopmentFile, updateDevelopmentFile } from '@/api/file' import { getDevelopmentFile, updateDevelopmentFile } from '@/api/file'
@ -27,34 +28,88 @@
export default defineComponent({ export default defineComponent({
name: 'VueTemplateDemo', name: 'VueTemplateDemo',
components: { Editor }, components: { Editor },
props: {
dataFrom: {
type: Object,
},
},
data() { data() {
return { return {
text: '', text: '',
route: useRouter(), route: useRouter(),
iconfontJs: fontJs, iconfontJs: fontJs,
uuidOne: '',
uuidTwo: '',
uuidSnum: '',
} }
}, },
created() { created() {
this.uuidSplice()
this.getDevelopmentFile() this.getDevelopmentFile()
}, },
methods: { methods: {
uuid(len, radix) {
var chars =
'0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
var uuid = [],
i
radix = radix || chars.length
if (len) {
// Compact form
for (i = 0; i < len; i++) uuid[i] = chars[0 | (Math.random() * radix)]
} else {
// rfc4122, version 4 form
var r
// rfc4122 requires these characters
uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-'
uuid[14] = '4'
// Fill in random data. At i==19 set the high bits of clock sequence as
// per rfc4122, sec. 4.1.5
for (i = 0; i < 36; i++) {
if (!uuid[i]) {
r = 0 | (Math.random() * 16)
uuid[i] = chars[i == 19 ? (r & 0x3) | 0x8 : r]
}
}
}
return uuid.join('')
},
uuidSplice() {
this.uuidOne = this.uuid(13, 16)
this.uuidTwo = this.uuid(13, 16)
this.uuidSnum = this.uuidOne + this.uuidTwo
this.uuidSnum = this.uuidSnum.replace(/\s+/g, '')
console.log('this.uuidOne', this.uuidSnum)
},
async saveText(file) { async saveText(file) {
// console.log('保存成功', e) // console.log('保存成功', e)
// const jsonStr = JSON.stringify(e) // const jsonStr = JSON.stringify(e)
const blob = new Blob([file], { const blob = new Blob([file], {
type: 'md', type: 'md',
}) })
let myfile = new File([blob], this.route.currentRoute.query.id + '.md') let myfile = new File([blob], this.uuidSnum + '.md')
var formData = new FormData() var formData = new FormData()
const type = pinyin(this.route.currentRoute.query.type, { const type = pinyin(this.dataFrom.type, {
pattern: 'initial', pattern: 'initial',
}).replace(/\s*/g, '') }).replace(/\s*/g, '')
formData.append('fileName', this.route.currentRoute.query.id + '.md') formData.append('fileName', this.uuidSnum + '.md')
formData.append('type', type) formData.append('type', type)
formData.append('file', myfile) // 'file' 为HTTP Post里的字段名, file 对浏览器里的File对象 formData.append('file', myfile) // 'file' 为HTTP Post里的字段名, file 对浏览器里的File对象
// formData.append('name', this.route.currentRoute.query.id + '.md') // formData.append('name', this.route.currentRoute.query.id + '.md')
// FileSaver.saveAs(blob, '开发指南.md') // FileSaver.saveAs(blob, '开发指南.md')
const res = await updateDevelopmentFile(formData) const res = await updateDevelopmentFile(formData)
let infoList = {
attrType: '技术文档',
attrValue: res.data.data,
delFlag: 0,
}
mybus.emit('chageDataFrom', infoList)
mybus.emit('showTextFunctionEmit', false)
console.log('res', res) console.log('res', res)
if (res.data.code === 0) { if (res.data.code === 0) {
message.success('保存成功') message.success('保存成功')
@ -63,20 +118,22 @@
} }
}, },
async getDevelopmentFile() { async getDevelopmentFile() {
console.log( const type = pinyin(this.dataFrom.type, {
this.route.currentRoute.query.id,
this.route.currentRoute.query.type
)
const type = pinyin(this.route.currentRoute.query.type, {
pattern: 'initial', pattern: 'initial',
}).replace(/\s*/g, '') }).replace(/\s*/g, '')
console.log(type) console.log(type)
const param = { const param = {
type: type, type: type,
resourceId: this.route.currentRoute.query.id, resourceId: this.uuidSnum,
} }
const res = await getDevelopmentFile(param) const res = await getDevelopmentFile(param)
this.text = res.data this.text = res.data
let infoList = {
attrType: '技术文档',
attrValue: this.text.data,
delFlag: 0,
}
mybus.emit('chageDataFrom', infoList)
console.log('res', res) console.log('res', res)
}, },
}, },