admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rongtu_dev' into rongtu_cjw

Browse Source
This commit is contained in:
Vce 2024-04-11 19:24:55 +08:00
commit e980cbe92c
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -4,7 +4,7 @@ NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用) # 本地环境接口地址(/api/index.ts文件中使用)
# VITE_API_URL = 'http://192.168.34.221:9111' # VITE_API_URL = 'http://192.168.34.221:9111'
# VITE_API_URL = 'http://192.168.34.221:28888' # VITE_API_URL = 'http://192.168.34.221:28888'
VITE_API_URL = 'http://192.168.34.221:28889' # VITE_API_URL = 'http://192.168.34.221:28889'
# VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://121.196.214.246/api'
# VITE_API_URL = 'http://jxj.zhgdyun.com:100' # VITE_API_URL = 'http://jxj.zhgdyun.com:100'
# VITE_API_URL = 'http://192.168.34.221:12360' # VITE_API_URL = 'http://192.168.34.221:12360'
@ -13,7 +13,7 @@ VITE_API_URL = 'http://192.168.34.221:28889'
# 演示平台 # 演示平台
# VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
# 百色七参数线上地址 # 百色七参数线上地址
# VITE_API_URL = 'http://101.43.164.214:11113' VITE_API_URL = 'http://101.43.164.214:11113'
# 上传 # 上传
VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='

7
src/views/sevenLargeScreen/newProjectOverView/centerTop.vue
View File

@ -10,15 +10,14 @@
<div class="href-content" v-if="activeTab == 0"> <div class="href-content" v-if="activeTab == 0">
<el-carousel indicator-position="none" height="450px"> <el-carousel indicator-position="none" height="450px">
<el-carousel-item v-for="(item, index) in videoList" :key="item.id"> <el-carousel-item v-for="(item, index) in videoList" :key="item.id">
<div style="width: 100%; height: 100%">
<ckplayerComp <ckplayerComp
:name="index" :name="index"
:poster="''" :poster="''"
:deviceIp="`http://${item.account}:${item.password}`" :deviceIp="`http://${item.account}:${item.password}`"
:videoUrls="item.serialNumber" :videoUrls="item.serialNumber"
:autoPlay="true" :autoPlay="true"
></ckplayerComp> ></ckplayerComp>
</div>
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
</div> </div>
@ -251,7 +250,7 @@ const getVideoList = async () => {
videos[i].style.width = "99.9%"; videos[i].style.width = "99.9%";
videos[i].style.height = "99.9%"; videos[i].style.height = "99.9%";
} }
}, 1000); }, 2000);
}; };
const changeActive = (activeIndex: any) => { const changeActive = (activeIndex: any) => {
activeTab.value = activeIndex; activeTab.value = activeIndex;