Huawei_Technology
/
mindspore-mindinsight
Not watched
1
0
Fork 0
Code
Releases 11 Wiki evaluate Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain HPC
Browse Source

fix issue

tags/v0.5.0-beta
ph 5 years ago
parent
c72c303a54
commit
5877076013
4 changed files with 158 additions and 91 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +9
    -8
      mindinsight/ui/src/components/multiselectGroup.vue
  2. +4
    -0
      mindinsight/ui/src/store.js
  3. +79
    -45
      mindinsight/ui/src/views/train-manage/data-traceback.vue
  4. +66
    -38
      mindinsight/ui/src/views/train-manage/model-traceback.vue

+ 9
- 8
mindinsight/ui/src/components/multiselectGroup.vue View File

@@ -171,7 +171,7 @@ export default {
break; break;
} }
const listItem = this.checkListArr[i]; const listItem = this.checkListArr[i];
if (listItem.show) {
if (listItem.show && !listItem.checked) {
listItem.checked = true; listItem.checked = true;
this.multiSelectedItemNames[listItem.label] = true; this.multiSelectedItemNames[listItem.label] = true;
this.selectedNumber++; this.selectedNumber++;
@@ -309,23 +309,24 @@ export default {
const loopCount = this.checkListArr.length; const loopCount = this.checkListArr.length;
for (let i = 0; i < loopCount; i++) { for (let i = 0; i < loopCount; i++) {
const listItem = this.checkListArr[i]; const listItem = this.checkListArr[i];
if (reg.test(listItem.label)) {
listItem.show = true;
if (listItem.checked) {
if (this.selectedNumber >= this.limitNum) { if (this.selectedNumber >= this.limitNum) {
listItem.checked = false; listItem.checked = false;
itemSelectAll = false;
} else if (listItem.checked) {
} else {
this.multiSelectedItemNames[listItem.label] = true; this.multiSelectedItemNames[listItem.label] = true;
this.selectedNumber++; this.selectedNumber++;
} else {
itemSelectAll = false;
} }
}
if (reg.test(listItem.label)) {
listItem.show = true;
} else { } else {
listItem.show = false; listItem.show = false;
} }
} }
if (!itemSelectAll && this.selectedNumber >= this.limitNum) {
if (this.selectedNumber >= this.limitNum) {
itemSelectAll = true; itemSelectAll = true;
} else {
itemSelectAll = false;
} }
} else { } else {
this.checkListArr.forEach((listItem) => { this.checkListArr.forEach((listItem) => {


+ 4
- 0
mindinsight/ui/src/store.js View File

@@ -32,6 +32,7 @@ export default new Vuex.Store({
: 3, : 3,
// multiSelevtGroup component count // multiSelevtGroup component count
multiSelectedGroupCount: 0, multiSelectedGroupCount: 0,
tableId: 0,
}, },
mutations: { mutations: {
// set cancelTokenArr // set cancelTokenArr
@@ -72,6 +73,9 @@ export default new Vuex.Store({
multiSelectedGroupComponentNum(state) { multiSelectedGroupComponentNum(state) {
state.multiSelectedGroupCount++; state.multiSelectedGroupCount++;
}, },
increaseTableId(state) {
state.tableId++;
},
}, },
actions: {}, actions: {},
}); });

+ 79
- 45
mindinsight/ui/src/views/train-manage/data-traceback.vue View File

@@ -24,11 +24,12 @@ limitations under the License.
type="primary" type="primary"
size="mini" size="mini"
plain plain
v-show="(summaryDirList&&!summaryDirList.length)||(totalSeries&&totalSeries.length)">
v-show="(summaryDirList && !summaryDirList.length)||(totalSeries && totalSeries.length)">
{{ $t('modelTraceback.showAllData') }} {{ $t('modelTraceback.showAllData') }}
</el-button> </el-button>
<div class="select-container" <div class="select-container"
v-show="totalSeries&&totalSeries.length&&(!summaryDirList||(summaryDirList&&summaryDirList.length))">
v-show="totalSeries && totalSeries.length &&
(!summaryDirList || (summaryDirList && summaryDirList.length))">
<div class="display-column"> <div class="display-column">
{{$t('modelTraceback.displayColumn')}} {{$t('modelTraceback.displayColumn')}}
</div> </div>
@@ -50,17 +51,17 @@ limitations under the License.
<button type="text" <button type="text"
@click="allSelect" @click="allSelect"
class="select-all-button" class="select-all-button"
:class="[selectCheckAll?'checked-color':'button-text',
basearr.length>checkOptions.length ? 'btn-disabled' : '']"
:disabled="basearr.length>checkOptions.length">
:class="[selectCheckAll ? 'checked-color' : 'button-text',
basearr.length > checkOptions.length ? 'btn-disabled' : '']"
:disabled="basearr.length > checkOptions.length">
{{ $t('public.selectAll')}} {{ $t('public.selectAll')}}
</button> </button>
<button type="text" <button type="text"
@click="deselectAll" @click="deselectAll"
class="deselect-all-button" class="deselect-all-button"
:class="[!selectCheckAll?'checked-color':'button-text',
basearr.length>checkOptions.length ? 'btn-disabled' : '']"
:disabled="basearr.length>checkOptions.length">
:class="[!selectCheckAll ? 'checked-color' : 'button-text',
basearr.length > checkOptions.length ? 'btn-disabled' : '']"
:disabled="basearr.length > checkOptions.length">
{{ $t('public.deselectAll')}} {{ $t('public.deselectAll')}}
</button> </button>
</div> </div>
@@ -69,7 +70,7 @@ limitations under the License.
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
:disabled="item.disabled" :disabled="item.disabled"
:title="item.disabled?$t('modelTraceback.mustExist'):''">
:title="item.disabled ? $t('modelTraceback.mustExist') : ''">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
@@ -79,7 +80,8 @@ limitations under the License.
<div id="data-echart" <div id="data-echart"
v-show="showEchartPic && !echartNoData"></div> v-show="showEchartPic && !echartNoData"></div>
<div class="echart-nodata-container" <div class="echart-nodata-container"
v-show="!showEchartPic && showTable"></div>
v-show="!showEchartPic && showTable && !(summaryDirList && !summaryDirList.length)">
</div>
<div class="btns-container" <div class="btns-container"
v-show="!echartNoData && showTable"> v-show="!echartNoData && showTable">
<el-button type="primary" <el-button type="primary"
@@ -103,7 +105,7 @@ limitations under the License.
<el-table ref="table" <el-table ref="table"
:data="table.data" :data="table.data"
tooltip-effect="light" tooltip-effect="light"
height="calc(100% - 54px)"
height="calc(100% - 40px)"
row-key="summary_dir" row-key="summary_dir"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@sort-change="tableSortChange"> @sort-change="tableSortChange">
@@ -116,8 +118,8 @@ limitations under the License.
:key="key" :key="key"
:prop="key" :prop="key"
:label="table.columnOptions[key].label" :label="table.columnOptions[key].label"
:sortable="sortArray.includes(table.columnOptions[key].label)?'custom':false"
:fixed="table.columnOptions[key].label===text?true:false"
:sortable="sortArray.includes(table.columnOptions[key].label) ? 'custom' : false"
:fixed="table.columnOptions[key].label === text?true:false"
min-width="200" min-width="200"
show-overflow-tooltip> show-overflow-tooltip>
<template slot="header" <template slot="header"
@@ -151,7 +153,7 @@ limitations under the License.
</el-table-column> </el-table-column>
<!-- remark column --> <!-- remark column -->
<el-table-column fixed="right" <el-table-column fixed="right"
width="310">
width="260">
<template slot="header"> <template slot="header">
<div> <div>
<div class="label-text">{{$t('public.remark')}}</div> <div class="label-text">{{$t('public.remark')}}</div>
@@ -208,10 +210,10 @@ limitations under the License.
<div> <div>
<div class="icon-image-container"> <div class="icon-image-container">
<div class="icon-image" <div class="icon-image"
:class="[item.number===scope.row.tag && scope.row.showIcon?'icon-border':'']"
:class="[item.number === scope.row.tag && scope.row.showIcon ? 'icon-border' : '']"
v-for="item in imageList" v-for="item in imageList"
:key="item.number" :key="item.number"
@click="iconValueChange(scope.row,item.number,$event)">
@click="iconValueChange(scope.row, item.number, $event)">
<img :src="item.iconAdd"> <img :src="item.iconAdd">
</div> </div>
</div> </div>
@@ -243,33 +245,34 @@ limitations under the License.
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div>
<div class="hide-count"
v-show="recordsNumber-showNumber">
{{ $t('modelTraceback.totalHide').replace(`{n}`,(recordsNumber-showNumber))}}
</div>
<div class="pagination-container">
<el-pagination @current-change="handleCurrentChange" <el-pagination @current-change="handleCurrentChange"
:current-page="pagination.currentPage" :current-page="pagination.currentPage"
:page-size="pagination.pageSize" :page-size="pagination.pageSize"
:layout="pagination.layout" :layout="pagination.layout"
:total="pagination.total"> :total="pagination.total">
</el-pagination> </el-pagination>
<div class="hide-count"
v-show="recordsNumber-showNumber">
{{ $t('modelTraceback.totalHide').replace(`{n}`, (recordsNumber-showNumber))}}
</div>
<div class="clear"></div>
</div> </div>
</div> </div>
<div v-show="((!lineagedata.serData || !lineagedata.serData.length) && initOver) <div v-show="((!lineagedata.serData || !lineagedata.serData.length) && initOver)
||(echartNoData&&(lineagedata.serData&&!!lineagedata.serData.length))"
||(echartNoData && (lineagedata.serData && !!lineagedata.serData.length))"
class="no-data-page"> class="no-data-page">
<div class="no-data-img"> <div class="no-data-img">
<img :src="require('@/assets/images/nodata.png')" <img :src="require('@/assets/images/nodata.png')"
alt="" /> alt="" />
<p class="no-data-text" <p class="no-data-text"
v-show="!summaryDirList||(summaryDirList&&summaryDirList.length)&&!lineagedata.serData">
v-show="!summaryDirList || (summaryDirList && summaryDirList.length) && !lineagedata.serData">
{{ $t('public.noData') }} {{ $t('public.noData') }}
</p> </p>
<div v-show="echartNoData&&(lineagedata.serData&&!!lineagedata.serData.length)">
<div v-show="echartNoData && (lineagedata.serData && !!lineagedata.serData.length)">
<p class="no-data-text">{{ $t('dataTraceback.noDataFound') }}</p> <p class="no-data-text">{{ $t('dataTraceback.noDataFound') }}</p>
</div> </div>
<div v-show="summaryDirList&&!summaryDirList.length">
<div v-show="summaryDirList && !summaryDirList.length">
<p class="no-data-text">{{ $t('dataTraceback.noDataFound') }}</p> <p class="no-data-text">{{ $t('dataTraceback.noDataFound') }}</p>
<p class="no-data-text"> <p class="no-data-text">
{{ $t('dataTraceback.click') }} {{ $t('dataTraceback.click') }}
@@ -494,7 +497,7 @@ export default {
obj.iconAdd = require('@/assets/images/icon' + obj.number + '.svg'); obj.iconAdd = require('@/assets/images/icon' + obj.number + '.svg');
this.imageList.push(obj); this.imageList.push(obj);
} }
document.title = this.$t('summaryManage.dataTraceback') + '-MindInsight';
document.title = `${this.$t('summaryManage.dataTraceback')}-MindInsight`;
document.addEventListener('click', this.blurFloat, true); document.addEventListener('click', this.blurFloat, true);
this.$nextTick(() => { this.$nextTick(() => {
this.init(); this.init();
@@ -527,8 +530,8 @@ export default {
return; return;
} }
row.showIcon = true; row.showIcon = true;
const e = window.event;
document.getElementById('icon-dialog').style.top = e.clientY + 'px';
document.getElementById('icon-dialog').style.top =
window.event.clientY + 'px';
}, },


iconValueChange(row, num, event) { iconValueChange(row, num, event) {
@@ -575,6 +578,13 @@ export default {
*/ */


clearIcon(row) { clearIcon(row) {
const classWrap = event.path.find((item) => {
return item.className === 'icon-dialog';
});
const classArr = classWrap.querySelectorAll('.icon-border');
classArr.forEach((item) => {
item.classList.remove('icon-border');
});
row.showIcon = false; row.showIcon = false;
this.iconValue = 0; this.iconValue = 0;
row.tag = 0; row.tag = 0;
@@ -848,7 +858,7 @@ export default {
} }
this.initChart(); this.initChart();
const list = []; const list = [];
this.checkOptions.forEach((item) => {
this.basearr.forEach((item) => {
this.selectArrayValue.forEach((i) => { this.selectArrayValue.forEach((i) => {
if (i === item.value) { if (i === item.value) {
list.push(i); list.push(i);
@@ -917,7 +927,7 @@ export default {
}); });
} }
const list = []; const list = [];
this.checkOptions.forEach((item) => {
this.basearr.forEach((item) => {
this.selectArrayValue.forEach((i) => { this.selectArrayValue.forEach((i) => {
if (i === item.value) { if (i === item.value) {
const obj = {}; const obj = {};
@@ -1061,6 +1071,9 @@ export default {
this.showTable = false; this.showTable = false;
this.echartNoData = true; this.echartNoData = true;
} else { } else {
const echartLength = this.echart.brushData.length;
this.recordsNumber = echartLength;
this.showNumber = echartLength;
this.echart.showData = this.echart.brushData; this.echart.showData = this.echart.brushData;
this.initChart(); this.initChart();
this.pagination.currentPage = 1; this.pagination.currentPage = 1;
@@ -1431,6 +1444,7 @@ export default {
this.initOver = false; this.initOver = false;
this.echartNoData = false; this.echartNoData = false;
this.showEchartPic = true; this.showEchartPic = true;
this.selectCheckAll = true;
// checkOptions initializate to an empty array // checkOptions initializate to an empty array
this.checkOptions = []; this.checkOptions = [];
this.selectArrayValue = []; this.selectArrayValue = [];
@@ -1733,7 +1747,9 @@ export default {
const item = {}; const item = {};
item.key = k; item.key = k;
item.value = dataObj[key][k]; item.value = dataObj[key][k];
item.id = (index + 1) * 10 + 1 + j;
item.id =
`${new Date().getTime()}` + `${this.$store.state.tableId}`;
this.$store.commit('increaseTableId');
tempData.children.push(item); tempData.children.push(item);
}); });
} }
@@ -1775,14 +1791,15 @@ export default {
<style lang="scss"> <style lang="scss">
.label-text { .label-text {
line-height: 20px !important; line-height: 20px !important;
vertical-align: bottom;
padding-top: 20px;
display: block !important;
} }
.remark-tip { .remark-tip {
line-height: 14px !important;
line-height: 20px !important;
font-size: 12px; font-size: 12px;
white-space: pre-wrap !important; white-space: pre-wrap !important;
vertical-align: bottom;
color: gray; color: gray;
display: block !important;
} }
.el-color-dropdown__main-wrapper, .el-color-dropdown__main-wrapper,
.el-color-dropdown__value, .el-color-dropdown__value,
@@ -1841,6 +1858,13 @@ export default {
height: 100%; height: 100%;
overflow-y: auto; overflow-y: auto;
position: relative; position: relative;
.el-table th.is-leaf {
background: #f5f7fa;
}
.el-table td,
.el-table th.is-leaf {
border: 1px solid #ebeef5;
}
.inline-block-set { .inline-block-set {
display: inline-block; display: inline-block;
} }
@@ -1878,7 +1902,7 @@ export default {
.no-data-page { .no-data-page {
width: 100%; width: 100%;
height: 100%; height: 100%;
padding-top: 224px;
padding-top: 200px;
} }
.no-data-img { .no-data-img {
background: #fff; background: #fff;
@@ -1944,6 +1968,7 @@ export default {
.data-checkbox-area { .data-checkbox-area {
position: relative; position: relative;
margin: 24px 32px 12px; margin: 24px 32px 12px;
height: 46px;
.reset-btn { .reset-btn {
position: absolute; position: absolute;
right: 0px; right: 0px;
@@ -1951,12 +1976,12 @@ export default {
} }
} }
#data-echart { #data-echart {
height: 34%;
height: 32%;
width: 100%; width: 100%;
padding: 0 12px; padding: 0 12px;
} }
.echart-nodata-container { .echart-nodata-container {
height: 34%;
height: 32%;
width: 100%; width: 100%;
} }
.btn-container-margin { .btn-container-margin {
@@ -1975,8 +2000,8 @@ export default {


.table-container { .table-container {
background-color: white; background-color: white;
height: calc(60% - 90px);
margin: 6px 32px 0;
height: calc(68% - 130px);
padding: 6px 32px;
position: relative; position: relative;
.custom-label { .custom-label {
max-width: calc(100% - 25px); max-width: calc(100% - 25px);
@@ -1997,24 +2022,33 @@ export default {
.click-span { .click-span {
cursor: pointer; cursor: pointer;
} }
.clear {
clear: both;
}
.hide-count { .hide-count {
display: inline-block;
position: absolute;
right: 450px;
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
padding-top: 12px;
color: red; color: red;
float: right;
margin-right: 10px;
} }
.el-pagination { .el-pagination {
position: absolute;
right: 0px;
float: right;
margin-right: 32px;
bottom: 10px; bottom: 10px;
} }
.pagination-container {
height: 40px;
}
} }
} }


.details-data-list { .details-data-list {
.el-table td,
.el-table th.is-leaf {
border: none;
border-top: 1px solid #ebeef5;
}
.el-table { .el-table {
th { th {
padding: 10px 0; padding: 10px 0;


+ 66
- 38
mindinsight/ui/src/views/train-manage/model-traceback.vue View File

@@ -20,7 +20,7 @@ limitations under the License.
<div class="select-box" <div class="select-box"
v-if="!noData && v-if="!noData &&
(!summaryDirList || (summaryDirList && summaryDirList.length))"> (!summaryDirList || (summaryDirList && summaryDirList.length))">
<div v-show="showTable&&!noData"
<div v-show="showTable && !noData"
class="select-container"> class="select-container">
<!-- multiple collapse-tags --> <!-- multiple collapse-tags -->
<div class="display-column"> {{$t('modelTraceback.displayColumn')}}</div> <div class="display-column"> {{$t('modelTraceback.displayColumn')}}</div>
@@ -40,19 +40,18 @@ limitations under the License.
<button type="text" <button type="text"
@click="allSelect" @click="allSelect"
class="select-all-button" class="select-all-button"
:class="[selectCheckAll?
'checked-color':'button-text',
basearr.length>checkOptions.length?'btn-disabled':'']"
:disabled="basearr.length>checkOptions.length">
:class="[selectCheckAll ? 'checked-color' : 'button-text',
basearr.length > checkOptions.length ? 'btn-disabled' : '']"
:disabled="basearr.length > checkOptions.length">
{{$t('public.selectAll')}} {{$t('public.selectAll')}}
</button> </button>
<button type="text" <button type="text"
@click="deselectAll" @click="deselectAll"
class="deselect-all-button" class="deselect-all-button"
:class="[!selectCheckAll? :class="[!selectCheckAll?
'checked-color':'button-text',
basearr.length>checkOptions.length?'btn-disabled':'']"
:disabled="basearr.length>checkOptions.length">
'checked-color' : 'button-text',
basearr.length > checkOptions.length ? 'btn-disabled' : '']"
:disabled="basearr.length > checkOptions.length">
{{$t('public.deselectAll')}} {{$t('public.deselectAll')}}
</button> </button>
</div> </div>
@@ -64,7 +63,7 @@ limitations under the License.
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
:disabled="item.disabled" :disabled="item.disabled"
:title="item.disabled?$t('modelTraceback.mustExist'):''">
:title="item.disabled ? $t('modelTraceback.mustExist') : ''">
</el-option> </el-option>
</el-option-group> </el-option-group>
</el-select> </el-select>
@@ -82,19 +81,19 @@ limitations under the License.
type="primary" type="primary"
size="mini" size="mini"
plain plain
v-if="(!noData&&basearr.length) ||
v-if="(!noData && basearr.length) ||
(noData && summaryDirList && !summaryDirList.length)"> (noData && summaryDirList && !summaryDirList.length)">
{{ $t('modelTraceback.showAllData') }}</el-button> {{ $t('modelTraceback.showAllData') }}</el-button>
</div> </div>


</div> </div>
<div id="echart" <div id="echart"
v-show="!noData&&showEchartPic"></div>
v-show="!noData && showEchartPic"></div>
<div class="echart-no-data" <div class="echart-no-data"
v-show="!showEchartPic"> v-show="!showEchartPic">
</div> </div>
<div class="btns-container" <div class="btns-container"
v-show="showTable&&!noData">
v-show="showTable && !noData">
<el-button type="primary" <el-button type="primary"
size="mini" size="mini"
class="custom-btn" class="custom-btn"
@@ -118,7 +117,7 @@ limitations under the License.
<el-table-column type="selection" <el-table-column type="selection"
width="55" width="55"
:reserve-selection="true" :reserve-selection="true"
v-show="showTable&&!noData">
v-show="showTable && !noData">
</el-table-column> </el-table-column>


<!--metric table column--> <!--metric table column-->
@@ -188,7 +187,7 @@ limitations under the License.
</div> </div>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{formatNumber(key,scope.row[key])}}</span>
<span>{{formatNumber(key, scope.row[key])}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@@ -197,7 +196,7 @@ limitations under the License.
:key="key" :key="key"
:prop="key" :prop="key"
:label="table.columnOptions[key].label" :label="table.columnOptions[key].label"
:fixed="table.columnOptions[key].label===text?true:false"
:fixed="table.columnOptions[key].label === text ? true : false"
show-overflow-tooltip show-overflow-tooltip
min-width="150" min-width="150"
sortable="custom"> sortable="custom">
@@ -216,7 +215,7 @@ limitations under the License.
</el-table-column> </el-table-column>
<!-- remark column --> <!-- remark column -->
<el-table-column fixed="right" <el-table-column fixed="right"
width="310">
width="260">
<template slot="header"> <template slot="header">
<div> <div>
<div class="label-text">{{$t('public.remark')}}</div> <div class="label-text">{{$t('public.remark')}}</div>
@@ -271,7 +270,7 @@ limitations under the License.
<div> <div>
<div class="icon-image-container"> <div class="icon-image-container">
<div class="icon-image" <div class="icon-image"
:class="[item.number===scope.row.tag&&scope.row.showIcon ? 'icon-border':'']"
:class="[item.number === scope.row.tag && scope.row.showIcon ? 'icon-border' : '']"
v-for="item in imageList" v-for="item in imageList"
:key="item.number" :key="item.number"
@click="iconValueChange(scope.row,item.number,$event)"> @click="iconValueChange(scope.row,item.number,$event)">
@@ -300,17 +299,18 @@ limitations under the License.
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div>
<div class="hide-count"
v-show="recordsNumber-showNumber">
{{$t('modelTraceback.totalHide').replace(`{n}`,(recordsNumber-showNumber))}}
</div>
<div class="pagination-container">
<el-pagination @current-change="pagination.pageChange" <el-pagination @current-change="pagination.pageChange"
:current-page="pagination.currentPage" :current-page="pagination.currentPage"
:page-size="pagination.pageSize" :page-size="pagination.pageSize"
:layout="pagination.layout" :layout="pagination.layout"
:total="pagination.total"> :total="pagination.total">
</el-pagination> </el-pagination>
<div class="hide-count"
v-show="recordsNumber-showNumber">
{{$t('modelTraceback.totalHide').replace(`{n}`, (recordsNumber-showNumber))}}
</div>
<div class="clear"></div>
</div> </div>


</div> </div>
@@ -425,7 +425,7 @@ export default {
obj.iconAdd = require('@/assets/images/icon' + obj.number + '.svg'); obj.iconAdd = require('@/assets/images/icon' + obj.number + '.svg');
this.imageList.push(obj); this.imageList.push(obj);
} }
document.title = this.$t('summaryManage.modelTraceback') + '-MindInsight';
document.title = `${this.$t('summaryManage.modelTraceback')}-MindInsight`;
document.addEventListener('click', this.blurFloat, true); document.addEventListener('click', this.blurFloat, true);
this.$store.commit('setSelectedBarList', []); this.$store.commit('setSelectedBarList', []);
this.getStoreList(); this.getStoreList();
@@ -466,8 +466,8 @@ export default {
return; return;
} }
row.showIcon = true; row.showIcon = true;
const e = window.event;
document.getElementById('icon-dialog').style.top = e.clientY + 'px';
document.getElementById('icon-dialog').style.top =
window.event.clientY + 'px';
}, },


/** /**
@@ -514,6 +514,13 @@ export default {
}, },
// clear icon // clear icon
clearIcon(row) { clearIcon(row) {
const classWrap = event.path.find((item) => {
return item.className === 'icon-dialog';
});
const classArr = classWrap.querySelectorAll('.icon-border');
classArr.forEach((item) => {
item.classList.remove('icon-border');
});
row.showIcon = false; row.showIcon = false;
this.iconValue = 0; this.iconValue = 0;
row.tag = 0; row.tag = 0;
@@ -1345,10 +1352,11 @@ export default {
this.echart.brushData = list; this.echart.brushData = list;
this.echart.showData = this.echart.brushData; this.echart.showData = this.echart.brushData;
this.initChart(); this.initChart();
this.table.data = list.slice(
const showList = list.slice(
(this.pagination.currentPage - 1) * this.pagination.pageSize, (this.pagination.currentPage - 1) * this.pagination.pageSize,
this.pagination.currentPage * this.pagination.pageSize, this.pagination.currentPage * this.pagination.pageSize,
); );
this.table.data = showList;
this.recordsNumber = this.table.data.length; this.recordsNumber = this.table.data.length;
this.showNumber = this.table.data.length; this.showNumber = this.table.data.length;
this.pagination.total = res.data.count || 0; this.pagination.total = res.data.count || 0;
@@ -1365,6 +1373,8 @@ export default {
sortChange(column) { sortChange(column) {
this.sortInfo.sorted_name = column.prop; this.sortInfo.sorted_name = column.prop;
this.sortInfo.sorted_type = column.order; this.sortInfo.sorted_type = column.order;
this.recordsNumber = 0;
this.showNumber = 0;
this.getStoreList(); this.getStoreList();
const tempParam = { const tempParam = {
limit: this.pagination.pageSize, limit: this.pagination.pageSize,
@@ -1384,9 +1394,21 @@ export default {
(res) => { (res) => {
if (res && res.data && res.data.object) { if (res && res.data && res.data.object) {
const list = this.setDataOfModel(res.data.object); const list = this.setDataOfModel(res.data.object);
this.table.data = list;
const tempList = list.slice(0, this.pagination.pageSize);
this.recordsNumber = tempList.length;
if (this.hidenDirChecked.length) {
this.hidenDirChecked.forEach((dir) => {
tempList.forEach((item, index) => {
if (item.summary_dir === dir) {
tempList.splice(index, 1);
}
});
});
}
this.showNumber = tempList.length;
this.table.data = tempList;
this.pagination.total = res.data.count || 0; this.pagination.total = res.data.count || 0;
this.pagination.currentPage = 0;
this.pagination.currentPage = 1;
} }
}, },
(error) => {}, (error) => {},
@@ -1741,6 +1763,7 @@ export default {
this.$store.commit('setSelectedBarList', []); this.$store.commit('setSelectedBarList', []);
this.noData = false; this.noData = false;
this.showTable = false; this.showTable = false;
this.selectCheckAll = true;
this.chartFilter = {}; this.chartFilter = {};
this.tableFilter.summary_dir = undefined; this.tableFilter.summary_dir = undefined;
this.sortInfo = {}; this.sortInfo = {};
@@ -1838,14 +1861,15 @@ export default {
<style lang="scss"> <style lang="scss">
.label-text { .label-text {
line-height: 20px !important; line-height: 20px !important;
vertical-align: bottom;
padding-top: 20px;
display: block !important;
} }
.remark-tip { .remark-tip {
line-height: 14px !important;
line-height: 20px !important;
font-size: 12px; font-size: 12px;
white-space: pre-wrap !important; white-space: pre-wrap !important;
vertical-align: bottom;
color: gray; color: gray;
display: block !important;
} }
.el-color-dropdown__main-wrapper, .el-color-dropdown__main-wrapper,
.el-color-dropdown__value, .el-color-dropdown__value,
@@ -1943,6 +1967,7 @@ export default {
.btns { .btns {
margin-left: 20px; margin-left: 20px;
padding-top: 12px; padding-top: 12px;
height: 46px;
} }
.btn-container-margin { .btn-container-margin {
margin: 0 55px 10px; margin: 0 55px 10px;
@@ -2048,7 +2073,7 @@ export default {
} }
.table-container { .table-container {
background-color: white; background-color: white;
height: calc(60% - 40px);
height: calc(68% - 130px);
padding: 6px 32px; padding: 6px 32px;
position: relative; position: relative;
.custom-label { .custom-label {
@@ -2059,21 +2084,24 @@ export default {
a { a {
cursor: pointer; cursor: pointer;
} }
.clear {
clear: both;
}
.hide-count { .hide-count {
display: inline-block;
position: absolute;
right: 450px;
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
padding-top: 4px;
color: red; color: red;
float: right;
margin-right: 10px;
} }
.el-pagination { .el-pagination {
float: right;
margin-right: 32px; margin-right: 32px;
position: absolute;
right: 0;
bottom: 10px; bottom: 10px;
} }
.pagination-container {
height: 40px;
}
} }
.no-data-page { .no-data-page {
width: 100%; width: 100%;


Write Preview
Loading…
Cancel
Save