diff --git a/components/dates/yy-mm-dd-hh-ss.vue b/components/dates/yy-mm-dd-hh-ss.vue
index eab00e0..586f4af 100644
--- a/components/dates/yy-mm-dd-hh-ss.vue
+++ b/components/dates/yy-mm-dd-hh-ss.vue
@@ -6,7 +6,7 @@
取消
确定
-
+
@@ -68,6 +68,7 @@
hour: "",
minute: "",
value: [0, 0, 0, 0, 0],
+ ifDate:false
};
},
@@ -148,6 +149,10 @@
}
}
this.minutes = minutes;
+ // 兼容微信小程序
+ setTimeout(()=>{
+ this.ifDate = true;
+ },1000)
},
show() {
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..c3ff205
--- /dev/null
+++ b/index.html
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/manifest.json b/manifest.json
index b6c500b..a35ed69 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,144 +1,96 @@
{
- "name" : "飞猴",
- "appid" : "__UNI__25FB71A",
+ "name" : "飞猴云服务",
+ "appid" : "__UNI__BDCAFA5",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
"transformPx" : false,
+ /* 5+App特有相关 */
"app-plus" : {
"usingComponents" : true,
+ "nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3,
- /* 5+App特有相关 */
- "modules" : {
- "Payment" : {},
- "Share" : {},
- "Maps" : {},
- "Geolocation" : {}
+ "splashscreen" : {
+ "alwaysShowBeforeRender" : true,
+ "waiting" : true,
+ "autoclose" : true,
+ "delay" : 0
},
/* 模块配置 */
+ "modules" : {},
+ /* 应用发布信息 */
"distribute" : {
- /* 应用发布信息 */
+ /* android打包配置 */
"android" : {
- /* android打包配置 */
"permissions" : [
- "",
+ "",
+ "",
+ "",
+ "",
+ "",
"",
"",
- "",
"",
- "",
- "",
- "",
"",
- "",
- "",
- "",
- "",
"",
- "",
+ "",
"",
- "",
+ "",
+ "",
""
]
},
- "ios" : {
- "privacyDescription" : {
- "NSLocationWhenInUseUsageDescription" : ""
- },
- "capabilities" : {
- "entitlements" : {
- "com.apple.developer.associated-domains" : [ "applinks:static-c27fa8d7-ef72-4327-ab9b-d4787a747ee3.bspapp.com" ]
- }
- }
- },
/* ios打包配置 */
- "sdkConfigs" : {
- "maps" : {
- "amap" : {
- "appkey_ios" : "",
- "appkey_android" : "57d6437544bb36bd3b5f4efb5b06ddbf"
- }
- },
- "payment" : {
- "weixin" : {
- "__platform__" : [ "ios", "android" ],
- "appid" : "wx2654bc27c419ada6",
- "UniversalLinks" : "https://static-c27fa8d7-ef72-4327-ab9b-d4787a747ee3.bspapp.com/uni-universallinks/__UNI__25FB71A/"
- }
- },
- "push" : {},
- "geolocation" : {
- "system" : {
- "__platform__" : [ "ios", "android" ]
- },
- "baidu" : {
- "__platform__" : [ "ios", "android" ],
- "appkey_ios" : "",
- "appkey_android" : "mDcZsWM7gGKb7MC1bC8Mo33FScjYEr0I"
- },
- "amap" : {
- "__platform__" : [ "ios", "android" ],
- "appkey_ios" : "",
- "appkey_android" : "57d6437544bb36bd3b5f4efb5b06ddbf"
- }
- },
- "share" : {
- "weixin" : {
- "appid" : "wx2654bc27c419ada6",
- "UniversalLinks" : "https://static-c27fa8d7-ef72-4327-ab9b-d4787a747ee3.bspapp.com/uni-universallinks/__UNI__25FB71A/"
- }
- },
- "ad" : {}
- }
- },
- "splashscreen" : {
- "alwaysShowBeforeRender" : false,
- "waiting" : false
+ "ios" : {},
+ /* SDK配置 */
+ "sdkConfigs" : {}
}
},
- /* SDK配置 */
- "quickapp" : {},
/* 快应用特有相关 */
+ "quickapp" : {},
+ /* 小程序特有相关 */
"mp-weixin" : {
- /* 小程序特有相关 */
"appid" : "wx372ffc194d87c693",
"setting" : {
- "urlCheck" : true,
- "es6" : true
+ "urlCheck" : false
},
- "usingComponents" : true,
- "permission" : {
- "scope.userLocation" : {
- "desc" : "您的位置信息将用于小程序位置接口的效果展示"
- }
- }
+ "usingComponents" : true
},
- "h5" : {
- "sdkConfigs" : {
- "maps" : {
- "qqmap" : {
- "key" : "QNHBZ-55RKF-OMFJJ-NPU7O-EPSDH-ACBAA"
- }
- }
- },
- "devServer" : {
- "https" : false,
- "port" : 8080,
- "disableHostCheck" : true,
- "proxy" : {
- "/web" : {
- "target" : "https://7and5.cn",
- "changeOrigin" : true,
- "secure" : false,
- "pathRewrite" : {
- "^/web" : ""
- }
- }
- }
- }
+ "mp-alipay" : {
+ "usingComponents" : true
},
"mp-baidu" : {
- "appid" : "24346353"
+ "usingComponents" : true
},
- "_spaceID" : "c27fa8d7-ef72-4327-ab9b-d4787a747ee3"
+ "mp-toutiao" : {
+ "usingComponents" : true
+ },
+ "uniStatistics" : {
+ "enable" : false
+ },
+ "vueVersion" : "2",
+ "h5" : {
+ "sdkConfigs" : {
+ "maps" : {
+ "qqmap" : {
+ "key" : "QNHBZ-55RKF-OMFJJ-NPU7O-EPSDH-ACBAA"
+ }
+ }
+ },
+ "devServer" : {
+ "https" : false,
+ "port" : 8080,
+ "disableHostCheck" : true,
+ "proxy" : {
+ "/web" : {
+ "target" : "https://7and5.cn",
+ "changeOrigin" : true,
+ "secure" : false,
+ "pathRewrite" : {
+ "^/web" : ""
+ }
+ }
+ }
+ }
+ }
}
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..fbb8c42
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,12 @@
+{
+ "name": "轮播视频和图片",
+ "version": "1.0.1",
+ "lockfileVersion": 2,
+ "requires": true,
+ "packages": {
+ "": {
+ "name": "轮播视频和图片",
+ "version": "1.0.1"
+ }
+ }
+}
diff --git a/pages/guide-page/guide-page.vue b/pages/guide-page/guide-page.vue
index 024d7e4..9571f01 100644
--- a/pages/guide-page/guide-page.vue
+++ b/pages/guide-page/guide-page.vue
@@ -17,7 +17,7 @@
methods: {
checkContext(){
if(uni.getStorageSync('password')) {
- // 是否登录过，登录过就直接刷新token重新登录
+ // 是否登录过，登录过就直接刷新token重新登录
let params = {
login_type: 'account', // 登陆手机类型： mobile：手机登陆、account：账号密码登陆
phone: '', // 手机号码，login_type 为 mobile 时必填
diff --git a/pagesA/dataQuery/queryFunction.vue b/pagesA/dataQuery/queryFunction.vue
index a94dc99..581f139 100644
--- a/pagesA/dataQuery/queryFunction.vue
+++ b/pagesA/dataQuery/queryFunction.vue
@@ -7,7 +7,7 @@
+ v-for="(item,index) in dataList" :key="index">
{{item.title}}
@@ -19,7 +19,7 @@
最近查询
-
+
{{item.name}}
编号：{{item.code}}
@@ -347,6 +347,7 @@
width: 37rpx;
height: 37rpx;
margin-right: 40rpx;
+ margin-top: 8rpx;
}
.recently-query-content .li .text-content {
diff --git a/pagesA/faultStatistics/faultStatistics.vue b/pagesA/faultStatistics/faultStatistics.vue
index 3ad90ce..f8fc65a 100644
--- a/pagesA/faultStatistics/faultStatistics.vue
+++ b/pagesA/faultStatistics/faultStatistics.vue
@@ -1,6 +1,6 @@
-
+
@@ -139,7 +139,6 @@
chartData: {
series: [{
-
format: "tooltipDemo1",
data: [{
name: "网络故障",
diff --git a/pagesA/faultStatistics/projectOverview.vue b/pagesA/faultStatistics/projectOverview.vue
index c7bb25b..4d35dfc 100644
--- a/pagesA/faultStatistics/projectOverview.vue
+++ b/pagesA/faultStatistics/projectOverview.vue
@@ -1,698 +1,652 @@
-
-
-
-
-
-
- 项目概况
-
-
-
- 累计总项目量
-
-
-
- 0
-
-
- 2
-
-
- 9
-
-
- 8
-
-
- 5
-
-
-
-
-
-
- 今日
-
-
-
-
-
- 新增项目量
-
-
- 0单
-
-
-
-
- 新增工单量
-
-
- 0单
-
-
-
-
- 项目维保率
-
-
- 0单
-
-
-
-
-
-
-
- 本周
-
-
-
-
-
- 新增项目量
-
-
- 0单
-
-
-
-
- 新增工单量
-
-
- 0单
-
-
-
-
- 项目维保率
-
-
- 0单
-
-
-
-
-
-
-
- 本月
-
-
-
-
-
- 新增项目量
-
-
- 0单
-
-
-
-
- 新增工单量
-
-
- 0单
-
-
-
-
- 项目维保率
-
-
- 0单
-
-
-
-
-
-
-
-
-
-
-
-
-
- 年度项目数据明细
-
-
-
-
-
-
-
-
-
-
-
- 服务数据
-
-
-
-
- 本月服务量
-
-
-
-
- 维保工单:
-
-
- 3
-
-
-
-
- 巡检服务单:
-
-
- 65465
-
-
-
-
-
- 移屏服务单:
-
-
- 32132
-
-
-
-
- 拆屏工单:
-
-
- 32132
-
-
-
-
-
-
- 累计服务量
-
-
-
-
- 维保工单:
-
-
- 3
-
-
-
-
- 巡检服务单:
-
-
- 65465
-
-
-
-
-
- 移屏服务单:
-
-
- 32132
-
-
-
-
- 拆屏工单:
-
-
- 32132
-
-
-
-
-
-
-
-
-
- 年度服务数据汇总
-
-
-
-
-
-
-
-
-
-
- 质保即将到期项目
-
-
-
-
-
- 项目名称
-
-
- 工单
-
-
- 日期
-
-
-
-
-
- 1.五岭新天地二期停车场xxxxxxxxxxxxx
-
-
- 6
-
-
- 22/2/24
-
-
-
-
- 1.五岭新天地二期停车场xxxxxxxxxxxxx
-
-
- 6
-
-
- 22/2/24
-
-
-
-
- 1.五岭新天地二期停车场xxxxxxxxxxxxx
-
-
- 6
-
-
- 22/2/24
-
-
-
-
- 1.五岭新天地二期停车场xxxxxxxxxxxxx
-
-
- 6
-
-
- 22/2/24
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 项目概况
+
+
+
+ 累计总项目量
+
+
+
+ 0
+
+
+ 2
+
+
+ 9
+
+
+ 8
+
+
+ 5
+
+
+
+
+
+
+ 今日
+
+
+
+
+
+ 新增项目量
+
+
+ 0单
+
+
+
+
+ 新增工单量
+
+
+ 0单
+
+
+
+
+ 项目维保率
+
+
+ 0单
+
+
+
+
+
+
+
+ 本周
+
+
+
+
+
+ 新增项目量
+
+
+ 0单
+
+
+
+
+ 新增工单量
+
+
+ 0单
+
+
+
+
+ 项目维保率
+
+
+ 0单
+
+
+
+
+
+
+
+ 本月
+
+
+
+
+
+ 新增项目量
+
+
+ 0单
+
+
+
+
+ 新增工单量
+
+
+ 0单
+
+
+
+
+ 项目维保率
+
+
+ 0单
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 年度项目数据明细
+
+
+
+
+
+
+
+
+
+
+
+ 服务数据
+
+
+
+
+ 本月服务量
+
+
+
+
+ 维保工单:
+
+
+ 3
+
+
+
+
+ 巡检服务单:
+
+
+ 65465
+
+
+
+
+
+ 移屏服务单:
+
+
+ 32132
+
+
+
+
+ 拆屏工单:
+
+
+ 32132
+
+
+
+
+
+
+ 累计服务量
+
+
+
+
+ 维保工单:
+
+
+ 3
+
+
+
+
+ 巡检服务单:
+
+
+ 65465
+
+
+
+
+
+ 移屏服务单:
+
+
+ 32132
+
+
+
+
+ 拆屏工单:
+
+
+ 32132
+
+
+
+
+
+
+
+
+
+ 年度服务数据汇总
+
+
+
+
+
+
+
+
+
+
+ 质保即将到期项目
+
+
+
+
+
+ 项目名称
+
+
+ 工单
+
+
+ 日期
+
+
+
+
+
+ 1.五岭新天地二期停车场xxxxxxxxxxxxx
+
+
+ 6
+
+
+ 22/2/24
+
+
+
+
+ 1.五岭新天地二期停车场xxxxxxxxxxxxx
+
+
+ 6
+
+
+ 22/2/24
+
+
+
+
+ 1.五岭新天地二期停车场xxxxxxxxxxxxx
+
+
+ 6
+
+
+ 22/2/24
+
+
+
+
+ 1.五岭新天地二期停车场xxxxxxxxxxxxx
+
+
+ 6
+
+
+ 22/2/24
+
+
+
+
+
+
+
+
diff --git a/pagesA/project/details.vue b/pagesA/project/details.vue
index b2463c4..392a610 100644
--- a/pagesA/project/details.vue
+++ b/pagesA/project/details.vue
@@ -99,7 +99,7 @@
return {
autoplay: true,
interval: 3000,
- index: 1,
+ index: 0,
projectId: "",
recordState: [{
title: '维保记录',
diff --git a/pagesA/repairsPage/repairsPage.vue b/pagesA/repairsPage/repairsPage.vue
index 3a3b36a..ea592ad 100644
--- a/pagesA/repairsPage/repairsPage.vue
+++ b/pagesA/repairsPage/repairsPage.vue
@@ -18,7 +18,7 @@
维保类型：
+ v-for="(item,index) in faultTypeData" :key="index">
{{item.name}}
@@ -269,26 +269,26 @@
return out;
},
mapFun() {
- const that = this
- uni.getLocation({
- type: 'gcj02', //返回可以用于uni.openLocation的经纬度
- success: function(res) {
- const latitude = res.latitude;
- const longitude = res.longitude;
- uni.chooseLocation({
- success: function(res) {
- that.data.service_address = res.address
- }
- });
- // uni.openLocation({
- // latitude: latitude,
- // longitude: longitude,
- // success: function () {
- // console.log('success');
- // }
- // });
- }
- });
+ let that = this
+ uni.chooseLocation({
+ success: (res) => {
+
+ }
+ })
+ // uni.chooseLocation({
+ // success:(res)=> {
+ // console.log(res,275);
+ // that.data.service_address = res.address
+ // }
+ // });
+ // uni.getLocation({
+ // type: 'wgs84', //返回可以用于uni.openLocation的经纬度gcj02
+ // success: function(res) {
+ // console.log(res);
+ // let latitude = res.latitude;
+ // let longitude = res.longitude;
+ // }
+ // });
},
repairsNavFun(index) {
this.current = index;
diff --git a/pagesA/workOrder/payReturnVisit.vue b/pagesA/workOrder/payReturnVisit.vue
index 33b0d8f..9f855dc 100644
--- a/pagesA/workOrder/payReturnVisit.vue
+++ b/pagesA/workOrder/payReturnVisit.vue
@@ -1,153 +1,218 @@
-
-
-
-
-
- 客户服务，重在回访仔细倾听，以服务质量求发展
-
-
-
-
- 联
- 系
- 人
-
-
-
-
-
- 联系电话
-
-
-
-
-
- 微
- 信
- 号
-
-
-
-
-
-
- 回访内容
-
-
-
-
-
- 客服电话
-
-
-
-
-
- 回访时间
-
-
-
-
-
-
-
-
+
+
+
+
+
+ 客户服务，重在回访仔细倾听，以服务质量求发展
+
+
+
+
+ 联
+ 系
+ 人
+
+
+
+
+
+ 联系电话
+
+
+
+
+
+ 微
+ 信
+ 号
+
+
+
-
+
+
+ 回访内容
+
+
+
+
+
+ 客服电话
+
+
+
+
+
+ 回访时间
+
+
+
+
+
+
+
+
+
+
diff --git a/pagesB/plan-fault-product-detail/detail.vue b/pagesB/plan-fault-product-detail/detail.vue
index bc4a59d..7e1ef8e 100644
--- a/pagesB/plan-fault-product-detail/detail.vue
+++ b/pagesB/plan-fault-product-detail/detail.vue
@@ -3,7 +3,7 @@
-
+
{{dataObj.title}}
@@ -25,15 +25,17 @@
export default {
data() {
return {
- detailTitle:'',
+ detailTitle:'方案详情',
current:0,
- dataObj:{},
+ dataObj:'',
rich_text:''//富文本
}
},
onLoad(op) {
- this.detailTitle = `${['方案详情','详情概述','产品详情'][op.index*1]}`;
- this.current = op.index*1;
+ if(op.index!=undefined) {
+ this.detailTitle = `${['方案详情','详情概述','产品详情'][op.index*1]}`;
+ this.current = op.index*1;
+ }
this.getDetail(op.id);
},
methods: {
diff --git a/pagesB/plan-fault/plan-fault.vue b/pagesB/plan-fault/plan-fault.vue
index 7ddd8fa..027eeda 100644
--- a/pagesB/plan-fault/plan-fault.vue
+++ b/pagesB/plan-fault/plan-fault.vue
@@ -42,7 +42,7 @@
data() {
return {
rateNum:5,
- ifPlanFault:'',
+ ifPlanFault:'解决方案',
current:'',
size:20,
page:1,
@@ -59,8 +59,10 @@
}
},
onLoad(op) {
- this.ifPlanFault = `${['解决方案','常见故障'][op.index*1]}`;
- this.current = op.index*1;
+ if(op.index!=undefined) {
+ this.ifPlanFault = `${['解决方案','常见故障'][op.index*1]}`;
+ this.current = op.index*1;
+ }
if(op.type_id!=undefined) this.type_id = op.type_id;
this.getPlanFault();
},
diff --git a/project.config.json b/project.config.json
deleted file mode 100644
index 9edc87c..0000000
--- a/project.config.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "description": "项目配置文件",
- "packOptions": {
- "ignore": []
- },
- "setting": {
- "urlCheck": true,
- "es6": true,
- "enhance": true,
- "postcss": true,
- "preloadBackgroundData": false,
- "minified": true,
- "newFeature": false,
- "coverView": true,
- "nodeModules": false,
- "autoAudits": false,
- "showShadowRootInWxmlPanel": true,
- "scopeDataCheck": false,
- "uglifyFileName": false,
- "checkInvalidKey": true,
- "checkSiteMap": true,
- "uploadWithSourceMap": true,
- "compileHotReLoad": false,
- "lazyloadPlaceholderEnable": false,
- "useMultiFrameRuntime": true,
- "useApiHook": true,
- "useApiHostProcess": true,
- "babelSetting": {
- "ignore": [],
- "disablePlugins": [],
- "outputPath": ""
- },
- "useIsolateContext": false,
- "userConfirmedBundleSwitch": false,
- "packNpmManually": false,
- "packNpmRelationList": [],
- "minifyWXSS": true,
- "disableUseStrict": false,
- "minifyWXML": true,
- "showES6CompileOption": false,
- "useCompilerPlugins": false,
- "ignoreUploadUnusedFiles": true
- },
- "compileType": "miniprogram",
- "libVersion": "2.22.0",
- "appid": "wx987dc41899f719e8",
- "projectname": "%E4%BD%A9%E4%B8%BD%E5%95%86%E5%9F%8E",
- "debugOptions": {
- "hidedInDevtools": []
- },
- "scripts": {},
- "staticServerOptions": {
- "baseURL": "",
- "servePath": ""
- },
- "isGameTourist": false,
- "condition": {
- "search": {
- "list": []
- },
- "conversation": {
- "list": []
- },
- "game": {
- "list": []
- },
- "plugin": {
- "list": []
- },
- "gamePlugin": {
- "list": []
- },
- "miniprogram": {
- "list": []
- }
- }
-}
\ No newline at end of file
diff --git a/readme.md b/readme.md
deleted file mode 100644
index b3ab5cd..0000000
--- a/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
diff --git a/static/tabbar/icon-mo-fun.png b/static/tabbar/icon-mo-fun.png
index 7caad2e..a87c593 100644
Binary files a/static/tabbar/icon-mo-fun.png and b/static/tabbar/icon-mo-fun.png differ
diff --git a/static/tabbar/icon-mo-home.png b/static/tabbar/icon-mo-home.png
index 14971a6..58f7c8d 100644
Binary files a/static/tabbar/icon-mo-home.png and b/static/tabbar/icon-mo-home.png differ
diff --git a/static/tabbar/icon-mo-news.png b/static/tabbar/icon-mo-news.png
index 28f24a7..6164a6a 100644
Binary files a/static/tabbar/icon-mo-news.png and b/static/tabbar/icon-mo-news.png differ
diff --git a/static/tabbar/icon-mo-person.png b/static/tabbar/icon-mo-person.png
index 6c64dc2..338ec7e 100644
Binary files a/static/tabbar/icon-mo-person.png and b/static/tabbar/icon-mo-person.png differ
diff --git a/static/tabbar/icon-scan.png b/static/tabbar/icon-scan.png
index d55ebc6..3298a9b 100644
Binary files a/static/tabbar/icon-scan.png and b/static/tabbar/icon-scan.png differ
diff --git a/static/tabbar/icon-select-fun.png b/static/tabbar/icon-select-fun.png
index dbc2af9..9f48b23 100644
Binary files a/static/tabbar/icon-select-fun.png and b/static/tabbar/icon-select-fun.png differ
diff --git a/static/tabbar/icon-select-home.png b/static/tabbar/icon-select-home.png
index 15dbf6e..521f9ca 100644
Binary files a/static/tabbar/icon-select-home.png and b/static/tabbar/icon-select-home.png differ
diff --git a/static/tabbar/icon-select-news.png b/static/tabbar/icon-select-news.png
index 8f92e72..74d7cc4 100644
Binary files a/static/tabbar/icon-select-news.png and b/static/tabbar/icon-select-news.png differ
diff --git a/static/tabbar/icon-select-person.png b/static/tabbar/icon-select-person.png
index 8300a66..37799a0 100644
Binary files a/static/tabbar/icon-select-person.png and b/static/tabbar/icon-select-person.png differ
diff --git a/uni.scss b/uni.scss
index f0f426c..a05adb4 100644
--- a/uni.scss
+++ b/uni.scss
@@ -39,38 +39,38 @@ $uni-border-color:#c8c7cc;
/* 尺寸变量 */
/* 文字尺寸 */
-$uni-font-size-sm:24upx;
-$uni-font-size-base:28upx;
-$uni-font-size-lg:32upx;
+$uni-font-size-sm:12px;
+$uni-font-size-base:14px;
+$uni-font-size-lg:16;
/* 图片尺寸 */
-$uni-img-size-sm:40upx;
-$uni-img-size-base:52upx;
-$uni-img-size-lg:80upx;
+$uni-img-size-sm:20px;
+$uni-img-size-base:26px;
+$uni-img-size-lg:40px;
/* Border Radius */
-$uni-border-radius-sm: 4upx;
-$uni-border-radius-base: 6upx;
-$uni-border-radius-lg: 12upx;
+$uni-border-radius-sm: 2px;
+$uni-border-radius-base: 3px;
+$uni-border-radius-lg: 6px;
$uni-border-radius-circle: 50%;
/* 水平间距 */
-$uni-spacing-row-sm: 10px;
-$uni-spacing-row-base: 20upx;
-$uni-spacing-row-lg: 30upx;
+$uni-spacing-row-sm: 5px;
+$uni-spacing-row-base: 10px;
+$uni-spacing-row-lg: 15px;
/* 垂直间距 */
-$uni-spacing-col-sm: 8upx;
-$uni-spacing-col-base: 16upx;
-$uni-spacing-col-lg: 24upx;
+$uni-spacing-col-sm: 4px;
+$uni-spacing-col-base: 8px;
+$uni-spacing-col-lg: 12px;
/* 透明度 */
$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
/* 文章场景相关 */
$uni-color-title: #2C405A; // 文章标题颜色
-$uni-font-size-title:40upx;
+$uni-font-size-title:20px;
$uni-color-subtitle: #555555; // 二级标题颜色
-$uni-font-size-subtitle:36upx;
+$uni-font-size-subtitle:26px;
$uni-color-paragraph: #3F536E; // 文章段落颜色
-$uni-font-size-paragraph:30upx;
\ No newline at end of file
+$uni-font-size-paragraph:15px;
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 6dae5fa..1b8b5db 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
@@ -20,179 +20,200 @@
const color = ['#1890FF', '#91CB74', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc'];
//事件转换函数，主要用作格式化x轴为时间轴，根据需求自行修改
-const formatDateTime = (timeStamp, returnType)=>{
- var date = new Date();
- date.setTime(timeStamp * 1000);
- var y = date.getFullYear();
- var m = date.getMonth() + 1;
- m = m < 10 ? ('0' + m) : m;
- var d = date.getDate();
- d = d < 10 ? ('0' + d) : d;
- var h = date.getHours();
- h = h < 10 ? ('0' + h) : h;
- var minute = date.getMinutes();
- var second = date.getSeconds();
- minute = minute < 10 ? ('0' + minute) : minute;
- second = second < 10 ? ('0' + second) : second;
- if(returnType == 'full'){return y + '-' + m + '-' + d + ' '+ h +':' + minute + ':' + second;}
- if(returnType == 'y-m-d'){return y + '-' + m + '-' + d;}
- if(returnType == 'h:m'){return h +':' + minute;}
- if(returnType == 'h:m:s'){return h +':' + minute +':' + second;}
- return [y, m, d, h, minute, second];
+const formatDateTime = (timeStamp, returnType) => {
+ var date = new Date();
+ date.setTime(timeStamp * 1000);
+ var y = date.getFullYear();
+ var m = date.getMonth() + 1;
+ m = m < 10 ? ('0' + m) : m;
+ var d = date.getDate();
+ d = d < 10 ? ('0' + d) : d;
+ var h = date.getHours();
+ h = h < 10 ? ('0' + h) : h;
+ var minute = date.getMinutes();
+ var second = date.getSeconds();
+ minute = minute < 10 ? ('0' + minute) : minute;
+ second = second < 10 ? ('0' + second) : second;
+ if (returnType == 'full') {
+ return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
+ }
+ if (returnType == 'y-m-d') {
+ return y + '-' + m + '-' + d;
+ }
+ if (returnType == 'h:m') {
+ return h + ':' + minute;
+ }
+ if (returnType == 'h:m:s') {
+ return h + ':' + minute + ':' + second;
+ }
+ return [y, m, d, h, minute, second];
}
const cfu = {
- //demotype为自定义图表类型，一般不需要自定义图表类型，只需要改根节点上对应的类型即可
- "type":["pie","ring","rose","word","funnel","map","arcbar","line","column","bar","area","radar","gauge","candle","mix","tline","tarea","scatter","bubble","demotype"],
- "range":["饼状图","圆环图","玫瑰图","词云图","漏斗图","地图","圆弧进度条","折线图","柱状图","条状图","区域图","雷达图","仪表盘","K线图","混合图","时间轴折线","时间轴区域","散点图","气泡图","自定义类型"],
- //增加自定义图表类型，如果需要categories，请在这里加入您的图表类型，例如最后的"demotype"
- //自定义类型时需要注意"tline","tarea","scatter","bubble"等时间轴（矢量x轴）类图表，没有categories，不需要加入categories
- "categories":["line","column","bar","area","radar","gauge","candle","mix","demotype"],
- //instance为实例变量承载属性，不要删除
- "instance":{},
- //option为opts及eopts承载属性，不要删除
- "option":{},
- //下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换
- "formatter":{
- "yAxisDemo1":function(val){return val+'元'},
- "yAxisDemo2":function(val){return val.toFixed(2)},
- "xAxisDemo1":function(val){return val+'年'},
- "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.name+item.data+'天'
- }
- },
- "pieDemo":function(val, index, series){
- if(index !== undefined){
- return series[index].name+"\n"+series[index].data+'元'
- }
- },
- },
- //这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。
- "demotype":{
- //我这里把曲线图当做了自定义图表类型，您可以根据需要随意指定类型或配置
- "type": "line",
- "color": color,
- "padding": [15,10,0,15],
- "xAxis": {
- "disableGrid": true,
- },
- "yAxis": {
- "gridType": "dash",
- "dashLength": 2,
- },
- "legend": {
- },
- "extra": {
- "line": {
- "type": "curve",
- "width": 1
- },
- }
- },
- //下面是自定义配置，请添加项目所需的通用配置
- "pie":{
- "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"
- }
- }
+ //demotype为自定义图表类型，一般不需要自定义图表类型，只需要改根节点上对应的类型即可
+ "type": ["pie", "ring", "rose", "word", "funnel", "map", "arcbar", "line", "column", "bar", "area", "radar",
+ "gauge", "candle", "mix", "tline", "tarea", "scatter", "bubble", "demotype"
+ ],
+ "range": ["饼状图", "圆环图", "玫瑰图", "词云图", "漏斗图", "地图", "圆弧进度条", "折线图", "柱状图", "条状图", "区域图", "雷达图", "仪表盘", "K线图",
+ "混合图", "时间轴折线", "时间轴区域", "散点图", "气泡图", "自定义类型"
+ ],
+ //增加自定义图表类型，如果需要categories，请在这里加入您的图表类型，例如最后的"demotype"
+ //自定义类型时需要注意"tline","tarea","scatter","bubble"等时间轴（矢量x轴）类图表，没有categories，不需要加入categories
+ "categories": ["line", "column", "bar", "area", "radar", "gauge", "candle", "mix", "demotype"],
+ //instance为实例变量承载属性，不要删除
+ "instance": {},
+ //option为opts及eopts承载属性，不要删除
+ "option": {},
+ //下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换
+ "formatter": {
+ "yAxisDemo1": function(val) {
+ return val + '元'
+ },
+ "yAxisDemo2": function(val) {
+ return val.toFixed(2)
+ },
+ "xAxisDemo1": function(val) {
+ return val + '年'
+ },
+ "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.name + item.data + '%'
+ }
+ },
+ "pieDemo": function(val, index, series) {
+ if (index !== undefined) {
+ return series[index].name + "\n" + series[index].data + '元'
+ }
+ },
},
- "ring":{
+ //这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。
+ "demotype": {
+ //我这里把曲线图当做了自定义图表类型，您可以根据需要随意指定类型或配置
+ "type": "line",
+ "color": color,
+ "padding": [15, 10, 0, 15],
+ "xAxis": {
+ "disableGrid": true,
+ },
+ "yAxis": {
+ "gridType": "dash",
+ "dashLength": 2,
+ },
+ "legend": {},
+ "extra": {
+ "line": {
+ "type": "curve",
+ "width": 1
+ },
+ }
+ },
+ //下面是自定义配置，请添加项目所需的通用配置
+ "pie": {
+ "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",
- "color": color,
- "padding": [5,5,5,5],
+ "color": color,
+ "padding": [5, 5, 5, 5],
"rotate": false,
"dataLabel": true,
"legend": {
"show": false,
"position": "right",
- "lineHeight": 25,
+ "lineHeight": 25,
},
// "title": {
// "name": "收益率",
@@ -206,7 +227,7 @@ const cfu = {
// },
"extra": {
"ring": {
- "ringWidth":30,
+ "ringWidth": 30,
"activeOpacity": 0.5,
"activeRadius": 10,
"offsetAngle": 0,
@@ -217,14 +238,14 @@ const cfu = {
},
},
},
- "rose":{
+ "rose": {
"type": "rose",
- "color": color,
- "padding": [5,5,5,5],
+ "color": color,
+ "padding": [5, 5, 5, 5],
"legend": {
"show": true,
"position": "left",
- "lineHeight": 25,
+ "lineHeight": 25,
},
"extra": {
"rose": {
@@ -240,9 +261,9 @@ const cfu = {
},
}
},
- "word":{
+ "word": {
"type": "word",
- "color": color,
+ "color": color,
"extra": {
"word": {
"type": "normal",
@@ -250,10 +271,10 @@ const cfu = {
}
}
},
- "funnel":{
+ "funnel": {
"type": "funnel",
- "color": color,
- "padding": [15,15,0,15],
+ "color": color,
+ "padding": [15, 15, 0, 15],
"extra": {
"funnel": {
"activeOpacity": 0.3,
@@ -266,11 +287,11 @@ const cfu = {
},
}
},
- "map":{
+ "map": {
"type": "map",
- "color": color,
- "padding": [0,0,0,0],
- "dataLabel": true,
+ "color": color,
+ "padding": [0, 0, 0, 0],
+ "dataLabel": true,
"extra": {
"map": {
"border": true,
@@ -283,9 +304,9 @@ const cfu = {
},
}
},
- "arcbar":{
+ "arcbar": {
"type": "arcbar",
- "color": color,
+ "color": color,
"title": {
"name": "百分比",
"fontSize": 25,
@@ -307,19 +328,18 @@ const cfu = {
}
}
},
- "line":{
+ "line": {
"type": "line",
- "color": color,
- "padding": [15,10,0,15],
+ "color": color,
+ "padding": [15, 10, 0, 15],
"xAxis": {
- "disableGrid": true,
+ "disableGrid": true,
},
"yAxis": {
- "gridType": "dash",
- "dashLength": 2,
- },
- "legend": {
+ "gridType": "dash",
+ "dashLength": 2,
},
+ "legend": {},
"extra": {
"line": {
"type": "straight",
@@ -327,75 +347,70 @@ const cfu = {
},
}
},
- "tline":{
- "type": "line",
- "color": color,
- "padding": [15,10,0,15],
- "xAxis": {
- "disableGrid": false,
- "boundaryGap":"justify",
- },
- "yAxis": {
- "gridType": "dash",
- "dashLength": 2,
- "data":[
- {
- "min":0,
- "max":80
- }
- ]
- },
- "legend": {
- },
- "extra": {
- "line": {
- "type": "curve",
- "width": 2
- },
- }
- },
- "tarea":{
- "type": "area",
- "color": color,
- "padding": [15,10,0,15],
- "xAxis": {
- "disableGrid": true,
- "boundaryGap":"justify",
- },
- "yAxis": {
- "gridType": "dash",
- "dashLength": 2,
- "data":[
- {
- "min":0,
- "max":80
- }
- ]
- },
- "legend": {
- },
- "extra": {
- "area": {
- "type": "curve",
- "opacity": 0.2,
- "addLine": true,
- "width": 2,
- "gradient": true
- },
- }
- },
- "column":{
- "type": "column",
- "color": color,
- "padding": [15,15,0,5],
+ "tline": {
+ "type": "line",
+ "color": color,
+ "padding": [15, 10, 0, 15],
"xAxis": {
- "disableGrid": true,
+ "disableGrid": false,
+ "boundaryGap": "justify",
},
"yAxis": {
- "data":[{"min":0}]
+ "gridType": "dash",
+ "dashLength": 2,
+ "data": [{
+ "min": 0,
+ "max": 80
+ }]
},
- "legend": {
+ "legend": {},
+ "extra": {
+ "line": {
+ "type": "curve",
+ "width": 2
+ },
+ }
+ },
+ "tarea": {
+ "type": "area",
+ "color": color,
+ "padding": [15, 10, 0, 15],
+ "xAxis": {
+ "disableGrid": true,
+ "boundaryGap": "justify",
},
+ "yAxis": {
+ "gridType": "dash",
+ "dashLength": 2,
+ "data": [{
+ "min": 0,
+ "max": 80
+ }]
+ },
+ "legend": {},
+ "extra": {
+ "area": {
+ "type": "curve",
+ "opacity": 0.2,
+ "addLine": true,
+ "width": 2,
+ "gradient": true
+ },
+ }
+ },
+ "column": {
+ "type": "column",
+ "color": color,
+ "padding": [15, 15, 0, 5],
+ "xAxis": {
+ "disableGrid": true,
+ },
+ "yAxis": {
+ "data": [{
+ "min": 0
+ }]
+ },
+ "legend": {},
"extra": {
"column": {
"type": "group",
@@ -405,44 +420,41 @@ const cfu = {
},
}
},
- "bar":{
- "type": "bar",
- "color": color,
- "padding": [15,30,0,5],
- "xAxis": {
- "boundaryGap":"justify",
- "disableGrid":false,
- "min":0,
- "axisLine":false
- },
- "yAxis": {
- },
- "legend": {
- },
- "extra": {
- "bar": {
- "type": "group",
- "width": 30,
- "meterBorde": 1,
- "meterFillColor": "#FFFFFF",
- "activeBgColor": "#000000",
- "activeBgOpacity": 0.08
- },
- }
- },
- "area":{
+ "bar": {
+ "type": "bar",
+ "color": color,
+ "padding": [15, 30, 0, 5],
+ "xAxis": {
+ "boundaryGap": "justify",
+ "disableGrid": false,
+ "min": 0,
+ "axisLine": false
+ },
+ "yAxis": {},
+ "legend": {},
+ "extra": {
+ "bar": {
+ "type": "group",
+ "width": 30,
+ "meterBorde": 1,
+ "meterFillColor": "#FFFFFF",
+ "activeBgColor": "#000000",
+ "activeBgOpacity": 0.08
+ },
+ }
+ },
+ "area": {
"type": "area",
"color": color,
- "padding": [15,15,0,15],
+ "padding": [15, 15, 0, 15],
"xAxis": {
- "disableGrid": true,
+ "disableGrid": true,
},
"yAxis": {
- "gridType": "dash",
- "dashLength": 2,
- },
- "legend": {
+ "gridType": "dash",
+ "dashLength": 2,
},
+ "legend": {},
"extra": {
"area": {
"type": "straight",
@@ -453,15 +465,15 @@ const cfu = {
},
}
},
- "radar":{
+ "radar": {
"type": "radar",
"color": color,
- "padding": [5,5,5,5],
- "dataLabel": false,
+ "padding": [5, 5, 5, 5],
+ "dataLabel": false,
"legend": {
"show": true,
"position": "right",
- "lineHeight": 25,
+ "lineHeight": 25,
},
"extra": {
"radar": {
@@ -473,7 +485,7 @@ const cfu = {
},
}
},
- "gauge":{
+ "gauge": {
"type": "gauge",
"color": color,
"title": {
@@ -513,10 +525,10 @@ const cfu = {
}
}
},
- "candle":{
+ "candle": {
"type": "candle",
"color": color,
- "padding": [15,15,0,15],
+ "padding": [15, 15, 0, 15],
"enableScroll": true,
"enableMarkLine": true,
"dataLabel": false,
@@ -532,10 +544,8 @@ const cfu = {
"scrollColor": "#A6A6A6",
"scrollBackgroundColor": "#EFEBEF"
},
- "yAxis": {
- },
- "legend": {
- },
+ "yAxis": {},
+ "legend": {},
"extra": {
"candle": {
"color": {
@@ -546,16 +556,15 @@ const cfu = {
},
"average": {
"show": true,
- "name": ["MA5","MA10","MA30"],
- "day": [5,10,20],
- "color": ["#1890ff","#2fc25b","#facc14"]
+ "name": ["MA5", "MA10", "MA30"],
+ "day": [5, 10, 20],
+ "color": ["#1890ff", "#2fc25b", "#facc14"]
}
},
"markLine": {
"type": "dash",
"dashLength": 5,
- "data": [
- {
+ "data": [{
"value": 2150,
"lineColor": "#f04864",
"showLabel": true
@@ -569,198 +578,194 @@ const cfu = {
}
}
},
- "mix":{
- "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": []
- }
- }
+ "mix": {
+ "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": {//x轴
+ "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": {//y轴
+ "disabled": false,
+ "disableGrid": false,
+ "splitNumber": 5,
+ "gridType": "solid",//dash：虚线 solid:实线
+ "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": false,//点击时不显示描述信息
+ "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": false,//点击时不显示选中竖线
+ "horizentalLine": false,
+ "xAxisLabel": false,
+ "yAxisLabel": false,
+ "labelBgColor": "#FFFFFF",
+ "labelBgOpacity": 0.7,
+ "labelFontColor": "#666666"
+ },
+ "markLine": {
+ "type": "solid",
+ "dashLength": 4,
+ "data": []
+ }
+ }
},
- "scatter":{
+ "scatter": {
"type": "scatter",
- "color":color,
- "padding":[15,15,0,15],
- "dataLabel":false,
- "xAxis": {
- "disableGrid": false,
- "gridType":"dash",
- "splitNumber":5,
- "boundaryGap":"justify",
- "min":0
- },
- "yAxis": {
- "disableGrid": false,
- "gridType":"dash",
- },
- "legend": {
- },
- "extra": {
- "scatter": {
- },
- }
+ "color": color,
+ "padding": [15, 15, 0, 15],
+ "dataLabel": false,
+ "xAxis": {
+ "disableGrid": false,
+ "gridType": "dash",
+ "splitNumber": 5,
+ "boundaryGap": "justify",
+ "min": 0
+ },
+ "yAxis": {
+ "disableGrid": false,
+ "gridType": "dash",
+ },
+ "legend": {},
+ "extra": {
+ "scatter": {},
+ }
},
- "bubble":{
+ "bubble": {
"type": "bubble",
- "color":color,
- "padding":[15,15,0,15],
- "xAxis": {
- "disableGrid": false,
- "gridType":"dash",
- "splitNumber":5,
- "boundaryGap":"justify",
- "min":0,
- "max":250
- },
- "yAxis": {
- "disableGrid": false,
- "gridType":"dash",
- "data":[{
- "min":0,
- "max":150
- }]
- },
- "legend": {
- },
- "extra": {
- "bubble": {
- "border":2,
- "opacity": 0.5,
- },
- }
+ "color": color,
+ "padding": [15, 15, 0, 15],
+ "xAxis": {
+ "disableGrid": false,
+ "gridType": "dash",
+ "splitNumber": 5,
+ "boundaryGap": "justify",
+ "min": 0,
+ "max": 250
+ },
+ "yAxis": {
+ "disableGrid": false,
+ "gridType": "dash",
+ "data": [{
+ "min": 0,
+ "max": 150
+ }]
+ },
+ "legend": {},
+ "extra": {
+ "bubble": {
+ "border": 2,
+ "opacity": 0.5,
+ },
+ }
}
}
-export default cfu;
\ No newline at end of file
+export default cfu;