Skip to content

Z
zhxf_vue
Commit 799fe848 authored by xiexingan's avatar xiexingan
Browse files
Options

tj

parent 30e9b1f1
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 44 deletions
src/pages/components/cardWarp.vue
View file @ 799fe848
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
:style="{ height, 'line-height': height, background: bgcolor ,'border-bottom':borderBottom ? '1px solid #ececec' :''}" :style="{ height, 'line-height': height, background: bgcolor ,'border-bottom':borderBottom ? '1px solid #ececec' :''}"
) )
div.card-title(:style="{'font-size':size+'px','font-weight':weight}") div.card-title(:style="{'font-size':size+'px','font-weight':weight}")
div {{ title }} div(:style="{'color':titleColor}") {{ title }}
slot(name="left") slot(name="left")
.slot-right(style='font-size:12px;position:absolute;right:0;') .slot-right(style='font-size:12px;position:absolute;right:0;')
slot(name="right" ) slot(name="right" )
...@@ -39,6 +39,10 @@ export default { ...@@ -39,6 +39,10 @@ export default {
borderBottom: { borderBottom: {
type: Boolean, type: Boolean,
default: true default: true
},
titleColor: {
type: String,
default: ''
} }
} }
} }
......
src/pages/ol/kanban/index.vue
View file @ 799fe848
...@@ -20,7 +20,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -20,7 +20,7 @@ el-container(style="padding: 0px; height: 77.6vh")
div(slot="content") div(slot="content")
el-row(type='flex' justify='center' ) el-row(type='flex' justify='center' )
el-col(:span='24' v-for="children in item.children") el-col(:span='24' v-for="children in item.children")
card-warp(:title="children.rightName",size='12' height="25px" weight='400' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName",size='12' height="25px" weight='400' titleColor='#193354' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
.content_warp .content_warp
div(:class="children.type") div(:class="children.type")
...@@ -35,7 +35,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -35,7 +35,7 @@ el-container(style="padding: 0px; height: 77.6vh")
div(slot="content") div(slot="content")
el-row(type='flex' justify='center' ) el-row(type='flex' justify='center' )
el-col(:span='24' v-for="children in item.children") el-col(:span='24' v-for="children in item.children")
card-warp(:title="children.rightName",size='12' height="25px" weight='400' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName",size='12' height="25px" weight='400' titleColor='#193354' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
.content_warp .content_warp
div(:class="children.type") div(:class="children.type")
...@@ -50,7 +50,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -50,7 +50,7 @@ el-container(style="padding: 0px; height: 77.6vh")
div(slot="content") div(slot="content")
el-row(type='flex' ) el-row(type='flex' )
el-col(:span='24' v-for="children in item.children") el-col(:span='24' v-for="children in item.children")
card-warp(:title="children.rightName",size='12' height="25px" weight='400' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName",size='12' height="25px" weight='400' titleColor='#193354' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
.content_warp .content_warp
div(:class="children.type") div(:class="children.type")
...@@ -65,7 +65,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -65,7 +65,7 @@ el-container(style="padding: 0px; height: 77.6vh")
div(slot="content") div(slot="content")
el-row(type='flex' ) el-row(type='flex' )
el-col(:span='24' v-for="children in item.children") el-col(:span='24' v-for="children in item.children")
card-warp(:title="children.rightName", height="25px" size='12' weight='400' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' titleColor='#193354' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
.content_warp .content_warp
div(:class="children.type") div(:class="children.type")
...@@ -80,7 +80,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -80,7 +80,7 @@ el-container(style="padding: 0px; height: 77.6vh")
div(slot="content") div(slot="content")
el-row(type='flex') el-row(type='flex')
el-col(:span='24' v-for="children in item.children") el-col(:span='24' v-for="children in item.children")
card-warp(:title="children.rightName", height="25px" size='12' weight='400' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' titleColor='#193354' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
.content_warp .content_warp
div(:class="children.type") div(:class="children.type")
...@@ -95,7 +95,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -95,7 +95,7 @@ el-container(style="padding: 0px; height: 77.6vh")
div(slot="content") div(slot="content")
el-row(type='flex' ) el-row(type='flex' )
el-col(:span='24' v-for="children in item.children") el-col(:span='24' v-for="children in item.children")
card-warp(:title="children.rightName", height="25px" size='12' weight='400' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' titleColor='#193354' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
.content_warp .content_warp
div(:class="children.type") div(:class="children.type")
...@@ -111,7 +111,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -111,7 +111,7 @@ el-container(style="padding: 0px; height: 77.6vh")
div(slot="content") div(slot="content")
el-row(type='flex' ) el-row(type='flex' )
el-col(:span='24' v-for="children in item.children") el-col(:span='24' v-for="children in item.children")
card-warp(:title="children.rightName", height="25px" size='12' weight='400' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' titleColor='#193354' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
.content_warp .content_warp
div(:class="children.type") div(:class="children.type")
...@@ -126,7 +126,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -126,7 +126,7 @@ el-container(style="padding: 0px; height: 77.6vh")
div(slot="content") div(slot="content")
el-row(type='flex' :gutter='10') el-row(type='flex' :gutter='10')
el-col(:span='24' v-for="children in item.children") el-col(:span='24' v-for="children in item.children")
card-warp(:title="children.rightName", height="25px" size='12' weight='400' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' titleColor='#193354' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
.content_warp .content_warp
div(:class="children.type") div(:class="children.type")
...@@ -143,7 +143,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -143,7 +143,7 @@ el-container(style="padding: 0px; height: 77.6vh")
div(slot="content") div(slot="content")
el-row(type='flex' :gutter='10' ) el-row(type='flex' :gutter='10' )
el-col(:span='24' v-for="children in item.children") el-col(:span='24' v-for="children in item.children")
card-warp(:title="children.rightName", height="25px" size='12' weight='400' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' titleColor='#193354' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
.content_warp .content_warp
div(:class="children.type") div(:class="children.type")
...@@ -159,7 +159,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -159,7 +159,7 @@ el-container(style="padding: 0px; height: 77.6vh")
div(slot="content") div(slot="content")
el-row(type='flex' :gutter='10' ) el-row(type='flex' :gutter='10' )
el-col(:span='24' v-for="children in item.children") el-col(:span='24' v-for="children in item.children")
card-warp(:title="children.rightName", height="25px" size='12' weight='400' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' titleColor='#193354' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
.content_warp .content_warp
div(:class="children.type") div(:class="children.type")
...@@ -174,7 +174,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -174,7 +174,7 @@ el-container(style="padding: 0px; height: 77.6vh")
div(slot="content") div(slot="content")
el-row(type='flex' ) el-row(type='flex' )
el-col(:span='24' v-for="children in item.children") el-col(:span='24' v-for="children in item.children")
card-warp(:title="children.rightName", height="25px" size='12' weight='400' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' titleColor='#193354' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
.content_warp .content_warp
div(:class="children.type") div(:class="children.type")
...@@ -189,7 +189,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -189,7 +189,7 @@ el-container(style="padding: 0px; height: 77.6vh")
div(slot="content") div(slot="content")
el-row(type='flex' ) el-row(type='flex' )
el-col(:span='24' v-for="children in item.children") el-col(:span='24' v-for="children in item.children")
card-warp(:title="children.rightName", height="25px" size='12' weight='400' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' titleColor='#193354' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
.content_warp .content_warp
div(:class="children.type") div(:class="children.type")
...@@ -206,7 +206,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -206,7 +206,7 @@ el-container(style="padding: 0px; height: 77.6vh")
div(slot="content") div(slot="content")
el-row(type='flex' :gutter='10') el-row(type='flex' :gutter='10')
el-col(:span='24' v-for="children in item.children") el-col(:span='24' v-for="children in item.children")
card-warp(:title="children.rightName", height="25px" size='12' weight='400' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' titleColor='#193354' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
.content_warp .content_warp
div(:class="children.type") div(:class="children.type")
...@@ -222,7 +222,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -222,7 +222,7 @@ el-container(style="padding: 0px; height: 77.6vh")
div(slot="content") div(slot="content")
el-row(type='flex' :gutter='10' ) el-row(type='flex' :gutter='10' )
el-col(:span='24' v-for="children in item.children") el-col(:span='24' v-for="children in item.children")
card-warp(:title="children.rightName", height="25px" size='12' weight='400' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' titleColor='#193354' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
.content_warp .content_warp
div(:class="children.type") div(:class="children.type")
...@@ -238,7 +238,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -238,7 +238,7 @@ el-container(style="padding: 0px; height: 77.6vh")
div(slot="content") div(slot="content")
el-row(type='flex' :gutter='10' ) el-row(type='flex' :gutter='10' )
el-col(:span='24' v-for="children in item.children") el-col(:span='24' v-for="children in item.children")
card-warp(:title="children.rightName", height="25px" size='12' weight='400' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' titleColor='#193354' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
.content_warp .content_warp
div(:class="children.type") div(:class="children.type")
...@@ -253,7 +253,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -253,7 +253,7 @@ el-container(style="padding: 0px; height: 77.6vh")
div(slot="content") div(slot="content")
el-row(type='flex' ) el-row(type='flex' )
el-col(:span='24' v-for="children in item.children") el-col(:span='24' v-for="children in item.children")
card-warp(:title="children.rightName", height="25px" size='12' weight='400' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' titleColor='#193354' :borderBottom='false' bgcolor='' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
.content_warp .content_warp
div(:class="children.type") div(:class="children.type")
...@@ -481,9 +481,6 @@ export default { ...@@ -481,9 +481,6 @@ export default {
if (element.id === e.resource_id) { if (element.id === e.resource_id) {
element.children.forEach((el) => { element.children.forEach((el) => {
el.value = e.water_pressure + 'MPa' el.value = e.water_pressure + 'MPa'
if (e.is_alarm === 2) {
el.type = el.type + 'h'
}
}) })
} }
}) })
...@@ -498,24 +495,12 @@ export default { ...@@ -498,24 +495,12 @@ export default {
element.children.forEach((el) => { element.children.forEach((el) => {
if (el.rightName === '温度') { if (el.rightName === '温度') {
el.value = e.temperature + '°C' el.value = e.temperature + '°C'
if (e.tp_is_alarm === 2) {
el.type = el.type + 'h'
}
} else if (el.rightName === '湿度') { } else if (el.rightName === '湿度') {
el.value = e.humidity + '%RH' el.value = e.humidity + '%RH'
if (e.hm_is_alarm === 2) {
el.type = el.type + 'h'
}
} else if (el.rightName === '一氧化碳') { } else if (el.rightName === '一氧化碳') {
el.value = e.carbon_monoxide + 'PPM' el.value = e.carbon_monoxide + 'PPM'
if (e.cm_is_alarm === 2) {
el.type = el.type + 'h'
}
} else if (el.rightName === '二氧化碳') { } else if (el.rightName === '二氧化碳') {
el.value = e.carbon_dioxide + 'PPM' el.value = e.carbon_dioxide + 'PPM'
if (e.cd_is_alarm === 2) {
el.type = el.type + 'h'
}
} }
}) })
} }
...@@ -530,9 +515,6 @@ export default { ...@@ -530,9 +515,6 @@ export default {
if (element.id === e.resource_id) { if (element.id === e.resource_id) {
element.children.forEach((el) => { element.children.forEach((el) => {
el.value = e.flow_rate + 'm3/h' el.value = e.flow_rate + 'm3/h'
if (e.fr_is_alarm === 2) {
el.type = el.type + 'h'
}
}) })
} }
}) })
...@@ -546,9 +528,6 @@ export default { ...@@ -546,9 +528,6 @@ export default {
if (element.id === e.resource_id) { if (element.id === e.resource_id) {
element.children.forEach((el) => { element.children.forEach((el) => {
el.value = e.gauge_height + 'cm' el.value = e.gauge_height + 'cm'
if (e.gh_is_alarm === 2) {
el.type = el.type + 'h'
}
}) })
} }
}) })
...@@ -562,9 +541,6 @@ export default { ...@@ -562,9 +541,6 @@ export default {
if (element.id === e.resource_id) { if (element.id === e.resource_id) {
element.children.forEach((el) => { element.children.forEach((el) => {
el.value = e.wind_speed + 'm/s' el.value = e.wind_speed + 'm/s'
if (e.ws_is_alarm === 2) {
el.type = el.type + 'h'
}
}) })
} }
}) })
...@@ -578,9 +554,6 @@ export default { ...@@ -578,9 +554,6 @@ export default {
if (element.id === e.resource_id) { if (element.id === e.resource_id) {
element.children.forEach((el) => { element.children.forEach((el) => {
el.value = e.wind_pressure + 'pa' el.value = e.wind_pressure + 'pa'
if (e.wp_is_alarm === 2) {
el.type = el.type + 'h'
}
}) })
} }
}) })
......
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