Skip to content

seeta-device / deviceManage

Go to a project
Commit 3a4ea50a by 李俊
Options

fix: 调整界面

1 parent cb3bb85a
Pipeline #5855 passed
in 2 minutes 10 seconds
Inline Side-by-side
Showing with 12 additions and 4 deletions
src/views/DeviceList/deviceService/deviceServiceIndex.vue
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<!-- 必须要套一层 --> <!-- 必须要套一层 -->
<div> <div>
<template v-for="(item, index) in row.tags"> <template v-for="(item, index) in row.tags">
<el-tag v-if="[0, 1].indexOf(index) !== -1" :key="index" class="label label-primary table-label">{{ simplify(item, 3) }}</el-tag> <el-tag v-if="[0, 1].indexOf(index) !== -1" :key="index" class="label label-primary">{{ simplify(item, 3) }}</el-tag>
</template> </template>
<span v-if="(row.tags && row.tags.length) > 10">共: {{(row.tags && row.tags.length) ? row.tags.length : 0}} 条</span> <span v-if="(row.tags && row.tags.length) > 10">共: {{(row.tags && row.tags.length) ? row.tags.length : 0}} 条</span>
</div> </div>
......
src/views/DeviceList/index.vue
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
<!-- 必须要套一层 --> <!-- 必须要套一层 -->
<div> <div>
<template v-for="(item, index) in row.tags"> <template v-for="(item, index) in row.tags">
<el-tag v-if="[0, 1].indexOf(index) !== -1" :key="index" class="label label-primary table-label">{{ simplify(item, 4) }}</el-tag> <el-tag v-if="[0, 1].indexOf(index) !== -1" :key="index" class="label label-primary tag-label">{{ simplify(item, 4) }}</el-tag>
</template> </template>
<span v-if="(row.tags && row.tags.length) > 10">共: {{(row.tags && row.tags.length) ? row.tags.length : 0}} 条</span> <span v-if="(row.tags && row.tags.length) > 10">共: {{(row.tags && row.tags.length) ? row.tags.length : 0}} 条</span>
</div> </div>
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
</el-tooltip> </el-tooltip>
</div> </div>
<div slot='systemSlot' slot-scope="row"> <div slot='systemSlot' slot-scope="row">
<el-tooltip class="item" effect="dark" :content="row.structure" placement="top"> <el-tooltip class="item" effect="dark" :content="row.system" placement="top">
<span>{{ simplify(row.system, 7) }}</span> <span>{{ simplify(row.system, 7) }}</span>
</el-tooltip> </el-tooltip>
</div> </div>
...@@ -492,6 +492,9 @@ export default { ...@@ -492,6 +492,9 @@ export default {
</script> </script>
<style lang="sass" scoped> <style lang="sass" scoped>
.tag-label
display: block
margin-bottom: 5px
.service-item .service-item
margin-right: 20px margin-right: 20px
.cell .cell
......
src/views/ServiceList/index.vue
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
:options="tagList" :options="tagList"
v-model="search.tags" v-model="search.tags"
@change="handleChangeSearch" @change="handleChangeSearch"
clearable
> >
</st-select> </st-select>
<span class="search-title">服务:</span> <span class="search-title">服务:</span>
...@@ -85,6 +86,7 @@ ...@@ -85,6 +86,7 @@
:options="serviceList" :options="serviceList"
v-model="search.services" v-model="search.services"
@change="handleChangeSearch" @change="handleChangeSearch"
clearable
> >
</st-select> </st-select>
</div> </div>
...@@ -140,7 +142,7 @@ ...@@ -140,7 +142,7 @@
<!-- 必须要套一层 --> <!-- 必须要套一层 -->
<div> <div>
<template v-for="(item, index) in row.tags"> <template v-for="(item, index) in row.tags">
<el-tag v-if="[0, 1].indexOf(index) !== -1" :key="index" class="label label-primary table-label">{{ simplify(item, 4) }}</el-tag> <el-tag v-if="[0, 1].indexOf(index) !== -1" :key="index" class="label label-primary tag-label">{{ simplify(item, 4) }}</el-tag>
</template> </template>
<span v-if="(row.tags && row.tags.length) > 10">共: {{(row.tags && row.tags.length) ? row.tags.length : 0}} 条</span> <span v-if="(row.tags && row.tags.length) > 10">共: {{(row.tags && row.tags.length) ? row.tags.length : 0}} 条</span>
</div> </div>
...@@ -461,6 +463,9 @@ export default { ...@@ -461,6 +463,9 @@ export default {
</script> </script>
<style lang="sass" scoped> <style lang="sass" scoped>
.tag-label
display: block
margin-bottom: 5px
.page-nav .page-nav
font-family: PingFangSC-Regular font-family: PingFangSC-Regular
font-size: 14px font-size: 14px
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!