prod
lily.zhang 4 years ago
parent a73aa61fb7
commit 80e3bd6004

@ -1,7 +1,7 @@
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-10-15 17:52:59 * @Date: 2021-10-15 17:52:59
* @LastEditTime: 2021-11-12 14:09:59 * @LastEditTime: 2021-11-12 15:09:00
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: /data-show/src/utils/gol/sideSingleColumn.js * @FilePath: /data-show/src/utils/gol/sideSingleColumn.js
@ -18,6 +18,7 @@
*/ */
import * as echarts from "echarts"; import * as echarts from "echarts";
import { bigNumberTransform } from "@/utils/gol/dataTool" import { bigNumberTransform } from "@/utils/gol/dataTool"
import {doStr} from "./dataTool"
export function createSideSingleColumn(dx=[], ds=[], color='#51bc91') { export function createSideSingleColumn(dx=[], ds=[], color='#51bc91') {
return { return {
grid: { grid: {
@ -64,6 +65,13 @@ export function createSideSingleColumn(dx=[], ds=[], color='#51bc91') {
axisTick: { axisTick: {
show: false, show: false,
}, },
axisLabel :{
interval:0,
formatter: (value) => {
let str = doStr(value, 8);
return str;
}
},
axisLine: { axisLine: {
show: false, show: false,
lineStyle: { lineStyle: {

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-11-03 11:54:08 * @Date: 2021-11-03 11:54:08
* @LastEditTime: 2021-11-11 11:22:08 * @LastEditTime: 2021-11-12 15:06:54
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: /data-show/src/views/MarketingComparison/mcChooseModel/index.vue * @FilePath: /data-show/src/views/MarketingComparison/mcChooseModel/index.vue
@ -32,7 +32,6 @@
</template> </template>
<script> <script>
import moment from "moment";
import { getUserSeriesName } from "@/api/comm"; import { getUserSeriesName } from "@/api/comm";
export default { export default {
name: "brandCompateHeader", name: "brandCompateHeader",
@ -138,39 +137,25 @@ export default {
let row = this.list[n]; let row = this.list[n];
row.brand = ""; row.brand = "";
row.model = ""; row.model = "";
row.startTime = "";
row.endTime = "";
row.isDel = false; row.isDel = false;
let filterArr = this.list.filter((ele) => { let filterArr = this.list.filter((ele) => {
return ele.brand && ele.model && ele.startTime && ele.endTime; return ele.brand && ele.model;
}); });
this.$emit("del", n); this.$emit("del", n);
this.$emit("change", filterArr); this.$emit("change", filterArr);
}, },
// //
handlerBrand(arr) { handlerBrand(arr) {
let n = this.list.findIndex(ele => ele.model === arr[1].name); let n = this.list.findIndex((ele) => ele.model === arr[1].name);
if(n != -1) return; if (n != -1) return;
let row = this.list[this.chooseIndex]; let row = this.list[this.chooseIndex];
row.brand = arr[0].brandname; row.brand = arr[0].brandname;
row.model = arr[1].name; row.model = arr[1].name;
row.isDel = true; row.isDel = true;
}, let filterArr = this.list.filter((ele) => {
// return ele.brand && ele.model;
handlerTime(item) { });
if (item.startTime && item.endTime) { this.$emit("change", filterArr);
let isBefore = moment(item.startTime).isBefore(item.endTime);
if (!isBefore) {
item.endTime = "";
this.$message.warning("结束时间必须大于开始时间");
} else {
let filterArr = this.list.filter((ele) => {
return ele.brand && ele.model;
});
this.$emit("change", filterArr);
}
}
}, },
}, },
}; };

@ -1,7 +1,7 @@
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-10-12 10:11:24 * @Date: 2021-10-12 10:11:24
* @LastEditTime: 2021-11-11 14:47:26 * @LastEditTime: 2021-11-12 15:49:35
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: /data-show/src/views/BrandInsight/titsopo/opt.js * @FilePath: /data-show/src/views/BrandInsight/titsopo/opt.js

Loading…
Cancel
Save