From 0678edc3ce322e2190941805434e1031b5e2153b Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 06 十一月 2018 14:23:13 +0800
Subject: [PATCH] 修复显示bug
---
gx_tieta/WebRoot/control.jsp | 2 +-
gx_tieta/WebRoot/pages/css/mylayui.css | 1 -
gx_tieta/WebRoot/pages/js/common.js | 5 +++++
gx_tieta/WebRoot/js/elecircle.js | 19 +++++++++++++++++++
4 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 6915364..3a9295e 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -25,7 +25,7 @@
<link rel="stylesheet" type="text/css" href="css/whyc-ui.css">
<link rel="stylesheet" type="text/css" href="css/confirm.css">
<link rel="stylesheet" type="text/css" href="src/css/layui.css">
- <link rel="stylesheet" type="text/css" href="pages/css/mylayui.css">
+ <!-- <link rel="stylesheet" type="text/css" href="pages/css/mylayui.css"> -->
<script type="text/javascript" src="js/echarts.js"></script>
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="js/base.js"></script>
diff --git a/gx_tieta/WebRoot/js/elecircle.js b/gx_tieta/WebRoot/js/elecircle.js
index 79573ac..c070f09 100644
--- a/gx_tieta/WebRoot/js/elecircle.js
+++ b/gx_tieta/WebRoot/js/elecircle.js
@@ -1125,6 +1125,25 @@
this.opts.push(txtInfor);
}
+// 缁樺埗鍥剧墖
+EleCircle.prototype.drawImg = function(options) {
+ var defaluts = {
+ img: '',
+ startX: 0,
+ startY: 0,
+ width: 30,
+ height: 30,
+ isShow: true,
+ name:'',
+ id: '',
+ };
+
+ var opts = $.extend({}, defaluts, options || {});
+
+ if(opts.img != '')
+ this.context.drawImage(opts.img, opts.startX-30, opts.startY-3, 65, 105);
+};
+
// 閲嶆柊缁樺埗鍥�
EleCircle.prototype.redraw =function() {
this.context.clearRect(0, 0, this.canvas.width, this.canvas.height);
diff --git a/gx_tieta/WebRoot/pages/css/mylayui.css b/gx_tieta/WebRoot/pages/css/mylayui.css
index 9729825..0a9ac54 100644
--- a/gx_tieta/WebRoot/pages/css/mylayui.css
+++ b/gx_tieta/WebRoot/pages/css/mylayui.css
@@ -3,7 +3,6 @@
height: 100%;
min-width: 1200px;
overflow: hidden;
- overflow-x: auto;
}
.layui-table-view {
margin: 0;
diff --git a/gx_tieta/WebRoot/pages/js/common.js b/gx_tieta/WebRoot/pages/js/common.js
index 65f2cf7..23d1aca 100644
--- a/gx_tieta/WebRoot/pages/js/common.js
+++ b/gx_tieta/WebRoot/pages/js/common.js
@@ -459,6 +459,11 @@
gl.CMD.sys.restart = 0x10;
gl.CMD.sys.set = 0x81;
gl.CMD.sys.get = 0x80;
+
+ //CMD涓媑prs
+ gl.namespace('CMD.gprs');
+ gl.CMD.gprs.param = 145;
+ gl.CMD.gprs.signal = "CSQ";
})(jQuery, window, document, GLOBAL);
// 鍦板浘淇℃伅
--
Gitblit v1.9.1