marco/sensor-web-v2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Marco Crapts
2022-07-14 23:21:55 +02:00
parent db6b0b9fe5
commit 22dfa72d87
3 changed files with 483 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

907
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

20
package.json
View File

@@ -8,23 +8,23 @@
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore" "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore"
}, },
"dependencies": { "dependencies": {
"bulma": "^0.9.3", "bulma": "^0.9.4",
"dayjs": "^1.11.1", "dayjs": "^1.11.1",
"dotenv": "^16.0.0", "dotenv": "^16.0.0",
"express": "^4.18.1", "express": "^4.18.1",
"highcharts": "^10.1.0", "highcharts": "^10.1.0",
"mongodb": "^4.5.0", "mongodb": "^4.5.0",
"sass": "^1.51.0", "sass": "^1.53.0",
"vue": "^3.2.33", "vue": "^3.2.37",
"vue-router": "^4.0.14" "vue-router": "^4.1.2"
}, },
"devDependencies": { "devDependencies": {
"@rushstack/eslint-patch": "^1.1.0", "@rushstack/eslint-patch": "^1.1.4",
"@vitejs/plugin-vue": "^2.3.1", "@vitejs/plugin-vue": "^3.0.0",
"@vue/eslint-config-prettier": "^7.0.0", "@vue/eslint-config-prettier": "^7.0.0",
"eslint": "^8.5.0", "eslint": "^8.19.0",
"eslint-plugin-vue": "^8.2.0", "eslint-plugin-vue": "^9.2.0",
"prettier": "^2.5.1", "prettier": "^2.7.1",
"vite": "^2.9.5" "vite": "^3.0.0"
} }
} }

13
src/components/Chart.vue
View File

@@ -5,7 +5,7 @@
</div> </div>
</template> </template>
<script> <script>
import { ref, watch, toRefs, nextTick } from 'vue' import { ref, watch, toRefs, nextTick, onMounted } from 'vue'
import Highcharts from 'highcharts' import Highcharts from 'highcharts'
import 'highcharts/css/highcharts.scss' import 'highcharts/css/highcharts.scss'
import Loader from '@/components/Loader.vue' import Loader from '@/components/Loader.vue'
@@ -37,7 +37,6 @@ export default {
try { try {
const [start, end] = [window.value.getStart(), window.value.getEnd()] const [start, end] = [window.value.getStart(), window.value.getEnd()]
const sample = Math.round((end - start) / 60 / 288) || 1 const sample = Math.round((end - start) / 60 / 288) || 1
console.log(import.meta.env.MODE)
const host = import.meta.env.MODE === 'development' ? 'http://localhost:3000' : '' const host = import.meta.env.MODE === 'development' ? 'http://localhost:3000' : ''
const fetchUrl = `${host}/type/${typeApi[type.value]}/startDate/${start}/endDate/${end}/sample/${sample}` const fetchUrl = `${host}/type/${typeApi[type.value]}/startDate/${start}/endDate/${end}/sample/${sample}`
const response = await fetch(fetchUrl) const response = await fetch(fetchUrl)
@@ -87,8 +86,14 @@ export default {
fetchData() fetchData()
} }
}) })
watch(data, () => { onMounted(() => {
nextTick(() => renderChart()) watch(
data,
() => {
if (data.value.length > 0) nextTick(() => renderChart())
},
{ immediate: true }
)
}) })
return { return {
loading, loading,