Former-commit-id: d00cd16829c46835158e3fcabb0ac2fb2a3b506d
TangShanKaiPing
zhengpengju 5 years ago
parent 035f1143e9
commit c49c249452

@ -1218,4 +1218,12 @@ a.weui-btn:visited .weui-btn_primary{
}
.ir button{
}
}
.grayscale{
-webkit-filter: grayscale(100%);
-moz-filter: grayscale(100%);
-ms-filter: grayscale(100%);
-o-filter: grayscale(100%);
filter: grayscale(100%);
filter: gray;
}

@ -8,6 +8,8 @@
<link rel="stylesheet" href="lib/weui/weui.min.css">
<link rel="stylesheet" href="css/weui.ext.css">
<link rel="stylesheet" href="css/app.css?v0.1.0.2002250904">
<link rel="apple-touch-icon" sizes="76x76" href="icon-76.png">
<link rel="apple-touch-icon" sizes="152x152" href="icon-76@2x.png">
<title>物联管控</title>
</head>
<body>
@ -22,7 +24,7 @@
</div>
</div>
<script>
var version = '0.1.0.202004291146'; // 版本信息全局变量
var version = '0.1.0.202005091640'; // 版本信息全局变量
</script>
<script src="js/config.js?v=0.1.0.202004281125"></script>
<script src="lib/linq/linq.min.js"></script>

@ -3,8 +3,7 @@
<div class="weui-tab__content">
<div class="weui-header">
<div class="weui-header-left"> <a class="icon icon-109" style="color:#fff" href="javascript:" v-on:click="closeWindow()">关闭</a> </div>
<h1 class="weui-header-title">消息({{store.state.messages.length}})</h1>
<div class="weui-header-right"><a class="icon"><img src="/images/more.svg" style="width:20px"></a></div>
<h1 class="weui-header-title">消息({{store.state.messages.length < 99 ? store.state.messages.length : '99+' }})</h1>
</div>
<div class="center page-bd main">
<div id="empty-msg" style="width:20%; margin: 30% 40%;" v-if="!store.state.messages.length">

@ -45,7 +45,9 @@
</a>
</div>
</div>
<canvas class="chart" style="width:60%;max-width:100%;" :id="device.number+'-'+data.key"></canvas>
<div>
<canvas class="chart" style="width:60%;max-width:100%;height:150px" :id="device.number+'-'+data.key"></canvas>
</div>
</div>
</div>
</div>

@ -30,10 +30,12 @@
},
// 实例生命周期钩子 (销毁完毕)
destroyed: function () {
console.log('destroyed:');
store.commit('setDevice', null);
},
methods: {
updateChart: function () {
console.log('updateChart:');
var dataList = Enumerable.from(this.device.data).where(function (o) {
return o.type === 10 || o.type === 20;
}).toArray();
@ -42,8 +44,10 @@
}
},
changeTime: function (key, time,title) {
console.log('changeTime:');
var vm = this;
var url = '/IoTCenter/api/v1/Device/GetChartData';
var t = (new Date()).valueOf();
var url = '/IoTCenter/api/v1/Device/GetChartData?t=' + t;
var data = {
number:this.device.number,
key: key,
@ -59,7 +63,8 @@
console.log(error);
});
},
UpdateChartInternal(key, data,title) {
UpdateChartInternal(key, data, title) {
console.log('UpdateChartInternal:');
var canvas = document.getElementById(this.device.number + '-' + key);
var chart;
Chart.helpers.each(Chart.instances, function (instance) {
@ -67,12 +72,16 @@
chart = instance;
}
});
if (chart) {
console.log('chart:', chart);
if (chart === '') {
chart.data = data;
chart.update();
}
else {
else {
var ctx = canvas.getContext('2d');
// ctx.canvas.height = 150;
console.log('canvas.getContext:', ctx);
var options = {
responsive: true,
legend: {
@ -84,8 +93,27 @@
},
animation: {
duration: 0
}
},
/*
scales: {
yAxes: [{
display: true,
gridLines: {
color: "rgb(210,210,211)"
},
ticks: {
min: 0,
stepSize: 500,
beginAtZero: true,
padding: 20,
callback: function(value, index, values) {
return value;
}
}
}]
}*/
};
chart = new Chart(ctx, {
type: 'line',
data: data,

@ -9,7 +9,8 @@
<div class="row" v-if="product">
<router-link v-for="device in product.devices" :to="{path:'/pages/iot/device',query:{number:device.number}}" class="col-lg-3 col-md-4 col-sm-6 p-3">
<div class="weui-grid__icon">
<img :src="product.image.replace('.png', '.svg')" />
<img v-if="product.name === '一路开关' && device.data[0].value === '关'" :src="product.image.replace('.png', '.svg')" class="grayscale" />
<img v-if="(product.name !== '一路开关') || (device.data[0].value !== '关')" :src="product.image.replace('.png', '.svg')" />
</div>
<p class="weui-grid__label">{{device.displayName}}</p>
</router-link>

Loading…
Cancel
Save