diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue index 0684889..f42807b 100644 --- a/src/components/Navbar.vue +++ b/src/components/Navbar.vue @@ -81,9 +81,11 @@ export default { navViewData: { // FILES: ['ALL', 'DISCOVER', 'COMPARE', 'DESIGN'], - FILES: ['ALL', 'DISCOVER'], + FILES: ['ALL', 'DISCOVER', 'COMPARE'], // DISCOVER: ['MAP', 'CONFORMANCE', 'PERFORMANCE', 'DATA'] - DISCOVER: ['MAP', 'CONFORMANCE', 'PERFORMANCE'] + DISCOVER: ['MAP', 'CONFORMANCE', 'PERFORMANCE'], + // COMPARE: ['PROCESS MAP', 'DASHBOARD'] + COMPARE: ['DASHBOARD'] }, navViewName: 'FILES', isActive: null, @@ -104,8 +106,8 @@ export default { }, showIcon: function() { let result = true; - if(this.navViewName === 'FILES') result = false; - else if(this.navViewName === 'UPLOAD') result = false; + + result = ['FILES', 'UPLOAD'].includes(this.navViewName) ? false : true; return result; } }, @@ -154,14 +156,9 @@ export default { this.$router.push({name: 'Performance', params: { type: type, fileId: fileId }}); break; } - // if(event.target.innerText === 'MAP') { - // if(type === 'rule') this.$router.push({name: 'CheckMap'}); - // else this.$router.push({name: 'Map', params: { type: type, fileId: fileId }}); - // } else if(event.target.innerText === 'CONFORMANCE') { - // if(type === 'rule') this.$router.push({name: 'CheckConformance'}); - // else this.$router.push({name: 'Conformance', params: { type: type, fileId: fileId }}); - // } break; + case 'COMPARE': + break } }, getNavViewName() { diff --git a/src/views/Compare/Dashboard/data.js b/src/views/Compare/Dashboard/data.js index 722a682..9482181 100644 --- a/src/views/Compare/Dashboard/data.js +++ b/src/views/Compare/Dashboard/data.js @@ -7,7 +7,7 @@ export const compareDashboardData = { "data": [ { "x": "2022-01-21T03:22:13.850000", - "y": 980217.631579 + "y": 0 }, { "x": "2022-02-26T08:13:51.550000", @@ -109,11 +109,11 @@ export const compareDashboardData = { "data": [ { "x": "2022-01-21T03:22:13.850000", - "y": 0.952810727062303 + "y": 0 }, { "x": "2022-02-26T08:13:51.550000", - "y": 0.9516609459556336 + "y": 0 }, { "x": "2022-04-03T13:05:29.250000", @@ -158,7 +158,7 @@ export const compareDashboardData = { }, { "x": "2022-02-26T08:13:51.550000", - "y": 0.9502456491200848 + "y": 0 }, { "x": "2022-04-03T13:05:29.250000", @@ -211,7 +211,7 @@ export const compareDashboardData = { "data": [ { "x": "2022-01-21T03:22:13.850000", - "y": 937071.842105 + "y": 0 }, { "x": "2022-02-26T08:13:51.550000", @@ -1586,6 +1586,10 @@ export const compareDashboardData = { "x": "i", "y": 131 }, + { + "x": "j", + "y": 0 + }, { "x": "k", "y": 39 diff --git a/src/views/Files/index.vue b/src/views/Files/index.vue index abdca64..193b89b 100644 --- a/src/views/Files/index.vue +++ b/src/views/Files/index.vue @@ -1,87 +1,203 @@