diff --git a/pages.json b/pages.json index cb56a02..54568f3 100644 --- a/pages.json +++ b/pages.json @@ -233,6 +233,24 @@ } } + ,{ + "path" : "pages/faultStatistics/faultStatistics", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/faultStatistics/projectOverview", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } ], "subPackages": [{ //A包 "root": "pagesA", @@ -306,5 +324,15 @@ "bounce": "none", "scrollIndicator": "none" } + }, + "condition" : { //模式配置,仅开发期间生效 + "current": 0, //当前激活的模式(list 的索引项) + "list": [ + { + "name": "", //模式名称 + "path": "", //启动页面,必选 + "query": "" //启动参数,在页面的onLoad函数里面得到 + } + ] } } diff --git a/pages/faultStatistics/faultStatistics.vue b/pages/faultStatistics/faultStatistics.vue new file mode 100644 index 0000000..c8939ec --- /dev/null +++ b/pages/faultStatistics/faultStatistics.vue @@ -0,0 +1,479 @@ + + + + + diff --git a/pages/faultStatistics/projectOverview.vue b/pages/faultStatistics/projectOverview.vue new file mode 100644 index 0000000..49532d3 --- /dev/null +++ b/pages/faultStatistics/projectOverview.vue @@ -0,0 +1,692 @@ + + + + + diff --git a/static/iocn/xl.png b/static/iocn/xl.png new file mode 100644 index 0000000..d650b62 Binary files /dev/null and b/static/iocn/xl.png differ diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js index 2b890d8..6dae5fa 100644 --- a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js +++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js @@ -60,15 +60,16 @@ const cfu = { "xAxisDemo2":function(val){return formatDateTime(val,'h:m')}, "seriesDemo1":function(val){return val+'元'}, "tooltipDemo1":function(item, category, index, opts){ + if(index==0){ return '随便用'+item.data+'年' }else{ - return '其他我没改'+item.data+'天' + return item.name+item.data+'天' } }, "pieDemo":function(val, index, series){ if(index !== undefined){ - return series[index].name+':'+series[index].data+'元' + return series[index].name+"\n"+series[index].data+'元' } }, }, @@ -90,26 +91,97 @@ const cfu = { "extra": { "line": { "type": "curve", - "width": 2 + "width": 1 }, } }, //下面是自定义配置,请添加项目所需的通用配置 "pie":{ - "type": "pie", - "color": color, - "padding": [5,5,5,5], - "extra": { - "pie": { - "activeOpacity": 0.5, - "activeRadius": 10, - "offsetAngle": 0, - "labelWidth": 15, - "border": true, - "borderWidth": 3, - "borderColor": "#FFFFFF" - }, - } + "type": "pie", + "canvasId": "", + "canvas2d": false, + "background": "none", + "animation": true, + "timing": "easeOut", + "duration": 1000, + "color": [ + "#1890FF", + "#91CB74", + "#FAC858", + "#EE6666", + "#73C0DE", + "#3CA272", + "#FC8452", + "#9A60B4", + "#ea7ccc" + ], + "padding": [ + 5, + 5, + 5, + 5 + ], + "rotate": false, + "errorReload": true, + "fontSize": 13, + "fontColor": "#666666", + "enableScroll": false, + "touchMoveLimit": 60, + "enableMarkLine": false, + "dataLabel": true, + "dataPointShape": true, + "dataPointShapeType": "solid", + "tapLegend": true, + "legend": { + "show": false, + "position": "top", + "float": "center", + "padding": 5, + "margin": 5, + "backgroundColor": "rgba(0,0,0,0)", + "borderColor": "rgba(0,0,0,0)", + "borderWidth": 0, + "fontSize": 13, + "fontColor": "#000", + "lineHeight": 11, + "hiddenColor": "#CECECE", + "itemGap": 10 + }, + "extra": { + "pie": { + "activeOpacity": 0.5, + "activeRadius": 10, + "offsetAngle": 0, + "customRadius": 0, + "labelWidth": 15, + "border": true, + "borderWidth": 3, + "borderColor": "#FFFFFF", + "linearType": "none" + }, + "tooltip": { + "showBox": true, + "showArrow": true, + "showCategory": false, + "borderWidth": 0, + "borderRadius": 0, + "borderColor": "#000000", + "borderOpacity": 0.7, + "bgColor": "#000000", + "bgOpacity": 0.7, + "gridType": "solid", + "dashLength": 4, + "gridColor": "#CCCCCC", + "fontColor": "#FFFFFF", + "splitLine": true, + "horizentalLine": false, + "xAxisLabel": false, + "yAxisLabel": false, + "labelBgColor": "#FFFFFF", + "labelBgOpacity": 0.7, + "labelFontColor": "#666666" + } + } }, "ring":{ "type": "ring", @@ -118,20 +190,20 @@ const cfu = { "rotate": false, "dataLabel": true, "legend": { - "show": true, + "show": false, "position": "right", "lineHeight": 25, }, - "title": { - "name": "收益率", - "fontSize": 15, - "color": "#666666" - }, - "subtitle": { - "name": "70%", - "fontSize": 25, - "color": "#7cb5ec" - }, + // "title": { + // "name": "收益率", + // "fontSize": 15, + // "color": "#666666" + // }, + // "subtitle": { + // "name": "70%", + // "fontSize": 25, + // "color": "#7cb5ec" + // }, "extra": { "ring": { "ringWidth":30, @@ -498,32 +570,144 @@ const cfu = { } }, "mix":{ - "type": "mix", - "color": color, - "padding": [15,15,0,15], - "xAxis": { - "disableGrid": true, - }, - "yAxis": { - "disabled": false, - "disableGrid": false, - "splitNumber": 5, - "gridType": "dash", - "dashLength": 4, - "gridColor": "#CCCCCC", - "padding": 10, - "showTitle": true, - "data": [] - }, - "legend": { - }, - "extra": { - "mix": { - "column": { - "width": 20 - } - }, - } + "type": "mix", + "canvasId": "", + "canvas2d": false, + "background": "none", + "animation": true, + "timing": "easeOut", + "duration": 1000, + "color": [ + "#1890FF", + "#91CB74", + "#FAC858", + "#EE6666", + "#73C0DE", + "#3CA272", + "#FC8452", + "#9A60B4", + "#ea7ccc" + ], + "padding": [ + 15, + 15, + 0, + 15 + ], + "rotate": false, + "errorReload": true, + "fontSize": 13, + "fontColor": "#666666", + "enableScroll": false, + "touchMoveLimit": 60, + "enableMarkLine": false, + "dataLabel": true, + "dataPointShape": true, + "dataPointShapeType": "solid", + "tapLegend": true, + "xAxis": { + "disabled": false, + "axisLine": true, + "axisLineColor": "#CCCCCC", + "calibration": false, + "fontColor": "#666666", + "fontSize": 13, + "rotateLabel": false, + "itemCount": 5, + "boundaryGap": "center", + "disableGrid": true, + "gridColor": "#CCCCCC", + "gridType": "solid", + "dashLength": 4, + "gridEval": 1, + "scrollShow": false, + "scrollAlign": "left", + "scrollColor": "#A6A6A6", + "scrollBackgroundColor": "#EFEBEF", + "format": "" + }, + "yAxis": { + "disabled": false, + "disableGrid": false, + "splitNumber": 5, + "gridType": "dash", + "dashLength": 4, + "gridColor": "#CCCCCC", + "padding": 10, + "showTitle": true, + "data": [ + { + "position": "top", + "title": "折线", + }, + { + "position": "top", + "title": "", + "textAlign": "left" + }, + { + "position": "left", + + "title": "", + "textAlign": "left" + }, + + ] + }, + "legend": { + "show": false, + "position": "bottom", + "float": "center", + "padding": 5, + "margin": 5, + "backgroundColor": "rgba(0,0,0,0)", + "borderColor": "rgba(0,0,0,0)", + "borderWidth": 0, + "fontSize": 13, + "fontColor": "#666666", + "lineHeight": 11, + "hiddenColor": "#CECECE", + "itemGap": 10 + }, + "extra": { + "mix": { + "column": { + "width": 20, + "seriesGap": 2, + "barBorderCircle": false, + "linearType": "none", + "linearOpacity": 1, + "colorStop": 0 + } + }, + "tooltip": { + "showBox": true, + "showArrow": true, + "showCategory": false, + "borderWidth": 0, + "borderRadius": 0, + "borderColor": "#000000", + "borderOpacity": 0.7, + "bgColor": "#000000", + "bgOpacity": 0.7, + "gridType": "solid", + "dashLength": 4, + "gridColor": "#CCCCCC", + "fontColor": "#FFFFFF", + "splitLine": true, + "horizentalLine": false, + "xAxisLabel": false, + "yAxisLabel": false, + "labelBgColor": "#FFFFFF", + "labelBgOpacity": 0.7, + "labelFontColor": "#666666" + }, + "markLine": { + "type": "solid", + "dashLength": 4, + "data": [] + } + } }, "scatter":{ "type": "scatter",