Parcourir la source

样式调整,bug修复

qymljy il y a 3 semaines
Parent
commit
7fcb7a980a

+ 1 - 1
src/HManagement/roleManage/modules/dataFiltering.vue

@@ -4,7 +4,7 @@
       <filteringAdd @addSuccess="onSuccess"></filteringAdd>
     </div>
     <div style="margin-top: 20px">
-      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  :height="tableHieght">
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  height="calc(100vh - 380px)">
         <template v-slot:customcol="scope">
           <div >{{$t(scope.column.data[scope.column.columnname])}}</div>
         </template>

+ 1 - 1
src/HManagement/roleManage/modules/reportCenter.vue

@@ -15,7 +15,7 @@
       <auth v-if="tool.checkAuth($route.name,'reportCenterAuth')" class="inline-16" @onSuccess="listData()"></auth>
     </div>
     <div style="margin-top: 15px">
-      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  :height="tableHieght" >
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  height="calc(100vh - 360px)" >
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'province'">
             <p>{{ scope.column.data.province + '-' + scope.column.data.city + '-' + scope.column.data.county}}</p>

+ 1 - 1
src/HManagement/roleManage/modules/roleContent.vue

@@ -41,7 +41,7 @@
               </el-row>
             </el-collapse-item>
           </el-collapse>
-          <tableLayout :layout="tablecols" :data="apps" :custom="false" height="500px" @rowClick="appoptionselect">
+          <tableLayout :layout="tablecols" :data="apps" :custom="false" height="calc(100vh - 390px)" @rowClick="appoptionselect">
           </tableLayout>
         </el-col>
         <el-col :span="11">

+ 5 - 5
src/HManagement/roleManage/modules/roleContent1.vue

@@ -20,7 +20,7 @@
               </el-row>
             </el-collapse-item>
           </el-collapse>
-          <tableLayout :layout="tablecols" :data="apps" :custom="false" height="500px" @rowClick="appoptionselect">
+          <tableLayout :layout="tablecols" :data="apps" :custom="false" height="calc(100vh - 360px)" @rowClick="appoptionselect">
           </tableLayout>
         </el-col>
         <el-col :span="11">
@@ -129,7 +129,7 @@ export default {
       }
       this.roleMainInfo = res.data
       console.log(this.roleMainInfo);
-      
+
       //显示默认授权信息,一般默认信息为第一条数据
       res.data.apps[0]?this.appoptionselect(res.data.apps[0]):''
       this.filterModules()
@@ -198,10 +198,10 @@ export default {
           }
         })
       });
-      
+
       this.apps = arr
       console.log(this.apps,'666');
-      
+
     },
     handleCheckAllChange2 (val) {
       let arr = this.appoptions.map(e=>{return e.optionid})
@@ -244,4 +244,4 @@ export default {
   border-top:1px solid #f1f2f3;
   padding-top:16px;
 }
-</style>
+</style>

+ 1 - 1
src/HManagement/roleManage/modules/userCenter.vue

@@ -15,7 +15,7 @@
       <!-- <auth v-if="tool.checkAuth($route.name,'reportCenterAuth')" class="inline-16" @onSuccess="listData()"></auth> -->
     </div>
     <div style="margin-top: 15px">
-      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  :height="tableHieght" >
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  height="calc(100vh - 360px)" >
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'province'">
             <p>{{ scope.column.data.province + '-' + scope.column.data.city + '-' + scope.column.data.county}}</p>

+ 1 - 1
src/SManagement/user/role-edit/RoleEdit.vue

@@ -66,7 +66,7 @@ export default {
       })
     },
     async save () {
-      this.add.content.rolename = this.$refs.info.ruleForm.name      
+      this.add.content.rolename = this.$refs.info.ruleForm.name
       this.add.content.remarks = this.$refs.info.ruleForm.descript
       this.getAllPower()
       this.$refs.info.$refs.ruleForm.validate(async val => {

+ 1 - 1
src/SManagement/user/role-edit/components/RolePowerSelect.vue

@@ -12,7 +12,7 @@
           </el-select>
 <!--          <auth :new_set="true" :roleid="power.content.roleid" @setAuth="searchActive"></auth>-->
         </div>
-        <table-layout :layout="tablecols" :data="powerList" @rowClick="rowClick"></table-layout>
+        <table-layout :layout="tablecols" :data="powerList" @rowClick="rowClick" height="calc(100vh - 390px)"></table-layout>
         <div class="page">
           <pagination :total="total" :pageSize="power.content.pageSize" :currentPage="power.content.pageNumber"
             @pageChange="pageChange">

+ 1 - 1
src/components/dynamic-table/index.vue

@@ -10,7 +10,7 @@
       :fit="tool.calculatedColumnWidth($refs.table,layout)"
       :height="height ? height : data.length <= 4?'260px':data.length <= 20?'calc(100vh - 420px)':'calc(100vh - 420px)'"
       @row-click="rowClick"
-      style="width:100%;min-height:260px;max-height: calc(100vh - 420px)"
+      style="width:100%;min-height:260px;max-height: calc(100vh - 360px)"
       :header-cell-style="{height:'40px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
       :cell-style="{height:'40px',color:'#666666',fontWeight:'400'}"
       border

+ 5 - 1
src/components/table/index9.vue

@@ -66,8 +66,12 @@ export default {
 }
 
 </script>
-<style>
+<style scoped>
 .el-tooltip__popper {
   max-width: 90%;
 }
+/deep/ .el-table .cell {
+  white-space: normal !important;
+  word-break: break-word;
+}
 </style>