Authored by 王涛

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

…eb into master-500-dev
@@ -12,7 +12,7 @@ server: @@ -12,7 +12,7 @@ server:
12 key-store-password: Hg0801.. 12 key-store-password: Hg0801..
13 key-password: Hg0801.. 13 key-password: Hg0801..
14 url: 14 url:
15 - gateway: https://192.168.0.41:8080 15 + gateway: http://192.168.0.104:9200
16 inspection_web: http://127.0.0.1:8082 16 inspection_web: http://127.0.0.1:8082
17 assetsweb: http://127.0.0.1:8082 17 assetsweb: http://127.0.0.1:8082
18 mxgraph_editor: http://127.0.0.1:8085 18 mxgraph_editor: http://127.0.0.1:8085
@@ -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,31 @@ export default { @@ -46,14 +46,31 @@ 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 + }
52 // 查询绑定的文件列表 67 // 查询绑定的文件列表
53 let params = { 68 let params = {
54 opsId: props.projectId, 69 opsId: props.projectId,
55 personId: props.parentNode.id, 70 personId: props.parentNode.id,
56 - code: props.treeNode.map.nodeType.code 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
57 } 74 }
58 proxy.$http.get('/api-web/bOpsFile/search', params, function (res) { 75 proxy.$http.get('/api-web/bOpsFile/search', params, function (res) {
59 if (res && res.code == 0 && res.data && res.data.length > 0) { 76 if (res && res.code == 0 && res.data && res.data.length > 0) {
@@ -74,11 +91,11 @@ export default { @@ -74,11 +91,11 @@ export default {
74 * @param docIds 文档id集合 91 * @param docIds 文档id集合
75 */ 92 */
76 let delDocRel = (docIds) => { 93 let delDocRel = (docIds) => {
77 - console.log("delDocRel",docIds)  
78 - let param={  
79 - id:docIds.join(','), 94 + console.log("delDocRel", docIds)
  95 + let param = {
  96 + id: docIds.join(','),
80 } 97 }
81 - proxy.$http.get('/api-web/bOpsFile/deleteSearch',param, function (res){ 98 + proxy.$http.get('/api-web/bOpsFile/deleteSearch', param, function (res) {
82 99
83 }) 100 })
84 } 101 }
@@ -102,7 +119,6 @@ export default { @@ -102,7 +119,6 @@ export default {
102 } 119 }
103 120
104 121
105 -  
106 // 监听编辑状态 122 // 监听编辑状态
107 Vue.watch(() => props.treeNode, (newValue, oldVlaue) => { 123 Vue.watch(() => props.treeNode, (newValue, oldVlaue) => {
108 initFlg.value = false; 124 initFlg.value = false;