Compare commits

..

No commits in common. "659e43e814f6f864c91278478d5717e95ffbaef6" and "038c35e6f2cfc199e0660c629d2da02c0c80248f" have entirely different histories.

6 changed files with 3 additions and 82 deletions

View File

@ -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="/static/index.97465e7b.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script src="/static/js/chunk-vendors.959091ef.js"></script><script src="/static/js/index.89f12c7d.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="/static/index.97465e7b.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script src="/static/js/chunk-vendors.959091ef.js"></script><script src="/static/js/index.f33bff14.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

View File

@ -8,17 +8,6 @@
<u-line></u-line>
</view>
<view class="py-20rpx">
<u-tabs
:list="desList"
bar-height="4"
height="50"
font-size="28"
gutter="18"
:current="current"
@change="changeTab"
></u-tabs>
</view>
<view class="pb-20rpx">
<qiun-data-charts
:loadingType="loadingType"
type="area"
@ -32,39 +21,6 @@
<script>
import QiunDataCharts from '@/components/qiun-data-charts/qiun-data-charts.vue'
import { http } from '@/api/index.js'
const desList = [
{
key: 'turbidity',
unit: 'NTU',
name: '浊度',
},
{
key: 'chlorine',
unit: 'mg/L',
name: '余氯',
},
{
key: 'ph',
unit: 'PH',
name: 'PH值',
},
{
key: 'temperature',
unit: '℃',
name: '温度',
},
{
key: 'oxygen',
unit: 'mg/L',
name: '溶解氧',
},
{
key: 'conductivity',
unit: 'uS/cm',
name: '电导率',
},
]
export default {
props: {
baseId: {
@ -74,8 +30,6 @@ export default {
components: { QiunDataCharts },
data() {
return {
desList,
current: 0,
loadingType: 1,
opts: {
dataLabel: false, //
@ -99,26 +53,16 @@ export default {
},
}
},
computed: {
currentTab() {
return this.desList[this.current]
},
},
mounted() {
this.init()
},
methods: {
changeTab(e) {
this.current = e
this.init()
},
async init() {
try {
const { data } = await http.get('/api/device-base-data-statics', {
params: {
base_id: this.baseId,
device_type: 3,
device_column: this.currentTab.key,
},
})
const resData = data.data

View File

@ -8,17 +8,6 @@
<u-line></u-line>
</view>
<view class="py-20rpx">
<u-tabs
:list="desList"
bar-height="4"
height="50"
font-size="28"
gutter="18"
:current="current"
@change="changeTab"
></u-tabs>
</view>
<view class="pb-20rpx">
<qiun-data-charts
:loadingType="loadingType"
type="area"
@ -73,8 +62,6 @@ export default {
components: { QiunDataCharts },
data() {
return {
desList,
current: 0,
loadingType: 1,
opts: {
dataLabel: false, //
@ -98,26 +85,16 @@ export default {
},
}
},
computed: {
currentTab() {
return this.desList[this.current]
},
},
mounted() {
this.init()
},
methods: {
changeTab(e) {
this.current = e
this.init()
},
async init() {
try {
const { data } = await http.get('/api/device-base-data-statics', {
params: {
base_id: this.baseId,
device_type: 2,
device_column: this.currentTab.key,
},
})
const resData = data.data