#4059 fix-3956

Merged
chenshihai merged 3 commits from fix-3956 into V20230425 1 year ago
  1. +13
    -15
      web_src/js/components/images/Images.vue
  2. +3
    -3
      web_src/js/components/images/adminImages.vue

+ 13
- 15
web_src/js/components/images/Images.vue View File

@@ -132,13 +132,13 @@
</template>
</el-table-column>
<el-table-column
prop="updatedUnix"
prop="createdUnix"
:label="$i18n['cloudeBrainMirror']['creation_time']"
align="center"
min-width="14%"
>
<template slot-scope="scope">
{{ scope.row.updatedUnix | transformTimestamp }}
{{ scope.row.createdUnix | transformTimestamp }}
</template>
</el-table-column>
<el-table-column align="center" min-width="18%" :label="$i18n['cloudeBrainMirror']['operation']">
@@ -286,7 +286,6 @@
{{sortCustom | transformSort(vm)}}<i class="el-icon-caret-bottom el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="{label:'defaultsort',sort:''}">{{$i18n['cloudeBrainMirror']['defaultsort']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'moststars',sort:'moststars'}">{{$i18n['cloudeBrainMirror']['moststars']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'mostused',sort:'mostused'}">{{$i18n['cloudeBrainMirror']['mostused']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'newest',sort:'newest'}">{{$i18n['cloudeBrainMirror']['newest']}}</el-dropdown-item>
@@ -327,7 +326,7 @@
</el-table-column>
<el-table-column
:label="$i18n['cloudeBrainMirror']['mirror_description']"
min-width="26%"
min-width="25%"
align="left"
prop="description"
>
@@ -348,7 +347,7 @@
<el-table-column
prop="cloudbrainType"
:label="$i18n['cloudeBrainMirror']['available_clusters']"
min-width="13%"
min-width="12%"
align="center"
>
<template slot-scope="scope">
@@ -358,7 +357,7 @@
<el-table-column
prop="isPrivate"
:label="$i18n['cloudeBrainMirror']['state']"
min-width="10%"
min-width="9%"
align="center"
>
<template slot-scope="scope">
@@ -408,16 +407,16 @@
</template>
</el-table-column>
<el-table-column
prop="updatedUnix"
prop="createdUnix"
:label="$i18n['cloudeBrainMirror']['creation_time']"
align="center"
min-width="14%"
min-width="13%"
>
<template slot-scope="scope">
{{ scope.row.updatedUnix | transformTimestamp }}
{{ scope.row.createdUnix | transformTimestamp }}
</template>
</el-table-column>
<el-table-column align="center" min-width="18%" :label="$i18n['cloudeBrainMirror']['operation']">
<el-table-column align="center" min-width="22%" :label="$i18n['cloudeBrainMirror']['operation']">
<template slot-scope="scope">
<div
style="
@@ -530,7 +529,6 @@
{{sortCustom | transformSort(vm)}}<i class="el-icon-caret-bottom el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="{label:'defaultsort',sort:''}">{{$i18n['cloudeBrainMirror']['defaultsort']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'moststars',sort:'moststars'}">{{$i18n['cloudeBrainMirror']['moststars']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'mostused',sort:'mostused'}">{{$i18n['cloudeBrainMirror']['mostused']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'newest',sort:'newest'}">{{$i18n['cloudeBrainMirror']['newest']}}</el-dropdown-item>
@@ -662,13 +660,13 @@
</template>
</el-table-column>
<el-table-column
prop="updatedUnix"
prop="createdUnix"
:label="$i18n['cloudeBrainMirror']['creation_time']"
align="center"
min-width="14%"
>
<template slot-scope="scope">
{{ scope.row.updatedUnix | transformTimestamp }}
{{ scope.row.createdUnix | transformTimestamp }}
</template>
</el-table-column>
<el-table-column align="center" min-width="18%" :label="$i18n['cloudeBrainMirror']['operation']">
@@ -803,12 +801,12 @@ export default {
currentPageCustom: 1,
pageSizeCustom: 10,
totalNumCustom: 0,
paramsCustom: { page: 1, pageSize: 10, q: "",cloudbrainType:-1,sort:"" },
paramsCustom: { page: 1, pageSize: 10, q: "",cloudbrainType:-1,sort:"newest" },
tableDataCustom: [],
starCustom: [],
loadingCustom: false,
refreshCustomTimer: null,
sortCustom:'defaultsort',
sortCustom:'newest',

currentPageStar: 1,
pageSizeStar: 10,


+ 3
- 3
web_src/js/components/images/adminImages.vue View File

@@ -98,9 +98,9 @@
</a>
</template>
</el-table-column>
<el-table-column prop="updatedUnix" :label="$i18n['cloudeBrainMirror']['creation_time']" align="center" min-width="12%">
<el-table-column prop="createdUnix" :label="$i18n['cloudeBrainMirror']['creation_time']" align="center" min-width="12%">
<template slot-scope="scope">
{{scope.row.updatedUnix | transformTimestamp}}
{{scope.row.createdUnix | transformTimestamp}}
</template>
</el-table-column>
<el-table-column align="center" min-width="24%" :label="$i18n['cloudeBrainMirror']['operation']">
@@ -181,7 +181,7 @@
currentPageCustom: 1,
pageSizeCustom: 15,
totalNumCustom: 0,
paramsCustom: { page: 1, pageSize: 15, q: '', recommend: false,sort:'', },
paramsCustom: { page: 1, pageSize: 15, q: '',recommend: false,cloudbrainType: -1,sort:'', },
tableDataCustom: [],
starCustom: [],
loadingCustom: false,


Loading…
Cancel
Save