Commit 6876d186 authored by co_dengxiongwen's avatar co_dengxiongwen

tj

parent c4e5efad
......@@ -40,24 +40,23 @@ import chart from '@/pages/components/chart.vue'
import pie from './pie'
export default {
components: {
tablePagination,
chart,
pie
},
data () {
components: {
tablePagination,
chart,
pie
},
data() {
return {
typeList: [
typeList: [
{ name: '当日' },
{ name: '本周' },
{ name: '当月' },
{ name: '今年' }
],
currentActive: '0',
type: null,
pageSize: 10,
totalPage: 0,
type: null,
pageSize: 10,
totalPage: 0,
visible: false,
dataForm: {
name: '',
......@@ -67,11 +66,7 @@ export default {
chartList: [
{ id: '11', title: '温度', color: '#21ACFC' },
{ id: '22', title: '湿度', color: '#36CBCB' },
{ id: '33', title: '风速', color: '#3AA0FF' },
{ id: '44', title: '光照', color: '#FAD337' },
{ id: '55', title: 'CO2', color: '#4ECB74' },
{ id: '66', title: 'PM2.5', color: '#999999' },
{ id: '77', title: '辐射', color: '#975FE4' }
{ id: '33', title: 'CO2', color: '#4ECB74' }
],
data: [
['2019-8-14 8:00:00', 70],
......@@ -81,17 +76,14 @@ export default {
['2019-8-14 8:00:06', 10],
['2019-8-14 8:00:20', 31]
],
dataRule: {
name: [ { required: true, message: '不能为空', trigger: 'blur' }]
}
dataRule: {}
}
},
methods: {
init (id, type) {
this.type = type
this.dataForm.id = id
init(id, type) {
this.type = type
this.dataForm.id = id
this.visible = true
if (id) {
......@@ -110,71 +102,69 @@ export default {
})
}
},
getDataList() {
},
// 当日 ,本周
getDataList() {},
// 当日 ,本周
handleDate(i) {
this.currentActive = i
},
// 表单提交
dataFormSubmit () {
dataFormSubmit() {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
// this.$http({
// url: this.$http.adornUrlProduct(`/brandMain/${!this.dataForm.id ? 'save' : 'update'}`),
// method: 'post',
// data: this.dataForm
// }).then((data) => {
// if (data && data.code === 0) {
// this.$message({
// message: '操作成功',
// type: 'success',
// duration: 1500,
// onClose: () => {
// this.visible = false
// this.$emit('refreshdatalist')
// }
// })
// } else {
// this.$message.error(data.msg)
// }
// })
// this.$http({
// url: this.$http.adornUrlProduct(`/brandMain/${!this.dataForm.id ? 'save' : 'update'}`),
// method: 'post',
// data: this.dataForm
// }).then((data) => {
// if (data && data.code === 0) {
// this.$message({
// message: '操作成功',
// type: 'success',
// duration: 1500,
// onClose: () => {
// this.visible = false
// this.$emit('refreshdatalist')
// }
// })
// } else {
// this.$message.error(data.msg)
// }
// })
}
})
}
}
}
</script>
<style lang='scss' scoped>
<style lang="scss" scoped>
.echartsWarp {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
height: calc(100vh - 530px);
margin-bottom: 90px;
// border: 1px solid;
> div {
width: 22%;
height: calc(85% / 2);
padding: 10px 10px 0 10px;
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
.title {
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 600;
color: #000000;
line-height: 40px;
&::before {
content: "";
display: inline-block;
width: 10px;
height: 10px;
border-radius: 50%;
background: #0097ff;
margin: 0 10px;
}
}
display: flex;
justify-content: space-between;
flex-wrap: wrap;
height: calc(100vh - 530px);
margin-bottom: 90px;
// border: 1px solid;
> div {
width: 22%;
height: calc(85% / 2);
padding: 10px 10px 0 10px;
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
.title {
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 600;
color: #000000;
line-height: 40px;
&::before {
content: '';
display: inline-block;
width: 10px;
height: 10px;
border-radius: 50%;
background: #0097ff;
margin: 0 10px;
}
}
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment