Skip to content

Z
zhxf_vue
Commit fff7f13f authored by co_dengxiongwen's avatar co_dengxiongwen
Browse files
Options

Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/zhxf_vue into dev

parents 7bd7876a 7176c9a0
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 36 deletions
src/pages/components/cardWarp.vue
View file @ fff7f13f
...@@ -3,11 +3,10 @@ ...@@ -3,11 +3,10 @@
.card-header( .card-header(
:style="{ height, 'line-height': height, background: bgcolor }" :style="{ height, 'line-height': height, background: bgcolor }"
) )
span.card-title(:style="{'font-size':size+'px','font-weight':weight}") {{ title }} div.card-title(:style="{'font-size':size+'px','font-weight':weight}")
div(style="margin-left: 20px;color:#3A648A;") div {{ title }}
slot(name="left") slot(name="left")
span(style='font-size:12px;') slot(name="right" style='font-size:12px;position:absolute;right:0;')
slot(name="right")
.card-content .card-content
slot(name="content") slot(name="content")
</template> </template>
...@@ -26,7 +25,7 @@ export default { ...@@ -26,7 +25,7 @@ export default {
}, },
bgcolor: { bgcolor: {
type: String, type: String,
default: '#f2faff' default: '#b7e4ff'
}, },
size: { size: {
type: String, type: String,
...@@ -47,18 +46,17 @@ export default { ...@@ -47,18 +46,17 @@ export default {
.card-header { .card-header {
display: flex; display: flex;
justify-content: space-between; // justify-content: space-between;
padding: 0 10px; padding: 0 5px;
border-bottom: 1px solid #ececec; border-bottom: 1px solid #ececec;
.card-title { .card-title {
display: flex; display: flex;
justify-content: center; width: 100%;
align-items: center; position: relative;
font-size: 15px;
} }
} }
.card-content { .card-content {
margin: 10px; margin: 8px;
} }
} }
</style> </style>
src/pages/ol/kanban/index.vue
View file @ fff7f13f
...@@ -5,21 +5,22 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -5,21 +5,22 @@ el-container(style="padding: 0px; height: 77.6vh")
) )
span.title-bold span.title-bold
el-select(v-model="mapId" size="mini" @change="handleChange") el-select(v-model="mapId" size="mini" @change="handleChange")
el-option(v-for="(item,index) in mapList" :key="index" :label="item.stationName=='全部'?item.stationName:item.stationName +' - '+item.name" :value="item.id") el-option(v-for="(item,index) in mapList" :key="index" :label="item.stationName=='全部'?item.stationName:item.stationName +'-'+item.name" :value="item.id")
el-main.box_main el-main.box_main
div( style="margin-bottom: 20px") div( style="margin-bottom: 20px")
el-row(v-if="this.mapId==''" :gutter='20') el-row(v-if="this.mapId==''" :gutter='10')
el-col(:span='24' v-if='dataList[0]' style="margin-bottom: 20px") el-col(:span='24' v-if='dataList[0]' style="margin-bottom: 20px")
card-warp(:title="dataList[0].name", height="35px") card-warp(:title="dataList[0].name", height="35px")
div(slot="content") div(slot="content")
el-row(type='flex' justify='center' :gutter='20' ) el-row(type='flex' justify='center' :gutter='10' )
el-col(:span='3' v-for="item in dataList[0].list") el-col(:span='3' v-for="item in dataList[0].list")
card-warp(:title="item.resourceName",size='13' height="30px" weight='550') card-warp(:title="item.resourceName",size='12' height="30px" weight='550')
span( slot="right" style='transform:scale(.9)') B3栋-负一层加压送风机房
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' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName",size='12' height="25px" weight='400' 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")
...@@ -28,7 +29,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -28,7 +29,7 @@ el-container(style="padding: 0px; height: 77.6vh")
el-col(:span='24' v-if='dataList[1]' style="margin-bottom: 20px") el-col(:span='24' v-if='dataList[1]' style="margin-bottom: 20px")
card-warp(:title="dataList[1].name", height="35px") card-warp(:title="dataList[1].name", height="35px")
div(slot="content") div(slot="content")
el-row(type='flex' justify='center' :gutter='20' ) el-row(type='flex' justify='center' :gutter='10' )
el-col(:span='12' v-for="item in dataList[1].list") el-col(:span='12' v-for="item in dataList[1].list")
card-warp(:title="item.resourceName", height="30px" size='13' weight='550') card-warp(:title="item.resourceName", height="30px" size='13' weight='550')
div(slot="content") div(slot="content")
...@@ -43,7 +44,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -43,7 +44,7 @@ el-container(style="padding: 0px; height: 77.6vh")
el-col(:span='6' v-if='dataList[2]' style="margin-bottom: 20px") el-col(:span='6' v-if='dataList[2]' style="margin-bottom: 20px")
card-warp(:title="dataList[2].name", height="35px") card-warp(:title="dataList[2].name", height="35px")
div(slot="content") div(slot="content")
el-row(type='flex' justify='center' :gutter='20' ) el-row(type='flex' justify='center' :gutter='10' )
el-col(:span='12' v-for="item in dataList[2].list") el-col(:span='12' v-for="item in dataList[2].list")
card-warp(:title="item.resourceName", height="30px" size='13' weight='550') card-warp(:title="item.resourceName", height="30px" size='13' weight='550')
div(slot="content") div(slot="content")
...@@ -58,7 +59,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -58,7 +59,7 @@ el-container(style="padding: 0px; height: 77.6vh")
el-col(:span='10' v-if='dataList[3]' style="margin-bottom: 20px") el-col(:span='10' v-if='dataList[3]' style="margin-bottom: 20px")
card-warp(:title="dataList[3].name", height="35px") card-warp(:title="dataList[3].name", height="35px")
div(slot="content") div(slot="content")
el-row(type='flex' justify='center' :gutter='20' ) el-row(type='flex' justify='center' :gutter='10' )
el-col(:span='24' v-for="item in dataList[3].list") el-col(:span='24' v-for="item in dataList[3].list")
card-warp(:title="item.resourceName", height="30px" size='13' weight='550') card-warp(:title="item.resourceName", height="30px" size='13' weight='550')
div(slot="content") div(slot="content")
...@@ -100,7 +101,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -100,7 +101,7 @@ el-container(style="padding: 0px; height: 77.6vh")
div(:class="children.type") div(:class="children.type")
div.value(:style="{color:children.over?'red':'#10cc2e'}") {{ children.value }} div.value(:style="{color:children.over?'red':'#10cc2e'}") {{ children.value }}
.scope {{ children.scope }} .scope {{ children.scope }}
el-row(v-if="mapId=='a417aed5969149eab43e56d18f75fd23'" :gutter='20') el-row(v-if="mapId=='a417aed5969149eab43e56d18f75fd23'" :gutter='10')
el-col(:span='4' v-if='dataList[0]' style="margin-bottom: 20px") el-col(:span='4' v-if='dataList[0]' style="margin-bottom: 20px")
card-warp(:title="dataList[0].name", height="35px") card-warp(:title="dataList[0].name", height="35px")
div(slot="content") div(slot="content")
...@@ -123,7 +124,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -123,7 +124,7 @@ el-container(style="padding: 0px; height: 77.6vh")
el-col(:span='24' v-for="item in dataList[0].list") el-col(:span='24' v-for="item in dataList[0].list")
card-warp(:title="item.resourceName", height="30px" size='13' weight='550') card-warp(:title="item.resourceName", height="30px" size='13' weight='550')
div(slot="content") div(slot="content")
el-row(type='flex' :gutter='20') 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' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
...@@ -140,7 +141,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -140,7 +141,7 @@ el-container(style="padding: 0px; height: 77.6vh")
el-col(:span='24' v-for="item in dataList[0].list") el-col(:span='24' v-for="item in dataList[0].list")
card-warp(:title="item.resourceName", height="30px" size='13' weight='550') card-warp(:title="item.resourceName", height="30px" size='13' weight='550')
div(slot="content") div(slot="content")
el-row(type='flex' :gutter='20' ) 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' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
...@@ -148,15 +149,15 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -148,15 +149,15 @@ el-container(style="padding: 0px; height: 77.6vh")
div(:class="children.type") div(:class="children.type")
div.value(:style="{color:children.over?'red':'#10cc2e'}") {{ children.value }} div.value(:style="{color:children.over?'red':'#10cc2e'}") {{ children.value }}
.scope {{ children.scope }} .scope {{ children.scope }}
el-row(v-if="mapId=='1cfdb9eaaeda4204a40b072406f07b19'" :gutter='20') el-row(v-if="mapId=='1cfdb9eaaeda4204a40b072406f07b19'" :gutter='10')
el-col(:span='16' v-if='dataList[0]' style="margin-bottom: 20px") el-col(:span='16' v-if='dataList[0]' style="margin-bottom: 20px")
card-warp(:title="dataList[0].name", height="35px") card-warp(:title="dataList[0].name", height="35px")
div(slot="content") div(slot="content")
el-row(type='flex' justify='center' :gutter='20') el-row(type='flex' justify='center' :gutter='10')
el-col(:span='24' v-for="item in dataList[0].list") el-col(:span='24' v-for="item in dataList[0].list")
card-warp(:title="item.resourceName", height="30px" size='13' weight='550') card-warp(:title="item.resourceName", height="30px" size='13' weight='550')
div(slot="content") div(slot="content")
el-row(type='flex' :gutter='20' ) 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' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
...@@ -167,7 +168,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -167,7 +168,7 @@ el-container(style="padding: 0px; height: 77.6vh")
el-col(:span='6' v-if='dataList[1]' style="margin-bottom: 20px") el-col(:span='6' v-if='dataList[1]' style="margin-bottom: 20px")
card-warp(:title="dataList[1].name", height="35px") card-warp(:title="dataList[1].name", height="35px")
div(slot="content") div(slot="content")
el-row(type='flex' justify='center' :gutter='20') el-row(type='flex' justify='center' :gutter='10')
el-col(:span='24' v-for="item in dataList[1].list") el-col(:span='24' v-for="item in dataList[1].list")
card-warp(:title="item.resourceName", height="30px" size='13' weight='550') card-warp(:title="item.resourceName", height="30px" size='13' weight='550')
div(slot="content") div(slot="content")
...@@ -182,7 +183,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -182,7 +183,7 @@ el-container(style="padding: 0px; height: 77.6vh")
el-col(:span='6' v-if='dataList[2]' style="margin-bottom: 20px") el-col(:span='6' v-if='dataList[2]' style="margin-bottom: 20px")
card-warp(:title="dataList[2].name", height="35px") card-warp(:title="dataList[2].name", height="35px")
div(slot="content") div(slot="content")
el-row(type='flex' justify='center' :gutter='20') el-row(type='flex' justify='center' :gutter='10')
el-col(:span='12' v-for="item in dataList[2].list") el-col(:span='12' v-for="item in dataList[2].list")
card-warp(:title="item.resourceName", height="30px" size='13' weight='550') card-warp(:title="item.resourceName", height="30px" size='13' weight='550')
div(slot="content") div(slot="content")
...@@ -194,15 +195,15 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -194,15 +195,15 @@ el-container(style="padding: 0px; height: 77.6vh")
div(:class="children.type") div(:class="children.type")
div.value(:style="{color:children.over?'red':'#10cc2e'}") {{ children.value }} div.value(:style="{color:children.over?'red':'#10cc2e'}") {{ children.value }}
.scope {{ children.scope }} .scope {{ children.scope }}
el-row(v-if="mapId=='019826466e324c64a8e34d575c709883'" :gutter='20') el-row(v-if="mapId=='019826466e324c64a8e34d575c709883'" :gutter='10')
el-col(:span='12' v-if='dataList[0]' style="margin-bottom: 20px") el-col(:span='12' v-if='dataList[0]' style="margin-bottom: 20px")
card-warp(:title="dataList[0].name", height="35px" :gutter='20') card-warp(:title="dataList[0].name", height="35px" :gutter='10')
div(slot="content") div(slot="content")
el-row(type='flex' justify='center' ) el-row(type='flex' justify='center' )
el-col(:span='24' v-for="item in dataList[0].list") el-col(:span='24' v-for="item in dataList[0].list")
card-warp(:title="item.resourceName", height="30px" size='13' :gutter='20' weight='550') card-warp(:title="item.resourceName", height="30px" size='13' :gutter='10' weight='550')
div(slot="content") div(slot="content")
el-row(type='flex' :gutter='20') 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' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
...@@ -210,7 +211,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -210,7 +211,7 @@ el-container(style="padding: 0px; height: 77.6vh")
div(:class="children.type") div(:class="children.type")
div.value(:style="{color:children.over?'red':'#10cc2e'}") {{ children.value }} div.value(:style="{color:children.over?'red':'#10cc2e'}") {{ children.value }}
.scope {{ children.scope }} .scope {{ children.scope }}
el-row(v-if="mapId=='a3324eec06b14e889a7f1aa429bedf21'" :gutter='20') el-row(v-if="mapId=='a3324eec06b14e889a7f1aa429bedf21'" :gutter='10')
el-col(:span='16' v-if='dataList[0]' style="margin-bottom: 20px") el-col(:span='16' v-if='dataList[0]' style="margin-bottom: 20px")
card-warp(:title="dataList[0].name", height="35px") card-warp(:title="dataList[0].name", height="35px")
div(slot="content") div(slot="content")
...@@ -218,7 +219,7 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -218,7 +219,7 @@ el-container(style="padding: 0px; height: 77.6vh")
el-col(:span='24' v-for="item in dataList[0].list") el-col(:span='24' v-for="item in dataList[0].list")
card-warp(:title="item.resourceName", height="30px" size='13' weight='550') card-warp(:title="item.resourceName", height="30px" size='13' weight='550')
div(slot="content") div(slot="content")
el-row(type='flex' :gutter='20' ) 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' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
...@@ -226,15 +227,15 @@ el-container(style="padding: 0px; height: 77.6vh") ...@@ -226,15 +227,15 @@ el-container(style="padding: 0px; height: 77.6vh")
div(:class="children.type") div(:class="children.type")
div.value(:style="{color:children.over?'red':'#10cc2e'}") {{ children.value }} div.value(:style="{color:children.over?'red':'#10cc2e'}") {{ children.value }}
.scope {{ children.scope }} .scope {{ children.scope }}
el-row(v-if="mapId=='1ba71eca3bbf499c98380d240f28f9eb'" :gutter='20') el-row(v-if="mapId=='1ba71eca3bbf499c98380d240f28f9eb'" :gutter='10')
el-col(:span='4' v-if='dataList[0]' style="margin-bottom: 20px") el-col(:span='4' v-if='dataList[0]' style="margin-bottom: 20px")
card-warp(:title="dataList[0].name", height="35px") card-warp(:title="dataList[0].name", height="35px")
div(slot="content") div(slot="content")
el-row(type='flex' justify='center' :gutter='20') el-row(type='flex' justify='center' :gutter='10')
el-col(:span='24' v-for="item in dataList[0].list") el-col(:span='24' v-for="item in dataList[0].list")
card-warp(:title="item.resourceName", height="30px" size='13' weight='550') card-warp(:title="item.resourceName", height="30px" size='13' weight='550')
div(slot="content") div(slot="content")
el-row(type='flex' :gutter='20' ) 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' style='width:185px;margin:0 auto;') card-warp(:title="children.rightName", height="25px" size='12' weight='400' style='width:185px;margin:0 auto;')
div(slot="content") div(slot="content")
......
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