Compare commits
No commits in common. "df66a052b34956fb94c665dd227467269b7f0a4d" and "136afba1b14eebad4fdab6c11efd0a11799a32d8" have entirely different histories.
df66a052b3
...
136afba1b1
|
|
@ -1,3 +1,3 @@
|
|||
ENV = 'development'
|
||||
|
||||
VUE_APP_BASE_API = 'http://lcny.sk797.cn'
|
||||
VUE_APP_BASE_API = ''
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
ENV = 'production'
|
||||
|
||||
VUE_APP_BASE_API = 'http://36.133.205.221:81'
|
||||
VUE_APP_BASE_API = ''
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
|
||||
ENV = 'test'
|
||||
|
||||
VUE_APP_BASE_API = ''
|
||||
|
||||
VUE_APP_BASE_API = 'http://lcny.sk797.cn/h5/'
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
<!DOCTYPE html><html lang="zh-CN"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><title></title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
|
||||
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel="stylesheet" href="http://lcny.sk797.cn/h5/static/index.97465e7b.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script src="http://lcny.sk797.cn/h5/static/js/chunk-vendors.6e372103.js"></script><script src="http://lcny.sk797.cn/h5/static/js/index.cd5f72a2.js"></script></body></html>
|
||||
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel="stylesheet" href="http://lcny.sk797.cn/h5/static/index.97465e7b.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script src="http://lcny.sk797.cn/h5/static/js/chunk-vendors.6e372103.js"></script><script src="http://lcny.sk797.cn/h5/static/js/index.c123915a.js"></script></body></html>
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
|
|
@ -1,10 +1,9 @@
|
|||
import Request from './luch-request/index.js'
|
||||
import jwt from './jwt.js'
|
||||
import { toast } from '@/com/utils.js'
|
||||
|
||||
const baseApi = process.env.VUE_APP_BASE_API;
|
||||
//测试地址
|
||||
// const baseApi = 'http://lcny.sk797.cn';
|
||||
// const baseApi = 'http://36.133.205.221:81';
|
||||
const baseApi = 'http://lcny.sk797.cn';
|
||||
const http = new Request();
|
||||
|
||||
http.setConfig((config) => { /* 设置全局配置 */
|
||||
|
|
|
|||
|
|
@ -144,10 +144,8 @@ export default {
|
|||
rotateAngle: 30,
|
||||
},
|
||||
yAxis: {
|
||||
min: 1,
|
||||
data: [
|
||||
{
|
||||
tofix: 1,
|
||||
min: 0,
|
||||
},
|
||||
],
|
||||
|
|
@ -221,7 +219,7 @@ export default {
|
|||
}
|
||||
)
|
||||
const { data: resData } = data
|
||||
|
||||
|
||||
const xAxis = []
|
||||
const seriesData = []
|
||||
|
||||
|
|
@ -229,10 +227,7 @@ export default {
|
|||
xAxis.push(key)
|
||||
seriesData.push(resData[key])
|
||||
})
|
||||
const max = Math.max(...seriesData)
|
||||
let maxN = Math.ceil(max / 5) * 5
|
||||
maxN = maxN === 0 ? 5 : maxN
|
||||
this.opts.yAxis.data[0].max = maxN
|
||||
|
||||
let res = {
|
||||
categories: xAxis,
|
||||
series: [
|
||||
|
|
@ -240,6 +235,7 @@ export default {
|
|||
name: '虫情统计',
|
||||
data: seriesData,
|
||||
},
|
||||
|
||||
],
|
||||
}
|
||||
this.chartData = JSON.parse(JSON.stringify(res))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<view class="login-page bg-page">
|
||||
<view class="login-page">
|
||||
<view class="img-a">
|
||||
<view class="t-b">
|
||||
隆昌农业大数据监控平台
|
||||
|
|
@ -85,7 +85,6 @@ export default {
|
|||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.login-page{
|
||||
background-color: #fff;
|
||||
.txt {
|
||||
font-size: 32rpx;
|
||||
font-weight: bold;
|
||||
|
|
|
|||
Loading…
Reference in New Issue