Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/service/SettlementService.java

@@ -6,6 +6,7 @@ import com.jeeplus.modules.sg.overheadline.entity.Settlement;
 import com.jeeplus.modules.sg.overheadline.mapper.SettlementMapper;
 import com.jeeplus.modules.sg.overheadline.util.BashInfo;
 import com.jeeplus.modules.sg.overheadline.util.SettementUtil;
+import com.jeeplus.modules.sg.substation.util.SubstationInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/webapp/webpage/modules/sg/project/addItemForm.jsp

@@ -29,7 +29,8 @@
                 <select name="type" lay-verify="required" lay-search="">
                     <option value="">请选择</option>
                     <option value="1">架空线路工程</option>
-                    <option value="2">电缆工程</option>
+                    <option value="2">电缆工程</option
+                    <option value="3">变电站工程</option>
                 </select>
             </div>
         </div>

src/main/webapp/webpage/modules/sg/projecttem/addItem.jsp

@@ -31,6 +31,7 @@
                     <option value="">请选择</option>
                     <option value="1">架空线路工程</option>
                     <option value="2">电缆工程</option>
+                    <option value="3">变电站工程</option>
                 </select></td>
             </tr>
             <tr>

src/main/webapp/webpage/modules/sg/projecttem/addItem2Form.js

@@ -25,7 +25,7 @@ layui.use('upload', function(){
                     ,'<td>'+ file.name +'</td>'
                     ,'<td><div contenteditable="true" class="mydiv1" placeholder="请输入项目名称"></div></td>'
                     ,'<td>'
-                    ,' <select name="type" class="myselect"><option value="">请选择项目类型</option><option value="1">架空线路工程</option><option value="2">电缆工程</option></select>'
+                    ,' <select name="type" class="myselect"><option value="">请选择项目类型</option><option value="1">架空线路工程</option><option value="2">电缆工程</option><option value="3">变电站工程</option></select>'
                     ,'<td style="text-align: center">'
                     ,'<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">删除</button>'
                     ,'</td>'