diff --git a/package-lock.json b/package-lock.json index 7f6f1dc..a1ce375 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "vue-i18n": "^8.17.5", "vue-router": "^3.1.6", "vue-underscore": "^0.1.4", + "vue2-highcharts": "^1.2.5", "vuetify": "^2.2.11", "vuex": "^3.1.3" }, @@ -7179,6 +7180,12 @@ "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==", "dev": true }, + "node_modules/highcharts": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/highcharts/-/highcharts-6.2.0.tgz", + "integrity": "sha512-A4E89MA+kto8giic7zyLU6ZxfXnVeCUlKOyzFsah3+n4BROx4bgonl92KIBtwLud/mIWir8ahqhuhe2by9LakQ==", + "peer": true + }, "node_modules/highlight.js": { "version": "10.7.3", "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", @@ -13792,6 +13799,15 @@ "underscore": "^1.8.3" } }, + "node_modules/vue2-highcharts": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/vue2-highcharts/-/vue2-highcharts-1.2.5.tgz", + "integrity": "sha512-di7kuqZyqo77pmCs23s+wIyA1aBuKMxRJg871ggcj0Y1GopfF9j/cPlmwgjyIMaOHz4iQmvfn8hEDNOMW7etEQ==", + "peerDependencies": { + "highcharts": "^6.0.3", + "vue": "^2.1.0" + } + }, "node_modules/vuetify": { "version": "2.7.2", "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.7.2.tgz", diff --git a/package.json b/package.json index 46bd4c5..1f6cb2b 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "vue-i18n": "^8.17.5", "vue-router": "^3.1.6", "vue-underscore": "^0.1.4", + "vue2-highcharts": "^1.2.5", "vuetify": "^2.2.11", "vuex": "^3.1.3" }, diff --git a/src/components/GazTrends/BofGazTrend.vue b/src/components/GazTrends/BofGazTrend.vue index 2b71f20..29d32fc 100644 --- a/src/components/GazTrends/BofGazTrend.vue +++ b/src/components/GazTrends/BofGazTrend.vue @@ -1,66 +1,83 @@ - + \ No newline at end of file diff --git a/src/components/PRB_FileControl.vue b/src/components/PRB_FileControl.vue index 5ec0ba7..edef7f4 100644 --- a/src/components/PRB_FileControl.vue +++ b/src/components/PRB_FileControl.vue @@ -19,6 +19,7 @@ файловый менеджер + @@ -66,10 +67,10 @@ + - @@ -175,6 +176,7 @@ import { mapGetters, mapActions, mapMutations } from "vuex"; export default { data: vm => ({ + progress: 100, file: { name: null, id: null, input: null, data: null }, dialog: { log: false, history: false }, pass: { val: null, select: true }, @@ -260,6 +262,7 @@ export default { snackbarColor() { return this.uploadStatus ? "green darken-4" : "red darken-4" }, + }, methods: { ...mapMutations("PRB_FileControl", { @@ -338,8 +341,18 @@ export default { this.getStorage(); this.getData(this.formatDate(this.date)); }, + progressValue() { + this.timerID = setInterval(() => { + this.progress = (this.progress - 0.02).toFixed(2); + if (this.progress < 0) { + this.progress = 101; + this.reload(); + } + }, 60); + } }, mounted() { + this.progressValue(); this.reload(); } }; diff --git a/src/routes.js b/src/routes.js index f599245..3d8d0b7 100644 --- a/src/routes.js +++ b/src/routes.js @@ -145,15 +145,15 @@ const routes = [ component: () => import("./components/PRB_FileControl.vue"), }, - { - path: "/GazTrends/BofGazTrend", - name: "BofGazTrend", - component: () => import("./components/GazTrends/BofGazTrend.vue"), - beforeEnter(to, from, next) { - axios.defaults.headers.post["project"] = "GazTrends"; - next(); - }, - }, + // { + // path: "/GazTrends/BofGazTrend", + // name: "BofGazTrend", + // component: () => import("./components/GazTrends/BofGazTrend.vue"), + // beforeEnter(to, from, next) { + // axios.defaults.headers.post["project"] = "GazTrends"; + // next(); + // }, + // }, { path: "/stat",