Skip to content

Commit

Permalink
style(css): 修改部分样式
Browse files Browse the repository at this point in the history
  • Loading branch information
BoBoooooo committed Sep 11, 2020
1 parent 6f960c4 commit c95dca8
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 21 deletions.
39 changes: 20 additions & 19 deletions src/views/devTools/Dict.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@
<div class="full-height page-container">
<el-row :gutter="15"
style="height:90%">
<el-col :span="6"
<el-col :span="5"
class="full-height">
<el-input placeholder="请输入查询内容"
v-model="filterText"
size="small"
prefix-icon="el-icon-search"></el-input>
<el-tree ref="dicttypetree"
class="full-height tree"
Expand All @@ -21,7 +22,7 @@
@node-drop="afterDropDown"
:props="defaultProps"
:filterNodeMethod="filterNode"
:allow-drag="node=> node.data.parentid !== '0'"
:allow-drag="node=> node.data.parentId !== '0'"
node-key="id"
highlight-current
:default-expanded-keys="['fe980574-2552-4754-88c8-366eb5a22861']"
Expand All @@ -42,15 +43,15 @@
</el-button>
<el-button type="text"
size="mini"
v-if="data.parentid!=='0'"
v-if="data.parentId!=='0'"
@click="() => remove(data)">
删除
</el-button>
</span>
</span>
</el-tree>
</el-col>
<el-col :span="18">
<el-col :span="19">
<CrudTable tableName="ad_codelist"
ref="codeListTable"
full-height
Expand Down Expand Up @@ -82,10 +83,10 @@
:model="entity"
label-width="80px">
<el-form-item label="类目名">
<el-input v-model="entity.codename"></el-input>
<el-input v-model="entity.codeName"></el-input>
</el-form-item>
<el-form-item label="排序码">
<el-input-number v-model="entity.codeorder"></el-input-number>
<el-input-number v-model="entity.codeOrder"></el-input-number>
</el-form-item>
<el-form-item label="备注">
<el-input type="textarea"
Expand Down Expand Up @@ -131,18 +132,18 @@ export default {
dialogStatus: 0,
defaultProps: {
children: 'children',
label: 'codename',
label: 'codeName',
},
textMap: {
1: '编辑',
0: '新增',
},
entity: {
id: '',
codename: '',
codevalue: '',
parentid: '',
codeorder: 0,
codeName: '',
codeValue: '',
parentId: '',
codeOrder: 0,
remark: '',
},
tableParams: {},
Expand All @@ -153,7 +154,7 @@ export default {
// 请求字典分类
crud(DML.SELECT, 'ad_codelist_type').then((res) => {
const options = res.data.list.map(item => ({
label: item.codename,
label: item.codeName,
value: item.id,
}));
resolve(options);
Expand All @@ -166,7 +167,7 @@ export default {
afterDropDown(node, end, position, event) {
if (position === 'inner') {
const obj = node.data;
obj.parentid = end.data.id;
obj.parentId = end.data.id;
crud(DML.UPDATE, 'ad_codelist_type', obj).then((res) => {
this.$message.success('操作成功');
this.fetchDictType();
Expand Down Expand Up @@ -200,7 +201,7 @@ export default {
});
},
save() {
this.entity.codevalue = this.entity.codename;
this.entity.codeValue = this.entity.codeName;
if (this.dialogStatus === STATUS.CREATE) {
crud(DML.INSERT, 'ad_codelist_type', this.entity).then((res) => {
this.fetchDictType();
Expand All @@ -223,7 +224,7 @@ export default {
Object.keys(this.entity).forEach((key) => {
this.entity[key] = '';
});
this.entity.parentid = data.id;
this.entity.parentId = data.id;
this.dialogStatus = STATUS.CREATE;
},
edit(data) {
Expand All @@ -232,18 +233,18 @@ export default {
this.dialogStatus = STATUS.UPDATE;
},
treeClick(data) {
if (data.parentid === '0') {
delete this.tableParams.codetype;
if (data.parentId === '0') {
delete this.tableParams.codeType;
} else {
this.codeTypeId = data.id || '';
this.tableParams.codetype = data.codevalue;
this.tableParams.codeType = data.id;
}
this.$refs.codeListTable.tableReload();
},
// 树节点过滤
filterNode(value, data, node) {
if (!value) return true;
return this.$pinyinmatch.match(data.codename, value);
return this.$pinyinmatch.match(data.codeName, value);
},
// 批量添加字典值
multiAddDict() {
Expand Down
2 changes: 1 addition & 1 deletion src/views/layout/Layout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default {
.main-container {
background: #f0f3f7;
padding: 0 50px 10px;
height: calc(100% - 80px);
height: calc(100% - 90px);
}
}
</style>
2 changes: 1 addition & 1 deletion src/views/layout/components/NavMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export default {
overflow-y: auto;
position: fixed;
z-index:200;
width: 33px;
width: 35px;
top: 100px;
max-height:80%;
border-top-right-radius: 8px;
Expand Down

0 comments on commit c95dca8

Please sign in to comment.