#4865 fix issue

Merged
chenyifan01 merged 2 commits from fix-4777 into V20231102 6 months ago
  1. +2
    -2
      templates/admin/cloudbrain/list.tmpl
  2. +2
    -2
      templates/user/dashboard/cloudbrains.tmpl
  3. +2
    -2
      web_src/js/features/cloudrbanin.js
  4. +2
    -2
      web_src/vuepages/pages/cloudbrain/detail/index.vue
  5. +2
    -2
      web_src/vuepages/pages/cloudbrain/list/index.vue

+ 2
- 2
templates/admin/cloudbrain/list.tmpl View File

@@ -161,7 +161,7 @@
<span>
<i id="{{$JobID}}-icon" style="vertical-align: middle;" class="{{.Status}}"></i>
<span id="{{$JobID}}-text" style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span>
<i id="{{$JobID}}-icon-detail" class="{{.DetailedStatus}}" style="vertical-align: middle;" title='{{$.i18n.Tr (printf "repo.%s" .DetailedStatus)}}'></i>
{{if eq .Status "WAITING"}}<i id="{{$JobID}}-icon-detail" class="{{.DetailedStatus}}" style="vertical-align: middle;" title='{{$.i18n.Tr (printf "repo.%s" .DetailedStatus)}}'></i>{{end}}
</span>
</span>
</div>
@@ -416,7 +416,7 @@
<span>
<i id="{{$JobID}}-icon" style="vertical-align: middle;" class="{{.Status}}"></i>
<span id="{{$JobID}}-text" style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span>
<i id="{{$JobID}}-icon-detail" class="{{.DetailedStatus}}" style="vertical-align: middle;" title='{{$.i18n.Tr (printf "repo.%s" .DetailedStatus)}}'></i>
{{if eq .Status "WAITING"}}<i id="{{$JobID}}-icon-detail" class="{{.DetailedStatus}}" style="vertical-align: middle;" title='{{$.i18n.Tr (printf "repo.%s" .DetailedStatus)}}'></i>{{end}}
</span>
</span>
</div>


+ 2
- 2
templates/user/dashboard/cloudbrains.tmpl View File

@@ -145,7 +145,7 @@
<span>
<i id="{{$JobID}}-icon" style="vertical-align: middle;" class="{{.Status}}"></i>
<span id="{{$JobID}}-text" style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span>
<i id="{{$JobID}}-icon-detail" class="{{.DetailedStatus}}" style="vertical-align: middle;" title='{{$.i18n.Tr (printf "repo.%s" .DetailedStatus)}}'></i>
{{if eq .Status "WAITING"}}<i id="{{$JobID}}-icon-detail" class="{{.DetailedStatus}}" style="vertical-align: middle;" title='{{$.i18n.Tr (printf "repo.%s" .DetailedStatus)}}'></i>{{end}}
</span>
</span>
</div>
@@ -386,7 +386,7 @@
<span>
<i id="{{$JobID}}-icon" style="vertical-align: middle;" class="{{.Status}}"></i>
<span id="{{$JobID}}-text" style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span>
<i id="{{$JobID}}-icon-detail" class="{{.DetailedStatus}}" style="vertical-align: middle;" title='{{$.i18n.Tr (printf "repo.%s" .DetailedStatus)}}'></i>
{{if eq .Status "WAITING"}}<i id="{{$JobID}}-icon-detail" class="{{.DetailedStatus}}" style="vertical-align: middle;" title='{{$.i18n.Tr (printf "repo.%s" .DetailedStatus)}}'></i>{{end}}
</span>
</span>
</div>


+ 2
- 2
web_src/js/features/cloudrbanin.js View File

@@ -74,7 +74,7 @@ export default async function initCloudrain() {
$("#duration-" + ID).text(duration);
data.AiCenter != undefined && $("#cluster-" + ID).text(aiCenter);
data.AiCenter != undefined && $("#" + versionname + "-ai_center").text(data.AiCenter);
if (detailStatus === 'dataMigrating' || detailStatus === 'centerPending') {
if ( (detailStatus === 'dataMigrating' || detailStatus === 'centerPending') && status==='WAITING') {
if (document.getElementById(`${ID}-icon-detail`)) {
document.getElementById(`${ID}-icon-detail`).remove()
}
@@ -461,7 +461,7 @@ export default async function initCloudrain() {
const detailStatus = data.DetailedStatus
const dataMigrate = $(`${ID}`).data('datamigrate')
const centerPend = $(`${ID}`).data('centerpend')
if (detailStatus === 'dataMigrating' || detailStatus === 'centerPending') {
if ((detailStatus === 'dataMigrating' || detailStatus === 'centerPending') && data.JobStatus==='WAITING') {
if (document.getElementById(`${ID}-icon-detail`)) {
document.getElementById(`${ID}-icon-detail`).remove()
}


+ 2
- 2
web_src/vuepages/pages/cloudbrain/detail/index.vue View File

@@ -25,8 +25,8 @@
<span>{{ $t('status') }}:</span>
<i :class="item.task.status"></i>
<span>{{ item.task.status }}</span>
<i v-if="item.task.detailed_status==='dataMigrating'" :class="item.task.detailed_status" :title="$t('cloudbrainObj.migratingData')"></i>
<i v-if="item.task.detailed_status==='centerPending'" :class="item.task.detailed_status" :title="$t('cloudbrainObj.centerPending')"></i>
<i v-if="item.task.detailed_status==='dataMigrating' && item.task.status==='WAITING'" :class="item.task.detailed_status" :title="$t('cloudbrainObj.migratingData')"></i>
<i v-if="item.task.detailed_status==='centerPending' && item.task.status==='WAITING'" :class="item.task.detailed_status" :title="$t('cloudbrainObj.centerPending')"></i>
</span>
<span class="task-duration">
<span>{{ $t('cloudbrainObj.runDuration') }}:</span><span>{{ item.task.formatted_duration }}</span>


+ 2
- 2
web_src/vuepages/pages/cloudbrain/list/index.vue View File

@@ -43,8 +43,8 @@
<div class="status-wrap">
<i :class="scope.row.task.status"></i>
<span>{{ scope.row.task.status }}</span>
<i v-if="scope.row.task.detailed_status==='dataMigrating'" :class="scope.row.task.detailed_status" :title="$t('cloudbrainObj.migratingData')"></i>
<i v-if="scope.row.task.detailed_status==='centerPending'" :class="scope.row.task.detailed_status" :title="$t('cloudbrainObj.centerPending')"></i>
<i v-if="scope.row.task.detailed_status==='dataMigrating' && scope.row.task.status==='WAITING'" :class="scope.row.task.detailed_status" :title="$t('cloudbrainObj.migratingData')"></i>
<i v-if="scope.row.task.detailed_status==='centerPending' && scope.row.task.status==='WAITING'" :class="scope.row.task.detailed_status" :title="$t('cloudbrainObj.centerPending')"></i>
</div>
</template>
</el-table-column>


Loading…
Cancel
Save