diff --git a/src/api/BrandComparison/BbsBrand.js b/src/api/BrandComparison/BbsBrand.js index d8d9d12..548d537 100644 --- a/src/api/BrandComparison/BbsBrand.js +++ b/src/api/BrandComparison/BbsBrand.js @@ -2,7 +2,7 @@ import httpService from "@/request" // 品牌对比-论坛信息概括对比 export function getCount0528C(params) { - let obj = Object.assign({action: 'getCount0528C', sType: 'BbsBrand', iContrastType: 1}, params) + let obj = Object.assign({action: 'getCount0528C', sType: 'BbsBrand', iContrastType: 1, iBBsType: 1}, params) return httpService({ url: `/api/v6.ashx`, method: 'post', @@ -15,7 +15,7 @@ export function getCount0528C(params) { // 品牌对比-论坛发帖趋势对比 export function getCountTime0528C(params) { - let obj = Object.assign({action: 'getCountTime0528C', sType: 'BbsBrand', iContrastType: 1}, params) + let obj = Object.assign({action: 'getCountTime0528C', sType: 'BbsBrand', iContrastType: 1, iBBsType: 1}, params) return httpService({ url: `/api/v6.ashx`, method: 'post', diff --git a/src/api/BrandComparison/BrandWeiyi.js b/src/api/BrandComparison/BrandWeiyi.js index 383f377..2ce59dc 100644 --- a/src/api/BrandComparison/BrandWeiyi.js +++ b/src/api/BrandComparison/BrandWeiyi.js @@ -2,7 +2,7 @@ import httpService from "@/request" // 品牌对比-尾翼信息趋势 export function getCountTime0528C(params) { - let obj = Object.assign({action: 'getCountTime0528C', sType: 'BrandWeiyi', iContrastType: 1}, params) + let obj = Object.assign({action: 'getCountTime0528C', sType: 'BrandWeiYi', iContrastType: 1}, params) return httpService({ url: `/api/v6.ashx`, method: 'post', @@ -15,7 +15,7 @@ export function getCountTime0528C(params) { // 品牌对比-分渠道信息量 export function getSourcetypeC(params) { - let obj = Object.assign({action: 'getSourcetypeC', sType: 'BrandWeiyi', iContrastType: 1}, params) + let obj = Object.assign({action: 'getSourcetypeC', sType: 'BrandWeiYi', iContrastType: 1}, params) return httpService({ url: `/api/v6.ashx`, method: 'post', @@ -28,7 +28,7 @@ export function getSourcetypeC(params) { // 品牌对比-尾翼top媒体 export function getSourceTopCount0528C(params) { - let obj = Object.assign({action: 'getSourceTopCount0528C', sType: 'BrandWeiyi', iContrastType: 1}, params) + let obj = Object.assign({action: 'getSourceTopCount0528C', sType: 'BrandWeiYi', iContrastType: 1}, params) return httpService({ url: `/api/v6.ashx`, method: 'post', diff --git a/src/lycomponents/iHeaderBrand/index.vue b/src/lycomponents/iHeaderBrand/index.vue index dca8706..78bfead 100644 --- a/src/lycomponents/iHeaderBrand/index.vue +++ b/src/lycomponents/iHeaderBrand/index.vue @@ -162,7 +162,9 @@ export default { this.selTime = null; this.reload(); } else { - this.reload() + if(this.getCtime2.sStartTime && this.getCtime2.sEndTime) { + this.reload(); + } } this.setCtime2(this.form); }, diff --git a/src/views/MyBrand/index.vue b/src/views/MyBrand/index.vue index fd4b516..cf20f1e 100644 --- a/src/views/MyBrand/index.vue +++ b/src/views/MyBrand/index.vue @@ -22,14 +22,14 @@ - +
选择 - + @@ -157,21 +157,9 @@ export default { this.settingForm.Crisis = val.join(','); }, openChange(e) { //预警开启/关闭 - let obj = { - Id: this.Id, - Statu: e?0:1 - }; - let form = { - token: this.getToken, - data: JSON.stringify(obj) - }; - addOrUpdSwsQyQuartzList(form).then(res => { - if(res.msg == 'Success') { - let m = e?'预警已开启':'预警已关闭' - this.Statu = e?'0':'1'; - this.$message.success(m); - } - }) + let m = e?'预警已开启':'预警已关闭' + this.Statu = e?'0':'1'; + this.$message.success(m); }, chooseSeries() { let obj = { @@ -187,11 +175,12 @@ export default { onSave() { let obj = { Id: this.Id, + Statu: this.Statu, Es: { Brands: this.getWarningBrand.brandname, SeriesNames: this.settingForm.SeriesNames, QingGan: 2, - Crisis: this.settingForm.Crisis + Crisis: this.settingForm.Crisis, }, }; let form = { diff --git a/src/views/Myself/index.vue b/src/views/Myself/index.vue index fbdc83c..d0e8661 100644 --- a/src/views/Myself/index.vue +++ b/src/views/Myself/index.vue @@ -11,6 +11,15 @@
+ + 修改密码 + + + 信息修改 + + + 推送设置 + 返回
@@ -19,15 +28,7 @@
{{getUser.UserName}} - - 修改密码 - - - 信息修改 - - - 推送设置 - +
账户名
@@ -119,19 +120,18 @@ - - + + - - — - + + — + - - + + - - — - + +
@@ -237,14 +237,6 @@ export default { Email: [{ validator: (rule, value, callback) => validateInput(rule, value, callback, '请输入邮箱!') }], }, pushVisible: false, - pushForm: { - WxWeek: '', - WxStart: '', - WxEnd: '', - EmailWeek: '', - EmailStart: '', - EmailEnd: '', - }, pushGroup: [ {label: '周一',value: '1'}, {label: '周二',value: '2'}, @@ -254,8 +246,11 @@ export default { {label: '周六',value: '6'}, {label: '周日',value: '7'}, ], - wxDateArr: [], - emDateArr: [], + publicDateArr: [], + publicStart: '', + publicEnd: '', + isWxOpen: false, + isEmailOpen: false }; }, created() { @@ -333,16 +328,18 @@ export default { this.pushVisible = true; getSwsQyWarningConf({token: this.getToken}).then(res => { let data = res.data[0]; - this.pushForm = { - WxWeek: data.WxWeek, - WxStart: data.WxStart, - WxEnd: data.WxEnd, - EmailWeek: data.EmailWeek, - EmailStart: data.EmailStart, - EmailEnd: data.EmailEnd, - }; - this.wxDateArr = data.WxWeek.split(','); - this.emDateArr = data.EmailWeek.split(','); + if(data.WxWeek) { + this.isWxOpen = true; + this.publicDateArr = data.WxWeek.split(','); + this.publicStart = data.WxStart; + this.publicEnd = data.WxEnd; + } + if(data.EmailWeek) { + this.isEmailOpen = true; + this.publicDateArr = data.EmailWeek.split(','); + this.publicStart = data.EmailStart; + this.publicEnd = data.EmailEnd; + } }) }, // 获取手机的验证码 @@ -391,7 +388,15 @@ export default { }) }, pushConfirm() { - let jsonData = JSON.stringify(this.pushForm) + let o = { + WxWeek: this.isWxOpen?this.publicDateArr.join(','):'', + WxStart: this.isWxOpen?this.publicStart:'', + WxEnd: this.isWxOpen?this.publicEnd:'', + EmailWeek: this.isEmailOpen?this.publicDateArr.join(','):'', + EmailStart: this.isEmailOpen?this.publicStart:'', + EmailEnd: this.isEmailOpen?this.publicEnd:'', + }; + let jsonData = JSON.stringify(o) let obj = { token: this.getToken, data: jsonData @@ -405,12 +410,6 @@ export default { } }) }, - wxDateChange(value) { - this.pushForm.WxWeek = value.join(',') - }, - emDateChange(value) { - this.pushForm.EmailWeek = value.join(',') - }, }, };