Merge pull request !139 from 潘慧/master_phtags/v0.3.0-alpha
| @@ -0,0 +1,9 @@ | |||||
| <?xml version="1.0" encoding="UTF-8"?> | |||||
| <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> | |||||
| <!-- Generator: Sketch 63.1 (92452) - https://sketch.com --> | |||||
| <title>1</title> | |||||
| <desc>Created with Sketch.</desc> | |||||
| <g id="1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> | |||||
| <circle id="椭圆形" fill="#00A5A7" cx="10" cy="10" r="9"></circle> | |||||
| </g> | |||||
| </svg> | |||||
| @@ -0,0 +1,9 @@ | |||||
| <?xml version="1.0" encoding="UTF-8"?> | |||||
| <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> | |||||
| <!-- Generator: Sketch 63.1 (92452) - https://sketch.com --> | |||||
| <title>10</title> | |||||
| <desc>Created with Sketch.</desc> | |||||
| <g id="10" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> | |||||
| <polygon id="多边形" fill="#00A5A7" points="10 0 18.660254 5 18.660254 15 10 20 1.33974596 15 1.33974596 5"></polygon> | |||||
| </g> | |||||
| </svg> | |||||
| @@ -0,0 +1,9 @@ | |||||
| <?xml version="1.0" encoding="UTF-8"?> | |||||
| <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> | |||||
| <!-- Generator: Sketch 63.1 (92452) - https://sketch.com --> | |||||
| <title>2</title> | |||||
| <desc>Created with Sketch.</desc> | |||||
| <g id="2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> | |||||
| <rect id="矩形" fill="#00A5A7" x="2" y="2" width="16" height="16"></rect> | |||||
| </g> | |||||
| </svg> | |||||
| @@ -0,0 +1,9 @@ | |||||
| <?xml version="1.0" encoding="UTF-8"?> | |||||
| <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> | |||||
| <!-- Generator: Sketch 63.1 (92452) - https://sketch.com --> | |||||
| <title>3</title> | |||||
| <desc>Created with Sketch.</desc> | |||||
| <g id="3" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> | |||||
| <polygon id="矩形" fill="#00A5A7" transform="translate(10.000000, 10.000000) rotate(-315.000000) translate(-10.000000, -10.000000) " points="3 3 16.2928932 3.70710678 17 17 3.70710678 16.2928932"></polygon> | |||||
| </g> | |||||
| </svg> | |||||
| @@ -0,0 +1,9 @@ | |||||
| <?xml version="1.0" encoding="UTF-8"?> | |||||
| <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> | |||||
| <!-- Generator: Sketch 63.1 (92452) - https://sketch.com --> | |||||
| <title>4</title> | |||||
| <desc>Created with Sketch.</desc> | |||||
| <g id="4" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> | |||||
| <polygon id="矩形" fill="#00A5A7" points="4 2 20 2 16 18 5.11535259e-13 18"></polygon> | |||||
| </g> | |||||
| </svg> | |||||
| @@ -0,0 +1,9 @@ | |||||
| <?xml version="1.0" encoding="UTF-8"?> | |||||
| <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> | |||||
| <!-- Generator: Sketch 63.1 (92452) - https://sketch.com --> | |||||
| <title>5</title> | |||||
| <desc>Created with Sketch.</desc> | |||||
| <g id="5" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> | |||||
| <polygon id="矩形备份" fill="#00A5A7" transform="translate(10.000000, 15.000000) rotate(-315.000000) translate(-10.000000, -15.000000) " points="-0.606601718 4.39339828 20.6066017 11.4644661 6.46446609 25.6066017"></polygon> | |||||
| </g> | |||||
| </svg> | |||||
| @@ -0,0 +1,9 @@ | |||||
| <?xml version="1.0" encoding="UTF-8"?> | |||||
| <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> | |||||
| <!-- Generator: Sketch 63.1 (92452) - https://sketch.com --> | |||||
| <title>6</title> | |||||
| <desc>Created with Sketch.</desc> | |||||
| <g id="6" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> | |||||
| <ellipse id="椭圆形" fill="#00A5A7" cx="10" cy="10" rx="10" ry="8"></ellipse> | |||||
| </g> | |||||
| </svg> | |||||
| @@ -0,0 +1,9 @@ | |||||
| <?xml version="1.0" encoding="UTF-8"?> | |||||
| <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> | |||||
| <!-- Generator: Sketch 63.1 (92452) - https://sketch.com --> | |||||
| <title>7</title> | |||||
| <desc>Created with Sketch.</desc> | |||||
| <g id="7" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> | |||||
| <polygon id="星形" fill="#00A5A7" points="10 17.2616257 4.12214748 19.0901699 4.04484003 12.9349488 0.489434837 7.90983006 6.31950873 5.93423836 10 1 13.6804913 5.93423836 19.5105652 7.90983006 15.95516 12.9349488 15.8778525 19.0901699"></polygon> | |||||
| </g> | |||||
| </svg> | |||||
| @@ -0,0 +1,9 @@ | |||||
| <?xml version="1.0" encoding="UTF-8"?> | |||||
| <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> | |||||
| <!-- Generator: Sketch 63.1 (92452) - https://sketch.com --> | |||||
| <title>8</title> | |||||
| <desc>Created with Sketch.</desc> | |||||
| <g id="8" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> | |||||
| <polygon id="矩形" fill="#00A5A7" transform="translate(10.000000, 10.000000) rotate(-180.000000) translate(-10.000000, -10.000000) " points="7 2 13 2 18 18 2 18"></polygon> | |||||
| </g> | |||||
| </svg> | |||||
| @@ -0,0 +1,9 @@ | |||||
| <?xml version="1.0" encoding="UTF-8"?> | |||||
| <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> | |||||
| <!-- Generator: Sketch 63.1 (92452) - https://sketch.com --> | |||||
| <title>9</title> | |||||
| <desc>Created with Sketch.</desc> | |||||
| <g id="9" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> | |||||
| <polygon id="多边形" fill="#00A5A7" points="10 1 19.5105652 7.90983006 15.8778525 19.0901699 4.12214748 19.0901699 0.489434837 7.90983006"></polygon> | |||||
| </g> | |||||
| </svg> | |||||
| @@ -37,7 +37,7 @@ export default { | |||||
| putLineagesData(params) { | putLineagesData(params) { | ||||
| return axios({ | return axios({ | ||||
| method: 'put', | method: 'put', | ||||
| url: '/v1/mindinsight/lineagemgr/lineages?train_id='+params.train_id, | |||||
| url: '/v1/mindinsight/lineagemgr/lineages?train_id=' + params.train_id, | |||||
| data: params.body, | data: params.body, | ||||
| }); | }); | ||||
| }, | }, | ||||
| @@ -125,15 +125,15 @@ export default { | |||||
| // query metedata | // query metedata | ||||
| getSummarySample(params) { | getSummarySample(params) { | ||||
| const trainIdsStr=params.train_id; | |||||
| const trainIdsArr=trainIdsStr.split('&'); | |||||
| let requestStr=''; | |||||
| trainIdsArr.forEach((item)=>{ | |||||
| const trainIdsStr = params.train_id; | |||||
| const trainIdsArr = trainIdsStr.split('&'); | |||||
| let requestStr = ''; | |||||
| trainIdsArr.forEach((item) => { | |||||
| if (item) { | if (item) { | ||||
| requestStr+=`train_id=${encodeURIComponent(item)}&`; | |||||
| requestStr += `train_id=${encodeURIComponent(item)}&`; | |||||
| } | } | ||||
| }); | }); | ||||
| requestStr+=`tag=${params.tag}`; | |||||
| requestStr += `tag=${params.tag}`; | |||||
| return axios({ | return axios({ | ||||
| method: 'get', | method: 'get', | ||||
| url: `v1/mindinsight/datavisual/scalars?${requestStr}`, | url: `v1/mindinsight/datavisual/scalars?${requestStr}`, | ||||
| @@ -170,15 +170,16 @@ export default { | |||||
| getProfilerDeviceData(params) { | getProfilerDeviceData(params) { | ||||
| return axios({ | return axios({ | ||||
| method: 'get', | method: 'get', | ||||
| url: '/v1/mindinsight/profiler_device', | |||||
| url: '/v1/mindinsight/profile/devices', | |||||
| params: params, | params: params, | ||||
| }); | }); | ||||
| }, | }, | ||||
| getProfilerOpTypeList(params) { | |||||
| getProfilerOpData(params) { | |||||
| return axios({ | return axios({ | ||||
| method: 'get', | |||||
| url: '/v1/mindinsight/profiler_device', | |||||
| params: params, | |||||
| method: 'post', | |||||
| url: '/v1/mindinsight/profile/ops/search', | |||||
| params: params.params, | |||||
| data: params.body, | |||||
| }); | }); | ||||
| }, | }, | ||||
| }; | }; | ||||
| @@ -55,6 +55,10 @@ export default new Vuex.Store({ | |||||
| setSelectedBarList: (state, val) => { | setSelectedBarList: (state, val) => { | ||||
| state.selectedBarList = val; | state.selectedBarList = val; | ||||
| }, | }, | ||||
| // hide list of model traceback | |||||
| setHidenDirChecked: (state, val) => { | |||||
| state.hidenDirChecked = val; | |||||
| }, | |||||
| customizedColumnOptions: (state, val) => { | customizedColumnOptions: (state, val) => { | ||||
| state.customizedColumnOptions = val; | state.customizedColumnOptions = val; | ||||
| }, | }, | ||||
| @@ -111,15 +111,15 @@ | |||||
| :label="item"> | :label="item"> | ||||
| </el-table-column> | </el-table-column> | ||||
| </el-table> | </el-table> | ||||
| <el-table v-show="statisticType === 1 && opAllTypelList.opDetailCol && opAllTypelList.opDetailCol.length" | |||||
| :data="opAllTypelList.opDetailList" | |||||
| <el-table v-show="statisticType === 1 && opAllTypeList.opDetailCol && opAllTypeList.opDetailCol.length" | |||||
| :data="opAllTypeList.opDetailList" | |||||
| stripe | stripe | ||||
| width="100%" | width="100%" | ||||
| height="calc(100% - 114px)" | height="calc(100% - 114px)" | ||||
| @cell-click="showInfoDetail" | @cell-click="showInfoDetail" | ||||
| @sort-change="(...args)=>{coreDetailSortChange(opAllTypelList, ...args)}" | |||||
| @sort-change="(...args)=>{coreDetailSortChange(opAllTypeList, ...args)}" | |||||
| tooltip-effect="light"> | tooltip-effect="light"> | ||||
| <el-table-column v-for="(item, $index) in opAllTypelList.opDetailCol" | |||||
| <el-table-column v-for="(item, $index) in opAllTypeList.opDetailCol" | |||||
| :property="item" | :property="item" | ||||
| :key="$index" | :key="$index" | ||||
| :label="item" | :label="item" | ||||
| @@ -128,12 +128,12 @@ | |||||
| </el-table-column> | </el-table-column> | ||||
| </el-table> | </el-table> | ||||
| <el-pagination v-show="statisticType === 1" | <el-pagination v-show="statisticType === 1" | ||||
| v-if="opAllTypelList.opDetailList.length" | |||||
| :current-page="opAllTypelList.opDetailPage.offset + 1" | |||||
| :page-size="opAllTypelList.opDetailPage.limit" | |||||
| @current-change="(...args)=>{opDetailPageChange(opAllTypelList, ...args)}" | |||||
| v-if="opAllTypeList.opDetailList.length" | |||||
| :current-page="opAllTypeList.opDetailPage.offset + 1" | |||||
| :page-size="opAllTypeList.opDetailPage.limit" | |||||
| @current-change="(...args)=>{opDetailPageChange(opAllTypeList, ...args)}" | |||||
| layout="total, prev, pager, next, jumper" | layout="total, prev, pager, next, jumper" | ||||
| :total="opAllTypelList.pageTotal"> | |||||
| :total="opAllTypeList.pageTotal"> | |||||
| </el-pagination> | </el-pagination> | ||||
| </div> | </div> | ||||
| <div class="image-noData" | <div class="image-noData" | ||||
| @@ -274,7 +274,7 @@ export default { | |||||
| }, | }, | ||||
| }, | }, | ||||
| opAllDetailCol: [], | opAllDetailCol: [], | ||||
| opAllTypelList: { | |||||
| opAllTypeList: { | |||||
| opDetailCol: [], | opDetailCol: [], | ||||
| opDetailList: [], | opDetailList: [], | ||||
| pageTotal: 0, | pageTotal: 0, | ||||
| @@ -292,7 +292,10 @@ export default { | |||||
| profile_dir: '', | profile_dir: '', | ||||
| train_id: '', | train_id: '', | ||||
| op_filter_condition: {}, | op_filter_condition: {}, | ||||
| op_sort_condition: {}, | |||||
| op_sort_condition: { | |||||
| name: 'execution_time', | |||||
| type: 'descending', | |||||
| }, | |||||
| initOver: false, | initOver: false, | ||||
| objectType: 'object', | objectType: 'object', | ||||
| }; | }; | ||||
| @@ -336,10 +339,9 @@ export default { | |||||
| this.searchByTypeInput = ''; | this.searchByTypeInput = ''; | ||||
| this.searchByNameInput = ''; | this.searchByNameInput = ''; | ||||
| this.op_filter_condition = {}; | this.op_filter_condition = {}; | ||||
| this.op_sort_condition = {}; | |||||
| this.opTypeCol = []; | this.opTypeCol = []; | ||||
| this.opTypeList = []; | this.opTypeList = []; | ||||
| this.opAllTypelList = { | |||||
| this.opAllTypeList = { | |||||
| opDetailCol: [], | opDetailCol: [], | ||||
| opDetailList: [], | opDetailList: [], | ||||
| pageTotal: 0, | pageTotal: 0, | ||||
| @@ -543,9 +545,9 @@ export default { | |||||
| op_name: {partial_match_str_in: [this.searchByNameInput]}, | op_name: {partial_match_str_in: [this.searchByNameInput]}, | ||||
| }; | }; | ||||
| } else { | } else { | ||||
| this.opAllTypelList.op_filter_condition = {}; | |||||
| this.opAllTypeList.op_filter_condition = {}; | |||||
| } | } | ||||
| this.getCoreDetailList(this.opAllTypelList); | |||||
| this.getCoreDetailList(this.opAllTypeList); | |||||
| } else { | } else { | ||||
| this.op_filter_condition = {}; | this.op_filter_condition = {}; | ||||
| if (this.searchByTypeInput) { | if (this.searchByTypeInput) { | ||||
| @@ -634,8 +636,8 @@ export default { | |||||
| }); | }); | ||||
| }, | }, | ||||
| coreTableChange() { | coreTableChange() { | ||||
| if (this.statisticType === 1 && !this.opAllTypelList.opDetailCol.length) { | |||||
| this.getCoreDetailList(this.opAllTypelList); | |||||
| if (this.statisticType === 1 && !this.opAllTypeList.opDetailCol.length) { | |||||
| this.getCoreDetailList(this.opAllTypeList); | |||||
| } | } | ||||
| }, | }, | ||||
| cpuChartChange() { | cpuChartChange() { | ||||