wupengfei 2 роки тому
батько
коміт
8335c95bc8

+ 1 - 2
.idea/workspace.xml

@@ -3,7 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="a760c6e5-d38f-48d9-be27-0f7a4f48e29f" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/store/controller/CollectInfo.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/controller/CollectInfo.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/store/view/collect_info/index_search.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/view/collect_info/index_search.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -150,7 +149,7 @@
       <workItem from="1661820079823" duration="2898000" />
       <workItem from="1661907611720" duration="5931000" />
       <workItem from="1661993135050" duration="4377000" />
-      <workItem from="1662078426211" duration="3388000" />
+      <workItem from="1662078426211" duration="3478000" />
     </task>
     <servers />
   </component>

+ 5 - 4
application/store/view/collect_info/index_search.html

@@ -24,15 +24,16 @@
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>
     </form>
+
     <form action="" id="exportForm" method="post" style="display: inline;" >
-        <button class="layui-btn layui-btn-primary layui-btn-sm" id="exportButton" type="submit" style="height: 32px;width: 73.69px;margin-left:3px; margin-bottom: 15px">
-            <i class="layui-icon">&#xe608;</i>导 列表
+        <button class="layui-btn layui-btn-primary layui-btn-sm" id="exportButton" type="submit" style="height: 32px;width: 80.69px;margin-left:3px; margin-bottom: 15px">
+            <i class="layui-icon">&#xe608;</i>导出列表
         </button>
     </form>
 
     <form action="" id="exportForm2" method="post" style="display: inline;" >
-        <button class="layui-btn layui-btn-primary layui-btn-sm" id="exportExcl" type="submit" style="height: 32px;width: 73.69px;margin-left:3px; margin-bottom: 15px">
-            <i class="layui-icon">&#xe608;</i>导 统计
+        <button class="layui-btn layui-btn-primary layui-btn-sm" id="exportExcl" type="submit" style="height: 32px;width: 80.69px;margin-left:3px; margin-bottom: 15px">
+            <i class="layui-icon">&#xe608;</i>导出统计
         </button>
     </form>