monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 02554aa3c65525eb8122431757adef7fcab5302a 2 parents 27884519 78ff0cd8

Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev
Inline Side-by-side
Showing 3 changed files with 28 additions and 29 deletions
@@ -76,11 +76,14 @@ @@ -76,11 +76,14 @@
76 .yfyw-user .zc-view .zc-info { 76 .yfyw-user .zc-view .zc-info {
77 width: calc(100% - 120px); 77 width: calc(100% - 120px);
78 text-align: left; 78 text-align: left;
  79 + display: flex;
  80 + justify-content: space-between;
79 } 81 }
80 82
81 .yfyw-user .zc-view .zc-item { 83 .yfyw-user .zc-view .zc-item {
82 display: flex; 84 display: flex;
83 - flex-wrap: wrap 85 + flex-wrap: wrap;
  86 + flex: 1;
84 } 87 }
85 88
86 .yfyw-user .zc-view .zc-item .zc-item-label { 89 .yfyw-user .zc-view .zc-item .zc-item-label {
@@ -102,7 +105,9 @@ @@ -102,7 +105,9 @@
102 105
103 .yfyw-user .zc-view .zc-info .zc-item-tools { 106 .yfyw-user .zc-view .zc-info .zc-item-tools {
104 text-align: right; 107 text-align: right;
105 - padding: 3px 108 + padding: 3px;
  109 + display: flex;
  110 + align-items: end;
106 } 111 }
107 112
108 /*-------------------------------------*/ 113 /*-------------------------------------*/
@@ -46,14 +46,25 @@ export default { @@ -46,14 +46,25 @@ export default {
46 46
47 let init = () => { 47 let init = () => {
48 //如果是日常资料，不能点击 48 //如果是日常资料，不能点击
49 - if("TWO_DAY_MATERIAL"== props.treeNode.map.nodeType.code){ 49 + if ("TWO_DAY_MATERIAL" == props.treeNode.map.nodeType.code) {
50 return true; 50 return true;
51 } 51 }
  52 + let code = '';
  53 + let personId = '';
  54 + //点击运维人员或项目
  55 + if ('COLLECT_ALL' == props.treeNode.map.nodeType.view.code || ('COLLECT_USER' == props.treeNode.map.nodeType.view.code && props.treeNode.map.nodeType.code == "ONE_USER")) {
  56 + code = props.docType;
  57 + }
  58 + //点击用户
  59 + if ('COLLECT_USER' == props.treeNode.map.nodeType.view.code && 'TWO_SPECIFIC' == props.treeNode.map.nodeType.code) {
  60 + code = props.docType;
  61 + personId = props.treeNode.id
  62 + }
52 // 查询绑定的文件列表 63 // 查询绑定的文件列表
53 let params = { 64 let params = {
54 opsId: props.projectId, 65 opsId: props.projectId,
55 - personId: props.parentNode.id,  
56 - code: props.treeNode.map.nodeType.code 66 + personId: personId,
  67 + code: code ? code : props.treeNode.map.nodeType.code
57 } 68 }
58 proxy.$http.get('/api-web/bOpsFile/search', params, function (res) { 69 proxy.$http.get('/api-web/bOpsFile/search', params, function (res) {
59 if (res && res.code == 0 && res.data && res.data.length > 0) { 70 if (res && res.code == 0 && res.data && res.data.length > 0) {
@@ -74,11 +85,11 @@ export default { @@ -74,11 +85,11 @@ export default {
74 * @param docIds 文档id集合 85 * @param docIds 文档id集合
75 */ 86 */
76 let delDocRel = (docIds) => { 87 let delDocRel = (docIds) => {
77 - console.log("delDocRel",docIds)  
78 - let param={  
79 - id:docIds.join(','), 88 + console.log("delDocRel", docIds)
  89 + let param = {
  90 + id: docIds.join(','),
80 } 91 }
81 - proxy.$http.get('/api-web/bOpsFile/deleteSearch',param, function (res){ 92 + proxy.$http.get('/api-web/bOpsFile/deleteSearch', param, function (res) {
82 93
83 }) 94 })
84 } 95 }
@@ -102,7 +113,6 @@ export default { @@ -102,7 +113,6 @@ export default {
102 } 113 }
103 114
104 115
105 -  
106 // 监听编辑状态 116 // 监听编辑状态
107 Vue.watch(() => props.treeNode, (newValue, oldVlaue) => { 117 Vue.watch(() => props.treeNode, (newValue, oldVlaue) => {
108 initFlg.value = false; 118 initFlg.value = false;
@@ -46,31 +46,14 @@ export default { @@ -46,31 +46,14 @@ export default {
46 46
47 let init = () => { 47 let init = () => {
48 //如果是日常资料，不能点击 48 //如果是日常资料，不能点击
49 - if ("TWO_DAY_MATERIAL" == props.treeNode.map.nodeType.code) { 49 + if("TWO_DAY_MATERIAL"== props.treeNode.map.nodeType.code){
50 return true; 50 return true;
51 } 51 }
52 - let code = '';  
53 - let personId = '';  
54 - //项目统计  
55 - if ('COLLECT_ALL' == props.treeNode.map.nodeType.view.code) {  
56 - code = props.docType;  
57 - // personId = '';  
58 - }  
59 - //用户统计  
60 - if('COLLECT_USER'== props.treeNode.map.nodeType.view.code){  
61 - code = props.docType;  
62 - // props.treeNode.children.forEach(item => {  
63 - // personId += item.id +',';  
64 - // });  
65 - // if();  
66 - }  
67 // 查询绑定的文件列表 52 // 查询绑定的文件列表
68 let params = { 53 let params = {
69 opsId: props.projectId, 54 opsId: props.projectId,
70 personId: props.parentNode.id, 55 personId: props.parentNode.id,
71 - code: code? code:props.treeNode.map.nodeType.code  
72 - // code: "THREE_PERSONAGE_NDA" != props.docType?props.treeNode.map.nodeType.code:"THREE_PERSONAGE_NDA"  
73 - //code: props.treeNode.map.nodeType.view.code 56 + code: props.treeNode.map.nodeType.code
74 } 57 }
75 proxy.$http.get('/api-web/bOpsFile/search', params, function (res) { 58 proxy.$http.get('/api-web/bOpsFile/search', params, function (res) {
76 if (res && res.code == 0 && res.data && res.data.length > 0) { 59 if (res && res.code == 0 && res.data && res.data.length > 0) {
@@ -119,6 +102,7 @@ export default { @@ -119,6 +102,7 @@ export default {
119 } 102 }
120 103
121 104
  105 +
122 // 监听编辑状态 106 // 监听编辑状态
123 Vue.watch(() => props.treeNode, (newValue, oldVlaue) => { 107 Vue.watch(() => props.treeNode, (newValue, oldVlaue) => {
124 initFlg.value = false; 108 initFlg.value = false;