Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 86c286ea fd4068de
Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 110 deletions
base-manager-ui/admin/src/pages/basicset/dept/department.vue
View file @ c6b8b131
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
type="edit" type="edit"
class="department_edit" class="department_edit"
title="编辑" title="编辑"
@click="showModal(v)" @click.stop="showModal(v)"
/> />
</a-tooltip> </a-tooltip>
<a-tooltip> <a-tooltip>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<a-icon <a-icon
type="delete" type="delete"
@click="delDepartment(v.id)" @click.stop="delDepartment(v.id)"
class="delete" class="delete"
department_del department_del
/> />
...@@ -122,11 +122,11 @@ ...@@ -122,11 +122,11 @@
</template> </template>
<!-- 所属楼栋 --> <!-- 所属楼栋 -->
<template slot="building" slot-scope="text"> <template slot="building" slot-scope="text">
<span>{{ text.building ? text.building : "--" }}</span> <span>{{ text.building ? text.building + "栋" : "--" }}</span>
</template> </template>
<!-- 所属楼层 --> <!-- 所属楼层 -->
<template slot="level" slot-scope="text"> <template slot="level" slot-scope="text">
<span>{{ text.level ? text.level : "--" }}</span> <span>{{ text.level ? text.level + "层" : "--" }}</span>
</template> </template>
<!-- 备注 --> <!-- 备注 -->
<template slot="summary" slot-scope="text"> <template slot="summary" slot-scope="text">
......
base-manager-ui/admin/src/pages/basicset/surface/calloutskin/CallOutSkin.vue
View file @ c6b8b131
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<div class="footer flex jcc aic"> <div class="footer flex jcc aic">
<div class="footer-item"> <div class="footer-item">
<p :style="{ color: filterItem('5', 0) }">当前窗口</p> <p :style="{ color: filterItem('5', 0) }">当前窗口</p>
<p class="footer-data" :style="{ color: filterItem('6', 0) }"> <p class="footer-data" :style="{ color: filterItem('7', 0) }">
A区16号 A区16号
</p> </p>
</div> </div>
...@@ -81,14 +81,14 @@ ...@@ -81,14 +81,14 @@
class="line" class="line"
:style="{ :style="{
backgroundImage: `linear-gradient(to bottom,#ccc,${filterItem( backgroundImage: `linear-gradient(to bottom,#ccc,${filterItem(
'6', '7',
0 0
)} 45%,${filterItem('6', 0)} 65%,#ccc 100% )`, )} 45%,${filterItem('7', 0)} 65%,#ccc 100% )`,
}" }"
></div> ></div>
<div class="footer-item"> <div class="footer-item">
<p :style="{ color: filterItem('5', 0) }">当前办理</p> <p :style="{ color: filterItem('5', 0) }">当前办理</p>
<p class="footer-data" :style="{ color: filterItem('6', 0) }"> <p class="footer-data" :style="{ color: filterItem('7', 0) }">
A0012 A0012
</p> </p>
</div> </div>
...@@ -96,14 +96,14 @@ ...@@ -96,14 +96,14 @@
class="line" class="line"
:style="{ :style="{
backgroundImage: `linear-gradient(to bottom,#ccc,${filterItem( backgroundImage: `linear-gradient(to bottom,#ccc,${filterItem(
'6', '7',
0 0
)} 45%,${filterItem('6', 0)} 65%,#ccc 100% )`, )} 45%,${filterItem('7', 0)} 65%,#ccc 100% )`,
}" }"
></div> ></div>
<div class="footer-item"> <div class="footer-item">
<p :style="{ color: filterItem('5', 0) }">等待办理</p> <p :style="{ color: filterItem('5', 0) }">等待办理</p>
<p class="footer-data" :style="{ color: filterItem('6', 0) }"> <p class="footer-data" :style="{ color: filterItem('7', 0) }">
<span>160</span> <span>160</span>
<span>120</span> <span>120</span>
</p> </p>
...@@ -112,14 +112,14 @@ ...@@ -112,14 +112,14 @@
class="line" class="line"
:style="{ :style="{
backgroundImage: `linear-gradient(to bottom,#ccc,${filterItem( backgroundImage: `linear-gradient(to bottom,#ccc,${filterItem(
'6', '7',
0 0
)} 45%,${filterItem('6', 0)} 65%,#ccc 100% )`, )} 45%,${filterItem('7', 0)} 65%,#ccc 100% )`,
}" }"
></div> ></div>
<div class="footer-item"> <div class="footer-item">
<p :style="{ color: filterItem('5', 0) }">当天办理</p> <p :style="{ color: filterItem('5', 0) }">当天办理</p>
<p class="footer-data" :style="{ color: filterItem('6', 0) }">16</p> <p class="footer-data" :style="{ color: filterItem('7', 0) }">16</p>
</div> </div>
</div> </div>
</div> </div>
......
portal-manager-ui/admin/src/assets/css/common.css
View file @ c6b8b131
/* 颜色 */ /* 颜色 */
.primary { .primary {
color: #1890FF; color: #1890ff;
} }
.delete { .delete {
color: #FF4D4F; color: #ff4d4f;
} }
.green { .green {
color: #1BBC9B; color: #1bbc9b;
} }
.clofff { .clofff {
color: #fff; color: #fff;
} }
.orange { .orange {
color: orange; color: orange;
} }
.bgdel { .bgdel {
background-color: #FF4D4F; background-color: #ff4d4f;
} }
.bgpr { .bgpr {
background-color: #1890FF; background-color: #1890ff;
} }
.bgg { .bgg {
background-color: #1BBC9B; background-color: #1bbc9b;
} }
/* 版心 */ /* 版心 */
.container { .container {
width: 1200px; width: 1200px;
} }
/* 弹性布局 */ /* 弹性布局 */
.flex { .flex {
display: flex; display: flex;
} }
.flex1 { .flex1 {
flex: 1 flex: 1;
} }
.flexc { .flexc {
flex-direction: column; flex-direction: column;
} }
.flexwrap { .flexwrap {
flex-wrap: wrap; flex-wrap: wrap;
} }
.jcc { .jcc {
justify-content: center; justify-content: center;
} }
.jca { .jca {
justify-content: space-around; justify-content: space-around;
} }
.jcb { .jcb {
justify-content: space-between; justify-content: space-between;
} }
.jce { .jce {
justify-content: space-evenly; justify-content: space-evenly;
} }
.aic { .aic {
align-items: center; align-items: center;
} }
.aca { .aca {
align-content: space-around; align-content: space-around;
} }
.acb { .acb {
align-content: space-between; align-content: space-between;
} }
.ace { .ace {
align-content: space-evenly; align-content: space-evenly;
} }
/* margin */ /* margin */
.m10 { .m10 {
margin: 10px margin: 10px;
} }
.m15 { .m15 {
margin: 15px; margin: 15px;
} }
.m20 { .m20 {
margin: 20px; margin: 20px;
} }
.mt10 { .mt10 {
margin-top: 10px; margin-top: 10px;
} }
.mt15 { .mt15 {
margin-top: 15px; margin-top: 15px;
} }
.mt20 { .mt20 {
margin-top: 20px; margin-top: 20px;
} }
.mt50 { .mt50 {
margin-top: 50px; margin-top: 50px;
} }
.ml10 { .ml10 {
margin-left: 10px; margin-left: 10px;
} }
.ml15 { .ml15 {
margin-left: 15px; margin-left: 15px;
} }
.ml20 { .ml20 {
margin-left: 20px; margin-left: 20px;
} }
.ml25 { .ml25 {
margin-left: 25px; margin-left: 25px;
} }
.mr10 { .mr10 {
margin-right: 10px; margin-right: 10px;
} }
.mr15 { .mr15 {
margin-right: 15px; margin-right: 15px;
} }
.mr20 { .mr20 {
margin-right: 20px; margin-right: 20px;
} }
.mr25 { .mr25 {
margin-right: 25px; margin-right: 25px;
} }
.mr50 { .mr50 {
margin-right: 50px; margin-right: 50px;
} }
.mb10 { .mb10 {
margin-bottom: 10px; margin-bottom: 10px;
} }
.mb15 { .mb15 {
margin-bottom: 15px; margin-bottom: 15px;
} }
.mb20 { .mb20 {
margin-bottom: 20px; margin-bottom: 20px;
} }
.mb25 { .mb25 {
margin-bottom: 25px; margin-bottom: 25px;
} }
/* padding */ /* padding */
.pd10 { .pd10 {
padding: 10px; padding: 10px;
} }
.pd15 { .pd15 {
padding: 15px; padding: 15px;
} }
.pd20 { .pd20 {
padding: 20px; padding: 20px;
} }
.pdt10 { .pdt10 {
padding-top: 10px; padding-top: 10px;
} }
.pdt15 { .pdt15 {
padding-top: 15px; padding-top: 15px;
} }
.pdt20 { .pdt20 {
padding-top: 20px; padding-top: 20px;
} }
.pdt30 { .pdt30 {
padding-top: 30px; padding-top: 30px;
} }
.pdl8 { .pdl8 {
padding-left: 8px; padding-left: 8px;
} }
.pdl10 { .pdl10 {
padding-left: 10px; padding-left: 10px;
} }
.pdl15 { .pdl15 {
padding-left: 15px; padding-left: 15px;
} }
.pdl20 { .pdl20 {
padding-left: 20px; padding-left: 20px;
} }
.pdr10 { .pdr10 {
padding-right: 10px; padding-right: 10px;
} }
.pdr15 { .pdr15 {
padding-right: 15px; padding-right: 15px;
} }
.pdr20 { .pdr20 {
padding-right: 20px; padding-right: 20px;
} }
.pdb10 { .pdb10 {
padding-bottom: 10px; padding-bottom: 10px;
} }
.pdb15 { .pdb15 {
padding-bottom: 15px; padding-bottom: 15px;
} }
.pdb20 { .pdb20 {
padding-bottom: 20px; padding-bottom: 20px;
} }
/* 字体大小 */ /* 字体大小 */
.font16 { .font16 {
font-size: 16px; font-size: 16px;
} }
.font18 { .font18 {
font-size: 18px; font-size: 18px;
} }
.font20 { .font20 {
font-size: 20px; font-size: 20px;
} }
.font22 { .font22 {
font-size: 22px; font-size: 22px;
} }
.font24 { .font24 {
font-size: 24px; font-size: 24px;
} }
.font26 { .font26 {
font-size: 26px; font-size: 26px;
} }
.font28 { .font28 {
font-size: 28px; font-size: 28px;
} }
.font30 { .font30 {
font-size: 30px; font-size: 30px;
} }
/* 字体位置 */ /* 字体位置 */
.tac { .tac {
text-align: center; text-align: center;
} }
.tal { .tal {
text-align: left; text-align: left;
} }
.tar { .tar {
text-align: right; text-align: right;
} }
/* 加粗 */ /* 加粗 */
.fontw600 { .fontw600 {
font-weight: 600; font-weight: 600;
} }
.fontw700 { .fontw700 {
font-weight: 700; font-weight: 700;
} }
.fontw800 { .fontw800 {
font-weight: 800; font-weight: 800;
} }
/* 手型鼠标 */ /* 手型鼠标 */
.pointer { .pointer {
cursor: pointer; cursor: pointer;
} }
.pagination { .pagination {
margin-top: 10px; margin-top: 10px;
text-align: right; text-align: right;
} }
.color_title { .color_title {
margin-left: 15px; margin-left: 15px;
position: relative; position: relative;
margin-bottom: 15px; margin-bottom: 15px;
color: #1890ff; color: #1890ff;
} }
.color_title::before { .color_title::before {
content: ""; content: "";
width: 4px; width: 4px;
height: 20px; height: 20px;
position: absolute; position: absolute;
top: 0px; top: 0px;
left: -16px; left: -16px;
background-color: rgba(5, 149, 253, 1); background-color: rgba(5, 149, 253, 1);
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 6px; width: 6px;
height:6px; height: 6px;
overflow-y: auto; overflow-y: auto;
} }
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
border-radius: 6px; border-radius: 6px;
background-color: rgba(144, 147, 153, .5); background-color: rgba(144, 147, 153, 0.5);
} }
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
border-radius: 6px; border-radius: 6px;
background: #fff; background: #fff;
} }
\ No newline at end of file .ant-modal-close {
color: #188fff !important;
}
.ant-modal-close svg {
font-size: 26px !important;
}
.ant-modal-title {
color: #1890ff !important;
font-size: 18px;
font-weight: bold;
}
portal-manager-ui/admin/src/views/thePlatformIsSet/components/menuManagement/components/addEdit.vue
View file @ c6b8b131
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
:confirmLoading="EditModalLoading" :confirmLoading="EditModalLoading"
@cancel="handleClose" @cancel="handleClose"
width="33%" width="33%"
:maskClosable="false"
> >
<a-form-model <a-form-model
:label-col="{ :label-col="{
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/EditPwd.vue
View file @ c6b8b131
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
centered centered
@ok="handleOk" @ok="handleOk"
@cancel="handleClose" @cancel="handleClose"
:maskClosable="false"
> >
<a-form-model <a-form-model
:model="form" :model="form"
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/EditUser.vue
View file @ c6b8b131
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
:centered="true" :centered="true"
:visible="Visible" :visible="Visible"
@cancel="Visible = false" @cancel="Visible = false"
:maskClosable="false"
> >
<a-form-model <a-form-model
ref="ruleForm" ref="ruleForm"
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/addEditRole.vue
View file @ c6b8b131
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
:confirmLoading="roleEditModalLoading" :confirmLoading="roleEditModalLoading"
@cancel="roleEditModalVisible = false" @cancel="roleEditModalVisible = false"
width="30%" width="30%"
:maskClosable="false"
> >
<a-form-model <a-form-model
:label-col="{ :label-col="{
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/addUser.vue
View file @ c6b8b131
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
:centered="true" :centered="true"
:visible="Visible" :visible="Visible"
@cancel="Visible = false" @cancel="Visible = false"
:maskClosable="false"
> >
<a-form-model <a-form-model
ref="ruleForm" ref="ruleForm"
......
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