#222 #150,#182

Merged
liwei03 merged 4 commits from openioctopus/octopus:master into master 2 years ago
  1. +5
    -5
      admin-portal/src/utils/requestLog.js
  2. +7
    -11
      admin-portal/src/views/platformManager/components/platformConfig.vue
  3. +3
    -3
      admin-portal/src/views/traningManager/components/taskLog.vue
  4. +5
    -5
      openai-portal/src/utils/requestLog.js
  5. +0
    -38
      openai-portal/src/views/Home/banner1.vue
  6. +0
    -44
      openai-portal/src/views/Home/banner2.vue
  7. +0
    -38
      openai-portal/src/views/Home/description.vue
  8. +0
    -159
      openai-portal/src/views/Home/description2.vue
  9. +0
    -36
      openai-portal/src/views/Home/header1.vue
  10. +0
    -15
      openai-portal/src/views/Home/index.vue
  11. +0
    -9
      openai-portal/src/views/dataManager/components/versionList.vue
  12. +0
    -11
      openai-portal/src/views/modelDev/components/algorithm/versionList.vue
  13. +3
    -3
      openai-portal/src/views/trainingManager/components/detailDialog/taskLog.vue

+ 5
- 5
admin-portal/src/utils/requestLog.js View File

@@ -65,11 +65,11 @@ service.interceptors.response.use(
// }
},
error => {
Message({
message: '没有找到日志',
type: 'warning',
duration: 5 * 1000
})
// Message({
// message: '没有找到日志',
// type: 'warning',
// duration: 5 * 1000
// })
console.log("error:", error)
// return Promise.reject(error)
}


+ 7
- 11
admin-portal/src/views/platformManager/components/platformConfig.vue View File

@@ -9,7 +9,8 @@
<el-form
:model="ruleForm"
:rules="rules"
ref="ruleForm"
ref="ruleForm"
v-loading="loading"
>
<el-form-item>
<div v-for="(item, index) in ruleForm.platformConfig" :key="index">
@@ -64,12 +65,12 @@ export default {
platformConfig: {
required: true, message: '请选择配置信息', trigger: ['change', 'blur']
},
}
},
loading: true
}
},
created() {
this.getPlatformConfigKey()
this.getPlatformConfigValue()
},
methods: {
getErrorMsg(code) {
@@ -82,6 +83,7 @@ export default {
getPlatformConfigKey().then(response => {
if (response.success) {
this.platformConfigKeyList = response.data.configKeys
this.getPlatformConfigValue()
} else {
this.$message({
message: this.getErrorMsg(response.error.subcode),
@@ -97,6 +99,7 @@ export default {
let configValue = response.data.config
this.judgeObjectEmpty(configValue)
} else {
this.loading = false
this.$message({
message: this.getErrorMsg(response.error.subcode),
type: 'warning'
@@ -129,14 +132,7 @@ export default {
})
})
}
// this.ruleForm.platformConfig.push({
// key: "test1",
// value: "",
// type: "radio",
// options: "yes",
// title: "test title",
// desc: "this is desc"
// })
this.loading = false
},
update(formName) {
const params = {}


+ 3
- 3
admin-portal/src/views/traningManager/components/taskLog.vue View File

@@ -35,7 +35,7 @@
</div>
<div>
<el-row>
<el-input v-model="textarea" type="textarea" :rows="20" />
<el-input v-model="textarea" type="textarea" :rows="20" :readonly="true" />
</el-row>

</div>
@@ -119,7 +119,7 @@
this.showLog = true
this.textarea = response.data
} else {
this.textarea = ''
this.textarea = '暂无相关日志'
}
})
} else {
@@ -144,7 +144,7 @@
this.timer2 = null;
clearTimeout(this.timer);
this.timer = null;
this.textarea = ''
this.textarea = '暂无相关日志'
}
})
}


+ 5
- 5
openai-portal/src/utils/requestLog.js View File

@@ -65,11 +65,11 @@ service.interceptors.response.use(
// }
},
error => {
Message({
message: '没有找到日志',
type: 'warning',
duration: 5 * 1000
})
// Message({
// message: '没有找到日志',
// type: 'warning',
// duration: 5 * 1000
// })
// return Promise.reject(error)
console.log("error:", error)
}


+ 0
- 38
openai-portal/src/views/Home/banner1.vue View File

@@ -1,38 +0,0 @@
<template>
<el-carousel :interval="3000" arrow="always" height="400px">
<el-carousel-item v-for="(item,index) in banner" :key="index">
<img :src="item.src" class="image">
</el-carousel-item>
</el-carousel>
</template>
<script>
export default {
data() {
return {
banner: [
{ src: require('@/assets/banner1.jpg'), desc: 'banner1' },
{ src: require('@/assets/banner2.jpg'), desc: 'banner2' },
{ src: require('@/assets/banner3.jpg'), desc: 'banner3' }
]
}
}
}
</script>
<style>
.el-carousel__item h3 {
color: #475669;
font-size: 14px;
opacity: 0.75;
line-height: 200px;
margin: 0;
}

.el-carousel__item:nth-child(2n) {
background-color: #99a9bf;
}

.el-carousel__item:nth-child(2n+1) {
background-color: #d3dce6;
}
.image{width: 100%;height:100%;}
</style>

+ 0
- 44
openai-portal/src/views/Home/banner2.vue View File

@@ -1,44 +0,0 @@
<template>
<el-carousel :interval="4000" type="card" height="400px">
<el-carousel-item v-for="(item,index) in model" :key="index">
<img :src="item.src" class="image">
</el-carousel-item>
</el-carousel>
</template>
<script>
export default {
data() {
return {
model: [
{ src: require('@/assets/model1.jpeg'), desc: 'model1' },
{ src: require('@/assets/model2.jpeg'), desc: 'model2' },
{ src: require('@/assets/model3.jpeg'), desc: 'model3' },
{ src: require('@/assets/model4.jpeg'), desc: 'model3' },
{ src: require('@/assets/model5.jpeg'), desc: 'model3' },
{ src: require('@/assets/model6.jpeg'), desc: 'model3' },
{ src: require('@/assets/model7.jpeg'), desc: 'model3' },
{ src: require('@/assets/model8.png'), desc: 'model3' },
{ src: require('@/assets/model9.jpeg'), desc: 'model3' }

]
}
}
}
</script>
<style>
.el-carousel__item h3 {
color: #475669;
font-size: 18px;
opacity: 0.75;
line-height: 300px;
margin: 0;
}

.el-carousel__item:nth-child(2n) {
background-color: #99a9bf;
}

.el-carousel__item:nth-child(2n+1) {
background-color: #d3dce6;
}
</style>

+ 0
- 38
openai-portal/src/views/Home/description.vue View File

@@ -1,38 +0,0 @@
<template>
<div>
<div>
<h1 class="description">鹏城云脑的AI应用场景</h1>
<div class="title">D910是由于计算速度快,能迅速反复迭代,研发出更强的AI模型。所以被广泛应用于ModelArts的数据标注,涵盖了自动驾驶、图像识别、声音识别、文本识别等AI智能领域。</div>
</div>
<!-- <div class="copyRight">© 启智章鱼</div> -->
</div>

</template>

<script>
export default {
data() {
return {
};
}
}
</script>
<style lang="scss" scoped>
.description {
font-family: PingFangSC-Medium;
font-size: 24px;
color: #333333;
letter-spacing: 0px;
text-align: center;
margin-top: 60px;
}

.title {
text-align: center;
font-family: PingFangSC-Regular;
font-size: 14px;
color: #666666;
letter-spacing: 0px;
margin-bottom: 18px;
}
</style>

+ 0
- 159
openai-portal/src/views/Home/description2.vue View File

@@ -1,159 +0,0 @@
<template>
<div class="wrapper">
<div>
<h1 class="description">鹏城云脑支持的AI引擎</h1>
<div class="title">D910是由于计算速度快,能迅速反复迭代,研发出更强的AI模型。所以被广泛应用于ModelArts的数据标注,涵盖了自动驾驶、图像识别、声音识别、文本识别等AI智能领域。</div>
<div class="bottomImage">
<div class="svgWrapper">
<div class="svg">
</div>
</div>
<div class="svgWrapper">
<div class="svg svg2">
</div>
</div>
<div class="svgWrapper">
<div class="svg svg3">
</div>
</div>
</div>
<div class="bottomImage">
<div class="svgWrapper">
<div class="svg svg4">
</div>
</div>
<div class="svgWrapper">
<div class="svg svg5">
</div>
</div>
<div class="svgWrapper">
<div class="svg svg6">
</div>
</div>
</div>
<div class="bottomImage">
<div class="svgWrapper">
<div class="svg svg7">
</div>
</div>
<div class="svgWrapper">
<div class="svg svg8">
</div>
</div>
<div class="svgWrapper">
<div class="svg svg9">
</div>
</div>

</div>
</div>
<!-- <div class="copyRight">© 启智章鱼</div> -->
</div>

</template>

<script>
export default {
data() {
return {
};
}
}
</script>
<style lang="scss" scoped>
.wrapper{margin: 0 auto;width: 60%;}
.description {
font-family: PingFangSC-Medium;
font-size: 24px;
color: #333333;
letter-spacing: 0px;
text-align: center;
}

.bottomImage {
width: 90%;
display: flex;
align-items: center;
margin-left: 5%;
}

/* .copyRight {
text-align: center;
color: rgba(0, 0, 0, 0.65);
font-size: 14px;
margin: 10px 0 20px 0;
} */

.copyRight:after {
display: block;
content: "";
width: 100px;
height: 40px;
}

.svgWrapper {
overflow: hidden;
border: 1px solid #e8e8e8;
width: 555px;
height: 70px;
margin: 0px 80px 25px 0px;
padding-top: 10px;
}

.svg {
width: 140px;
height: 50px;
background-repeat: no-repeat;
margin: 0 auto;
background-image: url("../../assets/ai.svg");
}

.svg2 {
width: 120px;
background-position: -140px 8px;
}

.svg3 {
width: 160px;
background-position: -255px 0px;
}

.svg4 {
width: 115px;
background-position: -410px 0px;
}

.svg5 {
width: 115px;
background-position: -520px 0px;
}

.svg6 {
width: 115px;
background-position: -635px 0px;
}

.svg7 {
width: 80px;
background-position: -750px 0px;
}

.svg8 {
width: 80px;
background-position: -825px 0px;
}

.svg9 {
width: 60px;
background-position: -900px 0px;
}

.title {
text-align: center;
font-family: PingFangSC-Regular;
font-size: 14px;
color: #666666;
letter-spacing: 0px;
margin-bottom: 18px;
}
</style>

+ 0
- 36
openai-portal/src/views/Home/header1.vue View File

@@ -1,36 +0,0 @@
<template>
<div>
<el-menu
:default-active="activeIndex"
class="el-menu-demo"
mode="horizontal"
background-color="#409EFF"
text-color="#fff"
active-text-color="#ffd04b"
@select="handleSelect"
>
<el-menu-item index="1" class="index1">鹏城云脑开源平台</el-menu-item>
<el-menu-item index="2"><a href="" target="_blank">首页</a></el-menu-item>
<el-menu-item index="3"><a href="" target="_blank">使用文档</a></el-menu-item>
<el-menu-item index="4"><a href="" target="_blank">社区</a></el-menu-item>
<el-menu-item index="5"><a href="" target="_blank">FAQ</a></el-menu-item>
<el-menu-item index="6"><a href="" target="_blank">代码仓库</a></el-menu-item>
</el-menu>
</div>
</template>
<script>
export default {
data() {
return {
activeIndex: '2'
};
},
methods: {
handleSelect(key, keyPath) {
console.log(key, keyPath);
}
}
}
</script>
<style>
</style>

+ 0
- 15
openai-portal/src/views/Home/index.vue View File

@@ -1,31 +1,16 @@
<template>
<div class="firstPage">
<header1 />
<banner1 />
<login />
<description />
<banner2 class="banner" />
<description2 />
</div>
</template>

<script>
import header1 from "./header1.vue";
import banner1 from "./banner1.vue";
import banner2 from "./banner2.vue";
import login from "./login.vue";
import description from './description.vue'
import description2 from './description2.vue';

export default {
name: "FirstPage",
components: {
header1,
banner1,
banner2,
login,
description,
description2
},
data() {
return {


+ 0
- 9
openai-portal/src/views/dataManager/components/versionList.vue View File

@@ -19,16 +19,7 @@
<span>{{ parseTime(scope.row.createdAt) }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="数据集状态" props="status">
<template slot-scope="scope">
<span>{{ getDatasetStatus(scope.row.status) }}</span>
</template>
</el-table-column> -->
<el-table-column label="数据集状态" v-if="typeChange===1">
<!-- <template slot-scope="scope">
<span v-if="scope.row.progress&&scope.row.progress!=0" style="color:#409EFF">{{
scope.row.progress+'%' }}</span>
</template> -->
<template slot-scope="scope">
<span v-if="!(scope.row.progress&&scope.row.progress!=0)">{{ getDatasetStatus(scope.row.status) }}</span>
<span v-if="scope.row.progress&&scope.row.progress!=0">{{ "上传中" }}</span>


+ 0
- 11
openai-portal/src/views/modelDev/components/algorithm/versionList.vue View File

@@ -23,17 +23,6 @@
<span>{{ scope.row.userName }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="算法状态" props="status">
<template slot-scope="scope">
<span>{{ getAlgorithmStatus(scope.row.fileStatus) }}</span>
</template>
</el-table-column> -->
<!-- <el-table-column label="上传进度" v-if="algorithmTabType == 1">
<template slot-scope="scope">
<span v-if="scope.row.progress&&scope.row.progress!=0" style="color:#409EFF">{{
scope.row.progress+'%' }}</span>
</template>
</el-table-column> -->
<el-table-column label="算法状态">
<template slot-scope="scope">
<span v-if="!(scope.row.progress&&scope.row.progress!=0)">{{ getAlgorithmStatus(scope.row.fileStatus)


+ 3
- 3
openai-portal/src/views/trainingManager/components/detailDialog/taskLog.vue View File

@@ -41,7 +41,7 @@
</div>
<div>
<el-row>
<el-input v-model="textarea" type="textarea" :rows="20" />
<el-input v-model="textarea" type="textarea" :rows="20" :readonly="true" />
</el-row>
</div>
</div>
@@ -125,7 +125,7 @@
this.showLog = true
this.textarea = response.data
} else {
this.textarea = ''
this.textarea = '暂无相关日志'
}
})
} else {
@@ -151,7 +151,7 @@
this.timer2 = null;
clearTimeout(this.timer);
this.timer = null;
this.textarea = ''
this.textarea = '暂无相关日志'
}
})
}


Loading…
Cancel
Save