diff --git a/templates/repo/datasets/dataset.tmpl b/templates/repo/datasets/dataset.tmpl
old mode 100644
new mode 100755
index 9e533acd3..9a42c7a56
--- a/templates/repo/datasets/dataset.tmpl
+++ b/templates/repo/datasets/dataset.tmpl
@@ -2,8 +2,20 @@
-
diff --git a/templates/repo/datasets/dataset_list.tmpl b/templates/repo/datasets/dataset_list.tmpl
index 53a8c8273..a86b7c6ca 100755
--- a/templates/repo/datasets/dataset_list.tmpl
+++ b/templates/repo/datasets/dataset_list.tmpl
@@ -3,7 +3,7 @@
@@ -14,7 +14,7 @@
{{svg "octicon-flame" 16}} {{(.DownloadCount | PrettyNumber)}}
-
+
{{svg "octicon-file" 16}}
diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl
index 2da6ca8bf..413bce917 100755
--- a/templates/repo/datasets/index.tmpl
+++ b/templates/repo/datasets/index.tmpl
@@ -1,6 +1,17 @@
{{template "base/head" .}}
- {{template "repo/header" .}}
+ {{template "repo/header" .}}
+
+
+
+
+
+
+
+
+
+
+
你确认删除该任务么?此任务一旦删除不可恢复。
+
+
+
+
+
+
+{{template "base/footer" .}}
+
+
\ No newline at end of file
diff --git a/templates/repo/modelarts/new.tmpl b/templates/repo/modelarts/new.tmpl
new file mode 100755
index 000000000..bb52e3585
--- /dev/null
+++ b/templates/repo/modelarts/new.tmpl
@@ -0,0 +1,184 @@
+{{template "base/head" .}}
+
+
+
+
+ {{template "repo/header" .}}
+
+
+ {{template "base/alert" .}}
+
+
+
+
+{{template "base/footer" .}}
+
+
\ No newline at end of file
diff --git a/templates/repo/modelarts/show.tmpl b/templates/repo/modelarts/show.tmpl
new file mode 100755
index 000000000..3f914b56d
--- /dev/null
+++ b/templates/repo/modelarts/show.tmpl
@@ -0,0 +1,122 @@
+{{template "base/head" .}}
+
+{{template "repo/header" .}}
+
+
+ {{template "base/alert" .}}
+
+
+
+
+ {{with .task}}
+
任务名称: {{.JobName}}
+ {{end}}
+
+
+
任务结果:
+ {{with .result}}
+
+
+
+ 状态 |
+ {{.Status}} |
+
+
+ 开始时间 |
+ {{.CreateTime}} |
+
+
+ 最后更新时间 |
+ {{.LatestUpdateTime}} |
+
+
+
+ {{end}}
+
+
+ {{with .result}}
+
+
+ 配置信息 |
+
+
+
+ 开发环境类型 |
+ {{.Profile.DeType}} |
+
+
+ 硬件类型 |
+ {{.Profile.FlavorType}} |
+
+
+
+
+
+
+ 机器规格详情 |
+
+
+
+ 机器规格 |
+ {{.Flavor}} |
+
+
+ 规格名称 |
+ {{.FlavorDetails.Name}} |
+
+
+ 规格销售状态 |
+ {{.FlavorDetails.Status}} |
+
+
+ 排队个数 |
+ {{.FlavorDetails.QueuingNum}} |
+
+
+ 排到队的剩余时间(秒) |
+ {{.FlavorDetails.QueueLeftTime}} |
+
+
+ 自动停止时间(秒) |
+ {{.FlavorDetails.Duration}} |
+
+
+
+
+
+
+ 排队信息 |
+
+
+
+ 实例状态 |
+ {{.QueuingInfo.Status}} |
+
+
+ 实例排队的开始时间 |
+ {{.QueuingInfo.BeginTime}} |
+
+
+ 排到队的剩余时间(秒) |
+ {{.QueuingInfo.RemainTime}} |
+
+
+ 实例排队的预计停止时间 |
+ {{.QueuingInfo.EndTime}} |
+
+
+ 实例在队列中的排位 |
+ {{.QueuingInfo.Rank}} |
+
+
+
+ {{end}}
+
+
+
+
+
+
+{{template "base/footer" .}}
diff --git a/web_src/js/components/MinioUploader.vue b/web_src/js/components/MinioUploader.vue
index 71b44a39c..c453daf16 100755
--- a/web_src/js/components/MinioUploader.vue
+++ b/web_src/js/components/MinioUploader.vue
@@ -245,7 +245,8 @@ export default {
file_name: file.name,
size: file.size,
dataset_id: file.datasetId,
- _csrf: csrf
+ _csrf: csrf,
+ type:0
})
);
}
@@ -450,4 +451,4 @@ export default {
border-bottom: 1px solid #dadce0;
min-height: 0;
}
-
+
\ No newline at end of file
diff --git a/web_src/js/components/ObsUploader.vue b/web_src/js/components/ObsUploader.vue
new file mode 100755
index 000000000..e61981c7e
--- /dev/null
+++ b/web_src/js/components/ObsUploader.vue
@@ -0,0 +1,298 @@
+
+
+
+
+
+ {{ file_status_text }}
+ {{ status }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 140a855a0..ddb69f701 100755
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -29,6 +29,7 @@ import {
} from './features/notification.js';
import {createCodeEditor} from './features/codeeditor.js';
import MinioUploader from './components/MinioUploader.vue';
+import ObsUploader from './components/ObsUploader.vue'
const {AppSubUrl, StaticUrlPrefix, csrf} = window.config;
@@ -2955,6 +2956,7 @@ $(document).ready(async () => {
initCodeView();
initVueApp();
initVueUploader();
+ initObsUploader();
initTeamSettings();
initCtrlEnterSubmit();
initNavbarContentToggle();
@@ -3641,6 +3643,21 @@ function initVueUploader() {
});
}
+// 新增
+function initObsUploader() {
+ const el = document.getElementById('obsUploader');
+ if (!el) {
+ return;
+ }
+
+ new Vue({
+ el: '#obsUploader',
+ components: {ObsUploader},
+ template: '
'
+ });
+}
+
+
window.timeAddManual = function () {
$('.mini.modal')
.modal({
diff --git a/webpack.config.js b/webpack.config.js
old mode 100644
new mode 100755
index d6a632ad1..a08810ebc
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -44,6 +44,9 @@ module.exports = {
filename: 'js/[name].js',
chunkFilename: 'js/[name].js',
},
+ node:{
+ fs: 'empty'
+ },
optimization: {
minimize: isProduction,
minimizer: [
@@ -237,7 +240,7 @@ module.exports = {
}),
new MonacoWebpackPlugin({
filename: 'js/monaco-[name].worker.js',
- }),
+ })
],
performance: {
hints: false,