Ver código fonte

解决名字过长导致 工作指派人员样式显示不合理的问题

dev-version-manage
kim131 4 anos atrás
pai
commit
468d420ab0
3 arquivos alterados com 35 adições e 18 exclusões
  1. +14
    -5
      src/views/components_web/projDetail/components/people-item.vue
  2. +2
    -12
      src/views/main_web/workspace/components/workLine.vue
  3. +19
    -1
      src/views/main_web/workspace/workspace.new.vue

+ 14
- 5
src/views/components_web/projDetail/components/people-item.vue Ver arquivo

@@ -1,10 +1,13 @@
<template>
<div class="people-item">
<div class="people-item" :title="user.cnName">
<div class="people-wrap" :class="{'rt-0': isShowManagerMark}">
<div class="people" :class="{'manager-mark': isShowManagerMark }">
<img class="proj-avatarface" v-if="Object.keys(user).length > 0"
:src="user.headImgUrl | resolveAvator" alt/>
<div class="add-btn" v-else-if="!isShowEmptyAvatar">
<div class="people">
<img v-if="Object.keys(user).length > 0"
class="proj-avatarface"
:class="{'manager-mark': isShowManagerMark }"
:src="user.headImgUrl | resolveAvator" alt
/>
<div v-else-if="!isShowEmptyAvatar" class="add-btn">
<i class="el-icon-plus proj-avatarface"></i>
</div>
<img v-else src="/static/img/暂无2.svg" alt="" class="proj-avatarface empty">
@@ -77,6 +80,7 @@
top: 4px;
border-radius: 50%;
margin: 0 auto;
width: 100%;
}
.people-item .people {
border-radius: 50%;
@@ -106,6 +110,11 @@
.people-name {
position: relative;
width: 100%;

overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;

height: 16px;
line-height: 16px;
color: rgba(17, 19, 21, 100);


+ 2
- 12
src/views/main_web/workspace/components/workLine.vue Ver arquivo

@@ -242,7 +242,7 @@
</div>
</button>
</template>
<div class="has-next-node" v-if="totalNodeNum - nowFolderIndex > 2 && isCalcuteExchangeNode"></div>
<div class="has-next-node" v-if="totalNodeNum - nowFolderIndex > 2 && isCalcuteExchangeNode && totalNodeNum > 5 "></div>
</div>
<!-- <i
class="icon font_family icon-icon_shezhi-jihuo rota90 workbtn workderct"
@@ -416,19 +416,9 @@ export default {
this.listUserFolders.forEach(item=>{
Res.Data.forEach(item2=>{
if(item.nodeId==item2.PermCode&&item2.Permission==1&&item.nodeId!=item2.SysCode){
// const isExists1 = item.listsShareFrom[1].find(i => i.nodeId == item2.SysCode);

// console.log('isExists1', isExists1)
// if(!isExists1) {
item.listsShareFrom[1].push(temp[item2.SysCode]);
// }
}else if(item.nodeId==item2.SysCode&&item2.Permission==1&&item.nodeId!=item2.PermCode){
// const isExists2 = item.listsShareFrom[0].find(i => i.nodeId == item2.PermCode);
// console.log('isExists2', isExists2)
// if(!isExists2) {
item.listsShareFrom[0].push(temp[item2.PermCode]);
// }
item.listsShareFrom[0].push(temp[item2.PermCode]);
}
}
)


+ 19
- 1
src/views/main_web/workspace/workspace.new.vue Ver arquivo

@@ -500,6 +500,7 @@ import vuetify from "vuetify";
import system from '@/services/system';
import { queryAllTemplateNodeModelFile } from '@/services/template.js';
import * as services from './service';
import * as tempalteService from '@/services/template.js';
import { firstCharToLowerCase, firstCharToUpperCase, notify } from '@/utils/tool';
import FileItem from './components/file-item';
import FolderItem from './components/folder-item';
@@ -646,6 +647,8 @@ export default {

isAllFileLoaded: false,//当前工作节点下的文件状态是否都加载完毕
hackWorkLine: null,

nestNodeList: [],//嵌套的模板数组
};
},
mounted: function () {
@@ -711,6 +714,21 @@ export default {
}
},
methods: {
// // 先根据项目的模板id 查询出嵌套模板数组
// async getNestTemplates(templateId) {
// const res = await tempalteService.queryNestTemplateByTemplateId(templateId);
// this.nestNodeList = res.Data || [];
// },
// // 根据id判断是否是被嵌套的节点
// isNest(id){
// let len = this.nestNodeList.length;
// for(let i = 0;i < len;i++){
// if(this.nestNodeList[i].ParentNodeId == id){
// return true;
// }
// }
// return false;
// },
// 搜索框字数超出35个字
maxTextLengthArrived() {
this.$notify({
@@ -802,7 +820,7 @@ export default {
"modifyUserId":this.userId,
"modifyTime":time,
"isShowRecycle":0,
"relativePath":""}
"relativePath":this.currentFolder.folderPath}

const addFileRes = await services.addFile(file);



Carregando…
Cancelar
Salvar