Commit cc391e8f by qinxiaoni

更新

parent f22fd116
ENV = 'development' ENV = 'development'
VUE_APP_BASE_API = 'http://192.168.0.150:9888' #VUE_APP_BASE_API = 'http://192.168.0.150:9888'
VUE_APP_WS_API = 'ws://192.168.0.150:9888' #VUE_APP_WS_API = 'ws://192.168.0.150:9888'
VUE_APP_FILE_API = 'http://192.168.0.150:9888' #VUE_APP_FILE_API = 'http://192.168.0.150:9888'
VUE_APP_BASE_API = 'http://192.168.0.28:9888'
VUE_APP_WS_API = 'ws://192.168.0.28:9888'
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_SYSTEAMTAG = '' VUE_APP_SYSTEAMTAG = ''
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<el-row> <el-row>
<el-col :span="18" :offset="3"> <el-col :span="18" :offset="3">
<!--第一栏开始--> <!--第一栏开始-->
<el-row :gutter="20" class="mt-15 first-zone-style"> <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>
<el-carousel style="border-radius:8px;" height="280px" :interval="4000"> <el-carousel style="border-radius:8px;" :interval="4000">
<el-carousel-item <el-carousel-item
style="border-radius:8px;" style="border-radius:8px;"
v-for="(item,index) in headlineRotation.slice(0,3)" v-for="(item,index) in headlineRotation.slice(0,3)"
...@@ -24,12 +24,15 @@ ...@@ -24,12 +24,15 @@
fit="contain" fit="contain"
style="width:100%;height:100%;" style="width:100%;height:100%;"
></el-image> --> ></el-image> -->
<el-image <el-image
v-if="item.rollAttInfoList[0] && item.rollAttInfoList[0].downloadPath" v-if="item.rollAttInfoList[0] && item.rollAttInfoList[0].downloadPath"
:src="item.rollAttInfoList[0].downloadPath" :src="item.rollAttInfoList[0].downloadPath"
fit="contain" fit="contain"
style="width:100%;height:100%;" style="width:100%;height:100%;"
></el-image> ></el-image>
<div class="carousel-intro" style> <div class="carousel-intro" style>
<span>&ensp;{{item.subject}}&ensp;</span> <span>&ensp;{{item.subject}}&ensp;</span>
</div> </div>
...@@ -128,7 +131,7 @@ ...@@ -128,7 +131,7 @@
<el-col <el-col
:span="4" :span="4"
style="background:#fff;box-shadow: -5px 0px 20px 5px rgba(0,0,0,0.05); " style="background:#fff;box-shadow: -5px 0px 20px 5px rgba(0,0,0,0.05);"
> >
<div class="partnerInfo"> <div class="partnerInfo">
<ul class="ul-list"> <ul class="ul-list">
...@@ -145,6 +148,10 @@ ...@@ -145,6 +148,10 @@
</el-row> </el-row>
<!--第一栏结束--> <!--第一栏结束-->
<!--第二栏按钮列表开始--> <!--第二栏按钮列表开始-->
<el-row class="mt-15 out-zone-style" :gutter="10"> <el-row class="mt-15 out-zone-style" :gutter="10">
<el-col class="mb-10" :span="3" v-for="(item,index) in btnsList" :key="index"> <el-col class="mb-10" :span="3" v-for="(item,index) in btnsList" :key="index">
...@@ -795,7 +802,7 @@ export default { ...@@ -795,7 +802,7 @@ export default {
} }
], ],
videoLiet: [], videoLiet: [],
whole: [] whole: [],
}; };
}, },
watch: { watch: {
...@@ -901,6 +908,7 @@ export default { ...@@ -901,6 +908,7 @@ export default {
let rollAttInfoList = new Array(); let rollAttInfoList = new Array();
rollAttInfoList.push(aitem); rollAttInfoList.push(aitem);
item.rollAttInfoList = rollAttInfoList; // 图片列表 item.rollAttInfoList = rollAttInfoList; // 图片列表
console.log('------suffix.length != 0');
this.headlineRotation.push(item); this.headlineRotation.push(item);
} }
} }
......
...@@ -31,6 +31,14 @@ export default { ...@@ -31,6 +31,14 @@ export default {
// }, // },
getH() { getH() {
let obj = this.$route.query; let obj = this.$route.query;
// let token ="Bearer " + "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJjaGVudGlhbnpob25nQGd4ZnkuY29tIiwiYXV0aCI6InNlYWw6Y291bnQsc2VhbDphZGQsYmFjazpsaXN0LHVuaWZpZWRTaWduYXR1cmU6bG9nLHVuaWZpZWRTaWduYXR1cmU6c2hvdyIsImp0aSI6Ijk3ZTNhOTNiZjQ4MzQ3ZjNhOTY3MjhjNzBhMjk0YTNkIn0.DruV7q_PwSv1jRxTY6r6t-Ewj8nGckkE9faQ7syNIVd5xofqFJtvoS6nyt2YUymM67kh3rxhmOKTb0HbyWQWEw"
// let cookie = obj.JSESSIONID;
// Cookie.set("JSESSIONID---", cookie);
// localStorage.setItem("token", token);
// setToken(token, false);
// this.$router.push("/");
if (obj.Authorization) { if (obj.Authorization) {
let token = let token =
obj.Authorization.indexOf("Bearer ") == -1 obj.Authorization.indexOf("Bearer ") == -1
......
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