Merge branch 'dev'

prod
校文 3 years ago
commit 06b2ed174f

@ -3,53 +3,26 @@
<div class="d-outer"> <div class="d-outer">
<div class="ds-inner"> <div class="ds-inner">
<v-label-div style="background: #010B19" title="专项分析"> <v-label-div style="background: #010B19" title="专项分析">
<a-button @click="handlerAdd" type="primary">新增主题</a-button> <a-button @click="handlerAdd" type="primary">新增专项分析</a-button>
</v-label-div> </v-label-div>
<div class="card-container"> <div class="tab-pane">
<a-tabs type="card" @change=handlerChangeTheme> <div class="card-items" v-for="(item, index) in myThemeArr" :key="index">
<a-tab-pane class="tab-pane" key="0" tab="专项列表"> <div class="card-item-top">
<div class="card-items" v-for="(item, index) in myThemeArr" :key="index"> <div class="card-uncomp" v-if="item.Classify == 1">
<div class="card-item-top"> <span style="margin-top: 5px">按品牌</span>
<div class="card-uncomp" v-if="!item.isCom">
<span style="margin-top: 5px">进行中</span>
</div>
<div class="card-completed" v-else></div>
<v-card-button @edit="handlerEdit(item.Guids)" @del="handlerDel(item.Guids)"></v-card-button>
</div>
<div class="card-item-data" @click="toThemeData(item.Guids,item.Name,item.Classify)">
<div class="cid-title">
{{item.Name}}
</div>
<div class="cid-data">
<div class="s1"><div class="s1-title">开始时间</div><div class="s1-text">{{item.StartTime}}</div></div>
<div class="s1"><div class="s1-title">结束时间</div><div class="s1-text">{{item.EndTime}}</div></div>
<div class="s1"><div class="s1-title">选择数量</div><div class="s1-text">{{item.ReportSum}}</div></div>
</div>
</div>
</div> </div>
</a-tab-pane> <div class="card-uncomp" v-else></div>
<a-tab-pane class="tab-pane" key="1" tab="往期列表"> <v-card-button @edit="handlerEdit(item.Guids)" @del="handlerDel(item.Guids)"></v-card-button>
<div class="card-items" v-for="(item, index) in myThemeArr" :key="index"> </div>
<div class="card-item-top"> <div class="card-item-data" @click="toThemeData(item.Guids,item.Name,item.Classify)">
<div class="card-uncomp" v-if="!item.isCom"> <div class="cid-title">{{item.Name}}</div>
<span style="margin-top: 5px">进行中</span> <div class="cid-data">
</div> <div class="s1"><div class="s1-title">开始时间</div><div class="s1-text">{{item.StartTime}}</div></div>
<div class="card-completed" v-else></div> <div class="s1"><div class="s1-title">结束时间</div><div class="s1-text">{{item.EndTime}}</div></div>
<v-card-button @edit="handlerEdit(item.Guids)" @del="handlerDel(item.Guids)"></v-card-button> <div class="s1"><div class="s1-title">选择数量</div><div class="s1-text">{{item.ReportSum}}</div></div>
</div> </div>
<div class="card-item-data" @click="toThemeData(item.Guids,item.Name)"> </div>
<div class="cid-title"> </div>
{{item.Name}}
</div>
<div class="cid-data">
<div class="s1"><div class="s1-title">开始时间</div><div class="s1-text">{{item.StartTime}}</div></div>
<div class="s1"><div class="s1-title">结束时间</div><div class="s1-text">{{item.EndTime}}</div></div>
<div class="s1"><div class="s1-title">选择数量</div><div class="s1-text">{{item.ReportSum}}</div></div>
</div>
</div>
</div>
</a-tab-pane>
</a-tabs>
</div> </div>
</div> </div>
</div> </div>
@ -92,12 +65,10 @@ export default {
border: 2px solid #0F2A4D; border: 2px solid #0F2A4D;
background: #010B19; background: #010B19;
} }
.card-container { .tab-pane {
background: #010B19; background: #010B19;
overflow: hidden; overflow: hidden;
padding: 16px; padding: 0 16px 16px 16px;
}
.tab-pane {
display: flex; display: flex;
flex-wrap:wrap; flex-wrap:wrap;
justify-content: flex-start; justify-content: flex-start;

@ -25,7 +25,7 @@
<img class="dd1" src="../../assets/images/ModelInsight/ic_qrpl.png" /> <img class="dd1" src="../../assets/images/ModelInsight/ic_qrpl.png" />
<div class="dd2"> <div class="dd2">
<span class="s1">{{ countObj.ReplyCount }}</span> <span class="s1">{{ countObj.ReplyCount }}</span>
<span class="s2">评论总数量</span> <span class="s2">互动人数</span>
</div> </div>
</div> </div>
<div class="d2"> <div class="d2">

@ -37,7 +37,7 @@ export default {
return { return {
load: false, load: false,
form: { form: {
sBrand: "", sSpecialGuid: "",
token: "", token: "",
}, },
labelArr: [], labelArr: [],
@ -69,7 +69,7 @@ export default {
}, },
created() { created() {
this.form.token = this.getToken; this.form.token = this.getToken;
this.form.sBrand = this.getBrand.brandname || '奥迪'; this.form.sSpecialGuid = this.$route.query.sSpecialGuid;
this.getData(); this.getData();
}, },
methods: { methods: {

@ -167,7 +167,7 @@ export default {
} }
this.$router.push({ this.$router.push({
path: '/specialAnalizeBoard', path: '/specialAnalizeBoard',
query: {sSpecialGuid: r.msg,name: res.Name, Classify: res.data.classify} query: {sSpecialGuid: r.msg,name: res.data.Name, Classify: res.data.classify}
}) })
}) })
} }
@ -204,10 +204,18 @@ export default {
this.seriesShow = false; this.seriesShow = false;
}, },
selectAllBrand(all) { selectAllBrand(all) {
this.chosenBrandList = [...this.chosenBrandList, ...all]; all.forEach(ele => {
if(this.chosenBrandList.indexOf(ele) == -1) {
this.chosenBrandList.push(ele)
}
})
}, },
selectAll(all) { selectAll(all) {
this.chosenSeriesList = [...this.chosenSeriesList, ...all]; all.forEach(ele => {
if(this.chosenSeriesList.indexOf(ele) == -1) {
this.chosenSeriesList.push(ele)
}
})
}, },
delBrand(index) { delBrand(index) {
if(this.form.Classify == 1) { if(this.form.Classify == 1) {
@ -280,7 +288,7 @@ export default {
text-align: center; text-align: center;
.close-icon { .close-icon {
position: relative; position: relative;
margin-top: 30px; margin-top: 32px;
margin-right: 24px; margin-right: 24px;
float: right; float: right;
color: #3373CC; color: #3373CC;

Loading…
Cancel
Save