Browse Source

feat:修改地址不是必填项,和tooltip的位置

master
zhaobing’ 1 year ago
parent
commit
0d0b06fef4
  1. 3
      weapp/package/deviceBigdataGraph/statusDetail/statusDetail.js
  2. 16
      weapp/package/report/report.js

3
weapp/package/deviceBigdataGraph/statusDetail/statusDetail.js

@ -5,7 +5,8 @@ const moment = require("../../../utils/moment");
function setOption(chart, data1, data2,xdata) {
const option = {
tooltip: {
trigger: 'item'
trigger: 'item',
position:['50%','50%']
},
legend: {
data:['设备故障率', '设备完好率'],

16
weapp/package/report/report.js

@ -197,14 +197,14 @@ Page({
templateData
} = that.data;
let alarm = false;
if (!address) {
wx.showToast({
title: '请获取当前位置',
icon: 'none',
duration: 1500
})
return;
}
// if (!address) {
// wx.showToast({
// title: '请获取当前位置',
// icon: 'none',
// duration: 1500
// })
// return;
// }
if (!structListIndex) {
wx.showToast({
title: '请选择结构物',

Loading…
Cancel
Save