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/js/elecircle.js | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
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: '璁惧鍋滅數鏀剧數'
}
};
--
Gitblit v1.9.1