Browse Source

用户列表样式、首页收缩、首页功能问题调整

cfort 2 years ago
parent
commit
67c44056a5

+ 3 - 8
src/views/platform/org/employee/list.vue

@@ -1,5 +1,5 @@
 <template>
-    <ibps-container type="full" class="page">
+    <div class="main-container">
         <ibps-crud
             ref="crud"
             style="width: 100%"
@@ -57,16 +57,11 @@
             @close="(visible) => (dialogMoreSearchVisible = visible)"
             @action-event="handleMoreSearchAction"
         />
-    </ibps-container>
+    </div>
 </template>
 
 <script>
-import {
-    queryPageList,
-    remove,
-    active,
-    disable
-} from '@/api/platform/org/employee'
+import { queryPageList, remove, active, disable } from '@/api/platform/org/employee'
 import ActionUtils from '@/utils/action'
 import { statusOptions, genderOptions, typeOptions } from './constants'
 import { mapActions, mapMutations } from 'vuex'

+ 0 - 5
src/views/system/dashboard/components/util.js

@@ -195,11 +195,6 @@ export function buildComponent (name, column, preview, vm) {
                             }
                             this.data = data && data.dataResult ? data.dataResult : data
                             this.totalCount = data && data.pageResult ? data.pageResult.totalCount : 0
-                            // 公告栏目对数据过滤
-                            if (param.alias === 'notice') {
-                                const deptIds = this.deptList.map(i => i.positionId)
-                                this.data = data.filter(i => deptIds.includes(i.depId))
-                            }
                             // 更新小铃铛消息数量
                             if (param.alias === 'unreadMessage') {
                                 Bus.$emit('getMessageCount', this.totalCount)

+ 1 - 1
src/views/system/homepage/index.vue

@@ -355,7 +355,7 @@ export default {
         },
         // 处理收缩/展开
         handleCollapseExpansion (index, isCollapse) {
-            this.layout[index].h = isCollapse ? 2 : this.defaultData[index].h
+            this.layout[index].h = isCollapse ? 1.34 : this.defaultData[index].h
             this.layout.push({ i: '0' })
             const deleteIndex = this.layout.findIndex(item => item.i === '0')
             this.layout.splice(deleteIndex, 1)