Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -261,8 +261,17 @@
             <!-- 研究中心 -->
             <el-table-column prop="associateDegreeNames" :label="centerNameDegree" min-width="190" v-if="user.timeType.isCro == 1" sortable="custom">
                 <template slot-scope="scope">
-                    <div>
+                    <!-- <div>
                         {{scope.row.associateDegreeNames}}
+                    </div> -->
+                    <el-popover placement="top" width="300" trigger="hover" v-if="scope.row.associateDegreeNames&&scope.row.associateDegreeNames.length > 12">
+                        <div slot="reference" class="kans">
+                            <span >{{scope.row.associateDegreeNames.substring(0,12)}}...</span>
+                        </div>
+                        <span >{{scope.row.associateDegreeNames}}</span>
+                    </el-popover>
+                    <div v-else>
+                        <span >{{scope.row.associateDegreeNames}}</span>
                     </div>
                 </template>
             </el-table-column>