Bläddra i källkod

merge 文案库

jiayufei 4 år sedan
förälder
incheckning
74f06ddb61

+ 11 - 1
src/api/manage.js

@@ -20,7 +20,17 @@ export function postNoCacheAction(url, parameter) {
     }
   })
 }
-
+// post---文件
+export function postFileAction(url,parameter) {
+  return axios({
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    },
+    url: url,
+    method:'post' ,
+    data: parameter
+  })
+}
 //post
 export function postAction(url,parameter) {
   return axios({

+ 10 - 0
src/views/modules/copy-library/copy-library-server.js

@@ -0,0 +1,10 @@
+/**
+ * @file 账户配置API
+ * @author jiayufei
+ */
+
+// export const urlAcount = 'http://118.24.244.213:8080'; // 线上
+// export const urlAcount = 'http://apipre.tjyourong.com.cn'; // 预生产
+// export const urlAcount = 'http://192.168.1.43:8080'; // 子安
+// export const urlAcount = 'http://139.186.165.84:8080'; // 测试
+export const urlAcount = 'http://192.168.1.8:8080'; // 学超

+ 159 - 0
src/views/modules/copy-library/copy-library.less

@@ -0,0 +1,159 @@
+.copy-library-content {
+    background: #fff;
+    height: calc(100vh - 137px);
+    padding: 20px;
+    overflow-y: auto;
+    .control-con-header {
+        margin-bottom: 20px;
+        position: relative;
+        .common-input-long {
+            width: 320px;
+        }
+        .acount-search-class {
+            width: 450px;
+        }
+        .reset-class {
+            margin-right: 10px !important;
+        }
+        .upload-person {
+            position: absolute;
+            right: 10px;
+            top: 0;
+        }
+    }
+    .pagin-table-class {
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 20px;
+    }
+}
+.handle-p {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+/deep/ .copywrit-modal {
+    width: 700px !important;
+    .ant-modal-body {
+        height: 500px !important;
+        overflow-y: auto;
+    }
+    .ad-name-tags-class {
+        width: 500px;
+        display: flex;
+        .name-tags-left {
+            width: 350px;
+        }
+    }
+    .acount-title {
+        display: flex;
+        font-size: 14px;
+        margin-top: 12px;
+        line-height: 32px;
+        .acount-title-left {
+            margin-right: 20px;
+            width: 100px;
+        }
+        .only-title-mater {
+            width: 400px;
+            .select-project {
+                width: 100%;
+            }
+            .mater-list-name {
+                display: flex;
+                height: 30px;
+                margin: 0;
+                .mater-list-show {
+                    display: inline-block;
+                    width: 400px;
+                    white-space: nowrap;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                }
+                .mater-list-icon {
+                    margin-left: 10px;
+                    color: #1890ff;
+                    cursor: pointer;
+                }
+            }
+        }
+        .examin-form-model {
+            width: 500px;
+            position: relative;
+            .examin-form-num {
+                position: absolute;
+                top: -10px;
+                right: -50px;
+            }
+            .examin-form-icon {
+                position: absolute;
+                top: 0px;
+                right: -85px;
+                font-size: 18px;
+                color: #1890ff;
+                cursor: pointer;
+            }
+        }
+        .examin-form-input {
+            width: 380px;
+        }
+    }
+    .push-plate {
+        margin-bottom: 20px;
+        .examin-select-title {
+            margin: 0 20px 0 20px;
+        }
+    }
+}
+/deep/ .select-matermal-modal {
+    width: 1000px !important;
+    .common-input-long {
+        width: 280px;
+    }
+    .pagin-table-class {
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 20px;
+    }
+    .mater-viedo-content {
+        .viedo-header-class {
+            display: flex;
+            justify-content: space-between;
+            border-bottom: 1px solid #eee;
+            .refush-btn-mat {
+                margin-left: 20px;
+            }
+        }
+        .viedo-serach-class {
+            margin-top: 20px;
+        }
+        .viedo-content-class {
+            .viedo-content-group {
+                display: flex;
+                flex-wrap: wrap;
+            }
+            .content-modal-li {
+                border: 1px solid #e4e4e4;
+                width: 180px;
+                height: 360px;
+                text-align: center;
+                position: relative;
+                margin: 0 10px 10px 0;
+                .checkbox-select-show,
+                .checkbox-select-time {
+                    margin-top: 14px;
+                }
+                img {
+                    width: 90%;
+                    margin-top: 20px;
+                }
+                .viedo-content-checkbox {
+                    position: absolute;
+                    z-index: 100;
+                    left: 0;
+                    top: 0;
+                }
+            }
+        }
+    }
+}

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1151 - 0
src/views/modules/copy-library/copy-library.vue


+ 12 - 9
src/views/modules/headline-view/headline-view.vue

@@ -70,6 +70,7 @@
                                 <span v-else-if="item.type === 'double'">{{ Number(item.today) | decimalsHandle }}</span>
                                 <span v-else-if="item.type === 'string'">{{ Number(item.today) | decimalsHandle }}</span>
                                 <span v-else-if="item.type === 'int'">{{ item.today !== 0 ? item.today + '%' : 0 }}</span>
+                                <span v-else-if="item.type === 'average'">{{ Number(item.today) | decimalsHandle }}</span>
                                 <span class="sign">
                                     <a-icon type="rise" class="rise" v-show="item.today - item.yesterday > 0"/>
                                     <a-icon type="fall" class="fall" v-show="item.today - item.yesterday < 0" />
@@ -81,6 +82,7 @@
                                 <span v-else-if="item.type === 'double'">{{ Number(item.yesterday) | decimalsHandle }}</span>
                                 <span v-else-if="item.type === 'string'">{{ Number(item.yesterday) | decimalsHandle }}</span>
                                 <span v-else-if="item.type === 'int'">{{ item.yesterday !== 0 ? item.yesterday + '%' : 0 }}</span>
+                                <span v-else-if="item.type === 'average'">{{ Number(item.yesterday) | decimalsHandle }}</span>
                             </div>
                             <span
                                 class="IndexName"
@@ -404,7 +406,7 @@ export default {
                     key: 'formCount',
                     today: 0,
                     yesterday: 0,
-                    type: 'int'
+                    type: 'average'
                 }
             ],
             newLink: '',
@@ -803,6 +805,7 @@ export default {
                     this.throwColumns[3].yesterday = Number(result.result.lastMap.converRate);
                     this.throwColumns[4].today = Number(result.result.nowMap.averageShow);
                     this.throwColumns[4].yesterday = Number(result.result.lastMap.averageShow);
+                    this.isActive = 'spendCost';
                 }
                 else {
                     this.$message.error(result.message);
@@ -1057,7 +1060,7 @@ export default {
                     trigger: 'axis',
                     formatter: params => {
                         let isType = '';
-                        let showBai = this.isActive === 'bclick' || this.isActive === 'formCount' ? '%' : '';
+                        let showBai = this.isActive === 'bclick' ? '%' : '';
                         this.throwColumns.forEach(item => {
                             if (item.dataIndex === this.isActive) {
                                 isType = item.title;
@@ -1082,17 +1085,16 @@ export default {
                         type: 'category',
                         show: false,
                         boundaryGap: false,
-                        data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+                        data: [],
                         axisPointer: {
                             type: 'none'
                         }
-                        
                     },
                     {
                         type: 'category',
                         show: false,
                         boundaryGap: false,
-                        data: ['1', '2', '3', '4', '5', '6', '7'],
+                        data: [],
                         axisPointer: {
                             type: 'none'
                         }
@@ -1109,7 +1111,7 @@ export default {
                         type: 'line',
                         smooth: true,
                         showSymbol: false,
-                        xAxisIndex: 1,
+                        xAxisIndex: 0,
                         symbol: 'circle',
                         lineStyle: {
                             color: '#2461F1',
@@ -1143,7 +1145,7 @@ export default {
                         data: [],
                         type: 'line',
                         smooth: true,
-                        xAxisIndex: 0,
+                        xAxisIndex: 1,
                         showSymbol: false,
                         symbol: 'circle',
                         lineStyle: {
@@ -1176,6 +1178,8 @@ export default {
             };
             option.xAxis[0].data = todayX;
             option.xAxis[1].data = LastX;
+            option.series[0].name = data.nowMap.costList[0].statDatetime;
+            option.series[1].name = data.lastMap.costList[0].statDatetime;
             option.series[0].data = tadayShowY;
             option.series[1].data = yestodayShowY;
             return option;
@@ -1221,8 +1225,7 @@ export default {
                         detail: {
                             formatter: function(value) {
                                 if (value !== 0) {
-                                    let num = Math.round(value);
-                                    return parseInt(num).toFixed(0) + '%';
+                                    return value + '%';
                                 }
                                 else {
                                     return 0;