Merge branch 'master' of http://120.26.64.82:3000/BFFE/Foshan4A4.0

src/components/rolelist/index.vue

@@ -30,18 +30,20 @@
       <template v-else-if="mainData.length">
         <div :class="active ? 'bgActive' : 'bgActivecheckbox'" class="paren_content">
           <template v-if="type">
-            <el-row :gutter="16">
-              <el-radio-group style="display: block" @change="radioChange" v-model="radio">
-                <el-col :span="number" v-for="(item, index) in mainData" :key="index">
-                  <div @click.stop="handleBg(index)" :class="active && msg === index ? 'bgColor' : ''" class="cide">
-                    <div class="cide_header">
-                      <p>{{ item.name }}</p>
-                      <el-radio :label="index"></el-radio>
+            <el-scrollbar class="scrollBar" style="height: 100%">
+              <el-row :gutter="16">
+                <el-radio-group style="display: block" @change="radioChange" v-model="radio">
+                  <el-col :span="number" v-for="(item, index) in mainData" :key="index">
+                    <div @click.stop="handleBg(index)" :class="active && msg === index ? 'bgColor' : ''" class="cide">
+                      <div class="cide_header">
+                        <p>{{ item.name }}</p>
+                        <el-radio :label="index"></el-radio>
+                      </div>
                     </div>
-                  </div>
-                </el-col>
-              </el-radio-group>
-            </el-row>
+                  </el-col>
+                </el-radio-group>
+              </el-row>
+            </el-scrollbar>
           </template>
         </div>
       </template>

src/components/rolelist/rolelist.scss

@@ -22,12 +22,17 @@
         margin-bottom: 0;
       }
     }
-    .paren_content {
+    ::v-deep .paren_content {
       width: 100%;
-      height: 83%;
+      height: 100%;
       .el-row {
         width: 100%;
       }
+      .scrollBar {
+        .el-scrollbar__wrap {
+          overflow-x: auto;
+        }
+      }
       .cide {
         height: 80px;
         background: #f5f7fa;

src/views/jobsManagement/list.vue

@@ -34,7 +34,9 @@
             <el-col :span="24">拥有职员：<span>{{ item.OfficerCount }}</span></el-col>
           </el-row> -->
             <el-row class="conntent2" v-if="radio == 2">
-              <el-col :span="24"><span>{{ item.UpLink }}</span></el-col>
+              <el-tooltip effect="dark" :content="item.UpLink" placement="bottom">
+                <el-col :span="24"><span class="msg">{{ item.UpLink }}</span></el-col>
+              </el-tooltip>
             </el-row>
             <el-row class="conntent">
               <el-col :span="12">
@@ -452,14 +454,16 @@ export default {
         margin-top: 14px;
       }
       .conntent2 {
-        margin-top: 14px;
-        height: 40px;
-        word-break: break-all;
-        text-overflow: ellipsis;
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 2;
-        overflow: hidden;
+        .msg {
+          margin-top: 14px;
+          height: 35px;
+          word-break: break-all;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 2;
+          overflow: hidden;
+        }
       }
       .used {
         font-size: 16px;