diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 000000000..e69de29bb
diff --git a/web_src/js/components/Images.vue b/web_src/js/components/Images.vue
index 6fe26d532..a56d81e4c 100644
--- a/web_src/js/components/Images.vue
+++ b/web_src/js/components/Images.vue
@@ -310,7 +310,6 @@ export default {
},
handleCurrentChange(val){
- console.log(val)
this.params.page = val
this.getImageList()
@@ -350,7 +349,6 @@ export default {
})
},
copyUrl(url){
- console.log(url)
const cInput = document.createElement('input')
cInput.value = url
document.body.appendChild(cInput)
@@ -380,16 +378,13 @@ export default {
clearP(value){
- console.log("sorce value",value)
if(!value) return ''
const reg = /\<\/?p\>/g;
value = value.replace(reg,'')
- console.log("repalace:",value)
return value
},
transformTimestamp(timestamp){
- console.log("timestamp",timestamp)
let a = new Date(timestamp).getTime();
const date = new Date(a);
const Y = date.getFullYear() + '-';
diff --git a/web_src/js/components/UserAnalysis.vue b/web_src/js/components/UserAnalysis.vue
index 5650e164f..682dbc78c 100755
--- a/web_src/js/components/UserAnalysis.vue
+++ b/web_src/js/components/UserAnalysis.vue
@@ -200,7 +200,6 @@
var saveFileName=''
var Date=(this.params.startDate).split('-')
var startDate=Date[0]+''+Date[1]+''+Date[2]
- console.log(startDate)
Date=(this.params.endDate).split('-')
var endDate=Date[0]+Date[1]+Date[2]
saveFileName = '用户分析_'+this.search+''+startDate+'_'+endDate
@@ -258,7 +257,6 @@
getUserList(type_val,index){
this.type_val = type_val
this.dynamic = index;
- console.log("dj:"+type_val)
var now = new Date(); // 当前日期
var nowDayOfWeek = now.getDay(); // 今天本周的第几天
var nowDay = now.getDate(); // 当前日
@@ -324,7 +322,6 @@
// console.log("res.data:"+res.data.data)
this.totalNum = res.data.count
- console.log("res.count:"+res.data.count)
})
@@ -354,9 +351,7 @@
},
filters:{
-
transformTimestamp(timestamp){
- console.log("timestamp",timestamp)
let a = new Date(timestamp*1000);
const date = new Date(a);
const Y = date.getFullYear() + '/';
@@ -366,7 +361,6 @@
const m = (date.getMinutes() <10 ? '0'+date.getMinutes() : date.getMinutes());// + ':' ;
// const s = (date.getSeconds() <10 ? '0'+date.getSeconds() : date.getSeconds()) ; // 秒
const dateString = Y + M + D + h + m ;//+ s;
- console.log('dateString', dateString); // > dateString 2021-07-06 14:23
return dateString;
},
},
diff --git a/web_src/js/excel/Export2Excel.js b/web_src/js/excel/Export2Excel.js
index 3c6d022af..85921f7ad 100755
--- a/web_src/js/excel/Export2Excel.js
+++ b/web_src/js/excel/Export2Excel.js
@@ -100,7 +100,6 @@ export function export_table_to_excel(id) {
/* original data */
var data = oo[0];
var ws_name = "SheetJS";
- console.log(data);
var wb = new Workbook(), ws = sheet_from_array_of_arrays(data);
@@ -118,7 +117,7 @@ export function export_table_to_excel(id) {
}
function formatJson(jsonData) {
- console.log(jsonData)
+
}
export function export_json_to_excel(th, jsonData, defaultTitle) {
diff --git a/web_src/js/excel/util.js b/web_src/js/excel/util.js
index b600e5e37..809b5b51b 100755
--- a/web_src/js/excel/util.js
+++ b/web_src/js/excel/util.js
@@ -3,7 +3,6 @@ export function export2Excel(columns,list,filename){
const { export_json_to_excel } = require('./Export2Excel');
let tHeader = []
let filterVal = []
- console.log(columns)
if(!columns){
return;
}
diff --git a/web_src/js/features/cloudrbanin.js b/web_src/js/features/cloudrbanin.js
new file mode 100644
index 000000000..5fcaf56c8
--- /dev/null
+++ b/web_src/js/features/cloudrbanin.js
@@ -0,0 +1,236 @@
+export default async function initCloudrain() {
+ let timeid = window.setInterval(loadJobStatus, 15000);
+ $(document).ready(loadJobStatus);
+ function loadJobStatus() {
+ $(".job-status").each((index, job) => {
+ const jobID = job.dataset.jobid;
+ const repoPath = job.dataset.repopath;
+ // const computeResource = job.dataset.resource
+ const versionname = job.dataset.version
+ const status_text = $(`#${jobID}-text`).text()
+ console.log(versionname)
+ const finalState = ['STOPPED','CREATE_FAILED','UNAVAILABLE','DELETED','RESIZE_FAILED','SUCCEEDED','IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED','SUBMIT_MODEL_FAILED','DEPLOY_SERVICE_FAILED','CHECK_FAILED']
+ if (finalState.includes(status_text)) {
+ return
+ }
+ // const diffResource = computeResource == "NPU" ? 'modelarts/notebook' : 'cloudbrain'
+ $.get(`/api/v1/repos/${repoPath}/${jobID}?version_name=${versionname}`, (data) => {
+ const jobID = data.JobID
+ const status = data.JobStatus
+ const duration = data.JobDuration
+ $('#duration-'+jobID).text(duration)
+ if (status != status_text) {
+ $('#' + jobID+'-icon').removeClass().addClass(status)
+ $('#' + jobID+ '-text').text(status)
+ finalState.includes(status) && $('#' + jobID + '-stop').removeClass('blue').addClass('disabled')
+ }
+ if(status==="RUNNING"){
+ $('#ai-debug-'+jobID).removeClass('disabled').addClass('blue').text('调试').css("margin","0 1rem")
+ $('#model-image-'+jobID).removeClass('disabled').addClass('blue')
+ }
+ if(status!=="RUNNING"){
+ // $('#model-debug-'+jobID).removeClass('blue')
+ // $('#model-debug-'+jobID).addClass('disabled')
+ $('#model-image-'+jobID).removeClass('blue').addClass('disabled')
+ }
+ if(["CREATING","STOPPING","WAITING","STARTING"].includes(status)){
+ $('#ai-debug-'+jobID).removeClass('blue').addClass('disabled')
+ }
+ if(['STOPPED','FAILED','START_FAILED','CREATE_FAILED','SUCCEEDED'].includes(status)){
+ $('#ai-debug-'+jobID).removeClass('disabled').addClass('blue').text('再次调试').css("margin","0")
+ }
+ if(["RUNNING","WAITING"].includes(status)){
+ $('#ai-stop-'+jobID).removeClass('disabled').addClass('blue')
+ }
+ if(["CREATING","STOPPING","STARTING","STOPPED","FAILED","START_FAILED","SUCCEEDED"].includes(status)){
+ $('#ai-stop-'+jobID).removeClass('blue').addClass('disabled')
+ }
+
+ if(["STOPPED","FAILED","START_FAILED","KILLED","COMPLETED","SUCCEEDED"].includes(status)){
+ $('#ai-delete-'+jobID).removeClass('disabled').addClass('blue')
+ }else{
+ $('#ai-delete-'+jobID).removeClass('blue').addClass('disabled')
+ }
+ }).fail(function(err) {
+ console.log(err);
+ });
+ });
+ };
+ function assertDelete(obj,versionName,repoPath) {
+ if (obj.style.color == "rgb(204, 204, 204)") {
+ return
+ } else {
+ const delId = obj.parentNode.id
+ let flag = 1;
+ $('.ui.basic.modal')
+ .modal({
+ onDeny: function() {
+ flag = false
+ },
+ onApprove: function() {
+ if(!versionName){
+ document.getElementById(delId).submit()
+ }
+ else{
+ deleteVersion(versionName,repoPath)
+ }
+ flag = true
+ },
+ onHidden: function() {
+ if (flag == false) {
+ $('.alert').html('您已取消操作').removeClass('alert-success').addClass('alert-danger').show().delay(1500).fadeOut();
+ }
+ }
+ })
+ .modal('show')
+ }
+ }
+ function deleteVersion(versionName,repoPath){
+ const url = `/api/v1/repos/${repoPath}`
+ $.post(url,{version_name:versionName},(data)=>{
+ if(data.StatusOK===0){
+ location.reload()
+ }
+ }).fail(function(err) {
+ console.log(err);
+ });
+ }
+ $('.ui.basic.ai_delete').click(function() {
+ const repoPath = this.dataset.repopath
+ const versionName = this.dataset.version
+ if(repoPath && versionName){
+ assertDelete(this,versionName,repoPath)
+ }
+ else{
+ assertDelete(this)
+ }
+ })
+ function stopDebug(JobID,stopUrl){
+ $.ajax({
+ type:"POST",
+ url:stopUrl,
+ data:$('#stopForm-'+JobID).serialize(),
+ success:function(res){
+ if(res.result_code==="0"){
+ $('#' + JobID+'-icon').removeClass().addClass(res.status)
+ $('#' + JobID+ '-text').text(res.status)
+ if(res.status==="STOPPED"){
+ $('#ai-debug-'+JobID).removeClass('disabled').addClass('blue').text("再次调试").css("margin","0")
+ $('#ai-image-'+JobID).removeClass('blue').addClass('disabled')
+ $('#ai-model-debug-'+JobID).removeClass('blue').addClass('disabled')
+ $('#ai-delete-'+JobID).removeClass('disabled').addClass('blue')
+ $('#ai-stop-'+JobID).removeClass('blue').addClass('disabled')
+ }
+ else{
+ $('#ai-debug-'+JobID).removeClass('blue').addClass('disabled')
+ $('#ai-stop-'+JobID).removeClass('blue').addClass('disabled')
+ }
+
+ }else{
+ $('.alert').html(res.error_msg).removeClass('alert-success').addClass('alert-danger').show().delay(2000).fadeOut();
+ }
+ },
+ error :function(res){
+ console.log(res)
+
+ }
+ })
+ }
+ $('.ui.basic.ai_stop').click(function() {
+ const jobID = this.dataset.jobid
+ const repoPath = this.dataset.repopath
+ stopDebug(jobID,repoPath)
+ })
+
+ function stopVersion(version_name,jobID,repoPath){
+ const url = `/api/v1/repos/${repoPath}/${jobID}/stop_version`
+ $.post(url,{version_name:version_name},(data)=>{
+ if(data.StatusOK===0){
+ $('#ai-stop-'+jobID).removeClass('blue')
+ $('#ai-stop-'+jobID).addClass('disabled')
+ refreshStatus(version_name,jobID,repoPath)
+ }
+ }).fail(function(err) {
+ console.log(err);
+ });
+ }
+ function refreshStatus(version_name,jobID,repoPath){
+
+ const url = `/api/v1/repos/${repoPath}/${jobID}/?version_name${version_name}`
+ $.get(url,(data)=>{
+ $(`#${jobID}-icon`).attr("class",data.JobStatus)
+ // detail status and duration
+ $(`#${jobID}-text`).text(data.JobStatus)
+ }).fail(function(err) {
+ console.log(err);
+ });
+ }
+ $('.ui.basic.ai_stop_version').click(function() {
+ const jobID = this.dataset.jobid
+ const repoPath = this.dataset.repopath
+ const versionName = this.dataset.version
+ stopVersion(versionName,jobID,repoPath)
+ })
+ function getModelInfo(repoPath,modelName,versionName,jobName){
+ console.log("getModelInfo")
+ $.get(`${repoPath}/modelmanage/show_model_info_api?name=${modelName}`,(data)=>{
+ if(data.length===0){
+ $(`#${jobName}`).popup('toggle')
+ }else{
+ let versionData = data.filter((item)=>{
+ return item.Version === versionName
+ })
+ if(versionData.length==0){
+ $(`#${jobName}`).popup('toggle')
+ }
+ else{
+ location.href = `${repoPath}/modelmanage/show_model_info?name=${modelName}`
+ }
+ }
+ })
+ }
+ $('.goto_modelmanage').click(function() {
+ const repoPath = this.dataset.repopath
+ const modelName = this.dataset.modelname
+ const versionName = this.dataset.version
+ const jobName = this.dataset.jobname
+ getModelInfo(repoPath,modelName,versionName,jobName)
+ })
+ function debugAgain(JobID,debugUrl){
+ if($('#' + JobID+ '-text').text()==="RUNNING"){
+ window.open(debugUrl+'debug')
+ }else{
+ $.ajax({
+ type:"POST",
+ url:debugUrl+'restart',
+ data:$('#debugAgainForm-'+JobID).serialize(),
+ success:function(res){
+ if(res.result_code==="0"){
+ if(res.job_id!==JobID){
+ location.reload()
+ }else{
+ $('#' + JobID+'-icon').removeClass().addClass(res.status)
+ $('#' + JobID+ '-text').text(res.status)
+ $('#ai-debug-'+JobID).removeClass('blue').addClass('disabled')
+ $('#ai-delete-'+JobID).removeClass('blue').addClass('disabled')
+ $('#ai-debug-'+JobID).text("调试").css("margin","0 1rem")
+ }
+ }else{
+ $('.alert').html(res.error_msg).removeClass('alert-success').addClass('alert-danger').show().delay(2000).fadeOut();
+ }
+ },
+ error :function(res){
+ console.log(res)
+
+ }
+ })
+ }
+ }
+ $('.ui.basic.ai_debug').click(function() {
+ const jobID = this.dataset.jobid
+ const repoPath = this.dataset.repopath
+ debugAgain(jobID,repoPath)
+ })
+}
+
+
\ No newline at end of file
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 6bc0d2b88..cec6823a6 100755
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -40,6 +40,8 @@ import EditTopics from './components/EditTopics.vue';
import DataAnalysis from './components/DataAnalysis.vue'
import Contributors from './components/Contributors.vue'
import Model from './components/Model.vue';
+import initCloudrain from './features/cloudrbanin.js'
+
Vue.use(ElementUI);
Vue.prototype.$axios = axios;
@@ -2936,6 +2938,7 @@ $(document).ready(async () => {
initNotificationCount();
initTribute();
initDropDown();
+ initCloudrain();
// Repo clone url.
if ($('#repo-clone-url').length > 0) {
@@ -3584,14 +3587,16 @@ function initVueApp() {
}
initVueComponents();
-
+
new Vue({
delimiters: ['${', '}'],
el,
data: {
+ page:parseInt(new URLSearchParams(window.location.search).get('page')),
searchLimit: Number(
(document.querySelector('meta[name=_search_limit]') || {}).content
),
+ page:1,
suburl: AppSubUrl,
uid: Number(
(document.querySelector('meta[name=_context_uid]') || {}).content
@@ -3600,6 +3605,15 @@ function initVueApp() {
},
components: {
ActivityTopAuthors
+ },
+ mounted(){
+ this.page = parseInt(new URLSearchParams(window.location.search).get('page'))
+ },
+ methods:{
+ handleCurrentChange:function (val) {
+ window.location.href='/admin/cloudbrains?page='+val
+ this.page = val
+ }
}
});
}
@@ -3688,8 +3702,6 @@ function initVueModel() {
}
function initVueDataAnalysis() {
const el = document.getElementById('data_analysis');
- console.log("el",el)
-
if (!el) {
return;
}
@@ -3756,7 +3768,6 @@ function initFilterBranchTagDropdown(selector) {
});
});
$data.remove();
- console.log("-this",this)
new Vue({
delimiters: ['${', '}'],
el: this,
diff --git a/web_src/less/openi.less b/web_src/less/openi.less
index 1d165dda8..c9e6a546f 100644
--- a/web_src/less/openi.less
+++ b/web_src/less/openi.less
@@ -720,4 +720,13 @@ display: block;
.markdown:not(code).file-view{
padding: 2em 0!important;
}
-}
\ No newline at end of file
+}
+//elemet-ui
+
+.el-pagination.is-background .el-pager li:not(.disabled).active {
+ background-color: #5bb973 !important;
+ color: #FFF !important;
+ }
+ .el-pagination.is-background .el-pager li:hover {
+ color: #5bb973 !important;
+ }
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index a08810ebc..cd3635427 100755
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -116,6 +116,15 @@ module.exports = {
],
},
{
+ test: /\.ts$/,
+ use: [
+ {
+ loader: "ts-loader",
+ }
+ ],
+ exclude: /node_modules/
+ },
+ {
test: /\.js$/,
exclude: /node_modules/,
use: [
@@ -252,6 +261,7 @@ module.exports = {
alias: {
vue$: 'vue/dist/vue.esm.js', // needed because vue's default export is the runtime only
},
+ extensions: ['.tsx', '.ts', '.js']
},
watchOptions: {
ignored: [
+ {{else}}
+ 
+ {{end}}
+