diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss index fbc44d3f7..2d5997897 100644 --- a/src/assets/scss/modules/management/list-main.scss +++ b/src/assets/scss/modules/management/list-main.scss @@ -5,7 +5,7 @@ .m-search { padding: 24px 10px 10px; - // box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1); + box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1); background: #FFFFFF; box-shadow: 0px 6px 16px 0px rgba(0,0,0,0.08), 0px 3px 6px -4px rgba(0,0,0,0.12); margin:20px 7px 7px; diff --git a/src/assets/scss/modules/management/volunteet.scss b/src/assets/scss/modules/management/volunteet.scss new file mode 100644 index 000000000..6b2409580 --- /dev/null +++ b/src/assets/scss/modules/management/volunteet.scss @@ -0,0 +1,124 @@ +.g-main{ + padding: 30px 0 0 30px; + width: 100%; + } + .flex{ + display: flex; + .flex1{ + flex: 1; + } + &-1{ + flex: 1; + } + &-y{ + flex-direction: column; + } + &-x{ + flex-direction: row; + } + &-center1{ + justify-content: center; + } + &-center2{ + align-items: center; + } + &-center3{ + align-items: flex-start; + } + // + &-mean{ + justify-content: space-around; + } + //两端对齐 + &-end{ + justify-content: space-between; + } + //水平轴右对齐 + &-fend{ + justify-content: flex-end; + } + // 允许子元素换行 + &-wrap{ + flex-wrap: wrap; + } + } +.m{ + &-left12{ + margin-left: 12px; + } + &-left5{ + margin-left: 12px; + } + &-left012{ + margin-left: -5px; + } + &-left18{ + margin-left: 18px; + } + &-right12{ + margin-right: 12px; + } + &-right7{ + margin-right: 7px; + } + &-top12{ + margin-top: 12px; + } + &-top5{ + margin-top: 5px; + } + &-bottom5{ + margin-bottom: 5px; + } + &-bottom10{ + margin-bottom: 10px; + } + &-right10{ + margin-right: 10px; + } + &-right26{ + margin-right: 26px; + } + + &-top15{ + margin-top: 15px; + } + &-top10{ + margin-top: 10px; + } + &-top18{ + margin-top: 18px; + } + &-bot50{ + margin-bottom: 50px; + } + &-bot10{ + margin-bottom:10px; + } + &-top16{ + margin-top:16px; + } + } + + .p{ + &-18{ + padding: 0 18px; + } + &-12{ + padding: 12px; + } + } +.el-form-item{ + margin-bottom: 10px; + } + .bto_btn{ + display: block; + position: fixed; + bottom: 5px; + left: 0; + background: #ffffff; + width: 100%; + padding: 6px 26px; + box-sizing: border-box; + text-align: right; +} \ No newline at end of file diff --git a/src/components/Dialog/index.vue b/src/components/Dialog/index.vue index 3257b768d..22e1013b6 100644 --- a/src/components/Dialog/index.vue +++ b/src/components/Dialog/index.vue @@ -18,11 +18,9 @@ - - \ No newline at end of file diff --git a/src/components/JwTree/nodeWrap.vue b/src/components/JwTree/nodeWrap.vue index 6b2ebd227..0113a65c3 100644 --- a/src/components/JwTree/nodeWrap.vue +++ b/src/components/JwTree/nodeWrap.vue @@ -72,7 +72,6 @@ export default { }; }, mounted() { - }, computed: {}, watch: {}, @@ -83,11 +82,9 @@ export default { } return row; }, - getOnerSixLevelFlag(item) { return this.sixLevelArr.includes(item.level); }, - async getChildrenData(item, idx, arr) { if(item.level != "street"){ let url = '/gov/org/organizational/neighborhood/getNeighborhoodCommitteeOrgTreeListByLevel' @@ -105,7 +102,6 @@ export default { arr.forEach((element, index) => { if (index === idx) { if (element.children) { - console.log(item); element.zkFlag = false; element.children = null; } else { @@ -135,9 +131,7 @@ export default { } }); } - }, - gotoPersonnel(id, name) { if (id) { this.$router.push({ path: `/organizational/orgPersonnel/${name}`, query: { user_id: id } }); @@ -162,7 +156,6 @@ export default { align-items: center; justify-content: space-around; } - .name_more { span { &:hover { @@ -249,7 +242,6 @@ export default { background-image: url(~@/assets/images/home/dyzxhClick.png); background-repeat: no-repeat; } - .lxjt { @include spanLevel; display: flex; diff --git a/src/components/NameSplit/index.vue b/src/components/NameSplit/index.vue index d5f747ac4..487982b79 100644 --- a/src/components/NameSplit/index.vue +++ b/src/components/NameSplit/index.vue @@ -10,7 +10,6 @@
({{ getPeopositionMap(item.partyOrgLevel) }})
- - - - diff --git a/src/views/components/CTable.vue b/src/views/components/CTable.vue index f1b3f908b..be0e5d049 100644 --- a/src/views/components/CTable.vue +++ b/src/views/components/CTable.vue @@ -33,7 +33,6 @@ @change.native="getRadioRow(scope.$index,scope.row)">  - - - @@ -409,16 +347,13 @@ export default { .el-table td { padding: 6px 0 !important; } - .page { padding: 20px 6px 0; text-align: right; } - .operate { text-align: center; } - .img_bc { width: 50px; height: 50px; diff --git a/src/views/components/CTree.vue b/src/views/components/CTree.vue index 1d408d111..32c7b32ce 100644 --- a/src/views/components/CTree.vue +++ b/src/views/components/CTree.vue @@ -177,9 +177,7 @@ export default { arrayData = [] arrayData.push(data) } - // alert(JSON.stringify(data)) this.nodeData = data - // console.log(this.nodeData) this.processData(this.nodeData, null) this.initCheckNodes() this.loading = false @@ -202,7 +200,6 @@ export default { this.params, (data, rspMsg) => { this.nodeData = data - console.log(this.nodeData) this.firstData = null this.processData(this.nodeData, null) this.initCheckNodes() @@ -344,10 +341,8 @@ export default { this.$emit('chechBoxClick', data, checkedArr) }, handleCurrentChange (data, node, store) { - // console.logconsole.log(data, node) }, handleNodeExpand (data, node, store) { - // console.log(data, node, store) }, loadNode (node, resolve) { if (node.level === 0) { @@ -410,7 +405,6 @@ export default { checkedNodes.push(oneNodes) } }) - // console.log(checkedNodes) return checkedNodes }, // 重置查询条件 diff --git a/src/views/components/CTreeDialogCheckBox.vue b/src/views/components/CTreeDialogCheckBox.vue index e5c3dc99c..2dcf8ccff 100644 --- a/src/views/components/CTreeDialogCheckBox.vue +++ b/src/views/components/CTreeDialogCheckBox.vue @@ -237,17 +237,6 @@ export default { }, // 复选框点击事件 handleCheckBox (data, checkedArr) { - // to do - // let filterText = this.$refs['dialog_tree'].filterText - // if (filterText) { - // if (data.children.length !== 0) { - // console.log('father', filterText) - // } else { - // console.log('children', filterText) - // } - // } else { - // console.log('blank') - // } let checkedNoRepeat = [] // 无重复的选中数组 let keysNoRepeat = [] // 无重复的keys数组 for (let i = 0; i < checkedArr.length; i++) { @@ -259,58 +248,8 @@ export default { } this.temArr = checkedNoRepeat this.temKeys = keysNoRepeat - // let checkedObj = { 'id': data.id, 'name': data.label } - // let id = data.id - // let index = '' - // let haven = false - // let length = this.temArr.length - // if (this.temArr.length === 0) { - // this.temArr.push(checkedObj) - // this.temKeys.push(Number(id)) - // } else { - // for (let i = 0 i < length i++) { - // if (this.temArr[i].id === id) { - // haven = true - // index = i - // break - // } - // } - // if (haven) { - // this.temArr.splice(index, 1) - // this.temKeys.splice(index, 1) - // } else { - // this.temArr.push(checkedObj) - // this.temKeys.push(Number(id)) - // } - // } }, - handleNodeClick (data, node) { // 点击树节点内容触发事件 - // console.log(checkedArr) - // let checkedObj = { 'id': data.id, 'name': data.label } - // let id = data.id - // let index = '' - // let haven = false - // let length = this.temArr.length - // if (this.temArr.length === 0) { - // this.temArr.push(checkedObj) - // this.temKeys.push(Number(id)) - // } else { - // for (let i = 0 i < length i++) { - // if (this.temArr[i].id === id) { - // haven = true - // index = i - // break - // } - // } - // if (haven) { - // this.temArr.splice(index, 1) - // this.temKeys.splice(index, 1) - // } else { - // this.temArr.push(checkedObj) - // this.temKeys.push(Number(id)) - // } - // } - } + handleNodeClick (data, node) {} }, mounted () { }, diff --git a/src/views/components/CTreeDialogSingle.vue b/src/views/components/CTreeDialogSingle.vue index 9362c4666..2f19cdbfb 100644 --- a/src/views/components/CTreeDialogSingle.vue +++ b/src/views/components/CTreeDialogSingle.vue @@ -3,12 +3,10 @@
- - 选择 - -
@@ -48,10 +44,8 @@ - - - diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index 411771526..ee6393ae1 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -8,7 +8,6 @@ - @@ -16,12 +15,10 @@ :value="item.value" @click.native="handelCLickIdType(item.value)"> - - @@ -29,12 +26,10 @@ :label="item.label" :value="item.value"> - - @@ -42,14 +37,12 @@ :value="item.value"> - - @@ -57,7 +50,6 @@ :label="item.label" :value="item.value"> - @@ -65,7 +57,6 @@ :label="item.label" :value="item.value"> - @@ -104,7 +95,6 @@ v-model.trim="form.resideInfoDtos[index].gridId" :options="orgOptions" :props="orgOptionProps" @change="handleChangeAgency(index)"> - - - -
拓展信息登记
- - @@ -221,22 +204,18 @@ @click.native="handelClickCareerStatus(item.value)"> - - - - - - - - - - - - - @@ -315,7 +284,6 @@ :label="item.label" :value="item.value"> - @@ -354,7 +322,6 @@
- - diff --git a/src/views/components/resiInfo/oldPeopleDto/index.vue b/src/views/components/resiInfo/oldPeopleDto/index.vue index 0bbaac646..e6996236f 100644 --- a/src/views/components/resiInfo/oldPeopleDto/index.vue +++ b/src/views/components/resiInfo/oldPeopleDto/index.vue @@ -1,7 +1,6 @@ - - diff --git a/src/views/components/resiInfo/parymemberInfoDto/index.vue b/src/views/components/resiInfo/parymemberInfoDto/index.vue index dc161139a..0dafcde99 100644 --- a/src/views/components/resiInfo/parymemberInfoDto/index.vue +++ b/src/views/components/resiInfo/parymemberInfoDto/index.vue @@ -1,7 +1,6 @@ - - diff --git a/src/views/components/resiInfo/postDto/index.vue b/src/views/components/resiInfo/postDto/index.vue index e4e102da2..d92ddeb95 100644 --- a/src/views/components/resiInfo/postDto/index.vue +++ b/src/views/components/resiInfo/postDto/index.vue @@ -1,7 +1,6 @@ - - diff --git a/src/views/components/resiInfo/specialSupportDto/index.vue b/src/views/components/resiInfo/specialSupportDto/index.vue index c0a1c1b95..9d47d1222 100644 --- a/src/views/components/resiInfo/specialSupportDto/index.vue +++ b/src/views/components/resiInfo/specialSupportDto/index.vue @@ -1,7 +1,6 @@ - - diff --git a/src/views/components/resiInfo/unitedFrontDto/index.vue b/src/views/components/resiInfo/unitedFrontDto/index.vue index 2e6074e40..59b2c4709 100644 --- a/src/views/components/resiInfo/unitedFrontDto/index.vue +++ b/src/views/components/resiInfo/unitedFrontDto/index.vue @@ -1,7 +1,6 @@ - - diff --git a/src/views/components/resiInfo/veteranDto/index.vue b/src/views/components/resiInfo/veteranDto/index.vue index ecd2498d5..99e3ab185 100644 --- a/src/views/components/resiInfo/veteranDto/index.vue +++ b/src/views/components/resiInfo/veteranDto/index.vue @@ -1,7 +1,6 @@ - - diff --git a/src/views/components/resiInfo/volunteerDto/index.vue b/src/views/components/resiInfo/volunteerDto/index.vue index 2fa007f94..d7daa9115 100644 --- a/src/views/components/resiInfo/volunteerDto/index.vue +++ b/src/views/components/resiInfo/volunteerDto/index.vue @@ -1,7 +1,6 @@ - - diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 55e53e191..9e8a6d71c 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -245,11 +245,8 @@ - - - diff --git a/src/views/components/tinymce/index.vue b/src/views/components/tinymce/index.vue index 19e710b9a..b82e7de7a 100644 --- a/src/views/components/tinymce/index.vue +++ b/src/views/components/tinymce/index.vue @@ -2,7 +2,6 @@