Browse Source

Merge branch 'master' into feature/work-jyf

jiayufei 4 years ago
parent
commit
63454839d6

+ 9 - 9
.editorconfig

@@ -3,37 +3,37 @@ charset = utf-8
 end_of_line = crlf
 insert_final_newline = false
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 [{*.ng, *.sht, *.html, *.shtm, *.shtml, *.htm}]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 [{*.jhm, *.xslt, *.xul, *.rng, *.xsl, *.xsd, *.ant, *.tld, *.fxml, *.jrxml, *.xml, *.jnlp, *.wsdl}]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 [{.babelrc, .stylelintrc, jest.config, .eslintrc, .prettierrc, *.json, *.jsb3, *.jsb2, *.bowerrc}]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 [*.svg]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 [*.js.map]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 [*.less]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 [*.vue]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 [{.analysis_options, *.yml, *.yaml}]
 indent_style = space
-indent_size = 2
+indent_size = 4
 

+ 5 - 1
src/config/router.config.js

@@ -77,7 +77,11 @@ export const constantRouterMap = [
       }
     ]
   },
-
+  {
+    path: '/creat-config',
+    name: 'creatConfig',
+    component: () => import(/* webpackChunkName: "fail" */ '@/views/modules/autoLaunch/configProject/creatConfig')
+  },
 
   {
     path: '/test',

+ 14 - 0
src/filters.js

@@ -3,6 +3,20 @@ import moment from 'moment';
 function fixedZero(val) {
     return val * 1 < 10 ? `0${val}` : val;
 }
+// function getrandom(minnum , maxnum ,total,size){
+//     var num = total; //定义整数
+//     var length= size;  //定义多个整数的数量
+//     var numArr = [];
+//     while(length > 1){
+//         var rnd = Math.floor(Math.random() * num); //通过JS的随机函数生成随机数
+//         num -= rnd;
+//         numArr.push(rnd);
+//         length --;
+//     }
+//     numArr.push(num);
+//     console.info(numArr);
+//     return numArr;
+// };getrandom(6,30,45,6)
 const filters = {
     // 格式化时间展示多长时间之前
     formatTime(time) {

+ 1 - 1
src/permission.js

@@ -10,7 +10,7 @@ import { generateIndexRouter } from "@/utils/util"
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
 
-const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration', '/user/transfer-local', '/errorPage', '/user/new-batch', '/user/lookPreview', 'http://192.168.0.111:8088/jeecg-boot/sys/feishu/url', '/user/FStransfer'] // no redirect whitelist
+const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration', '/user/transfer-local', '/errorPage', '/user/new-batch', '/user/lookPreview', 'http://192.168.0.111:8088/jeecg-boot/sys/feishu/url', '/user/FStransfer','/creat-config'] // no redirect whitelist
 
 router.beforeEach((to, from, next) => {
   NProgress.start() // start progress bar

+ 4 - 1
src/views/modules/Statistics/Statistics.vue

@@ -118,7 +118,7 @@ p{
           :activeTabKey="noTitleKey"
           @tabChange="key => onTabChange(key, 'noTitleKey')"
         >
-          <div id="chart" style="width:100%;height:500px"></div>
+          <div id="chart" style="width:100%;height:500px" :style="{ width: clientWidth - 48 - 24 + 'px' }"></div>
           <a-button class="duibi" type='primary'  @click="visible = true">数据对比</a-button>
         </a-card>
       </a-col>
@@ -363,6 +363,7 @@ export default {
 
   data: function() {
     return {
+      clientWidth: 0,
       loading: true,
       columns: [
         { title: '时间', dataIndex: 'statDate', align: 'center' },
@@ -1484,6 +1485,7 @@ export default {
       chart.clear()
       chart.setOption(option, true)
       window.onresize = function() {
+			  this.clientWidth = document.documentElement.clientWidth - 224;
         chart.resize()
       }
       // this.chart.on('click', param => {
@@ -1507,6 +1509,7 @@ export default {
   },
   activated: function() {
     this.$nextTick(() => {
+			this.clientWidth = document.documentElement.clientWidth - 224;
         postAction('/v1/api/file/getFileListByPage',{page: 1,size: 10}).then(res=>{
             console.log(res)
         })

File diff suppressed because it is too large
+ 1235 - 940
src/views/modules/Statistics/materialReport/materialReport.vue


+ 8 - 8
src/views/modules/advertiser/ProjectMemberList.vue

@@ -262,7 +262,7 @@
             <a-input type="password" v-model="password" placeholder="请输入密码" />
           </a-form-item>
         </div>
-        <!-- <a-form-item
+        <a-form-item
           label="自动投放"
           :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
           :wrapperCol="{ xs: { span: 24 }, sm: { span: 16 } }"
@@ -274,11 +274,11 @@
               { rules: [{ required: true, message: '请选择是否自动投放' }], initialValue: 1 },
             ]"
           >
-            <a-radio-button :value="1">开启</a-radio-button>
-            <a-radio-button :value="0">关闭</a-radio-button>
+            <a-radio-button :value="1">允许</a-radio-button>
+            <a-radio-button :value="3">禁止</a-radio-button>
           </a-radio-group>
-        </a-form-item> -->
-        <!-- <a-form-item
+        </a-form-item>
+        <a-form-item
           label="物料同步"
           :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
           :wrapperCol="{ xs: { span: 24 }, sm: { span: 16 } }"
@@ -293,7 +293,7 @@
                 v-decorator="['materialType', { rules: [{ required: true, message: '请选择同步物料' }], initialValue: [0] }]"
                 @change="changeData"
               />
-        </a-form-item> -->
+        </a-form-item>
       </a-form>
     </a-modal>
 
@@ -895,8 +895,8 @@ export default {
       // 触发表单验证
       this.formEdit.validateFields((err, values) => {
         if (!err) {
-          // params.materialType = values.materialType
-          // params.autoDelivery = values.autoDelivery
+          params.materialType = values.materialType
+          params.autoDelivery = values.autoDelivery
           if (this.mode == 'login') {
             params.accountName = this.accountName
             params.password = this.password

+ 14 - 0
src/views/modules/autoLaunch/configProject/configProject-service.js

@@ -0,0 +1,14 @@
+/**
+ * @file 项目配置列表
+ * @author zhuxinbo(zhuxinbo@c-top.com.cn)
+ */
+
+class AppMarketService {
+    constructor() { }
+
+
+
+
+}
+
+export default new AppMarketService();

+ 6 - 0
src/views/modules/autoLaunch/configProject/configProject.less

@@ -0,0 +1,6 @@
+.config-project {
+    .middle-button {
+        margin: 0 8px;
+    }
+  
+}

File diff suppressed because it is too large
+ 3480 - 0
src/views/modules/autoLaunch/configProject/creatConfig.vue


+ 96 - 0
src/views/modules/autoLaunch/configProject/editablCell.vue

@@ -0,0 +1,96 @@
+<template>
+    <div class="editable-cell">
+        <div v-if="editable" class="editable-cell-input-wrapper">
+            <a-input :value="value" @change="handleChange" @pressEnter="check" /><a-icon
+                type="check"
+                class="editable-cell-icon-check"
+                @click="check"
+            />
+        </div>
+        <div v-else class="editable-cell-text-wrapper">
+            <div
+                style="width:90%;
+                overflow:hidden;
+                text-overflow:ellipsis;
+                white-space:nowrap;"
+                :title="value"
+            >
+                {{ value || '' }}
+            </div>
+
+            <a-icon type="edit" class="editable-cell-icon" :style="{ top: value ? '10px' : '0px' }" @click="edit" />
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    props: {
+        text: String
+    },
+    data() {
+        return {
+            value: this.text,
+            editable: false
+        }
+    },
+    methods: {
+        handleChange(e) {
+            const value = e.target.value
+            this.value = value
+        },
+        check() {
+            this.editable = false
+            this.$emit('change', this.value)
+        },
+        edit() {
+            this.editable = true
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.editable-cell {
+    position: relative;
+}
+
+.editable-cell-input-wrapper,
+.editable-cell-text-wrapper {
+    padding-right: 24px;
+}
+
+.editable-cell-text-wrapper {
+    padding: 5px 24px 5px 5px;
+}
+
+.editable-cell-icon,
+.editable-cell-icon-check {
+    position: absolute;
+    right: 0;
+    width: 20px;
+    top: 10px;
+    cursor: pointer;
+}
+
+.editable-cell-icon {
+    line-height: 18px;
+    display: none;
+}
+
+.editable-cell-icon-check {
+    line-height: 28px;
+}
+
+.editable-cell:hover .editable-cell-icon {
+    display: inline-block;
+}
+
+.editable-cell-icon:hover,
+.editable-cell-icon-check:hover {
+    color: #108ee9;
+}
+
+.editable-add-btn {
+    margin-bottom: 8px;
+}
+</style>

File diff suppressed because it is too large
+ 1428 - 0
src/views/modules/autoLaunch/configProject/index.vue


+ 3 - 3
src/views/modules/autoLaunch/material-all/components/templateModal.vue

@@ -185,7 +185,7 @@ export default {
           this.populationData.allForm.noAgeBreak = dataJson.noAgeBreak + ''
           this.populationData.allForm.noGenderBreak = dataJson.noGenderBreak + ''
           this.populationData.allForm.noAreaBreak = dataJson.noAreaBreak + ''
-          this.populationData.allForm.behaviorInterest = dataJson.label ? '1' : '0'
+          this.populationData.allForm.behaviorInterest = dataJson.label=='[]' ? '1' : '0'
           this.populationData.allForm.checkArr =
             this.populationData.allForm.appType == '2' ? JSON.parse(dataJson.appIds) : []
           this.populationData.projectId = dataJson.projectId + ''
@@ -219,8 +219,8 @@ export default {
                   signature: data.md5,
                   id:this.id
                 }
-                params.label = JSON.stringify(params.behavior)
-                params.interestLabel = JSON.stringify(params.interest)
+                params.label = params.behavior?JSON.stringify(params.behavior):'[]'
+                params.interestLabel = params.interest?JSON.stringify(params.interest):'[]'
                 console.log(this.populationData)
                 if (this.populationData.allForm.regionType == 'limit') {
                   if(this.populationData.allForm.region.length === 0) {

+ 1 - 1
src/views/user/Login.vue

@@ -441,7 +441,7 @@ export default {
     loginSuccess() {
       this.loginBtn = false
       this.$router.push({
-        name: 'dashboard',
+        path: '/dashboard/analysis',
       })
       this.$notification.success({
         message: '欢迎',

+ 2 - 2
vue.config.js

@@ -84,9 +84,9 @@ module.exports = {
 				// target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
 				// target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
 				//  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目
-				// target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目 
+				// target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
 				// target:'http://118.24.244.213:8804',
-				// target: 'http://192.168.1.43:8806', // 子安
+				// target: 'http://192.168.1.43:9090', // 子安
 				// target: 'http://192.168.1.8:8806', // 学超
 				target:'http://139.186.165.84:8806', //测试
 				// target:'http://apipre.tjyourong.com.cn', //预生产