Merge remote-tracking branch 'origin/master'

src/main/webapp/static/plugin/assets/vermeit.css

@@ -32,9 +32,7 @@
     /*padding: 2px;*/
     margin-bottom: 3px;
 }
-.layui-btn-meself{
-    width: 80px;
-}
+.layui-btn-meself{ width: 70px;padding: 4px 7px;}
 .layui-mesl-mit{
     margin-left: 20px;margin-top: 30px;
 }

src/main/webapp/webpage/modules/sg/free/wbslist.js

@@ -101,7 +101,7 @@
 };
 
     renderTable1();
-    treetable.foldAll('#table1');
+    // treetable.foldAll('#table1');
 });
 layui.use(['table', 'form', 'element', 'treetable'], function () {
     var $ = layui.jquery;
@@ -149,7 +149,7 @@ layui.use(['table', 'form', 'element', 'treetable'], function () {
             };
 
             renderTable2();
-            treetable.foldAll('#table2');
+            // treetable.foldAll('#table2');
             });
         layui.use('table', function(){
             var table = layui.table;

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

@@ -62,7 +62,7 @@
                     "type":"${data1.type}",
                     "xmmc": "${data1.itemName}",
                     "sgdw": "某施工单位一",
-                    "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if>
+                    "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if><c:if test="${data1.type eq '3'}">"变电站线路"</c:if>
                 },
                 </c:forEach>
                 </c:if>

src/main/webapp/webpage/modules/sg/project/management.js

@@ -119,7 +119,7 @@ layui.config({
                 layer.open({
                     type: 2,
                     title: '添加项目',
-                    area: ['60%', '80%'],
+                    area: ['50%', '70%'],
                     shade: 0.8,
                     shadeClose: true,
                     content: '${ctxp}/webpage/modules/sg/project/addItemForm.jsp'

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

@@ -81,7 +81,7 @@
                     "type":"${data1.type}",
                     "xmmc": "${data1.itemName}",
                     "sgdw": "某施工单位一",
-                    "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if>
+                    "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if><c:if test="${data1.type eq '3'}">"变电站线路"</c:if>
                 },
                 </c:forEach>
                 </c:if>

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

@@ -16,7 +16,7 @@ function doSubmit(obj){
         throw SyntaxError;
     }
     $("#inputForm").submit();
-}
+    }
     $("#btnxz").click(function(){
         $("#myfile").trigger("click");
     })

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

@@ -75,7 +75,7 @@
                     "type":"${data1.type}",
                     "xmmc": "${data1.itemName}",
                     "sgdw": "某施工单位一",
-                    "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if>
+                    "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if><c:if test="${data1.type eq '3'}">"变电站线路"</c:if>
                 },
                 </c:forEach>
                 </c:if>

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

@@ -100,7 +100,7 @@
         layer.open({
         type: 2,
         title: '添加项目',
-        area: ['60%', '80%'],
+        area: ['50%', '70%'],
         shade: 0.8,
         shadeClose: true,
         content: '${ctxp}/webpage/modules/sg/projecttem/addItem.jsp'

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

@@ -34,7 +34,7 @@
                             <%--<a class="layui-btn layui-btn-meself" href="${ctx}/project/tem/indexlist"><img class="layui-meself-img1" src="${ctxp}/icon/back.png" alt="">&nbsp;返回</a>--%>
                             <%--<button type="button" class="layui-btn layui-btn-primary layui-btn-meself"  onclick="refresh()"><img class="layui-meself-img1" src="${ctxp}/icon/refush.png" alt="">&nbsp;刷新</button>--%>
                             <c:forEach items="${list}" var="data1" varStatus="index">
-                            <a type="button" class="layui-btn layui-btn-warm  layui-btn-meself" href="${ctx}/project/export?id=${data1.id}"><img class="layui-meself-img1" src="${ctxp}/icon/daochu2.png" alt="">&nbsp;导出</a>
+                            <a type="button" class="layui-btn layui-btn-warm  layui-btn-meself" href="${ctx}/project/export?id=${data1.id}"><img class="layui-meself-img1" src="${ctxp}/icon/daochu.png" alt="">&nbsp;导出</a>
                             </c:forEach>
                         </div>
                         <table id="table1" class="layui-table" lay-filter="table1"></table>

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

@@ -88,7 +88,7 @@
                     "type":"${data1.type}",
                     "xmmc": "${data1.itemName}",
                     "sgdw": "某施工单位一",
-                    "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if>
+                    "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if><c:if test="${data1.type eq '3'}">"变电站线路"</c:if>
                 },
                 </c:forEach>
                 </c:if>