Merge branch 'master-500-dev-XuHaoJie' into 'master-500-dev'

青海-运维管理-汇总点击事件优化



See merge request !427

@@ -12,7 +12,7 @@ server:
     key-store-password: Hg0801..
     key-password: Hg0801..
 url:
-  gateway: https://192.168.0.41:8080
+  gateway: http://192.168.0.104:9200
   inspection_web: http://127.0.0.1:8082
   assetsweb: http://127.0.0.1:8082
   mxgraph_editor: http://127.0.0.1:8085

@@ -76,11 +76,14 @@
 .yfyw-user .zc-view .zc-info {
     width: calc(100% - 120px);
     text-align: left;
+    display: flex;
+    justify-content: space-between;
 }
 
 .yfyw-user .zc-view .zc-item {
     display: flex;
-    flex-wrap: wrap
+    flex-wrap: wrap;
+    flex: 1;
 }
 
 .yfyw-user .zc-view .zc-item .zc-item-label {
@@ -102,7 +105,9 @@
 
 .yfyw-user .zc-view .zc-info .zc-item-tools {
     text-align: right;
-    padding: 3px
+    padding: 3px;
+    display: flex;
+    align-items: end;
 }
 
 /*-------------------------------------*/

@@ -46,14 +46,31 @@ export default {
 
         let init = () => {
             //如果是日常资料，不能点击
-            if("TWO_DAY_MATERIAL"== props.treeNode.map.nodeType.code){
+            if ("TWO_DAY_MATERIAL" == props.treeNode.map.nodeType.code) {
                 return true;
             }
+            let code = '';
+            let personId = '';
+            //项目统计
+            if ('COLLECT_ALL' == props.treeNode.map.nodeType.view.code) {
+                code = props.docType;
+                // personId = '';
+            }
+            //用户统计
+            if('COLLECT_USER'== props.treeNode.map.nodeType.view.code){
+                code = props.docType;
+                // props.treeNode.children.forEach(item => {
+                //     personId += item.id +',';
+                // });
+                //  if();
+            }
             // 查询绑定的文件列表
             let params = {
                 opsId: props.projectId,
                 personId: props.parentNode.id,
-                code: props.treeNode.map.nodeType.code
+                code: code? code:props.treeNode.map.nodeType.code
+                // code: "THREE_PERSONAGE_NDA" != props.docType?props.treeNode.map.nodeType.code:"THREE_PERSONAGE_NDA"
+                //code: props.treeNode.map.nodeType.view.code
             }
             proxy.$http.get('/api-web/bOpsFile/search', params, function (res) {
                 if (res && res.code == 0 && res.data && res.data.length > 0) {
@@ -74,11 +91,11 @@ export default {
          * @param docIds 文档id集合
          */
         let delDocRel = (docIds) => {
-            console.log("delDocRel",docIds)
-            let param={
-                id:docIds.join(','),
+            console.log("delDocRel", docIds)
+            let param = {
+                id: docIds.join(','),
             }
-            proxy.$http.get('/api-web/bOpsFile/deleteSearch',param, function (res){
+            proxy.$http.get('/api-web/bOpsFile/deleteSearch', param, function (res) {
 
             })
         }
@@ -102,7 +119,6 @@ export default {
         }
 
 
-
         // 监听编辑状态
         Vue.watch(() => props.treeNode, (newValue, oldVlaue) => {
             initFlg.value = false;