Prechádzať zdrojové kódy

Merge branch 'feature/work-jyf' into V1.1.7

jiayufei 4 rokov pred
rodič
commit
e2ea5ffdbf

+ 15 - 16
src/views/modules/crowd-control/components/tree-select/tree-select.vue

@@ -1,9 +1,7 @@
 <template>
 <template>
     <div class="tree-select-class">
     <div class="tree-select-class">
         <div class="select-class-left">
         <div class="select-class-left">
-            <div class="class-left-header">
-                选择分享的账户名称
-            </div>
+            <div class="class-left-header">选择分享的账户名称</div>
             <div class="class-left-content">
             <div class="class-left-content">
                 <a-input-search class="input-search" placeholder="Search" @change="onChange" />
                 <a-input-search class="input-search" placeholder="Search" @change="onChange" />
                 <template>
                 <template>
@@ -77,7 +75,7 @@ export default {
         getAccountId() {
         getAccountId() {
             postAction('/ctop/projectMember/participateListByMediaId', {
             postAction('/ctop/projectMember/participateListByMediaId', {
                 userId: this.userInfo().id,
                 userId: this.userInfo().id,
-                type: 'kuaishou',
+                type: 'kuaishou'
             }).then(result => {
             }).then(result => {
                 if (result.result.length) {
                 if (result.result.length) {
                     this.spinning = false;
                     this.spinning = false;
@@ -90,16 +88,16 @@ export default {
                                 return {
                                 return {
                                     key: i.accountId,
                                     key: i.accountId,
                                     title:
                                     title:
-                                    (i.userName.length == 2
+                                    (i.userName.length === 2
                                         ? i.userName + '\xa0\xa0\xa0\xa0\xa0'
                                         ? i.userName + '\xa0\xa0\xa0\xa0\xa0'
-                                        : i.userName.length == 3
+                                        : i.userName.length === 3
                                         ? i.userName + '\xa0\xa0\xa0\xa0'
                                         ? i.userName + '\xa0\xa0\xa0\xa0'
-                                        : i.userName) +
-                                    '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0' +
-                                    i.accountId +
-                                    '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0' +
-                                    i.authName,
-                                }
+                                        : i.userName)
+                                        + '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0'
+                                        + i.accountId
+                                        + '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0'
+                                        + i.authName
+                                };
                             }) : []
                             }) : []
                         };
                         };
                     });
                     });
@@ -139,7 +137,8 @@ export default {
                 if (text.indexOf(value) > -1) {
                 if (text.indexOf(value) > -1) {
                     newTreeData.push(node);
                     newTreeData.push(node);
                     continue;
                     continue;
-                } else {
+                }
+                else {
                     if (children) {
                     if (children) {
                         let newNodes = this.getNewTreeData(node.children, value);
                         let newNodes = this.getNewTreeData(node.children, value);
                         if (newNodes.length > 0) {
                         if (newNodes.length > 0) {
@@ -173,7 +172,7 @@ export default {
                 if (item.children) {
                 if (item.children) {
                     this.nodes(item.children, checkedKeys);
                     this.nodes(item.children, checkedKeys);
                 }
                 }
-                else { 
+                else {
                     if (checkedKeys.indexOf(item.key) !== -1) {
                     if (checkedKeys.indexOf(item.key) !== -1) {
                         this.selectRightData.add(item);
                         this.selectRightData.add(item);
                     }
                     }
@@ -181,9 +180,9 @@ export default {
                         this.selectRightData.delete(item);
                         this.selectRightData.delete(item);
                     }
                     }
                 }
                 }
-            })
+            });
         }
         }
-    },
+    }
 };
 };
 </script>
 </script>
 <style lang="less" scoped>
 <style lang="less" scoped>

+ 1 - 1
src/views/modules/crowd-control/crowd-control.vue

@@ -434,7 +434,7 @@ export default {
         },
         },
         handleCauseTableData() {
         handleCauseTableData() {
             const paramsData = {
             const paramsData = {
-                orientationId: this.causeDetailData.orientationId,
+                signature: this.causeDetailData.signature,
                 pageNo: this.causePag.page,
                 pageNo: this.causePag.page,
                 pageSize: this.causePag.size
                 pageSize: this.causePag.size
             };
             };