Compare commits
25 Commits
| Author | SHA1 | Date |
|---|---|---|
 ihzero
|
00e6628189 | |
|
ihzero
|
be897f3391 | |
|
ihzero
|
f697ade3bf | |
|
ihzero
|
233ab2f796 | |
|
ihzero
|
88422c7fcd | |
|
ihzero
|
bce9df6b1c | |
|
ihzero
|
a0e6e4b71f | |
|
ihzero
|
3c2abc8dce | |
|
ihzero
|
5be20c15d3 | |
|
ihzero
|
7397101ece | |
|
ihzero
|
e61d287d60 | |
|
ihzero
|
2ad7021e46 | |
|
ihzero
|
a858bcea76 | |
|
ihzero
|
ff8b4998fa | |
|
ihzero
|
ca8894d99a | |
|
ihzero
|
b0d2ffbc1f | |
|
ihzero
|
5d8733f9a6 | |
|
ihzero
|
7ad6449812 | |
|
ihzero
|
49b6b23b73 | |
|
ihzero
|
d1c7d2741a | |
|
ihzero
|
4979e671d3 | |
|
ihzero
|
d7e31ac7e5 | |
|
ihzero
|
b8195da0e3 | |
|
ihzero
|
36e357cedc | |
|
ihzero
|
a70790a56e |
|
|
@ -1,3 +1,3 @@
|
||||||
ENV = 'development'
|
ENV = 'development'
|
||||||
|
|
||||||
VUE_APP_BASE_API = 'https://lcny-api.peidikeji.cn'
|
VUE_APP_BASE_API = 'https://lcny.sk797.cn'
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
ENV = 'production'
|
ENV = 'production'
|
||||||
|
|
||||||
VUE_APP_BASE_API = 'https://lcny-api.peidikeji.cn'
|
VUE_APP_BASE_API = 'https://lcny.sk797.cn'
|
||||||
|
# VUE_APP_BASE_API = 'https://lcny-api.peidikeji.cn'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
|
|
||||||
ENV = 'test'
|
ENV = 'test'
|
||||||
|
|
||||||
VUE_APP_BASE_API = 'http://lcny.sk797.cn/h5/'
|
VUE_APP_BASE_API = 'https://lcny.sk797.cn'
|
||||||
|
|
|
||||||
|
|
@ -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)'))
|
<!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.10961fd4.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="https://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="https://lcny.sk797.cn/h5/static/js/chunk-vendors.959091ef.js"></script><script src="https://lcny.sk797.cn/h5/static/js/index.1b28d926.js"></script></body></html>
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 873 B |
Binary file not shown.
|
After Width: | Height: | Size: 54 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 54 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 992 B |
Binary file not shown.
|
Before Width: | Height: | Size: 919 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1005 B |
Binary file not shown.
|
Before Width: | Height: | Size: 283 B |
Binary file not shown.
|
Before Width: | Height: | Size: 699 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 408 B |
Binary file not shown.
|
Before Width: | Height: | Size: 683 B |
Binary file not shown.
|
Before Width: | Height: | Size: 675 B |
Binary file not shown.
|
Before Width: | Height: | Size: 661 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 754 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 953 B |
Binary file not shown.
|
Before Width: | Height: | Size: 607 B |
Binary file not shown.
|
Before Width: | Height: | Size: 820 B |
Binary file not shown.
|
Before Width: | Height: | Size: 647 B |
Binary file not shown.
|
Before Width: | Height: | Size: 833 B |
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 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 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 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 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 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
|
|
@ -8,7 +8,6 @@
|
||||||
"build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build",
|
"build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build",
|
||||||
"build:custom": "cross-env NODE_ENV=production uniapp-cli custom",
|
"build:custom": "cross-env NODE_ENV=production uniapp-cli custom",
|
||||||
"build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
|
"build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
|
||||||
"build:h5:test": "cross-env NODE_ENV=test UNI_PLATFORM=h5 vue-cli-service uni-build",
|
|
||||||
"build:mp-360": "cross-env NODE_ENV=production UNI_PLATFORM=mp-360 vue-cli-service uni-build",
|
"build:mp-360": "cross-env NODE_ENV=production UNI_PLATFORM=mp-360 vue-cli-service uni-build",
|
||||||
"build:mp-alipay": "cross-env NODE_ENV=production UNI_PLATFORM=mp-alipay vue-cli-service uni-build",
|
"build:mp-alipay": "cross-env NODE_ENV=production UNI_PLATFORM=mp-alipay vue-cli-service uni-build",
|
||||||
"build:mp-baidu": "cross-env NODE_ENV=production UNI_PLATFORM=mp-baidu vue-cli-service uni-build",
|
"build:mp-baidu": "cross-env NODE_ENV=production UNI_PLATFORM=mp-baidu vue-cli-service uni-build",
|
||||||
|
|
|
||||||
|
|
@ -66,10 +66,10 @@ export default {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
isEdit() {
|
isEdit() {
|
||||||
return (!!this.$listeners.onEdit && checkPermission(this.editAuth)) || (!!this.$listeners.onEdit && this.editAuth.length==0)
|
return !!this.$listeners.onEdit && checkPermission(this.editAuth)
|
||||||
},
|
},
|
||||||
isDel() {
|
isDel() {
|
||||||
return (!!this.$listeners.onDel && checkPermission(this.delAuth)) || (!!this.$listeners.onDel && this.delAuth.length==0)
|
return !!this.$listeners.onDel && checkPermission(this.delAuth)
|
||||||
},
|
},
|
||||||
columsList() {
|
columsList() {
|
||||||
const arr = []
|
const arr = []
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@
|
||||||
"usingComponents" : true
|
"usingComponents" : true
|
||||||
},
|
},
|
||||||
"h5" : {
|
"h5" : {
|
||||||
"template" : ""
|
"template" : "",
|
||||||
// "publicPath" : "http://lcny.sk797.cn/h5/"
|
"publicPath" : "https://lcny.sk797.cn/h5/"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -77,6 +77,11 @@ export default {
|
||||||
onLoad({ id }) {
|
onLoad({ id }) {
|
||||||
this.id = id
|
this.id = id
|
||||||
this.init()
|
this.init()
|
||||||
|
window.postMessage({
|
||||||
|
even:'appbarhidden'
|
||||||
|
},{
|
||||||
|
title:'基地详情'
|
||||||
|
})
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
init() {
|
init() {
|
||||||
|
|
|
||||||
|
|
@ -3,17 +3,9 @@
|
||||||
<view class="bg-white p-30rpx">
|
<view class="bg-white p-30rpx">
|
||||||
<view class="flex justify-between items-center">
|
<view class="flex justify-between items-center">
|
||||||
<view class="text-32rpx">全市数据统计</view>
|
<view class="text-32rpx">全市数据统计</view>
|
||||||
<u-button
|
<u-button size="mini" v-auth="['endpoint.town_street.base_statistics_edit']" @click="cityEditShow = true">编辑</u-button>
|
||||||
size="mini"
|
|
||||||
v-auth="['endpoint.town_street.base_statistics_edit']"
|
|
||||||
@click="cityEditShow = true"
|
|
||||||
>编辑</u-button
|
|
||||||
>
|
|
||||||
</view>
|
</view>
|
||||||
<view
|
<view class="grid grid-cols-2 mt-20rpx" v-auth="['endpoint.town_street.base_statistics']">
|
||||||
class="grid grid-cols-2 mt-20rpx"
|
|
||||||
v-auth="['endpoint.town_street.base_statistics']"
|
|
||||||
>
|
|
||||||
<CountItem
|
<CountItem
|
||||||
v-for="(item, i) in showCityList"
|
v-for="(item, i) in showCityList"
|
||||||
:key="i"
|
:key="i"
|
||||||
|
|
@ -96,29 +88,7 @@
|
||||||
@onEdit="handleEdit"
|
@onEdit="handleEdit"
|
||||||
:colums="baseTableColums"
|
:colums="baseTableColums"
|
||||||
:data="currentData"
|
:data="currentData"
|
||||||
:editAuth="['endpoint.town_street.edit']"
|
|
||||||
>
|
>
|
||||||
<template v-slot:extends="{ data }">
|
|
||||||
<view class="w-full">
|
|
||||||
<view v-for="(item, i) in formtExtends(data)" :key="i">
|
|
||||||
<view class="flex items-center">
|
|
||||||
<view class="flex-1 flex-center">
|
|
||||||
{{ item.name }}
|
|
||||||
</view>
|
|
||||||
<view class="flex-1">
|
|
||||||
<u-cell-item
|
|
||||||
v-for="(va, ii) in item.value"
|
|
||||||
:key="ii"
|
|
||||||
:title="va.year"
|
|
||||||
:value="va.value"
|
|
||||||
:arrow="false"
|
|
||||||
></u-cell-item>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<u-line></u-line>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</template>
|
|
||||||
</BaseTablePopup>
|
</BaseTablePopup>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -128,8 +98,6 @@ import cuPopup from '@/components/cu-popup/index.vue'
|
||||||
import CountEdit from './components/town-count-edit.vue'
|
import CountEdit from './components/town-count-edit.vue'
|
||||||
import BaseTablePopup from '@/components/base-table/popup.vue'
|
import BaseTablePopup from '@/components/base-table/popup.vue'
|
||||||
import CityEdit from './components/town-city-edit'
|
import CityEdit from './components/town-city-edit'
|
||||||
import checkPermission from '@/utils/permission.js'
|
|
||||||
import { concat } from 'lodash-es'
|
|
||||||
const filterCityCount = [
|
const filterCityCount = [
|
||||||
'city_data_chart_nongye',
|
'city_data_chart_nongye',
|
||||||
'city_data_chart_yuye',
|
'city_data_chart_yuye',
|
||||||
|
|
@ -137,28 +105,6 @@ const filterCityCount = [
|
||||||
'city_data_chart_lingye',
|
'city_data_chart_lingye',
|
||||||
'city_data_chart_activity',
|
'city_data_chart_activity',
|
||||||
]
|
]
|
||||||
const defaultData = {
|
|
||||||
chart_nongye: {
|
|
||||||
label: '统计数据-农业',
|
|
||||||
unit: '万元',
|
|
||||||
},
|
|
||||||
chart_yuye: {
|
|
||||||
label: '统计数据-渔业',
|
|
||||||
unit: '万元',
|
|
||||||
},
|
|
||||||
chart_xumuye: {
|
|
||||||
label: '统计数据-畜牧业',
|
|
||||||
unit: '万元',
|
|
||||||
},
|
|
||||||
chart_lingye: {
|
|
||||||
label: '统计数据-林业',
|
|
||||||
unit: '万元',
|
|
||||||
},
|
|
||||||
chart_activity: {
|
|
||||||
label: '统计数据-其他',
|
|
||||||
unit: '万元',
|
|
||||||
},
|
|
||||||
}
|
|
||||||
const baseTableColums = [
|
const baseTableColums = [
|
||||||
{
|
{
|
||||||
title: '街镇名称',
|
title: '街镇名称',
|
||||||
|
|
@ -184,10 +130,6 @@ const baseTableColums = [
|
||||||
title: '街镇描述',
|
title: '街镇描述',
|
||||||
dataIndex: 'description',
|
dataIndex: 'description',
|
||||||
},
|
},
|
||||||
{
|
|
||||||
title: '统计数据',
|
|
||||||
dataIndex: 'extends',
|
|
||||||
},
|
|
||||||
]
|
]
|
||||||
import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js'
|
import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js'
|
||||||
export default {
|
export default {
|
||||||
|
|
@ -205,23 +147,20 @@ export default {
|
||||||
(item) => !filterCityCount.includes(item.slug)
|
(item) => !filterCityCount.includes(item.slug)
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
options() {
|
|
||||||
return [
|
|
||||||
{
|
|
||||||
text: '编辑',
|
|
||||||
style: {
|
|
||||||
backgroundColor: '#007aff',
|
|
||||||
},
|
|
||||||
permission: ['endpoint.town_street.edit'],
|
|
||||||
},
|
|
||||||
].filter((e) => checkPermission(e.permission))
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
baseTablePopupShow: false,
|
baseTablePopupShow: false,
|
||||||
baseTableColums,
|
baseTableColums,
|
||||||
cityItemShow: false,
|
cityItemShow: false,
|
||||||
|
options: [
|
||||||
|
{
|
||||||
|
text: '编辑',
|
||||||
|
style: {
|
||||||
|
backgroundColor: '#007aff',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
cityList: [],
|
cityList: [],
|
||||||
cityEditShow: false,
|
cityEditShow: false,
|
||||||
dataList: [],
|
dataList: [],
|
||||||
|
|
@ -245,48 +184,6 @@ export default {
|
||||||
this.getCityData()
|
this.getCityData()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
isObject(val) {
|
|
||||||
return Object.prototype.toString.call(val) === '[object Object]'
|
|
||||||
},
|
|
||||||
isArray(val) {
|
|
||||||
return Object.prototype.toString.call(val) === '[object Array]'
|
|
||||||
},
|
|
||||||
formtExtends({ value }) {
|
|
||||||
const defaultObj = value
|
|
||||||
const tempData = Object.keys(defaultObj).reduce((pre, cur) => {
|
|
||||||
const currentData = defaultData[cur]
|
|
||||||
const obj = {
|
|
||||||
name: currentData.label,
|
|
||||||
unit: currentData.unit,
|
|
||||||
slug: cur,
|
|
||||||
}
|
|
||||||
const extend = defaultObj[cur]
|
|
||||||
if (this.isObject(extend) || this.isArray(extend)) {
|
|
||||||
const temp = []
|
|
||||||
|
|
||||||
if (Object.keys(extend).length === 0) {
|
|
||||||
temp.push({
|
|
||||||
value: '',
|
|
||||||
year: null,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const key in extend) {
|
|
||||||
temp.push({
|
|
||||||
value: extend[key],
|
|
||||||
year: key,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
return concat(pre, {
|
|
||||||
...obj,
|
|
||||||
isMore: true,
|
|
||||||
value: temp,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}, [])
|
|
||||||
return tempData ?? []
|
|
||||||
},
|
|
||||||
handleEdit(e) {
|
handleEdit(e) {
|
||||||
this.currentData = e
|
this.currentData = e
|
||||||
this.baseTablePopupShow = false
|
this.baseTablePopupShow = false
|
||||||
|
|
|
||||||
|
|
@ -443,38 +443,11 @@
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
onLoad() {
|
onLoad() {
|
||||||
this.getSupplier();
|
|
||||||
this.getProject();
|
|
||||||
this.queryDataList();
|
this.queryDataList();
|
||||||
this.getDeviceTypes();
|
this.getDeviceTypes();
|
||||||
this.getAgriculturalBasic();
|
this.getAgriculturalBasic();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
getSupplier(){
|
|
||||||
this.$http.get('/api/keywords',{params:{
|
|
||||||
type_key:'device-supplier'
|
|
||||||
}}).then(({data})=>{
|
|
||||||
this.supplierlist=data.data.map(e=>{
|
|
||||||
return {
|
|
||||||
label:e.name,
|
|
||||||
value:e.key
|
|
||||||
}
|
|
||||||
})
|
|
||||||
console.log(this.supplierlist);
|
|
||||||
})
|
|
||||||
},
|
|
||||||
getProject(){
|
|
||||||
this.$http.get('/api/keywords',{params:{
|
|
||||||
type_key:'device-project'
|
|
||||||
}}).then(({data})=>{
|
|
||||||
this.projectlist=data.data.map(e=>{
|
|
||||||
return {
|
|
||||||
label:e.name,
|
|
||||||
value:e.key
|
|
||||||
}
|
|
||||||
})
|
|
||||||
})
|
|
||||||
},
|
|
||||||
queryBtn(){
|
queryBtn(){
|
||||||
this.list = [];
|
this.list = [];
|
||||||
this.queryDataList(true);
|
this.queryDataList(true);
|
||||||
|
|
|
||||||
|
|
@ -219,7 +219,7 @@ export default {
|
||||||
},
|
},
|
||||||
async getData() {
|
async getData() {
|
||||||
if (!this.filterParmas.device_id) {
|
if (!this.filterParmas.device_id) {
|
||||||
// this.$u.toast('没有关联基地')
|
this.$u.toast('没有关联基地')
|
||||||
this.loadingType = 0
|
this.loadingType = 0
|
||||||
return (this.chartData = { series: [] })
|
return (this.chartData = { series: [] })
|
||||||
}
|
}
|
||||||
|
|
@ -239,19 +239,15 @@ export default {
|
||||||
xAxis.push(key)
|
xAxis.push(key)
|
||||||
seriesData.push(resData[key])
|
seriesData.push(resData[key])
|
||||||
})
|
})
|
||||||
// const max = Math.max(seriesData)
|
const max = Math.max(...seriesData)
|
||||||
// console.log(seriesData);
|
|
||||||
// if (max > 5) {
|
|
||||||
// let maxN = Math.ceil(max / 5) * 5
|
|
||||||
// maxN = maxN === 0 ? 5 : maxN
|
|
||||||
// console.log(maxN);
|
|
||||||
// this.opts.yAxis.data[0].max = 100
|
|
||||||
// this.opts.yAxis.data[0].min = 0
|
|
||||||
// } else {
|
|
||||||
// console.log(max);
|
|
||||||
// this.opts.yAxis.splitNumber = max
|
|
||||||
// }
|
|
||||||
|
|
||||||
|
if (max > 5) {
|
||||||
|
let maxN = Math.ceil(max / 5) * 5
|
||||||
|
maxN = maxN === 0 ? 5 : maxN
|
||||||
|
this.opts.yAxis.data[0].max = maxN
|
||||||
|
} else {
|
||||||
|
this.opts.yAxis.splitNumber = max
|
||||||
|
}
|
||||||
|
|
||||||
let res = {
|
let res = {
|
||||||
categories: xAxis,
|
categories: xAxis,
|
||||||
|
|
|
||||||
|
|
@ -150,8 +150,8 @@ export default {
|
||||||
async getData(e) {
|
async getData(e) {
|
||||||
if (!e.device_id) {
|
if (!e.device_id) {
|
||||||
this.mescroll.endByPage(0, 0)
|
this.mescroll.endByPage(0, 0)
|
||||||
// this.$u.toast('没有关联基地')
|
|
||||||
return
|
return this.$u.toast('没有关联基地')
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
const { data } = await http.get(
|
const { data } = await http.get(
|
||||||
|
|
|
||||||
|
|
@ -8,26 +8,20 @@
|
||||||
></image>
|
></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="content-box">
|
<view class="content-box">
|
||||||
<view class="menus-section" v-for="(menu, index) in menus" :key="index">
|
<view
|
||||||
<view class="title-t" v-if="menu.parent && menu.children.length > 0"
|
class="menus-section"
|
||||||
|
v-for="(menu, index) in menus"
|
||||||
|
:key="index"
|
||||||
|
>
|
||||||
|
<view class="title-t" v-if="menu.parent && menu.children.length>0"
|
||||||
>{{ menu.parent }}-{{ menu.label }}</view
|
>{{ menu.parent }}-{{ menu.label }}</view
|
||||||
>
|
>
|
||||||
<view class="title-t" v-if="!menu.parent && menu.children.length > 0">{{
|
<view class="title-t" v-if="!menu.parent && menu.children.length>0">{{ menu.label }}</view>
|
||||||
menu.label
|
|
||||||
}}</view>
|
|
||||||
<view class="menu-ul">
|
<view class="menu-ul">
|
||||||
<view class="menu-li" v-for="(cdm, i) in menu.children" :key="i">
|
<view class="menu-li" v-for="(cdm, i) in menu.children" :key="i">
|
||||||
<view class="menu_item" @click="linknavFn(cdm)">
|
<view class="menu_item" @click="linknavFn(cdm)">
|
||||||
<view class="menu_item_content">
|
<view class="icon"></view>
|
||||||
<view class="icon">
|
<view class="name">{{ cdm.label }}</view>
|
||||||
<image
|
|
||||||
class="icon_img"
|
|
||||||
v-if="cdm.icon"
|
|
||||||
:src="require(`@/static/img/${cdm.icon}`)"
|
|
||||||
></image>
|
|
||||||
</view>
|
|
||||||
<view class="name">{{ cdm.label }}</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -50,43 +44,36 @@ export default {
|
||||||
label: '气象监测',
|
label: '气象监测',
|
||||||
url: '/pages/index/meteorological',
|
url: '/pages/index/meteorological',
|
||||||
permission: 'endpoint.weather.index',
|
permission: 'endpoint.weather.index',
|
||||||
icon: 'moon-cloudy-line.png',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '智能监控',
|
label: '智能监控',
|
||||||
url: '/pages/index/monitor',
|
url: '/pages/index/monitor',
|
||||||
permission: 'endpoint.camera.index',
|
permission: 'endpoint.camera.index',
|
||||||
icon: 'live-line.png',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '土壤监控',
|
label: '土壤监控',
|
||||||
url: '/pages/index/soil-monitoring',
|
url: '/pages/index/soil-monitoring',
|
||||||
permission: 'endpoint.soil.index',
|
permission: 'endpoint.soil.index',
|
||||||
icon: 'map-pin-range-line.png',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '水质监控',
|
label: '水质监控',
|
||||||
url: '/pages/index/water-quality',
|
url: '/pages/index/water-quality',
|
||||||
permission: 'endpoint.water.index',
|
permission: 'endpoint.water.index',
|
||||||
icon: 'contrast-drop-line.png',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '昆虫性诱监测',
|
label: '昆虫性诱监测',
|
||||||
url: '/pages/index/insect-monitors',
|
url: '/pages/index/insect-monitors',
|
||||||
permission: 'endpoint.insect.index',
|
permission: 'endpoint.insect.index',
|
||||||
icon: 'bug-line.png',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '虫情监测',
|
label: '虫情监测',
|
||||||
url: '/pages/index/pests',
|
url: '/pages/index/pests',
|
||||||
permission: 'endpoint.worm_statics.index',
|
permission: 'endpoint.worm_statics.index',
|
||||||
icon: 'bug-2-line.png',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '杀虫灯检测',
|
label: '杀虫灯检测',
|
||||||
url: '/pages/index/insecticidal-lamp',
|
url: '/pages/index/insecticidal-lamp',
|
||||||
permission: 'endpoint.insecticidal_lamp.index',
|
permission: 'endpoint.insecticidal_lamp.index',
|
||||||
icon: 'alarm-warning-line.png',
|
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|
@ -98,19 +85,16 @@ export default {
|
||||||
label: '城镇数据',
|
label: '城镇数据',
|
||||||
url: '/pages/basics/town-base',
|
url: '/pages/basics/town-base',
|
||||||
permission: 'endpoint.town_street.index',
|
permission: 'endpoint.town_street.index',
|
||||||
icon: 'building-4-line.png',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '基地数据',
|
label: '基地数据',
|
||||||
url: '/pages/basics/basics-base',
|
url: '/pages/basics/basics-base',
|
||||||
permission: 'endpoint.agricultural_basic.index',
|
permission: 'endpoint.agricultural_basic.index',
|
||||||
icon: 'home-4-line.png',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '基地概况',
|
label: '基地概况',
|
||||||
url: '/pages/basics/profile',
|
url: '/pages/basics/profile',
|
||||||
permission: 'endpoint.agricultural_base_overview.index',
|
permission: 'endpoint.agricultural_base_overview.index',
|
||||||
icon: 'home-3-line.png',
|
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|
@ -122,13 +106,11 @@ export default {
|
||||||
label: '城镇农作物',
|
label: '城镇农作物',
|
||||||
url: '/pages/crop/town-crop',
|
url: '/pages/crop/town-crop',
|
||||||
permission: 'endpoint.town_crops.index',
|
permission: 'endpoint.town_crops.index',
|
||||||
icon: 'plant-line.png',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '基地农作物',
|
label: '基地农作物',
|
||||||
url: '/pages/crop/basics-crop',
|
url: '/pages/crop/basics-crop',
|
||||||
permission: 'endpoint.crops.index',
|
permission: 'endpoint.crops.index',
|
||||||
icon: 'leaf-line.png',
|
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|
@ -140,13 +122,11 @@ export default {
|
||||||
label: '城镇产量',
|
label: '城镇产量',
|
||||||
url: '/pages/yield/town-yield',
|
url: '/pages/yield/town-yield',
|
||||||
permission: 'endpoint.town_crops_output.index',
|
permission: 'endpoint.town_crops_output.index',
|
||||||
icon: 'box-1-line.png',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '基地产量',
|
label: '基地产量',
|
||||||
url: '/pages/yield/basics-yield',
|
url: '/pages/yield/basics-yield',
|
||||||
permission: 'endpoint.crops_output.index',
|
permission: 'endpoint.crops_output.index',
|
||||||
icon: 'instance-line.png',
|
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|
@ -158,31 +138,26 @@ export default {
|
||||||
label: '稻虾价格',
|
label: '稻虾价格',
|
||||||
url: '/pages/estate/estate-price',
|
url: '/pages/estate/estate-price',
|
||||||
permission: 'endpoint.rice_shrimp_prices.index',
|
permission: 'endpoint.rice_shrimp_prices.index',
|
||||||
icon: 'price-tag-3-line.png',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '稻虾每周价格',
|
label: '稻虾每周价格',
|
||||||
url: '/pages/estate/estate-week-price',
|
url: '/pages/estate/estate-week-price',
|
||||||
permission: 'endpoint.rice_shrimp_weekly_prices.index',
|
permission: 'endpoint.rice_shrimp_weekly_prices.index',
|
||||||
icon: 'price-tag-2-line.png',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '稻虾产业',
|
label: '稻虾产业',
|
||||||
url: '/pages/estate/estate-industry',
|
url: '/pages/estate/estate-industry',
|
||||||
permission: 'endpoint.rice_shrimp_industries.index',
|
permission: 'endpoint.rice_shrimp_industries.index',
|
||||||
icon: 'collage-line.png',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '稻虾流向',
|
label: '稻虾流向',
|
||||||
url: '/pages/estate/estate-flows',
|
url: '/pages/estate/estate-flows',
|
||||||
permission: 'endpoint.rice_shrimp_flows.index',
|
permission: 'endpoint.rice_shrimp_flows.index',
|
||||||
icon: 'flow-chart.png',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '大宗物资',
|
label: '大宗物资',
|
||||||
url: '/pages/estate/estate-materiels',
|
url: '/pages/estate/estate-materiels',
|
||||||
permission: 'endpoint.materiels.index',
|
permission: 'endpoint.materiels.index',
|
||||||
icon: 'shopping-basket-2-line.png',
|
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|
@ -193,13 +168,11 @@ export default {
|
||||||
label: '设备管理',
|
label: '设备管理',
|
||||||
url: '/pages/device/index',
|
url: '/pages/device/index',
|
||||||
permission: 'endpoint.device.index',
|
permission: 'endpoint.device.index',
|
||||||
icon: 'robot-2-line.png',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '警报明细',
|
label: '警报明细',
|
||||||
url: '/pages/device/warning',
|
url: '/pages/device/warning',
|
||||||
permission: 'endpoint.warnings.index',
|
permission: 'endpoint.warnings.index',
|
||||||
icon: 'feedback-line.png',
|
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|
@ -208,12 +181,10 @@ export default {
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...mapGetters(['userInfo']),
|
...mapGetters(['userInfo']),
|
||||||
menus() {
|
menus(){
|
||||||
return this.filterAsyncRoutes(
|
|
||||||
this.menuList,
|
return this.filterAsyncRoutes(this.menuList, this.userInfo?.permissions_slug ?? [])
|
||||||
this.userInfo?.permissions_slug ?? []
|
}
|
||||||
)
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
onLoad() {},
|
onLoad() {},
|
||||||
methods: {
|
methods: {
|
||||||
|
|
@ -251,11 +222,11 @@ export default {
|
||||||
.banner-section {
|
.banner-section {
|
||||||
.banner_img {
|
.banner_img {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 427rpx;
|
height: 280rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.index-page {
|
.index-page {
|
||||||
background-color: #EEEBFE;
|
background-color: #f8f8f8;
|
||||||
.content-box {
|
.content-box {
|
||||||
padding-top: 30rpx;
|
padding-top: 30rpx;
|
||||||
padding-bottom: 150rpx;
|
padding-bottom: 150rpx;
|
||||||
|
|
@ -268,7 +239,7 @@ export default {
|
||||||
.title-t {
|
.title-t {
|
||||||
margin-bottom: 24rpx;
|
margin-bottom: 24rpx;
|
||||||
padding: 0 10rpx;
|
padding: 0 10rpx;
|
||||||
font-size: 34rpx;
|
font-size: 28rpx;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -280,40 +251,16 @@ export default {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
padding: 0 10rpx;
|
padding: 0 10rpx;
|
||||||
margin-bottom: 18rpx;
|
margin-bottom: 18rpx;
|
||||||
|
|
||||||
.menu_item {
|
.menu_item {
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
border-radius: 8rpx;
|
box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.15);
|
||||||
|
min-height: 90rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
padding: 10rpx 15rpx;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
padding-top: 100%;
|
|
||||||
position: relative;
|
|
||||||
.menu_item_content {
|
|
||||||
position: absolute;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
bottom: 0;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: center;
|
|
||||||
padding-top: 24%;
|
|
||||||
.icon {
|
|
||||||
width: 40rpx;
|
|
||||||
height: 40rpx;
|
|
||||||
.icon_img {
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.name{
|
|
||||||
font-size: 24rpx;
|
|
||||||
margin-top: 14rpx;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -149,8 +149,7 @@ export default {
|
||||||
},
|
},
|
||||||
async getData(e) {
|
async getData(e) {
|
||||||
if (!e.device_id) {
|
if (!e.device_id) {
|
||||||
// this.$u.toast('没有关联基地')
|
return this.$u.toast('没有关联基地')
|
||||||
return
|
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
const { data } = await http.get(
|
const { data } = await http.get(
|
||||||
|
|
|
||||||
|
|
@ -193,8 +193,7 @@ export default {
|
||||||
this.chatList = []
|
this.chatList = []
|
||||||
if (!this.filterParmas.device_id){
|
if (!this.filterParmas.device_id){
|
||||||
this.loadingType = 0
|
this.loadingType = 0
|
||||||
// this.$u.toast('没有关联基地')
|
return this.$u.toast('没有关联基地')
|
||||||
return
|
|
||||||
}
|
}
|
||||||
const { data } = await http.get('/api/monitoring-data', {
|
const { data } = await http.get('/api/monitoring-data', {
|
||||||
params: this.filterParmas,
|
params: this.filterParmas,
|
||||||
|
|
|
||||||
|
|
@ -415,8 +415,7 @@
|
||||||
let _data = data.data;
|
let _data = data.data;
|
||||||
if(_data.length==0){
|
if(_data.length==0){
|
||||||
this.loadingType = 0
|
this.loadingType = 0
|
||||||
// this.$u.toast('没有关联基地');
|
return this.$u.toast('没有关联基地');
|
||||||
return
|
|
||||||
}
|
}
|
||||||
for(let item of _data){
|
for(let item of _data){
|
||||||
item['label'] = item.name;
|
item['label'] = item.name;
|
||||||
|
|
|
||||||
|
|
@ -544,8 +544,7 @@ export default {
|
||||||
let _data = data.data
|
let _data = data.data
|
||||||
if(_data.length==0){
|
if(_data.length==0){
|
||||||
this.loading = 'nomore'
|
this.loading = 'nomore'
|
||||||
// this.$u.toast('没有关联基地')
|
return this.$u.toast('没有关联基地')
|
||||||
return
|
|
||||||
}
|
}
|
||||||
for (let item of _data) {
|
for (let item of _data) {
|
||||||
item['label'] = item.name
|
item['label'] = item.name
|
||||||
|
|
|
||||||
|
|
@ -186,25 +186,6 @@
|
||||||
/>
|
/>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- PH -->
|
|
||||||
<view class="chart_section" v-if="chart_ph.isShow">
|
|
||||||
<view class="top_box">
|
|
||||||
<view class="tit">PH<text class="unit"></text></view>
|
|
||||||
<view class="name">{{addressName}}</view>
|
|
||||||
</view>
|
|
||||||
<view class="mb-20rpx">
|
|
||||||
<u-line></u-line>
|
|
||||||
</view>
|
|
||||||
<view class="cart_box">
|
|
||||||
<qiun-data-charts
|
|
||||||
v-if="loadingType!=0"
|
|
||||||
:loadingType="loadingType"
|
|
||||||
type="area"
|
|
||||||
:opts="opts"
|
|
||||||
:chartData="chart_ph"
|
|
||||||
/>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</template>
|
</template>
|
||||||
</view>
|
</view>
|
||||||
<!-- 设置预警值 -->
|
<!-- 设置预警值 -->
|
||||||
|
|
@ -289,7 +270,6 @@
|
||||||
chart_k:{},//氮
|
chart_k:{},//氮
|
||||||
chart_n:{},//磷
|
chart_n:{},//磷
|
||||||
chart_p:{},//钾
|
chart_p:{},//钾
|
||||||
chart_ph:{},//ph
|
|
||||||
//筛选
|
//筛选
|
||||||
q_start_time:'',
|
q_start_time:'',
|
||||||
q_end_time:'',
|
q_end_time:'',
|
||||||
|
|
@ -323,7 +303,6 @@
|
||||||
n:'磷',
|
n:'磷',
|
||||||
p:'钾',
|
p:'钾',
|
||||||
k:'氮',
|
k:'氮',
|
||||||
ph:'PH'
|
|
||||||
},
|
},
|
||||||
keyToUnit:{
|
keyToUnit:{
|
||||||
temperature:'℃',
|
temperature:'℃',
|
||||||
|
|
@ -332,7 +311,6 @@
|
||||||
n:'mg/kg',
|
n:'mg/kg',
|
||||||
p:'mg/kg',
|
p:'mg/kg',
|
||||||
k:'mg/kg',
|
k:'mg/kg',
|
||||||
ph:''
|
|
||||||
},
|
},
|
||||||
numberToString:{
|
numberToString:{
|
||||||
1:'Ⅰ',
|
1:'Ⅰ',
|
||||||
|
|
@ -466,8 +444,7 @@
|
||||||
let _data = data.data;
|
let _data = data.data;
|
||||||
if(_data.length==0){
|
if(_data.length==0){
|
||||||
this.loadingType = 0
|
this.loadingType = 0
|
||||||
// this.$u.toast('没有关联基地');
|
return this.$u.toast('没有关联基地');
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for(let item of _data){
|
for(let item of _data){
|
||||||
|
|
@ -645,7 +622,6 @@
|
||||||
//end 磷 n
|
//end 磷 n
|
||||||
//start 钾 p
|
//start 钾 p
|
||||||
let res6 = {
|
let res6 = {
|
||||||
isShow:!!chartInfo.p,
|
|
||||||
categories: chartInfo.p.categories,
|
categories: chartInfo.p.categories,
|
||||||
series: [
|
series: [
|
||||||
{
|
{
|
||||||
|
|
@ -658,23 +634,6 @@
|
||||||
this.chart_p = JSON.parse(JSON.stringify(res6));
|
this.chart_p = JSON.parse(JSON.stringify(res6));
|
||||||
//end 钾 p
|
//end 钾 p
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//start ph
|
|
||||||
let res7 = {
|
|
||||||
isShow:!!chartInfo.ph,
|
|
||||||
categories: chartInfo.ph?.categories,
|
|
||||||
series: [
|
|
||||||
{
|
|
||||||
name:'PH',
|
|
||||||
legendShape:'circle',
|
|
||||||
data: chartInfo.ph?.data,
|
|
||||||
}
|
|
||||||
]
|
|
||||||
};
|
|
||||||
this.chart_ph = JSON.parse(JSON.stringify(res7));
|
|
||||||
//end ph
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}).catch(()=>{
|
}).catch(()=>{
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -164,24 +164,6 @@
|
||||||
/>
|
/>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- 氨氮 -->
|
|
||||||
<view class="chart_section" v-if="chart_nh3n">
|
|
||||||
<view class="top_box">
|
|
||||||
<view class="tit">氨氮<text class="unit">mg/L</text></view>
|
|
||||||
<view class="name">{{ addressName }}</view>
|
|
||||||
</view>
|
|
||||||
<view class="mb-20rpx">
|
|
||||||
<u-line></u-line>
|
|
||||||
</view>
|
|
||||||
<view class="cart_box">
|
|
||||||
<qiun-data-charts
|
|
||||||
:loadingType="loadingType"
|
|
||||||
type="area"
|
|
||||||
:opts="opts"
|
|
||||||
:chartData="chart_nh3n"
|
|
||||||
/>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<!-- PH -->
|
<!-- PH -->
|
||||||
<view class="chart_section" v-if="chart_ph">
|
<view class="chart_section" v-if="chart_ph">
|
||||||
<view class="top_box">
|
<view class="top_box">
|
||||||
|
|
@ -255,7 +237,6 @@
|
||||||
</view>
|
</view>
|
||||||
<scroll-view class="scroll-y" scroll-y="true">
|
<scroll-view class="scroll-y" scroll-y="true">
|
||||||
<view class="form_cont">
|
<view class="form_cont">
|
||||||
|
|
||||||
<u-form v-for="(info, k) in formInfo" :key="k">
|
<u-form v-for="(info, k) in formInfo" :key="k">
|
||||||
<view class="title2 u-border-bottom">{{ keyToName[k] }}</view>
|
<view class="title2 u-border-bottom">{{ keyToName[k] }}</view>
|
||||||
<u-form-item
|
<u-form-item
|
||||||
|
|
@ -353,7 +334,6 @@ export default {
|
||||||
chart_conductivity: {}, //电导率
|
chart_conductivity: {}, //电导率
|
||||||
chart_chlorine: {}, //氯
|
chart_chlorine: {}, //氯
|
||||||
chart_oxygen: {}, //氧气
|
chart_oxygen: {}, //氧气
|
||||||
chart_nh3n: {}, //氨氮
|
|
||||||
chart_ph: {}, //PH
|
chart_ph: {}, //PH
|
||||||
chart_temperature: {}, //温度
|
chart_temperature: {}, //温度
|
||||||
chart_turbidity: {}, //浊度
|
chart_turbidity: {}, //浊度
|
||||||
|
|
@ -388,7 +368,6 @@ export default {
|
||||||
conductivity: '电导率',
|
conductivity: '电导率',
|
||||||
chlorine: '氯',
|
chlorine: '氯',
|
||||||
oxygen: '氧气',
|
oxygen: '氧气',
|
||||||
nh3n: '氨氮',
|
|
||||||
ph: 'PH',
|
ph: 'PH',
|
||||||
turbidity: '浊度',
|
turbidity: '浊度',
|
||||||
},
|
},
|
||||||
|
|
@ -397,7 +376,6 @@ export default {
|
||||||
conductivity: 'us/cm',
|
conductivity: 'us/cm',
|
||||||
chlorine: 'mg/L',
|
chlorine: 'mg/L',
|
||||||
oxygen: 'mg/L',
|
oxygen: 'mg/L',
|
||||||
nh3n: 'mg/L',
|
|
||||||
ph: '',
|
ph: '',
|
||||||
turbidity: 'NTU',
|
turbidity: 'NTU',
|
||||||
},
|
},
|
||||||
|
|
@ -536,8 +514,7 @@ export default {
|
||||||
let _data = data.data
|
let _data = data.data
|
||||||
if (_data.length == 0) {
|
if (_data.length == 0) {
|
||||||
this.loadingType = 0
|
this.loadingType = 0
|
||||||
// this.$u.toast('没有关联基地')
|
return this.$u.toast('没有关联基地')
|
||||||
return
|
|
||||||
}
|
}
|
||||||
for (let item of _data) {
|
for (let item of _data) {
|
||||||
item['label'] = item.name
|
item['label'] = item.name
|
||||||
|
|
@ -700,23 +677,6 @@ export default {
|
||||||
}else{
|
}else{
|
||||||
this.chart_oxygen = null
|
this.chart_oxygen = null
|
||||||
}
|
}
|
||||||
//start 氨氮 nh3n
|
|
||||||
if (chartInfo.nh3n) {
|
|
||||||
let res7 = {
|
|
||||||
categories: chartInfo.nh3n.categories,
|
|
||||||
series: [
|
|
||||||
{
|
|
||||||
name: '氨氮',
|
|
||||||
legendShape: 'circle',
|
|
||||||
data: chartInfo.nh3n.data,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}
|
|
||||||
|
|
||||||
this.chart_nh3n = JSON.parse(JSON.stringify(res7))
|
|
||||||
}else{
|
|
||||||
this.chart_nh3n = null
|
|
||||||
}
|
|
||||||
//end 氧气
|
//end 氧气
|
||||||
//start PH
|
//start PH
|
||||||
if (chartInfo.ph) {
|
if (chartInfo.ph) {
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 873 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 54 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 992 B |
Binary file not shown.
|
Before Width: | Height: | Size: 919 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1005 B |
Binary file not shown.
|
Before Width: | Height: | Size: 283 B |
Binary file not shown.
|
Before Width: | Height: | Size: 699 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 408 B |
Binary file not shown.
|
Before Width: | Height: | Size: 683 B |
Binary file not shown.
|
Before Width: | Height: | Size: 675 B |
Binary file not shown.
|
Before Width: | Height: | Size: 661 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 754 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 953 B |
Binary file not shown.
|
Before Width: | Height: | Size: 607 B |
Binary file not shown.
|
Before Width: | Height: | Size: 820 B |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue