From be47638f60bc2efbbe98b3debb854a5fcd4fc9b0 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.33>
Date: 星期六, 03 十一月 2018 16:54:46 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 92 ++++++++++++++++++++++++++++++
gx_tieta/WebRoot/js/elecircle.content.js | 4
gx_tieta/WebRoot/pages/js/common.js | 13 +++-
gx_tieta/WebRoot/js/elecircle.js | 20 +++---
4 files changed, 113 insertions(+), 16 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 3e38315..87c2ea5 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -24,6 +24,7 @@
<link rel="stylesheet" href="font-awesome-4.7.0/css/font-awesome.css">
<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">
<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>
@@ -239,6 +240,11 @@
<a href="javascript:void(0);" id="stopTest" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
<span class="whyc-btn-icon fa fa-stop-circle"></span>
<span class="whyc-btn-txt" id="stopTestBtn">鍋滄娴嬭瘯</span>
+ </a>
+ <br>
+ <a href="javascript:void(0);" id="stopTest" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
+ <span class="whyc-btn-icon fa fa-gear"></span>
+ <span class="whyc-btn-txt" id="sysSet">璁剧疆绯荤粺鍙傛暟</span>
</a>
</div>
</div>
@@ -943,6 +949,33 @@
</div>
</div>
+ <!-- 绯荤粺鍙傛暟璁剧疆 -->
+ <div class="popup" id="sysSet_popup">
+ <div class="popup-title"><span>绯荤粺鍙傛暟璁剧疆</span> <a href="javascript:;" class="close">X</a></div>
+ <div class="popup-content">
+ <div class="popup-tbl">
+ <table>
+ <tbody>
+ <tr>
+ <th>鏈烘埧id</th>
+ <th>鏈烘埧鍚嶇О</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="sysSet_dev_id" readonly="readonly" value=""></td>
+ <td><input type="text" id="sysSet_stationName" readonly="readonly" value=""></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+
+ <div class="popup-footer">
+ <input type="button" name="" id="sysSet_restart" value="閲嶅惎璁惧" >
+ <input type="button" name="" id="sysSet_read" value="璇诲彇" >
+ <input type="button" name="" id="sysSet_en" class="status-change-set" value="璁剧疆" >
+ </div>
+ </div>
+
<!-- 鍗曚綋鏇茬嚎 -->
<div class="popup w960 mr480x" id="monLineGraphPopup">
<div id="control_popupTools">
@@ -1045,6 +1078,8 @@
<!-- 寮曞叆鐢佃矾鍥� -->
<script type="text/javascript" src="js/elecircle.js"></script>
<script type="text/javascript" src="js/elecircle.content.js"></script>
+ <!-- 寮曞叆layui妗嗘灦 -->
+ <script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -1053,7 +1088,6 @@
permits=<%=permits%>;
//console.info(json);
<% } %>
- console.log(permits);
//鎷撴墤鍥剧姸鎬佸璞�
var mygraph = {
battstate:0,
@@ -1105,11 +1139,24 @@
myChart=echarts.init(oConEcharts);
myChart.showLoading();
+ // 璁剧疆椤甸潰鏉冮檺妯″潡
+ $(function() {
+ var testOp = checkUserPermit(permits, 'batt_test_op_permit');
+ console.log(testOp);
+ if(!testOp) {
+ $(".ele-circle .tools-btn").remove();
+ }
+
+ });
+
+
+
// 璁剧疆闈㈡澘
var LD9_popup = new Popup($('#LD9_popup'));
var equip61850_popup = new Popup($('#equip61850'));
var BTS_popup = new Popup($('#bts'));
var equip4016_popup = new Popup($('#equip4016'));
+ var sysSet_popup = new Popup($('#sysSet_popup'));
var localNav = new Popup($('#localNav'));
// 鍏呮斁鐢靛脊鍑烘璁剧疆
$(function() {
@@ -1138,6 +1185,12 @@
localNav.hidePopup(); // 闅愯棌localNav寮瑰嚭妗嗗拰閬僵灞�
});
+ // 璁剧疆绯荤粺鍙傛暟
+ $('#sysSet_popup').find('.close').bind('click', function() {
+ sysSet_popup.hidePopup(); // 闅愯棌sysSet_popup寮瑰嚭妗嗗拰閬僵灞�
+ });
+
+
// 绐楀彛澶у皬鏀瑰彉
$(window).resize(function() {
LD9_popup.hidePopup(); // 闅愯棌LD9寮瑰嚭妗嗗拰閬僵灞�
@@ -1145,6 +1198,7 @@
BTS_popup.hidePopup(); // 闅愯棌bts寮瑰嚭妗嗗拰閬僵灞�
equip4016_popup.hidePopup(); // 闅愯棌4016寮瑰嚭妗嗗拰閬僵灞�
localNav.hidePopup();
+ sysSet_popup.hidePopup(); // 闅愯棌sysSet_popup寮瑰嚭妗嗗拰閬僵灞�
});
});
//鍒濆鍖栨煴鐘跺浘
@@ -4350,6 +4404,42 @@
});
+ // 绯荤粺鍙傛暟璁剧疆
+ $(function() {
+ // 鐐瑰嚮璁剧疆绯荤粺鍙傛暟
+ $('#sysSet').click(function() {
+ var batt = getBatt();
+ var temp = {
+ dev_id:batt.FBSDeviceId
+ };
+ layer.msg('鍔熻兘寮�鍙戜腑...');
+
+ return;
+ sysSet_popup.showPopup();
+ searchSysData(temp);
+ });
+
+ // 鏌ヨ璁惧鐨勭郴缁熷弬鏁�
+ function searchSysData(temp) {
+ $.ajax({
+ type: "post",
+ url: "Fbs9100_sysparamAction_action_serchByCondition",
+ async: true,
+ dataType: 'json',
+ data: "json = " + JSON.stringify(temp),
+ success: function(data) {
+ var rs = JSON.parse(data.result);
+ console.info(rs);
+ if(rs.code == 1){
+
+ }else{
+
+ }
+ }
+ });
+ }
+ });
+
// 鏈哄巻鍗℃ā鍧�
$(function() {
// 鑾峰彇閫夐」鍗″垪琛�
diff --git a/gx_tieta/WebRoot/js/elecircle.content.js b/gx_tieta/WebRoot/js/elecircle.content.js
index 4ce250c..2d64550 100644
--- a/gx_tieta/WebRoot/js/elecircle.content.js
+++ b/gx_tieta/WebRoot/js/elecircle.content.js
@@ -467,7 +467,7 @@
id: 'title',
startX: 400,
startY: 40,
- name: '鐢垫睜缁勬诞鍏呯姸鎬佺數娴佹柟鍚�',
+ name: '璁惧娴厖鐘舵�佺數娴佹柟鍚�',
});
// 璁惧鍐呴儴娓╁害
@@ -487,7 +487,7 @@
[430, 520], [430, 360],[320,360]
],
clockwise: 0,
- name: '鐢垫睜缁勬诞鍏呯姸鎬佺數娴佹柟鍚�'
+ name: '璁惧娴厖鐘舵�佺數娴佹柟鍚�'
}
currentObj = $.extend({}, currentObj, floatCharge);
diff --git a/gx_tieta/WebRoot/js/elecircle.js b/gx_tieta/WebRoot/js/elecircle.js
index 9195d39..79573ac 100644
--- a/gx_tieta/WebRoot/js/elecircle.js
+++ b/gx_tieta/WebRoot/js/elecircle.js
@@ -1443,7 +1443,7 @@
isCanMove: 1,
clockwise: 0,
txtFillStyle: '#000',
- name: '鐢垫睜缁勬诞鍏呯姸鎬佺數娴佹柟鍚�'
+ name: '璁惧娴厖鐘舵�佺數娴佹柟鍚�'
},
discharge: {
points:[
@@ -1454,7 +1454,7 @@
isCanMove: 1,
clockwise: 1,
txtFillStyle: '#000',
- name: '鐢垫睜缁勬斁鐢垫祴璇曟椂鐢垫祦鏂瑰悜'
+ name: '璁惧鏀剧數娴嬭瘯鏃剁數娴佹柟鍚�'
},
constCharge: {
points:[
@@ -1465,7 +1465,7 @@
isCanMove: 1,
clockwise: 0,
txtFillStyle: '#000',
- name: '鐢垫睜缁勭ǔ娴佸厖鐢垫椂鐢垫祦鏂瑰悜'
+ name: '璁惧绋虫祦鍏呯數鏃剁數娴佹柟鍚�'
},
directCharge: {
points:[
@@ -1476,7 +1476,7 @@
isCanMove: 1,
clockwise: 0,
txtFillStyle: '#000',
- name: '鐢垫睜缁勭洿杩炲厖鐢垫椂鐢垫祦鏂瑰悜'
+ name: '璁惧鐩磋繛鍏呯數鏃剁數娴佹柟鍚�'
},
unLink: {
points:[
@@ -1493,7 +1493,7 @@
name: 'K1/D1娴嬭瘯'
},
powerCutDis: {
- name: '鐢垫睜缁勫仠鐢垫斁鐢�'
+ name: '璁惧鍋滅數鏀剧數'
}
};
@@ -2088,19 +2088,19 @@
var titleList = {
floatCharge:{
fillStyle: '#000',
- name: '鐢垫睜缁勬诞鍏呯姸鎬�'
+ name: '璁惧娴厖鐘舵��'
},
discharge: {
fillStyle: '#000',
- name: '鐢垫睜缁勬斁鐢垫祴璇�'
+ name: '璁惧鏀剧數娴嬭瘯'
},
constCharge: {
fillStyle: '#000',
- name: '鐢垫睜缁勭ǔ娴佸厖鐢�'
+ name: '璁惧绋虫祦鍏呯數'
},
directCharge: {
fillStyle: '#000',
- name: '鐢垫睜缁勭洿杩炲厖鐢�'
+ name: '璁惧鐩磋繛鍏呯數'
},
unLink: {
fillStyle: '#FF0000',
@@ -2112,7 +2112,7 @@
},
powerCutDis: {
fillStyle: '#000',
- name: '鐢垫睜缁勫仠鐢垫斁鐢�'
+ name: '璁惧鍋滅數鏀剧數'
}
};
diff --git a/gx_tieta/WebRoot/pages/js/common.js b/gx_tieta/WebRoot/pages/js/common.js
index 7e48252..2708ce0 100644
--- a/gx_tieta/WebRoot/pages/js/common.js
+++ b/gx_tieta/WebRoot/pages/js/common.js
@@ -525,7 +525,14 @@
// 妫�娴嬬敤鎴锋槸鍚︽湁鏉冮檺
function checkUserPermit(permits, name) {
- // 閬嶅巻
-
-
+ var rs = false;
+ // 閬嶅巻permits
+ for(var i=0; i<permits.length; i++) {
+ var _permit = permits[i];
+ if(_permit.permit_item_name == name && _permit.permit_item_value==1) {
+ rs = true;
+ break;
+ }
+ }
+ return rs;
}
\ No newline at end of file
--
Gitblit v1.9.1