diff --git a/public/CircuitBreakerSvg.png b/public/CircuitBreakerSvg.png
index 2e0d9fa..a1f4b0d 100644
Binary files a/public/CircuitBreakerSvg.png and b/public/CircuitBreakerSvg.png differ
diff --git a/public/DoubleWindingSvg.png b/public/DoubleWindingSvg.png
index 34e8a31..03eae5d 100644
Binary files a/public/DoubleWindingSvg.png and b/public/DoubleWindingSvg.png differ
diff --git a/public/DoubleWindingSvgB.png b/public/DoubleWindingSvgB.png
index 6477e07..d3c604a 100644
Binary files a/public/DoubleWindingSvgB.png and b/public/DoubleWindingSvgB.png differ
diff --git a/public/GGJ.png b/public/GGJ.png
deleted file mode 100644
index 034769c..0000000
Binary files a/public/GGJ.png and /dev/null differ
diff --git a/public/GGJSvg.png b/public/GGJSvg.png
new file mode 100644
index 0000000..3430824
Binary files /dev/null and b/public/GGJSvg.png differ
diff --git a/public/InterfaceReturn.json b/public/InterfaceReturn.json
index 981d99b..fc40c2d 100644
--- a/public/InterfaceReturn.json
+++ b/public/InterfaceReturn.json
@@ -1,72 +1,299 @@
[{
"type": "AlternatorSvg",
"title": "发电机",
- "panelclass":"draggable",
+ "panel_class":"draggable",
"template": "",
"props": ["prop_data"],
"default_attr":{
"color":"#FF0000"
},
+ "data_type":"none",
"create_type":"draggable",
"priview_img":"/AlternatorSvg.png"
}, {
"type": "ArrowDownSvg",
"title": "箭头向下",
- "panelclass":"draggable",
+ "panel_class":"draggable",
"template": "",
"props": ["prop_data"],
"default_attr":{
"color":"#FF0000"
},
+ "data_type":"none",
"create_type":"draggable",
"priview_img":"/ArrowDownSvg.png"
}, {
"type": "ArrowUpSvg",
"title": "箭头向上",
- "panelclass":"draggable",
+ "panel_class":"draggable",
"template": "",
"props": ["prop_data"],
"default_attr":{
"color":"#FF0000"
},
+ "data_type":"none",
"create_type":"draggable",
"priview_img":"/ArrowUpSvg.png"
},
+{
+ "type": "CircuitBreakerSvg",
+ "title": "断路器",
+ "panel_class":"draggable",
+ "template": "",
+ "props": ["prop_data"],
+ "default_attr":{
+ "color":"#FF0000"
+ },
+ "data_type":"switch",
+ "create_type":"draggable",
+ "priview_img":"/CircuitBreakerSvg.png"
+},
+{
+ "type": "DoubleWindingSvg",
+ "title": "双绕组变压器",
+ "panel_class":"draggable",
+ "template": " ",
+ "props": ["prop_data"],
+ "default_attr":{
+ "color":"#FF0000"
+ },
+ "data_type":"none",
+ "create_type":"draggable",
+ "priview_img":"/DoubleWindingSvg.png"
+},
+{
+ "type": "GGJSvg",
+ "title": "电容柜",
+ "panel_class":"draggable",
+ "template": " ",
+ "props": ["prop_data"],
+ "default_attr":{
+ "color":"#FF0000"
+ },
+ "data_type":"none",
+ "create_type":"draggable",
+ "priview_img":"/GGJSvg.png"
+},
+{
+ "type": "GroundGraySvg",
+ "title": "接地灰白",
+ "panel_class":"draggable",
+ "template": " ",
+ "props": ["prop_data"],
+ "default_attr":{
+ "color":"#CCCCCC"
+ },
+ "data_type":"none",
+ "create_type":"draggable",
+ "priview_img":"/GroundGraySvg.png"
+},
+{
+ "type": "IsolatingSwitchSvg",
+ "title": "隔离开关",
+ "panel_class":"draggable",
+ "template": " ",
+ "props": ["prop_data"],
+ "default_attr":{
+ "color":"#FF0000"
+ },
+ "data_type":"none",
+ "create_type":"draggable",
+ "priview_img":"/IsolatingSwitchSvg.png"
+},
+{
+ "type": "LightningArresterSvg",
+ "title": "避雷器",
+ "panel_class":"draggable",
+ "template": " ",
+ "props": ["prop_data"],
+ "default_attr":{
+ "color":"#FF0000"
+ },
+ "data_type":"none",
+ "create_type":"draggable",
+ "priview_img":"/LightningArresterSvg.png"
+},
+{
+ "type": "PolylineSvg",
+ "title": "多段折线",
+ "panel_class":"draggable",
+ "template": " ",
+ "props": ["prop_data"],
+ "default_attr":{
+ "color":"#FF0000"
+ },
+ "data_type":"none",
+ "create_type":"draggable",
+ "priview_img":"/PolylineSvg.png"
+},
+{
+ "type": "RectSvg",
+ "title": "长方形",
+ "panel_class":"draggable",
+ "template": "",
+ "props": ["prop_data"],
+ "default_attr":{
+ "color":"#FF0000"
+ },
+ "data_type":"none",
+ "create_type":"draggable",
+ "priview_img":"/RectSvg.png"
+},
+{
+ "type": "SignalLampSvg",
+ "title": "信号灯",
+ "panel_class":"draggable",
+ "template": " ",
+ "props": ["prop_data"],
+ "default_attr":{
+ "color":"#FF0000"
+ },
+ "data_type":"none",
+ "create_type":"draggable",
+ "priview_img":"/SignalLampSvg.png"
+},
+{
+ "type": "StandardCapacitorSvg",
+ "title": "标准电容器",
+ "panel_class":"draggable",
+ "template": " ",
+ "props": ["prop_data"],
+ "default_attr":{
+ "color":"#FF0000"
+ },
+ "data_type":"none",
+ "create_type":"draggable",
+ "priview_img":"/StandardCapacitorSvg.png"
+},
+{
+ "type": "StandardReactanceSvg",
+ "title": "标准电抗",
+ "panel_class":"draggable",
+ "template": "",
+ "props": ["prop_data"],
+ "default_attr":{
+ "color":"#FF0000"
+ },
+ "data_type":"none",
+ "create_type":"draggable",
+ "priview_img":"/StandardReactanceSvg.png"
+},
+{
+ "type": "TextSvg",
+ "title": "文字",
+ "panel_class":"draggable",
+ "template": "{{prop_data.title}}",
+ "props": ["prop_data"],
+ "default_attr":{
+ "color":"#FF0000"
+ },
+ "data_type":"none",
+ "create_type":"draggable",
+ "priview_img":"/TextSvg.png"
+},
+{
+ "type": "TransformerTriphaseOpenSvg",
+ "title": "三相互感器",
+ "panel_class":"draggable",
+ "template": " ",
+ "props": ["prop_data"],
+ "default_attr":{
+ "color":"#FF0000"
+ },
+ "data_type":"none",
+ "create_type":"draggable",
+ "priview_img":"/TransformerTriphaseOpenSvg.png"
+},
+{
+ "type": "TransformerYSvg",
+ "title": "电流互感器Y",
+ "panel_class":"draggable",
+ "template": " ",
+ "props": ["prop_data"],
+ "default_attr":{
+ "color":"#FF0000"
+ },
+ "data_type":"none",
+ "create_type":"draggable",
+ "priview_img":"/TransformerYSvg.png"
+},
+{
+ "type": "TwoCircleSvg",
+ "title": "双圆",
+ "panel_class":"draggable",
+ "template": " ",
+ "props": ["prop_data"],
+ "default_attr":{
+ "color":"#FF0000"
+ },
+ "data_type":"none",
+ "create_type":"draggable",
+ "priview_img":"/TwoCircleSvg.png"
+},
+{
+ "type": "WireBreakOffSvg",
+ "title": "电线开关-断开",
+ "panel_class":"draggable",
+ "template": " ",
+ "props": ["prop_data"],
+ "default_attr":{
+ "color":"#FF0000"
+ },
+ "data_type":"change",
+ "create_type":"draggable",
+ "priview_img":"/WireBreakOffSvg.png"
+},
+{
+ "type": "WireBreakOnSvg",
+ "title": "电线开关-连接",
+ "panel_class":"draggable",
+ "template": " ",
+ "props": ["prop_data"],
+ "default_attr":{
+ "color":"#00FF00"
+ },
+ "data_type":"change",
+ "create_type":"draggable",
+ "priview_img":"/WireBreakOnSvg.png"
+},
{
"type": "ConnLineSvg",
"title": "连接线",
- "panelclass":"draw",
+ "panel_class":"draw",
"template": "",
"props": ["prop_data"],
"default_attr":{
"color":"#FF0000"
},
+ "data_type":"none",
"create_type":"click",
"priview_img":"/VerticalLineSvg.png"
},
{
"type": "EchartsPieSvg",
"title": "Echart饼图",
- "panelclass":"chart",
+ "panel_class":"chart",
"template": " ",
"props": ["prop_data"],
"default_attr":{
"color":"#000000",
"echarts_option":"{\"title\":{\"text\":\"某站点用户访问来源\",\"subtext\":\"纯属虚构\",\"left\":\"center\"},\"tooltip\":{\"trigger\":\"item\"},\"legend\":{\"orient\":\"vertical\",\"left\":\"left\"},\"series\":[{\"name\":\"访问来源\",\"type\":\"pie\",\"radius\":\"50%\",\"data\":[{\"value\":1048,\"name\":\"搜索引擎\"},{\"value\":735,\"name\":\"直接访问\"},{\"value\":580,\"name\":\"邮件营销\"},{\"value\":484,\"name\":\"联盟广告\"},{\"value\":300,\"name\":\"视频广告\"}],\"emphasis\":{\"itemStyle\":{\"shadowBlur\":10,\"shadowOffsetX\":0,\"shadowColor\":\"rgba(0, 0, 0, 0.5)\"}}}]}"
},
+ "data_type":"echarts",
"create_type":"draggable",
"priview_img":"/ECharts_PieSvg.png"
},
{
"type": "EchartsBasicBarSvg",
"title": "Echart基础柱状图",
- "panelclass":"chart",
+ "panel_class":"chart",
"template": " ",
"props": ["prop_data"],
"default_attr":{
"color":"#000000",
"echarts_option":"{\"xAxis\":{\"type\":\"category\",\"data\":[\"Mon\",\"Tue\",\"Wed\",\"Thu\",\"Fri\",\"Sat\",\"Sun\"]},\"yAxis\":{\"type\":\"value\"},\"series\":[{\"data\":[120,200,150,80,70,110,130],\"type\":\"bar\"}]}"
},
+ "data_type":"echarts",
"create_type":"draggable",
"priview_img":"/ECharts_BasicBar.png"
}]
diff --git a/public/IsolatingSwitchSvg.png b/public/IsolatingSwitchSvg.png
index cf2d6de..66e5968 100644
Binary files a/public/IsolatingSwitchSvg.png and b/public/IsolatingSwitchSvg.png differ
diff --git a/public/PolylineDownSvg.png b/public/PolylineDownSvg.png
deleted file mode 100644
index 7d3406d..0000000
Binary files a/public/PolylineDownSvg.png and /dev/null differ
diff --git a/public/PolylineUpSvg.png b/public/PolylineSvg.png
similarity index 100%
rename from public/PolylineUpSvg.png
rename to public/PolylineSvg.png
diff --git a/public/SignalLamp.png b/public/SignalLampSvg.png
similarity index 100%
rename from public/SignalLamp.png
rename to public/SignalLampSvg.png
diff --git a/public/SmartTerminalSvg.png b/public/SmartTerminalSvg.png
deleted file mode 100644
index 56e10ff..0000000
Binary files a/public/SmartTerminalSvg.png and /dev/null differ
diff --git a/public/StandardReactance.png b/public/StandardReactance.png
deleted file mode 100644
index dfaeaca..0000000
Binary files a/public/StandardReactance.png and /dev/null differ
diff --git a/public/StandardReactanceSvg.png b/public/StandardReactanceSvg.png
new file mode 100644
index 0000000..7633d87
Binary files /dev/null and b/public/StandardReactanceSvg.png differ
diff --git a/public/TableSvg.png b/public/TableSvg.png
deleted file mode 100644
index a9995c5..0000000
Binary files a/public/TableSvg.png and /dev/null differ
diff --git a/public/TransformerTriphaseOpen.png b/public/TransformerTriphaseOpenSvg.png
similarity index 100%
rename from public/TransformerTriphaseOpen.png
rename to public/TransformerTriphaseOpenSvg.png
diff --git a/public/TransformerY.png b/public/TransformerYSvg.png
similarity index 100%
rename from public/TransformerY.png
rename to public/TransformerYSvg.png
diff --git a/public/WireBreakOffSvg.png b/public/WireBreakOffSvg.png
index 1ab2e5f..0c2b27f 100644
Binary files a/public/WireBreakOffSvg.png and b/public/WireBreakOffSvg.png differ
diff --git a/public/WireBreakOnSvg.png b/public/WireBreakOnSvg.png
new file mode 100644
index 0000000..fabc490
Binary files /dev/null and b/public/WireBreakOnSvg.png differ
diff --git a/src/components/LeftToolBar.vue b/src/components/LeftToolBar.vue
index 8e20099..950b15f 100644
--- a/src/components/LeftToolBar.vue
+++ b/src/components/LeftToolBar.vue
@@ -65,13 +65,13 @@ export default {
deep: true,
handler (val) {
this.draggableComponentList = val.filter(m => {
- return m.panelclass == 'draggable'
+ return m.panel_class == 'draggable'
});
this.drawComponentList = val.filter(m => {
- return m.panelclass == 'draw'
+ return m.panel_class == 'draw'
});
this.chartComponentList = val.filter(m => {
- return m.panelclass == 'chart'
+ return m.panel_class == 'chart'
});
}
}
diff --git a/src/views/CircuitEdit.vue b/src/views/CircuitEdit.vue
index bcdff12..e63b548 100644
--- a/src/views/CircuitEdit.vue
+++ b/src/views/CircuitEdit.vue
@@ -149,7 +149,7 @@ export default {
testAddSvg: {
type: "testAddSvg",
title: "测试新增组件",
- panelclass: "draggable",
+ panel_class: "draggable",
template: "",
props: ["prop_data"],
default_attr: {