pdkj
/
lcny-admin-mobile-vue
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: pdkj:d1c7d2741ad46cb2c93bbe6e17320fd527e02824
Branches Tags
pdkj:wechat
pdkj:master
pdkj:develop
...
compare: pdkj:7ad6449812df891361ec4e859d880675d8a87f2e
Branches Tags
pdkj:wechat
pdkj:master
pdkj:develop

3 Commits
d1c7d2741a ... 7ad6449812

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
Show Stats Expand all files Collapse all files

2
dist/build/h5/index.html vendored
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)')) <!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>

2
dist/build/h5/static/js/index.eabbf6b4.js → dist/build/h5/static/js/index.b5bd8dbe.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/build/h5/static/js/pages-estate-estate-materiels.2f0e0613.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/build/h5/static/js/pages-estate-estate-materiels.92e2e579.js vendored 100644
View File

File diff suppressed because one or more lines are too long

4
dist/build/h5/static/js/pages-index-insecticidal-lamp.123e52ca.js → dist/build/h5/static/js/pages-index-insecticidal-lamp.87f96d1b.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/build/h5/static/js/pages-index-meteorological.b1a6ecc7.js → dist/build/h5/static/js/pages-index-meteorological.dbabbca4.js vendored
View File

File diff suppressed because one or more lines are too long

3
dist/build/h5/static/js/pages-index-pests.abd7f050.js vendored 100644
View File

File diff suppressed because one or more lines are too long

3
dist/build/h5/static/js/pages-index-pests.c8e1f01c.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/build/h5/static/js/pages-index-soil-monitoring.82a5d37b.js → dist/build/h5/static/js/pages-index-soil-monitoring.8a5cab8e.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/build/h5/static/js/pages-index-water-quality.dcb0378f.js → dist/build/h5/static/js/pages-index-water-quality.8b633a3b.js vendored
View File

File diff suppressed because one or more lines are too long

4
src/pages/estate/estate-materiels.vue
View File

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

3
src/pages/index/components/pests-chart.vue
View File

@ -9,6 +9,7 @@
<view class="h-80vh flex-center"> <view class="h-80vh flex-center">
<view class="w-full"> <view class="w-full">
<qiun-data-charts <qiun-data-charts
:loadingType="loadingType"
type="column" type="column"
:opts="opts" :opts="opts"
:chartData="chartData" :chartData="chartData"
@ -29,6 +30,7 @@ export default {
}, },
data() { data() {
return { return {
loadingType: 1,
filterParmas: {}, filterParmas: {},
searchFormSchema: [ searchFormSchema: [
{ {
@ -218,6 +220,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
return (this.chartData = { series: [] }) return (this.chartData = { series: [] })
} }
try { try {

4
src/pages/index/insecticidal-lamp.vue
View File

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

12
src/pages/index/meteorological.vue
View File

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

11
src/pages/index/soil-monitoring.vue
View File

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

8
src/pages/index/water-quality.vue
View File

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