Merge branch 'dev' of git.oa00.com:SWS/carInsightSystem into dev

* 'dev' of git.oa00.com:SWS/carInsightSystem:
  lyl

# Conflicts:
#	src/views/EventDEC/esprocess/index.vue
#	src/views/EventDEC/tonalCommunicationPosture/index.vue
prod
lily.zhang 3 years ago
commit 4637aae19f

@ -181,27 +181,27 @@ export function getWebsite(params) {
})
}
// 尾翼分析-正面词云
// export function getPositive(params) {
// let obj = Object.assign({action: 'getPositive', sType: 'BrandWeiYi'}, params)
// return httpService({
// url: `/api/v6.ashx`,
// method: 'post',
// data: obj,
// headers: {
// 'content-type': 'application/x-www-form-urlencoded'
// }
// })
// }
export function getPositive1(params) {
let obj = Object.assign({action: 'getPositive', sType: 'BrandWeiYi'}, params)
return httpService({
url: `/api/v6.ashx`,
method: 'post',
data: obj,
headers: {
'content-type': 'application/x-www-form-urlencoded'
}
})
}
// 尾翼分析-负面词云
// export function getNegative(params) {
// let obj = Object.assign({action: 'getNegative', sType: 'BrandWeiYi'}, params)
// return httpService({
// url: `/api/v6.ashx`,
// method: 'post',
// data: obj,
// headers: {
// 'content-type': 'application/x-www-form-urlencoded'
// }
// })
// }
export function getNegative1(params) {
let obj = Object.assign({action: 'getNegative', sType: 'BrandWeiYi'}, params)
return httpService({
url: `/api/v6.ashx`,
method: 'post',
data: obj,
headers: {
'content-type': 'application/x-www-form-urlencoded'
}
})
}

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-10-19 19:45:01
* @LastEditTime: 2021-11-17 10:13:50
* @LastEditTime: 2021-11-17 10:17:53
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: /data-show/src/views/EventDEC/esprocess/index.vue
@ -113,6 +113,7 @@ export default {
form: {
sRele: "",
token: "",
sTimeType: "",
},
list: [],
m1: require("../../../assets/images/EventInsight/img_ct.png"),

@ -60,7 +60,7 @@ export default {
},
methods: {
getDdta() {
let obj = Object.assign({}, this.getCtime2, this.form);
let obj = Object.assign({}, this.form);
this.load = true;
getSourcetypeTime(obj).then((res) => {
let data = res.data || [];

@ -113,7 +113,6 @@ export default {
getEventData(obj).then(res => {
let data = res.data || [];
this.eventObj = {...data[0]._source};
console.log(this.eventObj)
this.load = false;
})
},

@ -35,9 +35,9 @@ export default {
},
},
form: {
sBrand: "",
token: "",
sSeriesName: "",
sRele: "",
},
d1: [],
d2: [],
@ -45,8 +45,7 @@ export default {
},
created() {
this.form.token = this.getToken;
this.form.sBrand = this.getBrand.brandname || this.brand;
this.form.sSeriesName = this.getModel.name;
this.form.sRele = this.id;
this.getData();
},
methods: {

@ -72,8 +72,8 @@ export default {
sum: "",
form: {
token: "",
sBrand: "",
sSeriesName: ""
sRele: "",
},
countObj: {
carseriesCount: 0,
@ -140,8 +140,7 @@ export default {
},
created() {
this.form.token = this.getToken;
this.form.sBrand = this.getBrand.brandname || "奥迪";
this.form.sSeriesName = this.getModel.name;
this.form.sRele = this.id;
this.getData();
},
methods: {

@ -29,7 +29,7 @@
<script>
import createWordCloud from "@/utils/gol/bubbleWord";
import { getEventData } from "@/api/EventdEC";
import { getSource } from "@/api/EventdEC";
import { getHotWord, getPositive, getNegative } from "@/api/EventdEC";
export default {
name: "mediaInterpretationEc",
@ -47,16 +47,15 @@ export default {
},
form: {
token: "",
sBrand: "",
sSeriesName: "",
sRele: "",
},
config: {},
};
},
created() {
this.form.token = this.getToken;
this.form.sBrand = this.getBrand.brandname || "奥迪";
this.form.sSeriesName = this.getModel.name;
this.form.sRele = this.id;
this.getDdta();
this.getData1();
},
@ -97,11 +96,9 @@ export default {
//
getDdta() {
let obj = Object.assign({}, this.form);
this.load = true;
getEventData(obj).then((res) => {
getSource(obj).then((res) => {
let data = res.data || [];
let totalNum = res.totalNum || 0;
this.total = totalNum;
this.list = data;
let arr = [];
data.forEach((ele) => {
let a = [ele.events_title, ele.events_number];

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-10-20 11:56:12
* @LastEditTime: 2021-10-20 12:03:07
* @LastEditTime: 2021-11-17 10:18:38
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: /data-show/src/views/EventDEC/pnwcWord/index.vue
@ -18,8 +18,7 @@
</template>
<script>
import createWordCloud from "@/utils/gol/bubbleWord";
import { getPositive, getNegative } from "@/api/TailInsightdetails";
// import createWordCloud from "@/utils/gol/bubbleWord";
export default {
name: "pnwcWord",
props: ["brand", "model"],
@ -34,17 +33,16 @@ export default {
},
},
form: {
sBrand: "",
token: "",
sSeriesName: "",
sRele: "",
},
opt: {},
};
},
created() {
this.form.token = this.getToken;
this.form.sBrand = this.getBrand.brandname || "奥迪";
this.form.sSeriesName = this.getModel.name;
this.form.sRele = this.id;
this.getData1();
},
methods: {
@ -56,24 +54,24 @@ export default {
this.getData2();
}
},
getData1() {
this.load = true;
let obj = Object.assign({}, this.form);
getPositive(obj).then((res) => {
let data = res.data;
this.opt = createWordCloud(data);
this.load = false;
});
},
getData2() {
this.load = true;
let obj = Object.assign({}, this.form);
getNegative(obj).then((res) => {
let data = res.data;
this.opt = createWordCloud(data);
this.load = false;
});
},
// getData1() {
// this.load = true;
// let obj = Object.assign({}, this.form);
// getPositive1(obj).then((res) => {
// let data = res.data;
// this.opt = createWordCloud(data);
// this.load = false;
// });
// },
// getData2() {
// this.load = true;
// let obj = Object.assign({}, this.form);
// getNegative1(obj).then((res) => {
// let data = res.data;
// this.opt = createWordCloud(data);
// this.load = false;
// });
// },
},
};
</script>

@ -34,17 +34,15 @@ export default {
},
},
form: {
sBrand: "",
token: "",
sSeriesName: "",
sRele: "",
},
};
},
created() {
this.form.token = this.getToken;
this.form.sBrand = this.getBrand.brandname || "奥迪";
this.form.sSeriesName = this.getModel.name;
this.form.sRele = this.id;
this.getDdta();
},
methods: {

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-10-19 19:35:25
* @LastEditTime: 2021-11-17 10:06:16
* @LastEditTime: 2021-11-17 10:17:40
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: /data-show/src/views/EventDEC/tonalCommunicationPosture/index.vue

@ -48,9 +48,9 @@ export default {
load: false,
opt: createOpt(),
form: {
sBrand: "",
token: "",
sSeriesName: "",
sRele: "",
},
props: {
id: {
@ -65,8 +65,7 @@ export default {
},
created() {
this.form.token = this.getToken;
this.form.sBrand = this.getBrand.brandname || "奥迪";
this.form.sSeriesName = this.getModel.name;
this.form.sRele = this.id;
this.getDdta();
},
methods: {

Loading…
Cancel
Save