Merge remote-tracking branch 'origin/master'

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

@@ -30,9 +30,9 @@
 <form class="layui-form" action="">
     <div class="layui-form-item" style="float: left;">
         <div class="" style="margin-left: 10px;margin-top: 10px;">
-            <span id="mylable2" style="font-size: 15px">项目调整</span>
-            <span style="font-size: 15px">:</span>
-            <span id="readid2" style="font-size: 15px"></span>
+            <span id="mylable2" style="font-size: 13px">项目调整</span>
+            <span style="font-size: 13px">:</span>
+            <span id="readid2" style="font-size: 13px"></span>
         </div>
         <div class="" style="margin-left: 10px;">
             <input type="radio" name="mydiv" value="1" title="增加" checked="">
@@ -43,7 +43,7 @@
 </td>
 <td>
 <div style="">&nbsp;&nbsp;
-    <input id="edt-search" type="text" placeholder="输入关键字" class="solr" style="font-size: 15px"/>&nbsp;&nbsp;
+    <input id="edt-search" type="text" placeholder="输入关键字" class="solr" style="font-size: 13px"/>&nbsp;&nbsp;
     <button class="layui-btn" id="btn-search">&nbsp;&nbsp;搜索&nbsp;&nbsp;</button>
 </div>
 </td>

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

@@ -226,7 +226,7 @@ layui.use(['table', 'form', 'element', 'treetable'], function () {
            layer.open({
                 type: 2,
                 title: xmmc,
-                area: ['40%', '95%'],
+                area: ['47%', '95%'],
                 shade: 0.8,
                 shadeClose: true,
                 content: '${ctxp}/webpage/modules/sg/free/avgpage.jsp'

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

@@ -31,7 +31,7 @@
                 <div class="layui-card-body">
                     <div class="" style="margin-left: 10px;margin-right: 10px;margin-top: 10px;">
                         <div class="layui-btn-group">
-                            <%--<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>--%>
+                            <a class="layui-btn layui-btn-meself" href="/webpage/modules/sg/projecttem/addItem2Form.jsp"><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/exportone?id=${data1.id}"><img class="layui-meself-img1" src="${ctxp}/icon/daochu.png" alt="">&nbsp;导出</a>