Skip to content

C
chinafrica
提交 fe1fc3ee authored 作者: 吴德鹏's avatar 吴德鹏
浏览文件
操作

修改一个小bug

上级 53c4caa5
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 217 行增加 和 217 行删除
platform-admin/src/main/resources/j2cache.properties
浏览文件 @ fe1fc3ee
...@@ -91,4 +91,4 @@ redis.testOnReturn=false ...@@ -91,4 +91,4 @@ redis.testOnReturn=false
redis.testWhileIdle=true redis.testWhileIdle=true
redis.timeBetweenEvictionRunsMillis=300000 redis.timeBetweenEvictionRunsMillis=300000
redis.blockWhenExhausted=false redis.blockWhenExhausted=false
redis.jmxEnabled=false redis.jmxEnabled=false
\ No newline at end of file
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfstationitem.html
浏览文件 @ fe1fc3ee
...@@ -602,7 +602,7 @@ ...@@ -602,7 +602,7 @@
<i-button type="warning" @click="changeItemsTop"><i class="fa fa-arrow-down"></i>&nbsp;取消置顶 <i-button type="warning" @click="changeItemsTop"><i class="fa fa-arrow-down"></i>&nbsp;取消置顶
</i-button> </i-button>
<i-button type="success" @click="changeItemsunTop"><i class="fa fa-arrow-up"></i>批量置顶</i-button> <i-button type="success" @click="changeItemsunTop"><i class="fa fa-arrow-up"></i>置顶</i-button>
</div> </div>
</div> </div>
......
platform-admin/src/main/webapp/js/sys/main.js
浏览文件 @ fe1fc3ee
...@@ -632,73 +632,73 @@ let app = new Vue({ ...@@ -632,73 +632,73 @@ let app = new Vue({
}; };
app.setOption(option); app.setOption(option);
}, },
initEchartsCategory() { // initEchartsCategory() {
var app = echarts.init(document.getElementById('category-echarts')); // var app = echarts.init(document.getElementById('category-echarts'));
let _this = this; // let _this = this;
option = { // option = {
//
tooltip: { // tooltip: {
trigger: 'item', // trigger: 'item',
formatter: '{a} <br/>{b}: {c} ({d}%)' // formatter: '{a} <br/>{b}: {c} ({d}%)'
}, // },
legend: { // legend: {
orient: 'vertical', // orient: 'vertical',
left: 'right', // left: 'right',
top: 'center', // top: 'center',
icon: "circle", // icon: "circle",
data: ['MEN', 'WOMEN', 'Afri Home', 'Hair', 'Sport'], // data: ['MEN', 'WOMEN', 'Afri Home', 'Hair', 'Sport'],
align: 'left', // align: 'left',
textStyle: { // textStyle: {
rich: { // rich: {
a: { // a: {
width: 60, // width: 60,
fontSize: 14, // fontSize: 14,
color: "rgba(0, 0, 0, 0.647058823529412)", // color: "rgba(0, 0, 0, 0.647058823529412)",
padding: 10, // padding: 10,
//
}, // },
b: { // b: {
width: 40, // width: 40,
//
fontSize: 14, // fontSize: 14,
color: "rgba(0, 0, 0, 0.3)" // color: "rgba(0, 0, 0, 0.3)"
}, // },
c: { // c: {
width: 40, // width: 40,
fontSize: 14, // fontSize: 14,
color: "#333" // color: "#333"
} // }
} // }
}, // },
formatter: function (name) { // formatter: function (name) {
var data = _this.initEchartsCategoryData[0].data; // var data = _this.initEchartsCategoryData[0].data;
var total = 0; // var total = 0;
var tarValue; // var tarValue;
var price; // var price;
for (var i = 0, l = data.length; i < l; i++) { // for (var i = 0, l = data.length; i < l; i++) {
total += data[i].value; // total += data[i].value;
if (data[i].name == name) { // if (data[i].name == name) {
tarValue = data[i].value; // tarValue = data[i].value;
} // }
price = data[i].price; // price = data[i].price;
} // }
var p = Math.round(((tarValue / total) * 100)).toFixed(2); // var p = Math.round(((tarValue / total) * 100)).toFixed(2);
let arr = ["{a|" + name.slice(0, 4) + "..}{b|" + p + "%} {c|￥" + price + "}"] // let arr = ["{a|" + name.slice(0, 4) + "..}{b|" + p + "%} {c|￥" + price + "}"]
return arr; // return arr;
}, // },
// show:false // // show:false
}, // },
grid: { // grid: {
x: 0, // x: 0,
y: 0, // y: 0,
x2: 0, // x2: 0,
y2: 0, // y2: 0,
borderWidth: 1 // borderWidth: 1
}, // },
series: [...this.initEchartsCategoryData] // series: [...this.initEchartsCategoryData]
}; // };
app.setOption(option); // app.setOption(option);
}, // },
changeMiddelActive(element, index) { changeMiddelActive(element, index) {
this.$refs.serviceStatusClear.clearSingleSelect(); this.$refs.serviceStatusClear.clearSingleSelect();
this.show = true; this.show = true;
...@@ -889,9 +889,9 @@ let app = new Vue({ ...@@ -889,9 +889,9 @@ let app = new Vue({
this.initEchartsPV(); this.initEchartsPV();
this.initEchartsPayTheAmount(); this.initEchartsPayTheAmount();
this.initEchartsMiddle(); this.initEchartsMiddle();
this.initEchartsMiddlebottomUserSearchSum(); // this.initEchartsMiddlebottomUserSearchSum();
this.initEchartsMiddlebottomUserSearchPerCapita(); // this.initEchartsMiddlebottomUserSearchPerCapita();
this.initEchartsCategory(); // this.initEchartsCategory();
this.getOrderNum(); this.getOrderNum();
this.getOrderPaidNum(); this.getOrderPaidNum();
this.getOrderRate(); this.getOrderRate();
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论