Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/webapp/webpage/modules/sg/project/addItemForm.jsp

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

@@ -15,7 +15,7 @@
     color: rgb(103,105,152);
 }
 .formbtn{
-    width: 80px;
+    width: 40px;
 }
 .input-meself-time{
     font-size: 13px;
@@ -36,7 +36,7 @@
     width: 80px;
 }
 .layui-mesl-mit{
-    margin-left: 20px;margin-top: 26px;
+    margin-left: 20px;margin-top: 30px;
 }
 
 /*.layui-form-label {*/

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

@@ -77,17 +77,6 @@
         <a class="layui-btn  layui-btn-xs" lay-event="fttz">分摊调整</a>
         <a class="layui-btn layui-btn-xs" lay-event="ddtz">单独调整</a>
     </script>
-    <script type="text/html" id="barbtn1">
-    <%--<c:if test="${not empty map.settlementList}">--%>
-        <%--<c:forEach items="${map.settlementList}" var="data" varStatus="id">--%>
-            <%--{{# if(data.status==0){}}--%>
-                <%--<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="byz">一致</a>--%>
-            {{# if(d.status==0){}}
-                <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="byz">不一致</a>
-            {{# }}}
-        <%--</c:forEach>--%>
-    <%--</c:if>--%>
-    </script>
 </body>
 <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
 <script>
@@ -221,11 +210,9 @@
                 page: false,
                 cols: [[
                     {type: 'numbers'},
-//                  {field: 'id', title: 'WBS要素'},
                     {field: 'wbsys', title: 'WBS要素'},
                     {field: 'wbssbm', title: 'WBS识别码'},
                     {field: 'money', title: '金额'},
-//                  {field: 'pid', title: 'pid'},
                 ]]
                 ,data: [
                 <c:if test="${ not empty map.list}">
@@ -303,7 +290,6 @@
         $("#newid").val(newid);
         $("#xmmc1").val(xmmc);
         $("#fyje1").val(fyje);
-//		alert(fyje);
         layui.use(['table','layer'],function(){
 
             layer.open({
@@ -311,8 +297,6 @@
                 title: '单独调整',
                 area: ['70%', '90%'],
                 shade: 0.8,
-//		  closeBtn: 0,
-//      fixed: true, //不固定
                 maxmin: true,
                 shadeClose: true,
                 content: '${ctxp}/webpage/modules/sg/free/alongst.jsp'
@@ -411,9 +395,9 @@
             var data = obj.data;
             var status = data.status;
             if(status=="0"){
-                var xml="<span style='color: green'>&nbsp;一致。</span>";
+                var xml="<span style='color:#168011'>&nbsp;一致</span>。";
             }else {
-                var xml="<span style='color: red'>&nbsp;不一致。</span>";
+                var xml="<span style='color:#FF0000'>&nbsp;不一致。</span>。";
             }
             if(obj.event === 'byz'){
                 layer.open({
@@ -426,6 +410,5 @@
             }
         });
     });
-
 </script>
 </html>

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

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

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

@@ -123,9 +123,11 @@
 
                                <div class="layui-inline">
                                    <div class="col-xs-12 col-sm-6 col-md-4 layui-mesl-mit">
-                                   <button class="layui-btn layui-btn-primary layui-btn-radius formbtn" lay-submit="" lay-filter="mybtnsubmit">查询</button>
-                                    <button type="reset" class="layui-btn layui-btn-primary layui-btn-radius formbtn">重置</button>
-                               </div>
+
+                                    <button class="layui-btn layui-btn-primary layui-btn-radius formbtn" lay-submit="" lay-filter="mybtnsubmit">查询</button>
+                                    <button type="reset" class="layui-btn layui-btn-primary layui-btn-radius formbtn" style="margin-left: 1px">重置</button>
+
+                                    </div>
                                </div>
                            </div>
                        </form>
@@ -139,9 +141,9 @@
                         </div>
                         <div class="layui-btn-group" style="float: right;margin-right: 10px;border: 1px solid rgb(204,204,204)">
                             <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="noneBtn"><img class="layui-meself-img" src="${ctxp}/icon/solr.png" alt=""></button>
-                            <button type="button" class="layui-btn layui-btn-primary layui-btn-sm"><i class="layui-icon"></i></button>
-                            <button type="button" class="layui-btn layui-btn-primary layui-btn-sm"><i class="layui-icon"></i></button>
-                            <button type="button" class="layui-btn layui-btn-primary layui-btn-sm"><i class="layui-icon"></i></button>
+                            <%--<button type="button" class="layui-btn layui-btn-primary layui-btn-sm"><i class="layui-icon"></i></button>--%>
+                            <%--<button type="button" class="layui-btn layui-btn-primary layui-btn-sm"><i class="layui-icon"></i></button>--%>
+                            <%--<button type="button" class="layui-btn layui-btn-primary layui-btn-sm"><i class="layui-icon"></i></button>--%>
                         </div>
                         <table id="table1" class="layui-table" lay-filter="table1"></table>
                     </div>
@@ -264,6 +266,7 @@
             });
         };
         renderTable1();
+        treetable.foldAll('#table1');
         table.on('tool(table1)', function(obj,target){
             var data = obj.data;
             //console.log(obj)
@@ -273,7 +276,7 @@
                     layer.open({
                         type: 2,
                         title: '添加工程',
-                        area: ['50%', '90%'],
+                        area: ['40%', '80%'],
                         shade: 0.8,
                         shadeClose: true,
                         content: '${ctxp}/webpage/modules/sg/project/addItemForm.jsp'
@@ -368,6 +371,7 @@
 </script>
 <script>
     $(document).ready(function(e) {
+
         $("#noneBtn").click(function(e) {
             $("#noneDiv").toggle(400);
         });