Merge remote-tracking branch 'origin/test' into test

# Conflicts: # resource/js/unit.js

Merge remote-tracking branch 'origin/test' into test
# Conflicts: # resource/js/unit.js
王富生
2 parents 5993e2d4 1bec3e58
Showing 5 changed files with 101 additions and 6 deletions
index/index.html
resource/js/unit.js
topages/staffmanage/staffmanage.html
topages/staffmanage/staffmanage.js
topages/staffmanage/staffmanagejs.js
@@ -50,7 +50,7 @@
 <script src="../resource/lib/bootstrap-table/bootstrap-table-zh-CN.js"></script>
 <script src="../resource/lib/dateUtils/DateUtils.js"></script>
 <script src="../resource/lib/jqueryform/jquery.form.js"></script>
-
+<script src="../resource/js/unit.js"></script>
 <script src="../topages/topagesTmp.js?a=1"></script>
 <script src="../resource/js/unit.js?a=1"></script>
 <!--<script src="../topages/workquery/workquery.js"></script>-->
@@ -36,6 +36,10 @@ dataUrl.util = {
     login: function () {
         return parkcloudbaseUrl + 'oauth/login';
     },
+    //日报系统-员工管理
+    queryAsraOpPage: function () {
+        return parkcloudbaseUrl + 'asraOp/queryAsraOpPage';
+    },
     //退出登录
     getLoginOut:function(){
         return parkcloudbaseUrl + 'oauth/loginout';
 <!--查询 sta-->
 <div class="staff-timeopr-wrap pos-rel clearfix">
     <div class="timeopr-text float-left">人员名称</div>
-    <input type="text" class="ITD-parkinput78 paddingleft-10 ITD-input-bordercolor common-fontcolor-50" maxlength="16" id="perName">
+    <input type="text" class="ITD-parkinput78 paddingleft-10 ITD-input-bordercolor common-fontcolor-50" maxlength="16"
+           id="perName">
     <div class="staff-searchbtn pos-abs cursor-pointer" id="queryBtn"></div>
 </div>
 <!--查询 end-->
 <!--------------------------------------------内容-->
-<table id="staffmanageTable" class="common-tableh47 bootstrap-table ITD-fix-table fixed-table-container table table-hover table-striped"><thead><tr><th style="text-align: left; width: 10%; " data-field="plName" tabindex="0"><div class="th-inner "><span class="information-icon"> </span>车场名称</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum0" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>0次</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum1" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>1次</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum2" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>2-5次</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum3" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>5-10次</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum4" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>10-20次</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum5" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>20-50次</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum6" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>50次以上</div><div class="fht-cell"></div></th></tr></thead><tbody><tr data-index="0"><td style="text-align: left; width: 10%; ">水岸天街</td><td style="text-align: left; width: 10%; ">115</td><td style="text-align: left; width: 10%; ">16</td><td style="text-align: left; width: 10%; ">117</td><td style="text-align: left; width: 10%; ">85</td><td style="text-align: left; width: 10%; ">18</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="1"><td style="text-align: left; width: 10%; ">接官厅西区</td><td style="text-align: left; width: 10%; ">40</td><td style="text-align: left; width: 10%; ">1</td><td style="text-align: left; width: 10%; ">6</td><td style="text-align: left; width: 10%; ">7</td><td style="text-align: left; width: 10%; ">4</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="2"><td style="text-align: left; width: 10%; ">百柳西区</td><td style="text-align: left; width: 10%; ">20</td><td style="text-align: left; width: 10%; ">2</td><td style="text-align: left; width: 10%; ">15</td><td style="text-align: left; width: 10%; ">5</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="3"><td style="text-align: left; width: 10%; ">百柳南区</td><td style="text-align: left; width: 10%; ">58</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="4"><td style="text-align: left; width: 10%; ">银马北区</td><td style="text-align: left; width: 10%; ">37</td><td style="text-align: left; width: 10%; ">5</td><td style="text-align: left; width: 10%; ">21</td><td style="text-align: left; width: 10%; ">21</td><td style="text-align: left; width: 10%; ">7</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="5"><td style="text-align: left; width: 10%; ">银马东区</td><td style="text-align: left; width: 10%; ">22</td><td style="text-align: left; width: 10%; ">3</td><td style="text-align: left; width: 10%; ">13</td><td style="text-align: left; width: 10%; ">8</td><td style="text-align: left; width: 10%; ">4</td><td style="text-align: left; width: 10%; ">1</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="6"><td style="text-align: left; width: 10%; ">八一北区</td><td style="text-align: left; width: 10%; ">122</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="7"><td style="text-align: left; width: 10%; ">松州园北区</td><td style="text-align: left; width: 10%; ">135</td><td style="text-align: left; width: 10%; ">14</td><td style="text-align: left; width: 10%; ">10</td><td style="text-align: left; width: 10%; ">6</td><td style="text-align: left; width: 10%; ">1</td><td style="text-align: left; width: 10%; ">3</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="8"><td style="text-align: left; width: 10%; ">八一东区</td><td style="text-align: left; width: 10%; ">8</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="9"><td style="text-align: left; width: 10%; ">园丁北区</td><td style="text-align: left; width: 10%; ">43</td><td style="text-align: left; width: 10%; ">1</td><td style="text-align: left; width: 10%; ">11</td><td style="text-align: left; width: 10%; ">12</td><td style="text-align: left; width: 10%; ">2</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr></tbody></table>
 \ No newline at end of file
+<table id="staffmanageTable" class="common-tableh47 bootstrap-table ITD-fix-table fixed-table-container table table-hover table-striped">
+</table>
+
+<script src="../../topages/staffmanage/staffmanage.js"></script>
+
+/**
+ * Created by mac on 18/7/24.
+ */
+var fun = {
+    /**初始化*/
+    init:function(){
+        debugger;
+        console.log(1)
+        fun.createTableData();
+    },
+    //生成表格数据
+    createTableData: function () {
+        $('#staffmanageTable').bootstrapTable('destroy').bootstrapTable({
+            striped: true,//表格显示条纹
+            pagination: true, //启动分页
+            pageNumber: 1, //当前第几页
+            pageSize: 10,  //每页显示的记录数
+            pageList: [10, 15, 20],  //记录数可选列表
+            sidePagination: 'server',//表示服务端分页
+            queryParamsType: 'limit',
+            method: 'POST',//请求方法
+            paginationPreText: '<',
+            paginationNextText: '>',
+            ajax: tableLoadRequest,//自定义ajax加载数据
+            // uniqueId:'id',
+            columns: [
+                {
+                    field: 'id',
+                    title: '<span class="type-icon"></span>类型',
+                    width: '15%',
+                    align: "left"
+                },
+                {
+                    field: 'opName',
+                    title: '<span class="state-icon"></span>状态',
+                    width: '15%',
+                    align: "left"
+                },
+
+            ]
+        });
+
+    },
+
+    /*获取查询参数*/
+    getQueryParam: function () {
+        /**员工名字*/
+        var opName = "";
+
+        var req = {
+            opName: opName
+        };
+
+        return req;
+    },
+
+};
+
+fun.init();
+/**
+ * 自定义table AJAX请求
+ * @param {Object} params
+ */
+function tableLoadRequest(params) {
+    var req = fun.getQueryParam();
+    //设置请求参数
+    var pageNum = (params.data.offset / params.data.limit) + 1;
+
+    //条件查询
+    req.baseRequest = {
+        pageNum: pageNum,
+        pageSize: params.data.limit
+    };
+    req.sysCode = sysComm.sysCode;
+    var opt = {
+        method: 'post',
+        url: dataUrl.util.queryAsraOpPage(),
+        data: JSON.stringify(req),
+        contentType: 'application/json; charset=utf-8',
+        dataType: 'json',
+        success: function (res) {
+            if (res.code == '8888') {
+                //console.log(res.data);
+                params.success(res.data);
+            }
+        }
+    };
+    sysAjax(opt);
+}
-/**
- * Created by mac on 18/7/24.
- */