Compare commits

..

No commits in common. "7aeb47f9411416f320c3d5157b6b0149c98107ab" and "0c7be40d6447a43ff3d67f026eaf6fa42fef78dc" have entirely different histories.

5 changed files with 18 additions and 23 deletions

View File

@ -19,10 +19,9 @@ let myUrl = window.location.href.split("/#")[0];
let testUrl = '' let testUrl = ''
// window.location.href === "https://www.kaiyuancloud.cn/#/login?redirect=%2F"1 // window.location.href === "https://www.kaiyuancloud.cn/#/login?redirect=%2F"
if (window.location.href.includes("dev.opencomputing.cn")) { if (window.location.href.includes("www.kaiyuancloud.cn/dev")) {
testUrl = 'https://www.kaiyuancloud.cn/dev'
testUrl = 'https://dev.opencomputing.cn'
} else if (window.location.href.includes("https://www.kaiyuancloud.cn")) {//dev } else if (window.location.href.includes("https://www.kaiyuancloud.cn")) {//dev
testUrl = 'https://www.kaiyuancloud.cn' testUrl = 'https://www.kaiyuancloud.cn'
} else if (window.location.href.includes("localhost")) { } else if (window.location.href.includes("localhost")) {

View File

@ -15,8 +15,8 @@
<ul class="info"> <ul class="info">
<li>地址<span v-if="JSON.stringify(logoInfoNew)!=='{}'">{{ logoInfoNew.home.adress }}</span> <li>地址<span v-if="JSON.stringify(logoInfoNew)!=='{}'">{{ logoInfoNew.home.adress }}</span>
</li> </li>
<li> 邮箱{{logoInfoNew.home.email}}</li> <li> 邮箱open-computing@kaiyuancloud.cn</li>
<li>电话 <span class="tel">{{logoInfoNew.home.mobile}}</span> <li>电话 <span class="tel">400-6150805 010-65917875 </span>
</li> </li>
@ -80,13 +80,9 @@
</div> </div>
<div style="display: flex;justify-content: center;align-items: center;width: 100%; "> <div style="display: flex;justify-content: center;align-items: center;width: 100%; ">
<span v-if="JSON.stringify(logoInfoNew)!=='{}'" <span v-if="JSON.stringify(logoInfoNew)!=='{}'"
style="margin:15px 0 ;width: 1400px;display:flex;justify-content:center;align-items:center;color: #7A82A0;"> 京ICP{{ style="margin:15px 0 ;width: 1400px;display:flex;justify-content:center;align-items:center;color: #7A82A0;">京公网安备11010502054007号 &nbsp;{{
logoInfoNew.home.license
}}&nbsp; &nbsp;&nbsp;{{
logoInfoNew.home.footerTitle logoInfoNew.home.footerTitle
}}&nbsp;{{ }}&nbsp;版权所有 @kaiyuanyun 2023 </span>
logoInfoNew.home.copyright
}}&nbsp; </span>
<!-- IPC备案号:{{ ICP }} <span style="margin-left: 0.267rem">版权所有 @kaiyuanyun 2023</span>--> <!-- IPC备案号:{{ ICP }} <span style="margin-left: 0.267rem">版权所有 @kaiyuanyun 2023</span>-->
<!-- <img src="../../image/login/policeInsignia/policeInsignia.png" alt=""--> <!-- <img src="../../image/login/policeInsignia/policeInsignia.png" alt=""-->
<!-- style="width:0.227rem;height:0.227rem;margin-right: 0.027rem;">--> <!-- style="width:0.227rem;height:0.227rem;margin-right: 0.027rem;">-->

View File

@ -164,14 +164,17 @@
<div class="message-footer"> <div class="message-footer">
<div class="item"> <div class="item">
<span v-if="JSON.stringify(logoInfoNew)!=='{}'" class="goPAge" <span class="goPAge"
@click="goPloic">京公网安备{{ logoInfoNew.home.publicsecurity }}</span> @click="goPloic">京公网安备11010502054007</span>
<span v-if="JSON.stringify(logoInfoNew)!=='{}'" class="goPAge" @click="goIPC">京ICP备{{logoInfoNew.home.license}}</span> <span class="goPAge" @click="goIPC">京ICP备2022001945号-1</span>
<span v-if="JSON.stringify(logoInfoNew)!=='{}'">增值电信业务经营许可证{{logoInfoNew.home.businesslicense}}</span> <span>增值电信业务经营许可证京B2 -20232313</span>
<span v-if="JSON.stringify(logoInfoNew)!=='{}'">邮箱{{logoInfoNew.home.email}}</span> <span>邮箱Open-computing@kaiyuancloud.cn</span>
</div> </div>
<div class="item"> <div class="item">
<span v-if="JSON.stringify(logoInfoNew)!=='{}'">电话{{logoInfoNew.home.mobile}}</span> <!-- <span>地址北京市朝阳区农展馆南路13号瑞辰国际</span>-->
<span>电话4006150805 010-65917875</span>
<!-- <span> 版权所有 © 2023开元云北京科技有限公司</span>-->
</div> </div>
</div> </div>
</div> </div>
@ -654,7 +657,6 @@ export default {
if (res.status == true && res.data && res.data.length) { if (res.status == true && res.data && res.data.length) {
this.$store.commit('setLogoInfo', res.data[0]); this.$store.commit('setLogoInfo', res.data[0]);
this.isShow = true this.isShow = true
this.$store.commit('setLogoInfoNew', res.data[0].additional_msg);
if (res.data[0].orgname == '中关村数智人工智能产业联盟') { if (res.data[0].orgname == '中关村数智人工智能产业联盟') {
this.logoUrlOut = 'https://www.ncmatch.cn' this.logoUrlOut = 'https://www.ncmatch.cn'
} }
@ -967,7 +969,6 @@ export default {
...mapState({ ...mapState({
isSuccessCode: state => state.login.isSuccessCode, isSuccessCode: state => state.login.isSuccessCode,
audioElement: state => state.sales.audioElement, audioElement: state => state.sales.audioElement,
logoInfoNew: state => state.product.logoInfoNew,
}) })
} }

View File

@ -131,6 +131,7 @@
<el-select v-model="addForm.pod_imagepath" placeholder="请选择" style="width: 100%"> <el-select v-model="addForm.pod_imagepath" placeholder="请选择" style="width: 100%">
<el-option label="docker.io/library/ubuntu:22.04" value="docker.io/library/ubuntu:22.04"/> <el-option label="docker.io/library/ubuntu:22.04" value="docker.io/library/ubuntu:22.04"/>
<el-option label="docker.io/library/mysql:8.0" value="docker.io/library/mysql:8.0"/> <el-option label="docker.io/library/mysql:8.0" value="docker.io/library/mysql:8.0"/>
<el-option label="ac2-registry.cn-hangzhou.cr.aliyuncs.com/ac2/pytorch-ubuntu:2.2.0.1-22.04-cu121" value="ac2-registry.cn-hangzhou.cr.aliyuncs.com/ac2/pytorch-ubuntu:2.2.0.1-22.04-cu121"/>
<el-option label="docker.io/jupyter/base-notebook:latest" <el-option label="docker.io/jupyter/base-notebook:latest"
value="docker.io/jupyter/base-notebook:latest"/> value="docker.io/jupyter/base-notebook:latest"/>
</el-select> </el-select>

View File

@ -63,9 +63,7 @@ module.exports = {
// } // }
// }, // },
'/api': { '/api': {
// target: 'http://47.93.12.75:8891', target: 'http://47.93.12.75:8891',
target: 'https://dev.opencomputing.cn',
// target: 'https://www.kaiyuancloud.cn', // target: 'https://www.kaiyuancloud.cn',
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,