Compare commits

...

3 Commits

Author SHA1 Message Date
ihzero 7ad6449812 打包 2023-11-22 21:23:32 +08:00
ihzero 49b6b23b73 Merge branch 'master' into develop 2023-11-22 21:21:11 +08:00
ihzero bcceb7c34e 修改bug 2023-11-22 21:20:53 +08:00
16 changed files with 52 additions and 18 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="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.eabbf6b4.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.b5bd8dbe.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

View File

@ -523,7 +523,7 @@
this.queryDataList(true);
}
uni.showToast({ title: data.message, icon: 'none' });
uni.showToast({ title: '修改成功', icon: 'none' });
})
.catch(({data}) => {
hideLoading()
@ -536,7 +536,7 @@
if(data.code==200){
this.queryDataList(true);
this.editShow = false;
uni.showToast({ title: data.message, icon: 'none' });
uni.showToast({ title: '保存成功', icon: 'none' });
}else{
uni.showToast({ title: data.message, icon: 'none' });
}

View File

@ -9,6 +9,7 @@
<view class="h-80vh flex-center">
<view class="w-full">
<qiun-data-charts
:loadingType="loadingType"
type="column"
:opts="opts"
:chartData="chartData"
@ -29,6 +30,7 @@ export default {
},
data() {
return {
loadingType: 1,
filterParmas: {},
searchFormSchema: [
{
@ -218,6 +220,7 @@ export default {
async getData() {
if (!this.filterParmas.device_id) {
this.$u.toast('没有关联基地')
this.loadingType = 0
return (this.chartData = { series: [] })
}
try {

View File

@ -17,7 +17,7 @@
<div class="p-20rpx text-32rpx">
{{ item.lable }}
</div>
<qiun-data-charts type="area" :opts="opts" :chartData="item.chatOpt" />
<qiun-data-charts :loadingType="loadingType" type="area" :opts="opts" :chartData="item.chatOpt" />
</view>
</view>
</view>
@ -67,6 +67,7 @@ export default {
},
data() {
return {
loadingType:1,
filterParmas: {},
searchFormSchema: [
{
@ -191,6 +192,7 @@ export default {
async getData() {
this.chatList = []
if (!this.filterParmas.device_id){
this.loadingType = 0
return this.$u.toast('没有关联基地')
}
const { data } = await http.get('/api/monitoring-data', {

View File

@ -43,6 +43,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="area"
:opts="optsc"
:chartData="chart_air_temperature"
@ -57,6 +58,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="area"
:opts="opts"
:chartData="chart_air_humidity"
@ -71,6 +73,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="mix"
:opts="opts2"
:chartData="chart_illumination"
@ -85,6 +88,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="mix"
:opts="opts2"
:chartData="chart_rainfall"
@ -99,6 +103,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="area"
:opts="opts3"
:chartData="chart_wind_speed"
@ -113,6 +118,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="mix"
:opts="opts4"
:chartData="chart_wind_direction"
@ -127,6 +133,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="area"
:opts="opts3"
:chartData="chart_noise"
@ -141,6 +148,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="area"
:opts="opts3"
:chartData="chart_pm10"
@ -155,6 +163,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="area"
:opts="opts3"
:chartData="chart_pm25"
@ -169,6 +178,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="area"
:opts="opts3"
:chartData="chart_co2"
@ -187,6 +197,7 @@
components: { QiunDataCharts },
data() {
return {
loadingType:1,
optsc:{},
opts: {
dataLabel:false,//
@ -403,6 +414,7 @@
if(data.code==200){
let _data = data.data;
if(_data.length==0){
this.loadingType = 0
return this.$u.toast('没有关联基地');
}
for(let item of _data){

View File

@ -83,6 +83,7 @@
<view class="cart_box">
<qiun-data-charts
type="area"
:loadingType="loadingType"
:opts="opts"
:chartData="chart_conductivity"
/>
@ -99,6 +100,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="area"
:opts="opts"
:chartData="chart_humidity"
@ -116,6 +118,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="area"
:opts="optsc"
:chartData="chart_temperature"
@ -133,6 +136,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="area"
:opts="opts"
:chartData="chart_k"
@ -150,6 +154,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="area"
:opts="opts"
:chartData="chart_n"
@ -167,6 +172,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="area"
:opts="opts"
:chartData="chart_p"
@ -223,6 +229,7 @@
components: { QiunDataCharts },
data() {
return {
loadingType:1,
optsc:{},
opts: {
dataLabel:false,//
@ -327,7 +334,6 @@
},
//
change(val){
console.log(val);
let narray = this.deviceAddressList.filter(item=>{
return item.value==val;
})
@ -429,8 +435,10 @@
if(data.code==200){
let _data = data.data;
if(_data.length==0){
this.loadingType = 0
return this.$u.toast('没有关联基地');
}
for(let item of _data){
item['label'] = item.name;
item['value'] = item.id;
@ -458,6 +466,7 @@
if(_data.length==0){
// return this.$u.toast('');
}
let options = [];
for(let k in _data){
let item = {};

View File

@ -80,6 +80,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="area"
:opts="opts"
:chartData="chart_chlorine"
@ -97,6 +98,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="area"
:opts="opts"
:chartData="chart_conductivity"
@ -115,6 +117,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="area"
:opts="opts"
:chartData="chart_oxygen"
@ -132,6 +135,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="area"
:opts="opts"
:chartData="chart_ph"
@ -149,6 +153,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="area"
:opts="optsc"
:chartData="chart_temperature"
@ -166,6 +171,7 @@
</view>
<view class="cart_box">
<qiun-data-charts
:loadingType="loadingType"
type="area"
:opts="opts"
:chartData="chart_turbidity"
@ -222,6 +228,7 @@
components: { QiunDataCharts },
data() {
return {
loadingType:1,
optsc:{},
opts: {
dataLabel:false,//
@ -429,6 +436,7 @@
if(data.code==200){
let _data = data.data;
if(_data.length==0){
this.loadingType = 0
return this.$u.toast('没有关联基地');
}
for(let item of _data){