Bladeren bron

设计单位提资管理功能

user5 3 jaren geleden
bovenliggende
commit
8d0f9e10e1

+ 20 - 0
src/main/java/com/jeeplus/modules/sg/picking/activiti/entity/PickIng.java

@@ -21,6 +21,10 @@ public class PickIng extends DataEntity<PickIng> {
     private String mdUnit;
     //版本
     private String version;
+    //名称
+    private List<String> mdSmallName;
+    //类型
+    private String type;
 
     @Override
     public String getId() {
@@ -74,4 +78,20 @@ public class PickIng extends DataEntity<PickIng> {
     public void setMdImg(String mdImg) {
         this.mdImg = mdImg;
     }
+
+    public List<String> getMdSmallName() {
+        return mdSmallName;
+    }
+
+    public void setMdSmallName(List<String> mdSmallName) {
+        this.mdSmallName = mdSmallName;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 }

+ 10 - 1
src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/PickIngMapper.java

@@ -8,6 +8,7 @@ import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.audit.information.entity.Information;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.picking.activiti.entity.*;
+import com.jeeplus.modules.sg.raiseCapitalDesign.entity.VoltageInfo;
 import com.jeeplus.modules.sys.entity.User;
 import org.apache.ibatis.annotations.Param;
 
@@ -92,4 +93,12 @@ public interface PickIngMapper extends BaseMapper<PickIng> {
     //通过判断出领料清单中所有的已经完成领料的储备项目名称,更新项目的状态
     void updateProjectEnter(List<String> updateProjectList);
 
-}
+
+    /**
+     * 根据类型名称查询数据
+     * @param pickIng
+     * @return
+     */
+    List<VoltageInfo> getListByTheClassName(PickIng pickIng);
+
+}

+ 30 - 1
src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/xml/PickIngMapper.xml

@@ -430,4 +430,33 @@
         from md_picking_application
         where procInsId = #{procInsId}
     </delete>
-</mapper>
+
+    <select id="getListByTheClassName" resultType="com.jeeplus.modules.sg.raiseCapitalDesign.entity.VoltageInfo">
+        SELECT
+        a.id as "id",
+        (CASE a.md_small_class
+        WHEN 'JKLYJ-50绝缘导线' THEN 'JKLYJ-10/50'
+        WHEN 'JKLYJ-150绝缘导线' THEN 'JKLYJ-10/150'
+        WHEN 'JKLYJ-240绝缘导线' THEN 'JKLYJ-10/240'
+        WHEN 'JKYJ-120' THEN 'JKYJ-120'
+        WHEN 'JKLYJ-120' THEN 'JKLYJ-120'
+        WHEN 'JKLYJ-70' THEN 'JKLYJ-70'
+        WHEN 'JKYJ-70' THEN 'JKYJ-70'
+        WHEN 'JKYJ-16' THEN 'JKYJ-16'
+        WHEN 'JKYJ-35' THEN 'JKYJ-35'
+        WHEN 'JKLGYJ-120/20' THEN 'JKLGYJ-120/20'
+        ELSE a.md_small_class END) as "voltageName",
+        #{type} as type
+        FROM md_module_block a
+        <where>
+            md_version = (select id from md_module_block_version where versionName = #{version})
+            <if test="mdSmallName != null and mdSmallName != ''">
+                AND a.md_small_class in
+                <foreach collection="mdSmallName" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        order by md_big_sort,md_the_sort,md_small_sort
+    </select>
+</mapper>

+ 28 - 0
src/main/java/com/jeeplus/modules/sg/raiseCapitalDesign/entity/VoltageData.java

@@ -0,0 +1,28 @@
+package com.jeeplus.modules.sg.raiseCapitalDesign.entity;
+
+import java.util.List;
+
+/**
+ * @author: 大猫
+ * @create: 2021-08-10 16:00
+ **/
+public class VoltageData {
+    private List<VoltageInfo> highVoltageList;
+    private List<VoltageInfo> lowVoltageList;
+
+    public List<VoltageInfo> getHighVoltageList() {
+        return highVoltageList;
+    }
+
+    public void setHighVoltageList(List<VoltageInfo> highVoltageList) {
+        this.highVoltageList = highVoltageList;
+    }
+
+    public List<VoltageInfo> getLowVoltageList() {
+        return lowVoltageList;
+    }
+
+    public void setLowVoltageList(List<VoltageInfo> lowVoltageList) {
+        this.lowVoltageList = lowVoltageList;
+    }
+}

+ 74 - 0
src/main/java/com/jeeplus/modules/sg/raiseCapitalDesign/entity/VoltageInfo.java

@@ -0,0 +1,74 @@
+package com.jeeplus.modules.sg.raiseCapitalDesign.entity;
+
+import com.jeeplus.core.persistence.DataEntity;
+
+/**
+ * 电压实体类
+ * @author: 徐滕
+ * @create: 2021-08-10 10:56
+ **/
+public class VoltageInfo extends DataEntity<VoltageInfo> {
+    private String conductorType;       //导线型号
+    private String singleCircuitPath;   //单回路路径
+    private String doubleCircuitPath;   //双回路路径
+    private String coefficient;         //计算系数
+    private String singleLong;          //单线长
+    private String voltageType;         //类型
+    private String voltageName;         //名称
+
+    public String getConductorType() {
+        return conductorType;
+    }
+
+    public void setConductorType(String conductorType) {
+        this.conductorType = conductorType;
+    }
+
+    public String getSingleCircuitPath() {
+        return singleCircuitPath;
+    }
+
+    public void setSingleCircuitPath(String singleCircuitPath) {
+        this.singleCircuitPath = singleCircuitPath;
+    }
+
+    public String getDoubleCircuitPath() {
+        return doubleCircuitPath;
+    }
+
+    public void setDoubleCircuitPath(String doubleCircuitPath) {
+        this.doubleCircuitPath = doubleCircuitPath;
+    }
+
+    public String getCoefficient() {
+        return coefficient;
+    }
+
+    public void setCoefficient(String coefficient) {
+        this.coefficient = coefficient;
+    }
+
+    public String getSingleLong() {
+        return singleLong;
+    }
+
+    public void setSingleLong(String singleLong) {
+        this.singleLong = singleLong;
+    }
+
+    public String getVoltageType() {
+        return voltageType;
+    }
+
+    public void setVoltageType(String voltageType) {
+        this.voltageType = voltageType;
+    }
+
+    public String getVoltageName() {
+        return voltageName;
+    }
+
+    public void setVoltageName(String voltageName) {
+        this.voltageName = voltageName;
+    }
+}

+ 50 - 0
src/main/java/com/jeeplus/modules/sg/raiseCapitalDesign/service/RaiseCapitalDesignService.java

@@ -3,6 +3,8 @@
  */
 package com.jeeplus.modules.sg.raiseCapitalDesign.service;
 
+import com.alibaba.fastjson.JSON;
+import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
@@ -15,6 +17,7 @@ import com.jeeplus.modules.sg.raiseCapital.entity.RaiseCapital;
 import com.jeeplus.modules.sg.raiseCapital.mapper.RaiseCapitalMapper;
 import com.jeeplus.modules.sg.raiseCapital.utils.RaiseExportUtil;
 import com.jeeplus.modules.sg.raiseCapital.utils.RaiseTemplate;
+import com.jeeplus.modules.sg.raiseCapitalDesign.entity.VoltageInfo;
 import com.jeeplus.modules.sg.raiseCapitalDesign.mapper.RaiseCapitalDesignMapper;
 import com.jeeplus.modules.sys.entity.DictValue;
 import com.jeeplus.modules.sys.utils.UserUtils;
@@ -30,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import redis.clients.jedis.BinaryJedisCommands;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -241,4 +245,50 @@ public class RaiseCapitalDesignService extends CrudService<RaiseCapitalDesignMap
 		return returnList;
 	}
 
+	/**
+	 * 根据UUID查询架空导线再redis中的数据
+	 * @return
+	 */
+	public List<VoltageInfo> getAerialConductor(String uuidKey, String type) {
+		List<VoltageInfo> list = Lists.newArrayList();
+		//创建通道,查询redis中数据
+		CacheChannel channel = J2Cache.getChannel();
+		RedisClient client = ((RedisCacheProvider)channel.getL2Provider()).getRedisClient();
+		BinaryJedisCommands binaryJedisCommands = client.get();
+		byte[] bytes = binaryJedisCommands.get(uuidKey.getBytes());
+		//判定是否存在这些数据的备份,有则进行处理并返回
+		if(null != bytes){
+			list = JSON.parseArray(new String(bytes),VoltageInfo.class);
+		}else{
+			PickIng entity = new PickIng();
+			entity.setVersion(MyActiviUtils.findDic().getValue());
+			if("highVoltage".equals(type)){
+				//查询4.1高压架空线路数据
+				List<String> mdSmallNameList = Lists.newArrayList();
+				mdSmallNameList.add("JKLYJ-240绝缘导线");
+				mdSmallNameList.add("JKLYJ-150绝缘导线");
+				mdSmallNameList.add("JKLYJ-50绝缘导线");
+				entity.setMdSmallName(mdSmallNameList);
+				entity.setType(type);
+				list = pickIngMapper.getListByTheClassName(entity);
+
+			}else{
+				//查询4.1低压架空线路数据
+				List<String> mdSmallNameList = Lists.newArrayList();
+				mdSmallNameList.add("JKYJ-120");
+				mdSmallNameList.add("JKLYJ-120");
+				mdSmallNameList.add("JKLYJ-70");
+				mdSmallNameList.add("JKYJ-70");
+				mdSmallNameList.add("JKYJ-16");
+				mdSmallNameList.add("JKYJ-35");
+				mdSmallNameList.add("JKLGYJ-120/20");
+				entity.setType(type);
+				entity.setMdSmallName(mdSmallNameList);
+				list = pickIngMapper.getListByTheClassName(entity);
+			}
+		}
+
+		return list;
+	}
+
 }

+ 17 - 0
src/main/java/com/jeeplus/modules/sg/raiseCapitalDesign/web/RaiseCapitalDesignController.java

@@ -21,6 +21,7 @@ import com.jeeplus.modules.sg.picking.activiti.service.PickIngService;
 import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
 import com.jeeplus.modules.sg.raiseCapital.entity.RaiseCapital;
 import com.jeeplus.modules.sg.raiseCapital.service.RaiseCapitalService;
+import com.jeeplus.modules.sg.raiseCapitalDesign.entity.VoltageInfo;
 import com.jeeplus.modules.sg.raiseCapitalDesign.service.RaiseCapitalDesignService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import net.oschina.j2cache.CacheChannel;
@@ -79,7 +80,10 @@ public class RaiseCapitalDesignController extends BaseController {
 	@RequiresPermissions("test:raiseCapitalDesign:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(RaiseCapital raiseCapital, Model model) {
+		//创建一个临时UUID信息
+		UUID uuid = UUID.randomUUID();
 		List<PickList> pickListList = raiseCapitalDesignService.newAllList();
+		model.addAttribute("pickUuid", uuid);
 		model.addAttribute("pickListList", pickListList);
 		model.addAttribute("raiseCapital", raiseCapital);
 		return "modules/sg/raiseCapitalDesign/raiseCapitalDesign";
@@ -107,6 +111,19 @@ public class RaiseCapitalDesignController extends BaseController {
 	}
 
 	/**
+	 * 查看,增加,编辑提资表单表单页面
+	 */
+	//@RequiresPermissions(value={"test:raiseCapitalDesign:view","test:raiseCapitalDesign:add","test:raiseCapitalDesign:edit"},logical=Logical.OR)
+	@RequestMapping(value = "aerialConductorForm")
+	public String aerialConductorForm(String uuid, Model model) {
+		List<VoltageInfo> highVoltageList = raiseCapitalDesignService.getAerialConductor(uuid + "aerialConductor","highVoltage");
+		List<VoltageInfo> lowVoltageList = raiseCapitalDesignService.getAerialConductor(uuid + "aerialConductor","lowVoltage");
+		model.addAttribute("highVoltageList", highVoltageList);
+		model.addAttribute("lowVoltageList", lowVoltageList);
+		return "modules/sg/raiseCapitalDesign/aerialConductorForm";
+	}
+
+	/**
 	 * 保存提资表单
 	 */
 	@ResponseBody

+ 2 - 2
src/main/webapp/webpage/modules/filing/basicInformation/basicInformationForm.jsp

@@ -160,7 +160,7 @@
 						<input id="basicChildList{{idx}}_id" name="basicChildList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
 						<input id="basicChildList{{idx}}_delFlag" name="basicChildList[{{idx}}].delFlag" type="hidden" value="0"/>
 					</td>
-					
+
 					<td  class="max-width-250">
 						<input type='text'  name="basicChildList[{{idx}}].projectCode" class="form-control"  value="{{row.projectCode}}"/>
 					</td>
@@ -191,4 +191,4 @@
 		</div>
 		</form:form>
 </body>
-</html>
+</html>

+ 200 - 0
src/main/webapp/webpage/modules/sg/raiseCapitalDesign/aerialConductorForm.jsp

@@ -0,0 +1,200 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>核准阶段管理</title>
+	<meta name="decorator" content="ani"/>
+	<script type="text/javascript">
+
+		$(document).ready(function() {
+	        $('#inDate').datetimepicker({
+				 format: "YYYY-MM-DD HH:mm:ss"
+		    });
+
+			$(".list-tabs li").click(function(){
+				$(".list-tabs li").each(function(){
+					$(this).removeAttr("class","active");
+					var id='#'+$(this).find("span").html();
+					$(id).attr("class","hide");
+				})
+				$(this).attr("class","active");
+				var id='#'+$(this).find("span").html();
+				$(id).removeAttr("class","hide");
+
+			})
+		});
+
+		function save() {
+            var isValidate = jp.validateForm('#inputForm');//校验表单
+            if(!isValidate){
+                return false;
+			}else{
+                jp.loading();
+                jp.post("${ctx}/filing/basicInformation/save",$('#inputForm').serialize(),function(data){
+                    if(data.success){
+                        jp.getParent().refresh();
+                        var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                        parent.layer.close(dialogIndex);
+                        jp.success(data.msg)
+
+                    }else{
+                        jp.error(data.msg);
+                    }
+                })
+			}
+
+        }
+		function addRow(list, idx, tpl, row){
+			$(list).append(Mustache.render(tpl, {
+				idx: idx, delBtn: true, row: row
+			}));
+			$(list+idx).find("select").each(function(){
+				$(this).val($(this).attr("data-value"));
+			});
+			$(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
+				var ss = $(this).attr("data-value").split(',');
+				for (var i=0; i<ss.length; i++){
+					if($(this).val() == ss[i]){
+						$(this).attr("checked","checked");
+					}
+				}
+			});
+			$(list+idx).find(".form_datetime").each(function(){
+				 $(this).datetimepicker({
+					 format: "YYYY-MM-DD HH:mm:ss"
+			    });
+			});
+		}
+		function delRow(obj, prefix){
+			var id = $(prefix+"_id");
+			var delFlag = $(prefix+"_delFlag");
+			if (id.val() == ""){
+				$(obj).parent().parent().remove();
+			}else if(delFlag.val() == "0"){
+				delFlag.val("1");
+				$(obj).html("&divide;").attr("title", "撤销删除");
+				$(obj).parent().parent().addClass("error");
+			}else if(delFlag.val() == "1"){
+				delFlag.val("0");
+				$(obj).html("&times;").attr("title", "删除");
+				$(obj).parent().parent().removeClass("error");
+			}
+		}
+	</script>
+</head>
+<body class="bg-white">
+<div>
+	<ul class="nav nav-tabs list-tabs">
+		<li class="active" role="presentation" id="click1"><a id="dq" href="javascript:void(0)"><span class="hide">highVoltage</span>10kV部分</a></li>
+		<li role="presentation" id="click2" ><a id="qd" href="javascript:void(0)"><span class="hide">lowVoltage</span>0.4kV部分</a></li>
+	</ul>
+</div>
+		<form:form id="inputForm" modelAttribute="voltageData" action="${ctx}/filing/basicInformation/save" method="post" class="form-horizontal">
+			<div class="tabs-container" id="highVoltage">
+				<div class="tab-content">
+					<div id="tab-1" class="tab-pane fade in  active">
+				<table class="table table-striped table-bordered table-condensed">
+					<thead>
+						<tr>
+							<th class="hide"></th>
+							<th>导线型号</th>
+							<th>单回路路径</th>
+							<th>双回路路径</th>
+							<th>单线长</th>
+						</tr>
+					</thead>
+					<tbody id="highVoltageList">
+					</tbody>
+				</table>
+				<script type="text/template" id="basicInformationTpl">//<!--
+					<tr id="highVoltageList{{idx}}">
+						<td class="hide">
+							<input id="highVoltageList{{idx}}_id" name="highVoltageList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+							<input id="highVoltageList{{idx}}_delFlag" name="highVoltageList[{{idx}}].delFlag" type="hidden" value="0"/>
+						</td>
+
+						<td  class="max-width-250">
+						<input type='text'  name="highVoltageList[{{idx}}].singleLong" readonly= "true" class="form-control"  value="{{row.voltageName}}"/>
+						</td>
+
+						<td  class="max-width-250">
+							<input type='text'  name="highVoltageList[{{idx}}].singleCircuitPath" class="form-control"  value="{{row.singleCircuitPath}}"/>
+						</td>
+						<td class="max-width-250">
+							<input type='text'  name="highVoltageList[{{idx}}].doubleCircuitPath" class="form-control"  value="{{row.doubleCircuitPath}}"/>
+						</td>
+						<td class="max-width-250">
+							<input type='text'  name="highVoltageList[{{idx}}].singleLong" readonly= "true" class="form-control"  value="{{row.singleLong}}"/>
+						</td>
+					</tr>//-->
+				</script>
+				<script type="text/javascript">
+					var basicInformationRowIdx = 0, basicInformationTpl = $("#basicInformationTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+					$(document).ready(function() {
+						var data = ${fns:toJson(highVoltageList)};
+						for (var i=0; i<data.length; i++){
+							console.log(data[i])
+							addRow('#highVoltageList', basicInformationRowIdx, basicInformationTpl, data[i]);
+							basicInformationRowIdx = basicInformationRowIdx + 1;
+						}
+					});
+				</script>
+				</div>
+			</div>
+		</div>
+
+			<div class="tabs-container hide" id="lowVoltage">
+				<div class="tab-content">
+					<div id="tab-2" class="tab-pane fade in  active">
+						<table class="table table-striped table-bordered table-condensed">
+							<thead>
+							<tr>
+								<th class="hide"></th>
+								<th>导线型号</th>
+								<th>单回路路径</th>
+								<th>双回路路径</th>
+								<th>单线长</th>
+							</tr>
+							</thead>
+							<tbody id="lowVoltageList">
+							</tbody>
+						</table>
+						<script type="text/template" id="lowVoltageTpl">//<!--
+				<tr id="lowVoltageList{{idx}}">
+					<td class="hide">
+						<input id="lowVoltageList{{idx}}_id" name="lowVoltageList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+						<input id="lowVoltageList{{idx}}_delFlag" name="lowVoltageList[{{idx}}].delFlag" type="hidden" value="0"/>
+					</td>
+
+					<td  class="max-width-250">
+					<input type='text'  name="lowVoltageList[{{idx}}].singleLong" readonly= "true" class="form-control"  value="{{row.voltageName}}"/>
+					</td>
+
+					<td  class="max-width-250">
+						<input type='text'  name="lowVoltageList[{{idx}}].singleCircuitPath" class="form-control"  value="{{row.singleCircuitPath}}"/>
+					</td>
+					<td class="max-width-250">
+						<input type='text'  name="lowVoltageList[{{idx}}].doubleCircuitPath" class="form-control"  value="{{row.doubleCircuitPath}}"/>
+					</td>
+					<td class="max-width-250">
+						<input type='text'  name="lowVoltageList[{{idx}}].singleLong" readonly= "true" class="form-control"  value="{{row.singleLong}}"/>
+					</td>
+				</tr>//-->
+						</script>
+						<script type="text/javascript">
+							var basicInformationRowIdx = 0, lowVoltageTpl = $("#lowVoltageTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+							$(document).ready(function() {
+								var data = ${fns:toJson(lowVoltageList)};
+								for (var i=0; i<data.length; i++){
+									console.log(data[i])
+									addRow('#lowVoltageList', basicInformationRowIdx, lowVoltageTpl, data[i]);
+									basicInformationRowIdx = basicInformationRowIdx + 1;
+								}
+							});
+						</script>
+					</div>
+				</div>
+			</div>
+		</form:form>
+</body>
+</html>

+ 18 - 0
src/main/webapp/webpage/modules/sg/raiseCapitalDesign/raiseCapitalDesign.js

@@ -378,6 +378,18 @@ $(document).ready(function() {
 			idx: idx, delBtn: true, row: row
 		}));
 	}
+
+	$(".list-tabs li").click(function(){
+		$(".list-tabs li").each(function(){
+			$(this).removeAttr("class","active");
+			var id='#'+$(this).find("span").html();
+			$(id).attr("class","hide");
+		})
+		$(this).attr("class","active");
+		var id='#'+$(this).find("span").html();
+		$(id).removeAttr("class","hide");
+
+	})
 })
 
 //刷新列表
@@ -407,6 +419,12 @@ function deleteAll(){
 	})
 }
 
+function aerialConductor(){
+	var pickUuid = $("#pickUuid").val();
+	console.log(pickUuid);
+	jp.openSaveDialog('新增领料信息', "${ctx}/raiseCapitalDesign/aerialConductorForm?uuid="+pickUuid, '800px', '500px');
+}
+
 function add(){
 	var projectName = $("#projectName").val();
 	jp.openSaveDialog('新增领料信息', "${ctx}/picking/activiti/netRaise?projectName=" + projectName, '800px', '500px');

+ 10 - 2
src/main/webapp/webpage/modules/sg/raiseCapitalDesign/raiseCapitalDesign.jsp

@@ -38,9 +38,10 @@
 		<h3 class="panel-title">提资管理</h3>
 	</div>
 		<div class="panel-body">
+			<input type="hidden" id="pickUuid" name="pickUuid" value="${pickUuid}">
 			<div>
-				<ul class="nav nav-tabs">
-					<li role="presentation" id="click1" style="border-bottom: 0px;border-left: 1px solid rgb(221,221,221);border-right: 1px solid rgb(221,221,221);border-top: 1px solid rgb(221,221,221)"><a id="dq" href="javascript:void(0)">填写需要材料</a></li>
+				<ul class="nav nav-tabs list-tabs">
+					<li class="active" role="presentation" id="click1"><a id="dq" href="javascript:void(0)">填写需要材料</a></li>
 					<%--<li role="presentation" id="click3" ><a id="mkqd" href="javascript:void(0)">查看模块清单</a></li>--%>
 					<li role="presentation" id="click2" ><a id="qd" href="javascript:void(0)">查看领料清单</a></li>
 				</ul>
@@ -97,6 +98,13 @@
 					</tr>
 					</tbody>
 				</table>
+				<div>
+					<%--<shiro:hasPermission name="sg:balancedlibrary:ReplaceMaterial:add">--%>
+						<button id="aerialConductor" class="btn btn-primary" onclick="aerialConductor()">
+							架空导线
+						</button>
+					<%--</shiro:hasPermission>--%>
+				</div>
 				<table class="table table-view">
 					<tbody>
 					<c:forEach items="${pickListList}" var="items" varStatus="status">