diff --git a/src/api/ModelInsight/index.js b/src/api/ModelInsight/index.js new file mode 100644 index 0000000..259f94b --- /dev/null +++ b/src/api/ModelInsight/index.js @@ -0,0 +1,23 @@ +/* + * @Author: your name + * @Date: 2021-10-28 16:40:48 + * @LastEditTime: 2021-10-28 19:09:07 + * @LastEditors: Please set LastEditors + * @Description: In User Settings Edit + * @FilePath: /data-show/src/api/ModelInsight/index.js + */ +import httpService from "@/request" + + +// 车型数据-数据传播总量 +export function getBrandOverviewCount0528(params) { + let obj = Object.assign({action: 'getBrandOverviewCount0528', sType: 'BrandOverview'}, params) + return httpService({ + url: `/api/v6.ashx`, + method: 'post', + data: obj, + headers: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} diff --git a/src/api/comm/index.js b/src/api/comm/index.js index 041c4fc..1fd4c42 100644 --- a/src/api/comm/index.js +++ b/src/api/comm/index.js @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-10-20 16:36:08 - * @LastEditTime: 2021-10-28 13:14:08 + * @LastEditTime: 2021-10-28 17:12:56 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/api/comm/index.js @@ -83,7 +83,18 @@ export function getUserBrand(params) { } }) } - +// 根据品牌车型列表 +export function getUserSeriesName(params) { + let obj = Object.assign({action: 'getUserSeriesName'}, params) + return httpService({ + url: `/api/v6.ashx`, + method: 'post', + data: obj, + headers: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} // 获取导出字段 export function getToExcelField(params) { let obj = Object.assign({action: 'getToExcelField'}, params) diff --git a/src/lycomponents/iHeader/index.vue b/src/lycomponents/iHeader/index.vue index 67af455..7c1ae36 100644 --- a/src/lycomponents/iHeader/index.vue +++ b/src/lycomponents/iHeader/index.vue @@ -66,7 +66,7 @@ export default { inject: ["reload"], data() { return { - sTimeType: 1, + sTimeType: 34, selVal: "", clock: "", sClock: "", @@ -76,7 +76,7 @@ export default { }; }, created() { - this.getTime(this.getCommTime); + this.getTime(); }, mounted() { this.intDt = self.setInterval(() => { @@ -94,12 +94,8 @@ export default { methods: { handleChange(val) { this.setCommTime({ sTimeType: val }); - if (this.sTimeType != this.selVal) { - this.setCommTime({ sStartTime: "", sEndTime: "" }); - } this.reload(); }, - // 点击个人中心 handlerMyself() { this.$router.push("/myself"); @@ -108,31 +104,23 @@ export default { handlerType(obj) { if (obj.key === "marketingAnalysis") { this.setHeaderType(2); + } else if(obj.key === 'brandInsight' || obj.key === 'modelInsight') { + this.setHeaderType(3); } else { this.setHeaderType(1); } this.$router.push({ path: `/${obj.key}` }); }, // 获取时间的选项 - getTime(commTime) { - getOneTime(commTime).then((res) => { + getTime() { + getOneTime().then((res) => { this.selDatas = res.data; if (!this.getCommTime.sTimeType) { this.sTimeType = this.selDatas[0].key; this.setCommTime({ sTimeType: this.sTimeType }); - } else { - this.sTimeType = this.getCommTime.sTimeType; } }); }, - // 自定时间的时候 - handlerChangeTime(val) { - let obj = { - sStartTime: val[0], - sEndTime: val[1], - }; - this.setCommTime(obj); - }, // 退出的方法 layout() { this.setToken(""); diff --git a/src/lycomponents/iHeaderBrand/index.vue b/src/lycomponents/iHeaderBrand/index.vue new file mode 100644 index 0000000..258d184 --- /dev/null +++ b/src/lycomponents/iHeaderBrand/index.vue @@ -0,0 +1,269 @@ + + + + + + diff --git a/src/lycomponents/iHeaderMa/index.vue b/src/lycomponents/iHeaderMa/index.vue index 90370dd..ef81d7f 100644 --- a/src/lycomponents/iHeaderMa/index.vue +++ b/src/lycomponents/iHeaderMa/index.vue @@ -123,10 +123,12 @@ export default { }, // 菜单 handlerType(obj) { - if(obj.key === 'marketingAnalysis') { - this.setHeaderType(2) + if (obj.key === "marketingAnalysis") { + this.setHeaderType(2); + } else if(obj.key === 'brandInsight' || obj.key === 'modelInsight') { + this.setHeaderType(3); } else { - this.setHeaderType(1) + this.setHeaderType(1); } this.$router.push({path: `/${obj.key}`}) }, diff --git a/src/lycomponents/iLayout/index.vue b/src/lycomponents/iLayout/index.vue index 51f6f1e..770707b 100644 --- a/src/lycomponents/iLayout/index.vue +++ b/src/lycomponents/iLayout/index.vue @@ -1,7 +1,7 @@ + + + + + diff --git a/src/lycomponents/index.js b/src/lycomponents/index.js index 29a5fa4..04b0ace 100644 --- a/src/lycomponents/index.js +++ b/src/lycomponents/index.js @@ -1,21 +1,25 @@ /* * @Author: your name * @Date: 2021-10-12 10:28:00 - * @LastEditTime: 2021-10-26 10:06:13 + * @LastEditTime: 2021-10-28 19:51:22 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/components/index.js */ import iHeader from "@/lycomponents/iHeader"; import iSwitchBrand from "@/lycomponents/iSwitchBrand"; +import iSwitchModel from "@/lycomponents/iSwitchModel"; import iHeaderMa from "@/lycomponents/iHeaderMa" +import iHeaderBrand from "@/lycomponents/iHeaderBrand" export default { install(Vue) { Vue.mixin({ components: { iHeader, iSwitchBrand, - iHeaderMa + iHeaderMa, + iSwitchModel, + iHeaderBrand } }) } diff --git a/src/mixins/index.js b/src/mixins/index.js index 26f6a61..b0ce45a 100644 --- a/src/mixins/index.js +++ b/src/mixins/index.js @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-10-12 13:56:13 - * @LastEditTime: 2021-10-28 13:01:22 + * @LastEditTime: 2021-10-28 19:41:06 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/mixins/index.js @@ -15,10 +15,10 @@ export default { 'loading': Loading }, computed: { - ...mapGetters(['getZoom', 'getToken', 'getUser', 'getAccount', 'getCommTime', 'getCtime', 'getHeaderType', 'getBrand']) + ...mapGetters(['getZoom', 'getToken', 'getUser', 'getAccount', 'getCommTime', 'getCtime','getCtime2', 'getHeaderType', 'getBrand', 'getModel']) }, methods: { - ...mapActions(["setZoom", 'setToken', 'setUser', 'setAccount', 'setCommTime', 'setCtime', 'setHeaderType', 'setBrand']), + ...mapActions(["setZoom", 'setToken', 'setUser', 'setAccount', 'setCommTime', 'setCtime','setCtime2', 'setHeaderType', 'setBrand', 'setModel']), // 获取当前日期时间 getDatetime() { let now = new Date(); diff --git a/src/store/actions.js b/src/store/actions.js index 1001742..fed6820 100644 --- a/src/store/actions.js +++ b/src/store/actions.js @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-10-12 13:36:49 - * @LastEditTime: 2021-10-27 10:28:48 + * @LastEditTime: 2021-10-28 19:34:37 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/store/actions.js @@ -25,11 +25,17 @@ const actions = { setCtime: ({commit}, log) => { commit('setCtime', log) }, + setCtime2: ({commit}, log) => { + commit('setCtime2', log) + }, setHeaderType: ({commit}, log) => { commit('setHeaderType', log) }, setBrand: ({commit}, log) => { commit('setBrand', log) + }, + setModel: ({commit}, log) => { + commit('setModel', log) } } export default actions diff --git a/src/store/getters.js b/src/store/getters.js index 788be43..8f85ef8 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-10-12 13:37:06 - * @LastEditTime: 2021-10-27 10:33:07 + * @LastEditTime: 2021-10-28 19:36:01 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/store/getters.js @@ -25,11 +25,17 @@ const getters = { getCtime(state) { return state.ctime }, + getCtime2(state) { + return state.ctime2 + }, getHeaderType(state) { return state.headerType }, getBrand(state) { return state.brand + }, + getModel(state) { + return state.model } } export default getters diff --git a/src/store/mutations.js b/src/store/mutations.js index 58ba336..ddcbdfc 100644 --- a/src/store/mutations.js +++ b/src/store/mutations.js @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-10-12 13:37:35 - * @LastEditTime: 2021-10-27 10:31:55 + * @LastEditTime: 2021-10-28 19:35:17 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/store/mutations.js @@ -36,6 +36,12 @@ const mutations = { let str = JSON.stringify(obj); sessionStorage.setItem('ctime', str); }, + setCtime2: (state, log) => { + let obj = Object.assign(state.ctime2, log); + state.ctime2 = obj; + let str = JSON.stringify(obj); + sessionStorage.setItem('ctime2', str); + }, setHeaderType: (state, log) => { state.headerType = log; sessionStorage.setItem('headerType', log); @@ -45,7 +51,14 @@ const mutations = { state.brand = obj; let str = JSON.stringify(obj); sessionStorage.setItem('brand', str); - } + }, + setModel: (state, log) => { + let obj = Object.assign(state.model, log); + state.model = obj; + let str = JSON.stringify(obj); + sessionStorage.setItem('model', str); + }, + } export default mutations; diff --git a/src/store/state.js b/src/store/state.js index 6067c57..788743e 100644 --- a/src/store/state.js +++ b/src/store/state.js @@ -1,24 +1,22 @@ /* * @Author: your name * @Date: 2021-10-12 13:37:50 - * @LastEditTime: 2021-10-27 10:32:21 + * @LastEditTime: 2021-10-28 19:34:13 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/store/state.js */ -let commTime = { - sStartTime: "", - sEndTime: "", - sTimeType: '' -} + const state = { $zoom: 1, token: sessionStorage.getItem('token') || "", user: JSON.parse(sessionStorage.getItem('user')) || {}, account: JSON.parse(localStorage.getItem('account')) || {}, - commTime: JSON.parse(sessionStorage.getItem('commTime')) || commTime, + commTime: JSON.parse(sessionStorage.getItem('commTime')) || {}, ctime: JSON.parse(sessionStorage.getItem('ctime')) || {}, + ctime2: JSON.parse(sessionStorage.getItem('ctime2')) || {}, headerType: sessionStorage.getItem('headerType') || 1, - brand: JSON.parse(sessionStorage.getItem('brand')) || {} + brand: JSON.parse(sessionStorage.getItem('brand')) || {}, + model: JSON.parse(sessionStorage.getItem('model')) || {}, } export default state; diff --git a/src/styles/antd.less b/src/styles/antd.less index 8e6fbb6..bf3cd5b 100644 --- a/src/styles/antd.less +++ b/src/styles/antd.less @@ -205,5 +205,15 @@ .ant-table-tbody > tr.ant-table-row-selected td { background: #2668c2 !important; } - - +.ant-popover-inner { + background: #08182e !important; + box-shadow: 0px 0px 10px 0px #3373CC !important; +} +.ant-popover-inner-content{ + padding:0 !important; + } + .ant-popover-title { + padding:10px !important; + border-bottom: 1px solid #173b6d !important; + color: #fff !important; + } diff --git a/src/views/BrandInsight/brandData/index.vue b/src/views/BrandInsight/brandData/index.vue index 7d9d867..3094974 100644 --- a/src/views/BrandInsight/brandData/index.vue +++ b/src/views/BrandInsight/brandData/index.vue @@ -1,7 +1,7 @@
- + diff --git a/src/views/Index/realTimeEvent/index.vue b/src/views/Index/realTimeEvent/index.vue index 53b7748..0a14188 100644 --- a/src/views/Index/realTimeEvent/index.vue +++ b/src/views/Index/realTimeEvent/index.vue @@ -45,7 +45,7 @@ export default { }); this.config = { headerBGC: "#1b4062", - oddRowBGC: "#090f4d", + oddRowBGC: "#173b6d", evenRowBGC: "rgba(69, 149, 244, 0)", columnWidth: [230], rowNum: 5, diff --git a/src/views/IndustryDataExport/index.vue b/src/views/IndustryDataExport/index.vue index cc50674..bb04942 100644 --- a/src/views/IndustryDataExport/index.vue +++ b/src/views/IndustryDataExport/index.vue @@ -1,7 +1,7 @@