yunyang
/
carInsightSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

# Conflicts:
#	src/views/EventDEC/esprocess/index.vue
#	src/views/EventDEC/tonalCommunicationPosture/index.vue
prod
lily.zhang 4 years ago
parent 7cbffbca60 75f722dc0c
commit 4637aae19f
11 changed files with 67 additions and 77 deletions
Show Stats Download Patch File Download Diff File

44
src/api/EventdEC/index.js
Unescape View File

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

3
src/views/EventDEC/esprocess/index.vue
Unescape View File

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

2
src/views/EventDEC/incidentSpreadSituation/index.vue
Unescape View File

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

1
src/views/EventDEC/index.vue
Unescape View File

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

7
src/views/EventDEC/kmdED/index.vue
Unescape View File

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

7
src/views/EventDEC/mediaInterpretationED/index.vue
Unescape View File

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

15
src/views/EventDEC/mediaInterpretationEc/index.vue
Unescape View File

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

48
src/views/EventDEC/pnwcWord/index.vue
Unescape View File

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

8
src/views/EventDEC/tailAnalysisED/index.vue
Unescape View File

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

2
src/views/EventDEC/tonalCommunicationPosture/index.vue
Unescape View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-19 19:35:25 * @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 * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: /data-show/src/views/EventDEC/tonalCommunicationPosture/index.vue * @FilePath: /data-show/src/views/EventDEC/tonalCommunicationPosture/index.vue

7
src/views/EventDEC/wbUserEDE/index.vue
Unescape View File

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

Write Preview
Loading…
Cancel
Save