Skip to content

S
smart_gov_platform
Commit ca019dc8 authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 4f9d261c d0fc24b2
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 114 deletions
base-manager-ui/admin/src/assets/css/common.less
View file @ ca019dc8
......@@ -8,20 +8,23 @@
// 字体颜色
@clfff: #fff;
@cl999: #999;
@cl000: #000;//表头
@cl333: #333;//表体
@cl000: #000; //表头
@cl333: #333; //表体
@cl8B: #8B96A6;
@dlecl: #FA4D4C;//表格删除
@redact: #1890FF;//表格编辑
@dlecl: #FA4D4C; //表格删除
@redact: #1890FF; //表格编辑
// 按钮背景色
@addbg: linear-gradient(90deg, #5ab6ff 0%, #2e9aff 100%);//新增
@delbg: #FA4D4C;//删除
@qubg: #E1F0FE;//取消 重置
@addbg: linear-gradient(90deg, #5ab6ff 0%, #2e9aff 100%); //新增
@delbg: #FA4D4C; //删除
@qubg: #E1F0FE; //取消 重置
// 分页显示位置
.pagination{
text-align: right;
.pagination {
margin-top: 10px;
margin-right: 10px;
text-align: right;
}
/* 溢出表格滚动条 */
/* 表格 */
/*.table 为全局表格自定义样式*/
......@@ -29,21 +32,23 @@
// .ant-table-header {
// overflow-y: auto !important;
// }
.ant-table-fixed-header .ant-table-scroll .ant-table-header {
overflow: hidden!important;
margin-bottom: 0!important;
.ant-table-fixed-header .ant-table-scroll .ant-table-header {
overflow: hidden !important;
margin-bottom: 0 !important;
padding-right: 5px;
}
::-webkit-scrollbar {
width: 5px;
overflow-y: auto;
width: 5px;
overflow-y: auto;
}
::-webkit-scrollbar-thumb {
border-radius: 5px;
background-color: rgba(144, 147, 153, .5);
}
::-webkit-scrollbar-track {
border-radius: 5px;
background: #fff;
}
}
\ No newline at end of file
base-manager-ui/admin/src/pages/basicset/business/components/businessTabs1.vue
View file @ ca019dc8
......@@ -20,10 +20,9 @@
<!-- 表格 -->
<a-table
bordered
:expandIcon="expandIcon"
:loading="leftLoading"
size="middle"
:scroll="{ y: 450 }"
:scroll="{ y: 540 }"
:pagination="false"
:columns="leftColumns"
:expandIconColumnIndex="2"
......@@ -31,13 +30,17 @@
:row-selection="{ onChange: onSelectChange }"
:rowKey="(record) => record.id"
>
<template slot="num" slot-scope="text, record, index">
<template
slot="num"
v-if="record.parentId === 0"
slot-scope="text, record, index"
>
<span>
{{ (leftCurrent - 1) * leftSize + index + 1 }}
</span>
</template>
<template slot="businessName" slot-scope="text">
<div class="table-name">{{ text.businessName }}</div>
{{ text.businessName }}
</template>
<template slot="action" slot-scope="text">
<a href="javascript:;" class="edit" @click="handleEdit(text)"
......@@ -99,8 +102,7 @@
<!-- 表格 -->
<a-table
bordered
:expandIcon="expandIcon"
:scroll="{ y: 450 }"
:scroll="{ y: 540 }"
:loading="rightLoading"
:pagination="false"
size="middle"
......@@ -113,13 +115,17 @@
:data-source="businessDataList"
:rowKey="(record) => record.id"
>
<template slot="num" slot-scope="text, record, index">
<template
v-if="record.parentId === 0"
slot="num"
slot-scope="text, record, index"
>
<span>
{{ (rightCurrent - 1) * rightSize + index + 1 }}
</span>
</template>
<template slot="name" slot-scope="text">
<div class="table-name">{{ text.name }}</div>
{{ text.name }}
</template>
<template slot="action" slot-scope="text">
<a class="jion" @click="handleIn(text.id)">加入</a>
......@@ -177,6 +183,7 @@ const leftColumns = [
{
title: "业务名称",
width: "70%",
align: "left",
scopedSlots: {
customRender: "businessName",
},
......@@ -198,6 +205,7 @@ const rightColumns = [
},
{
title: "业务名称",
align: "left",
scopedSlots: {
customRender: "name",
},
......@@ -277,6 +285,7 @@ export default {
if (code === 1) {
this.leftTotal = data.pageInfo.totalResult;
this.businessData = this.delChildren(data.data);
console.log(this.businessData);
this.leftLoading = false;
}
},
......@@ -481,35 +490,35 @@ export default {
color: #67b6ff;
margin-right: 10px;
}
.ant-pagination {
margin-top: 20px;
}
// .ant-pagination {
// margin-top: 20px;
// }
.control {
width: 100%;
display: flex;
justify-content: space-between;
}
}
.table-content {
height: 500px;
}
// .table-content {
// height: 500px;
// }
.add-btn {
background-color: #04cb8f;
color: #fff;
}
.table-name {
width: 92%;
text-align: center;
display: inline-block;
}
.anticon {
font-size: 12px;
color: rgb(153, 152, 152);
cursor: pointer;
}
/deep/.ant-table-row-level-1 {
.table-name {
margin-left: 40px;
}
}
// .table-name {
// width: 92%;
// text-align: center;
// display: inline-block;
// }
// .anticon {
// font-size: 12px;
// color: rgb(153, 152, 152);
// cursor: pointer;
// }
// /deep/.ant-table-row-level-1 {
// .table-name {
// margin-left: 40px;
// }
// }
</style>
\ No newline at end of file
base-manager-ui/admin/src/pages/basicset/business/components/businessTabs2.vue
View file @ ca019dc8
......@@ -51,7 +51,7 @@
size="middle"
:loading="leftLoading"
:pagination="false"
:scroll="{ y: 450 }"
:scroll="{ y: 530 }"
:columns="leftColumns"
:data-source="matterSiteData"
:row-selection="{ onChange: onSelectChange }"
......@@ -130,7 +130,7 @@
<!-- 表格 -->
<a-table
bordered
:scroll="{ y: 450 }"
:scroll="{ y: 530 }"
:loading="rightLoading"
:pagination="false"
size="middle"
......@@ -499,9 +499,7 @@ export default {
color: #67b6ff;
margin-right: 10px;
}
.ant-pagination {
margin-top: 20px;
}
.control {
display: flex;
justify-content: space-between;
......@@ -516,7 +514,7 @@ export default {
background-color: #04cb8f;
color: #fff;
}
.table-content {
height: 500px;
}
// .table-content {
// height: 500px;
// }
</style>
\ No newline at end of file
base-manager-ui/admin/src/pages/basicset/business/components/businessTabs3.vue
View file @ ca019dc8
......@@ -25,7 +25,7 @@
size="middle"
:loading="Leftloading"
:pagination="false"
:scroll="{ y: 450 }"
:scroll="{ y: 530 }"
:columns="leftColumns"
:data-source="businessMatterData"
:row-selection="{ onChange: onSelectChange }"
......@@ -88,7 +88,7 @@
<a-table
bordered
:pagination="false"
:scroll="{ y: 450 }"
:scroll="{ y: 530 }"
:loading="rightloading"
size="middle"
:row-selection="{
......@@ -823,9 +823,9 @@ export default {
background-color: #04cb8f;
color: #fff;
}
.table-content {
height: 500px;
}
// .table-content {
// height: 500px;
// }
/deep/.ant-modal {
width: 450px !important;
}
......
base-manager-ui/admin/src/pages/basicset/deploy/deploy.vue
View file @ ca019dc8
......@@ -445,9 +445,9 @@ export default {
margin-right: 60px;
}
}
.table-content {
height: 620px;
}
// .table-content {
// height: 620px;
// }
.edit {
color: #03d76f;
margin-right: 15px;
......
base-manager-ui/admin/src/pages/basicset/dept/components/addWindowMatter.vue
View file @ ca019dc8
......@@ -406,11 +406,8 @@ export default {
}
.table-content {
margin-top: 10px;
height: 550px;
}
.ant-pagination {
margin-top: 10px;
}
.edit {
color: #03d76f;
margin-right: 10px;
......
base-manager-ui/admin/src/pages/basicset/dept/components/addwindow.vue
View file @ ca019dc8
......@@ -113,13 +113,18 @@
label="所属楼栋"
prop="building"
>
<a-input-number
<a-input
placeholder="请输入所属楼栋"
v-model.number="form.building"
>
<!-- <a-input-number
v-model="form.building"
style="width: 220px"
:min="1"
placeholder="请输入所属楼栋"
/>
<span class="tips">栋</span>
/> -->
<span slot="suffix">栋</span>
</a-input>
<!-- <a-select v-model="form.building" placeholder="请选择所属楼栋">
<a-select-option v-for="v in 10" :key="v" :value="v"
>{{ v }}栋</a-select-option
......@@ -133,13 +138,10 @@
label="所属楼层"
prop="level"
>
<a-input-number
v-model="form.level"
style="width: 220px"
:min="1"
placeholder="请输入所属楼层"
/>
<span class="tips">层</span>
<a-input placeholder="请输入所属楼栋" v-model.number="form.level">
<span slot="suffix">层</span>
</a-input>
<!-- <a-select v-model="form.level" placeholder="请选择所属楼层">
<a-select-option v-for="v in 10" :key="v" :value="v"
>{{ v }}层</a-select-option
......@@ -303,14 +305,6 @@ export default {
align-items: center !important;
margin-bottom: 15px;
}
.building-level {
position: relative;
.tips {
font-weight: 600;
position: absolute;
right: 30px;
}
}
/deep/.ant-input {
width: 100% !important;
}
......
base-manager-ui/admin/src/pages/basicset/dept/department.vue
View file @ ca019dc8
......@@ -104,7 +104,7 @@
<div class="table-content">
<!-- 表格 -->
<a-table
:scroll="{ y: 560 }"
:scroll="{ y: 580 }"
:loading="loading"
:columns="columns"
:data-source="windowData"
......@@ -714,14 +714,14 @@ export default {
flex: 1;
padding-top: 10px;
}
.ant-pagination {
margin-top: 10px;
margin-left: 10px;
margin-right: 10px;
}
.table-content {
height: 650px;
}
// .ant-pagination {
// margin-top: 10px;
// margin-left: 10px;
// margin-right: 10px;
// }
// .table-content {
// height: 650px;
// }
.department-list {
flex: 1;
padding-bottom: 10px;
......
base-manager-ui/admin/src/pages/basicset/holiday/festival.vue
View file @ ca019dc8
......@@ -31,7 +31,7 @@
:loading="loading"
:data-source="list"
:pagination="false"
:scroll="{ y: 550 }"
:scroll="{ y: 600 }"
:rowKey="(record) => record.id"
>
<a slot="name" slot-scope="text">{{ text }}</a>
......@@ -315,15 +315,10 @@ export default {
.beizhu {
margin-left: 30px;
}
.ant-pagination {
margin: 10px;
}
.btn-box {
display: flex;
justify-content: space-between;
margin-bottom: 20px;
}
.table-content {
height: 620px;
}
</style>
\ No newline at end of file
base-manager-ui/admin/src/pages/basicset/surface/AddSurfaceTemplate.vue
View file @ ca019dc8
......@@ -34,7 +34,7 @@
<a-table
bordered
size="middle"
:scroll="{ y: 450 }"
:scroll="{ y: 550 }"
:loading="leftLoading"
:pagination="false"
:columns="leftColumns"
......@@ -124,7 +124,7 @@
<!-- 表格 -->
<a-table
bordered
:scroll="{ y: 500 }"
:scroll="{ y: 550 }"
:pagination="false"
:loading="rightLoading"
size="middle"
......@@ -548,9 +548,7 @@ export default {
}
}
}
.table-content {
height: 520px;
}
.left {
width: 50%;
height: 100%;
......@@ -558,9 +556,7 @@ export default {
.right {
width: 50%;
}
.ant-pagination {
margin-top: 20px;
}
.anticon-arrow-left {
margin-right: 10px;
font-size: 20px;
......
base-manager-ui/admin/src/pages/basicset/workman/personnel.vue
View file @ ca019dc8
......@@ -635,14 +635,7 @@ export default {
margin-top: 20px;
}
}
.pagination {
margin-top: 20px;
margin-right: 10px;
}
.table-content {
height: 500px;
}
/deep/.ant-upload-list {
width: 250px;
}
......
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