From dab587733203e81bc405449abe48f66061d454e6 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.27>
Date: 星期二, 06 十一月 2018 16:11:36 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/js/elecircle.js | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/js/elecircle.js b/gx_tieta/WebRoot/js/elecircle.js
index c070f09..bf440a4 100644
--- a/gx_tieta/WebRoot/js/elecircle.js
+++ b/gx_tieta/WebRoot/js/elecircle.js
@@ -1133,6 +1133,11 @@
startY: 0,
width: 30,
height: 30,
+ lineWidth: 4,
+ fontSize: 14,
+ fontWeight: '',
+ strokeStyle: '#000',
+ fillStyle: '#000',
isShow: true,
name:'',
id: '',
@@ -1140,8 +1145,24 @@
var opts = $.extend({}, defaluts, options || {});
- if(opts.img != '')
- this.context.drawImage(opts.img, opts.startX-30, opts.startY-3, 65, 105);
+ if(opts.img != '' && opts.isShow) {
+ this.context.drawImage(opts.img, opts.startX, opts.startY, opts.width, opts.height);
+
+ this.context.lineWidth = opts.lineWidth;
+ this.context.strokeStyle = opts.strokeStyle;
+ this.context.fillStyle = opts.fillStyle;
+ this.context.font = opts.fontSize+'px Arial';
+ this.context.fillText(opts.name, opts.startX+30, opts.startY+25);
+ }
+
+ // 瀛樺偍鍐呭
+ var txtInfor = {
+ options: opts,
+ type:'drawImg',
+ };
+ this.opts.push(txtInfor);
+
+
};
// 閲嶆柊缁樺埗鍥�
--
Gitblit v1.9.1