Bladeren bron

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

jiayufei 4 jaren geleden
bovenliggende
commit
4a74ad5d64

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

@@ -3,7 +3,7 @@
         <div class="select-class-left">
             <div class="class-left-header">选择分享的账户名称</div>
             <div class="class-left-content">
-                <a-input-search class="input-search" placeholder="Search" @change="onChange" />
+                <a-input-search class="input-search" placeholder="请输入账户名或ID" @change="onChange" />
                 <template>
                     <a-tree
                         v-model="checkedKeys"

+ 8 - 0
src/views/modules/crowd-control/crowd-control.less

@@ -63,6 +63,14 @@
     .acount-search-class {
         width: 100% !important;
     }
+    .upload-txt-rules {
+        margin-top: 10px;
+        margin-bottom: 10px;
+        line-height: 1.5;
+    }
+    /deep/ .ant-radio-group {
+        line-height: 30px;
+    }
 }
 /deep/ .cause-modal {
     width: 600px !important;

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

@@ -119,6 +119,7 @@
                             name="file"
                             :file-list="fileList"
                             :before-upload="beforeUpload"
+                            @change="handleChange"
                         >
                             <a-button><a-icon type="upload" />文件上传</a-button>
                         </a-upload>
@@ -141,7 +142,7 @@
             <div>
                 <div class="acount-title">
                     <div class="acount-title-left">已选人群包</div>
-                    <div class="acount-title-right">{{ tableSelectList.orientationName }}</div>
+                    <div class="acount-title-right">{{ tableSelectList.orientationName }} (ID: {{ tableSelectList.id }})</div>
                 </div>
                 <div class="acount-title push-plate">
                     <div class="acount-title-left">推送平台</div>
@@ -376,6 +377,9 @@ export default {
                     this.dataSource = result.result.list || [];
                     this.totalAll = result.result.total || 0;
                 }
+                else {
+                    this.$message.error(result.message);
+                }
             }).catch(error => {
                 console.log(error, 'eeee');
             });
@@ -389,6 +393,9 @@ export default {
                         if (result.code === 200) {
                             this.handleGetTableList({});
                         }
+                        else {
+                            this.$message.error(result.message);
+                        }
                     }).catch(error => {
                         console.log(error, 'eeee');
                     });
@@ -410,6 +417,9 @@ export default {
                         this.acountData = result.result.list;
                     }
                 }
+                else {
+                    this.$message.error(result.message);
+                }
             }).catch(error => {
                 console.log(error, 'eeee');
             });
@@ -444,6 +454,9 @@ export default {
                     this.causeData = result.result.list || [];
                     this.totalAllCause = result.result.total || 0;
                 }
+                else {
+                    this.$message.error(result.message);
+                }
             }).catch(error => {
                 console.log(error, 'eeee');
             });
@@ -469,6 +482,9 @@ export default {
                     this.pushVisible = false;
                     this.handleGetTableList({});
                 }
+                else {
+                    this.$message.error(result.message);
+                }
             }).catch(error => {
                 console.log(error, 'eeeeeee');
             });
@@ -490,6 +506,9 @@ export default {
             }
             this.cosUpload(file);
         },
+        handleChange(info) {
+            this.fileList = info.fileList;
+        },
         cosUpload(file) {
             let that = this;
             let date = new Date();
@@ -583,6 +602,9 @@ export default {
                     this.personVisible = false;
                     this.handleGetTableList({});
                 }
+                else {
+                    this.$message.error(result.message);
+                }
             }).catch(error => {
                 console.log(error, 'eeee');
             });

+ 1 - 1
src/views/modules/stockWatch/accountPage.vue

@@ -1159,7 +1159,7 @@ const columns=[
                     option.xAxis[0].data=data.xData?data.xData.yesterday:[]
                     option.xAxis[1].data=data.xData?data.xData.today:[]
                    
-                }
+                } 
                 option.series[0].name=data.yData?data.yData.yesterday.name:''
                 option.series[1].name=data.yData?data.yData.today.name:''
                 option.series[0].data=data.yData?data.yData.yesterday.data:[]