Browse Source

修改对比分析

plg 5 months ago
parent
commit
6780b91129

+ 2 - 1
src/components/CompareUser.vue

@@ -527,7 +527,8 @@ export default {
     queryDetail1(id) {
       let url = `/userRecordScore/findAllByPlanIdAndUserNo?planId=${id}&userNo=${this.userInfo.userNo}`;
       this.$http.get(url, {}, (res) => {
-        console.log(res);
+        console.log("res");
+        console.log(res)
         if (res && res.code == 200) {
           this.orgName1 = res.data.user.orgName;
           let a = res.data.report.filter((item) => {

+ 4 - 6
src/views/manage/channelManagement/channelManagement.vue

@@ -49,12 +49,6 @@
           </div>
         </el-col>
       </el-row>
-      <el-row class="add_user_class">
-        <el-col :span="24">
-          <div class="search-head"></div>
-        </el-col>
-      </el-row>
-
       <div class="table-content">
         <el-table
           :data="tableData"
@@ -554,6 +548,8 @@ export default {
     height: 100%;
     box-sizing: border-box;
     overflow-y: auto;
+    display: flex;
+    flex-direction: column;
 
     .search-head {
       width: 100%;
@@ -570,6 +566,8 @@ export default {
 
     .table-content {
       margin: 10px 0;
+      flex: 1;
+      overflow-y: auto;
     }
   }
 }

+ 8 - 10
src/views/manage/channelManagement/contract.vue

@@ -62,13 +62,8 @@
           </div>
         </el-col>
       </el-row>
-      <el-row class="add_user_class">
-        <el-col :span="24">
-          <div class="search-head"></div>
-        </el-col>
-      </el-row>
 
-      <div class="table-content">
+      <div class="table-content" v-show="isUser">
         <el-table
           v-show="isUser"
           :data="tableData"
@@ -145,8 +140,9 @@
         </el-table>
       </div>
 
-      <div class="table-content">
+      <div class="table-content" v-show="!isUser">
         <el-table
+          style="height: 100%"
           v-show="!isUser"
           :data="tableData"
           :row-style="{ height: '0px' }"
@@ -584,7 +580,7 @@ export default {
       if (this.isUser) {
         url = `/user/findUserListByPage?pageSize=${this.pageSize}&pageNum=${
           this.pageNum
-        }${
+        }&roleType=1${
           this.group.length == 0
             ? `&orgNo=${this.userInfo.orgNo}`
             : `&orgNo=${this.group[this.group.length - 1]}`
@@ -601,7 +597,6 @@ export default {
         }`;
       }
       this.$http.get(url, {}, (res) => {
-        console.log(res);
         if (res && res.code == 200) {
           console.log(res.data.content);
           this.tableData = res.data.content;
@@ -685,7 +680,8 @@ export default {
     height: 100%;
     box-sizing: border-box;
     overflow-y: auto;
-
+    display: flex;
+    flex-direction: column;
     .search-head {
       width: 100%;
       display: flex;
@@ -701,6 +697,8 @@ export default {
 
     .table-content {
       margin: 10px 0;
+      flex: 1;
+      overflow-y: auto;
     }
   }
 }