Commit be042ae4 by qinxiaoni

更新

parent 4fc695f4
...@@ -11,7 +11,7 @@ VUE_APP_FILE_API = 'http://192.168.0.28:9888' ...@@ -11,7 +11,7 @@ VUE_APP_FILE_API = 'http://192.168.0.28:9888'
# 内网 登录地址 # 内网 登录地址
#VUE_APP_LOGIN_API = 'http://171.106.48.55:36003/cas/login?service=http://192.168.0.150:9888/oauth/login?systemTag=oa-interInformation' #VUE_APP_LOGIN_API = 'http://171.106.48.55:36003/cas/login?service=http://192.168.0.150:9888/oauth/login?systemTag=oa-interInformation'
VUE_APP_LOGIN_API = 'http://171.106.48.55:36003/cas/login?service=http://192.168.0.28:9888/oauth/login?systemTag=oa-interInformation' VUE_APP_LOGIN_API = 'http://175.178.197.14:8081/cas/login?service=http://192.168.0.28:9888/oauth/login?systemTag=oa-interInformation'
#获取菜单标识 #获取菜单标识
VUE_APP_SYSTEAMTAG = '' VUE_APP_SYSTEAMTAG = ''
......
...@@ -5,17 +5,17 @@ ...@@ -5,17 +5,17 @@
<!--第一栏开始--> <!--第一栏开始-->
<el-row :gutter="20" class="mt-15 first-zone-style" type="flex"> <el-row :gutter="20" class="mt-15 first-zone-style" type="flex">
<el-col :span="10" style="padding-left:0;padding-right:0;"> <el-col :span="10" style="padding-left:0;padding-right:0;">
<div> <div style="height: 100%;">
<el-carousel style="border-radius:8px;" :interval="4000"> <el-carousel style="border-radius:8px;height: 100%;" :interval="4000">
<el-carousel-item <el-carousel-item
style="border-radius:8px;" style="border-radius:8px;height: 100%;"
v-for="(item,index) in headlineRotation.slice(0,3)" v-for="(item,index) in headlineRotation.slice(0,3)"
:key="index" :key="index"
> >
<div <div
v-if="item.attInfoList" v-if="item.attInfoList"
class="carousel-div" class="carousel-div"
style="border-radius:8px;" style="border-radius:8px;height: 100%;"
@click="setParams(item)" @click="setParams(item)"
> >
<!-- <el-image <!-- <el-image
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
></el-image> ></el-image>
<div class="carousel-intro" style> <div class="carousel-intro" style="height: 100%;">
<span>&ensp;{{item.subject}}&ensp;</span> <span>&ensp;{{item.subject}}&ensp;</span>
</div> </div>
</div> </div>
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
</el-carousel> </el-carousel>
</div> </div>
</el-col> </el-col>
<el-col :span="10" style> <el-col :span="10" style>
<div class="zone-style"> <div class="zone-style">
<div class="k-flex-between-center"> <div class="k-flex-between-center">
...@@ -1475,6 +1476,9 @@ export default { ...@@ -1475,6 +1476,9 @@ export default {
border-color: #363636; border-color: #363636;
height: 45px; height: 45px;
} }
.el-carousel__container {
height: 100% !important;
}
} }
// 树形菜单结束 // 树形菜单结束
// 图片墙 // 图片墙
...@@ -1601,4 +1605,6 @@ export default { ...@@ -1601,4 +1605,6 @@ export default {
.home-btn { .home-btn {
padding: 9px 10px; padding: 9px 10px;
} }
</style> </style>
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="zone-style"> <div class="zone-style" style="height: cacl(100% - 30px);">
<div class="k-flex-between-center"> <div class="k-flex-between-center">
<!--<span class="fist-text" style=""></span> <!--<span class="fist-text" style=""></span>
<span>日头条</span>--> <span>日头条</span>-->
...@@ -182,12 +182,13 @@ ...@@ -182,12 +182,13 @@
<!--关注自己的法院结束--> <!--关注自己的法院结束-->
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-row> <el-row style="height: calc(100% - 30px);">
<el-col :span="24"> <el-col :span="24" style="height: 100%;">
<el-row> <el-row style="height: 100%;">
<el-col :span="24"> <el-col :span="24" style="height: 100%;">
<div class="zone-style"> <div class="zone-style" style="height: 100%;">
<div class="k-flex-between-center"> <div class="k-flex-between-center">
<div class="k-flex k-align-center"> <div class="k-flex k-align-center">
<el-image <el-image
...@@ -211,7 +212,7 @@ ...@@ -211,7 +212,7 @@
highlightsData[0].attInfoList && highlightsData[0].attInfoList &&
highlightsData[0].attInfoList[0] highlightsData[0].attInfoList[0]
" "
style style=""
:src="highlightsData[0].attInfoList[0].downloadPath" :src="highlightsData[0].attInfoList[0].downloadPath"
></el-image> ></el-image>
</el-col> </el-col>
...@@ -253,6 +254,10 @@ ...@@ -253,6 +254,10 @@
</el-row> </el-row>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24" class="mt-10"> <el-col :span="24" class="mt-10">
<div class="zone-style"> <div class="zone-style">
...@@ -550,12 +555,29 @@ export default { ...@@ -550,12 +555,29 @@ export default {
-webkit-line-clamp: 3; -webkit-line-clamp: 3;
overflow: hidden; overflow: hidden;
} }
.hightlight-v img{
height: 100% !important;
width: 100% !important;
}
::v-deep { ::v-deep {
// 设置轮播图指示器大小 // 设置轮播图指示器大小
.el-carousel__button { .el-carousel__button {
width: 5px; width: 5px;
} }
.hightlight-v img{
height: 100% !important;
width: 100% !important;
}
.hightlight-v p{
margin: 0px;
}
.zone-style{
height: calc(100% - 30px);
}
// .el-col {
// height: 100% !important;
// }
} }
.active-btn { .active-btn {
background: #d33237; background: #d33237;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment