diff --git a/src/main/webapp/WEB-INF/views/statistics/collectorStatus.jsp b/src/main/webapp/WEB-INF/views/statistics/collectorStatus.jsp
new file mode 100644
index 0000000..92bcdc1
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/statistics/collectorStatus.jsp
@@ -0,0 +1,129 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+
+
+
扫描上传记录报表
+
+
+
+
+
+ <%@include file="../../jspf/comm.jspf" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
index dde0c3e..716ce72 100644
--- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
+++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
@@ -1176,10 +1176,10 @@ function initTable5(data,sidePagination) {
limit: limit, //页面大小
offset: offset, //页码
jzh: $("#patientId").val(),
- c1: $("#c1").val(),
+ c2: $("#c2").val(),
statusflag:$("#statusflag").val(),
sysflag:$("#sysflag").val(),
- assortId:$("#assortIdSearch").val()
+ assortId:$("#assortIdSearch").val(),
};
return temp;
},
@@ -1251,13 +1251,22 @@ function initTable5(data,sidePagination) {
},
{
title: '状态',
- field: 'statusFlagStr',
+ field: 'statusflag',
align: 'center',
valign: 'middle',
formatter: function (value, row, index) {
if(value != null){
+ if (row.statusflag == 3) {
+ value='完成';
+ return value;
+ }
+ if (row.statusflag == 2) {
+ value='正采';
+ return value;
+ }
var color = '';
if(row.statusflag == 0){
+ value='未开始';
color = selectTimeColor(row.tempTime,row.etimeStr);
}
return '
'+value+'';
diff --git a/src/main/webapp/static/js/statistics/collectorStatus.js b/src/main/webapp/static/js/statistics/collectorStatus.js
new file mode 100644
index 0000000..58e6432
--- /dev/null
+++ b/src/main/webapp/static/js/statistics/collectorStatus.js
@@ -0,0 +1,170 @@
+var tipLoad = 1;
+//定义表格内容最大高度
+var maxHeight = 0;
+//按日期查询变更事件
+$("#dateFlag").change(function(){
+ var value = $(this).val();
+ if(value == 1){
+ $("#day").show();
+ $("#month").hide();
+ $("#year").hide();
+ }else if(value == 2){
+ $("#day").hide();
+ $("#month").show();
+ $("#year").hide();
+ }else if(value == 3){
+ $("#day").hide();
+ $("#month").hide();
+ $("#year").show();
+ }
+ $("#table").bootstrapTable("refresh");
+})
+function initTable() {
+ if(tipLoad == 1){
+ $("#table").bootstrapTable({ // 对应table标签的id
+ url: path+"/statistics/getScanCount", // 获取表格数据的url
+ contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
+ cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
+ striped: true, //表格显示条纹，默认为false
+ pagination: true, // 在表格底部显示分页组件，默认false
+ paginationShowPageGo: true,
+ pageList: [5,10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
+ sidePagination: 'server', // 设置为服务器端分页 客户端：client
+ search: false,
+ showColumns: true,
+ toolbar: '#toolbar',//指定工具栏
+ searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
+ undefinedText: '--', //当数据为 undefined 时显示的字符
+ singleSelect: false,//设置True 将禁止多选
+ clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
+ //height: getStaticTableHeight(), //定义表格的高度。
+ searchTimeOut: 500,// 默认500 设置搜索超时时间。
+ toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right'
+ paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
+ showHeader: true,//是否显示列头。
+ trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
+ //是否显示导出按钮
+ showExport: true,
+ //导出表格方式（默认basic：只导出当前页的表格数据；all：导出所有数据；selected：导出选中的数据）
+ exportDataType: "basic",
+ //导出文件类型
+ exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'],
+ exportOptions: {
+ fileName: document.title
+ },
+ queryParams: function (params) {
+ var currPageSize = this.pageSize;
+ if (currPageSize == 2) {
+ currPageSize = 10;
+ }
+ var limit = null;
+ var offset = params.offset;
+ //判断是否导出全部all
+ if ($("#sel_exportoption").val() == "all") {
+ offset = 0;
+ limit = this.totalRows;
+ this.pageSize = limit;
+ } else {
+ limit = currPageSize;
+ this.pageSize = currPageSize;
+ }
+ var dateFlag = $("#dateFlag").val();
+ var startDate = getStartOrEndDate(dateFlag,"startTime");
+ var endDate = getStartOrEndDate(dateFlag,"endTime");
+ var temp = {
+ limit: limit, //页面大小
+ offset: offset, //页码
+ startDate: startDate,
+ endDate: endDate,
+ name:$("#name").val(),
+ isSearch:$("#isSearch").val(),
+ dateFlag:$("#dateFlag").val()
+ };
+ return temp;
+ },
+ columns: [{
+ title: '全选',
+ field: 'select', //复选框
+ checkbox: true,
+ width: 25,
+ align: 'center',
+ valign: 'middle'
+ },
+ {
+ title: '扫描人',
+ field: 'uuname',
+ align: 'center',
+ valign: 'middle'
+ },
+ {
+ title: '扫描日期',
+ field: 'uploaddatetime',
+ align: 'center',
+ valign: 'middle'
+ },
+ {
+ title: '扫描次数',
+ field: 'scanCount',
+ align: 'center',
+ valign: 'middle'
+ },
+ {
+ title: '扫描份数',
+ field: 'scanNums',
+ align: 'center',
+ valign: 'middle'
+ },
+ ],
+ onLoadSuccess: function (result) { //加载成功时执行
+ $(".page-list").show();
+ tipLoad =0;
+ //reloadTableHeight("table");
+ },
+ onLoadError: function () { //加载失败时执行
+ tipLoad = 0;
+ }
+ });
+ }
+}
+
+//导出excel功能
+$("#excelBtn").click(function () {
+ //获取选中数据记录
+ var idlist = $('#table').bootstrapTable('getAllSelections');
+ var dateFlag = $("#dateFlag").val();
+ var sql = '';//AND ((uuName = '何素芳' and convert(date, UpLoadDateTime, 8) = '2019-12-26') or (uuName = '何素芳' and convert(date, UpLoadDateTime, 8) = '2019-12-26'))
+ if(idlist.length > 0){
+ var dateWhereSql = '';
+ if(dateFlag == 1){
+ dateWhereSql = 'CONVERT (VARCHAR(10), t1.UpLoadDateTime, 120)';
+ }else if(dateFlag == 2){
+ dateWhereSql = 'CONVERT (VARCHAR(7), t1.UpLoadDateTime, 120)';
+ }else if(dateFlag == 3){
+ dateWhereSql = 'CONVERT (VARCHAR(4), t1.UpLoadDateTime, 120)';
+ }
+ for (var i = 0; i < idlist.length; i++) {
+ if(idlist.length == 1){
+ sql += "AND (powerusers.name = '"+idlist[i].uuname+"' and "+dateWhereSql+" = '"+idlist[i].uploaddatetime+"')";
+ }else{
+ if(i == 0){
+ sql += "AND ((powerusers.name = '"+idlist[i].uuname+"' and "+dateWhereSql+" = '"+idlist[i].uploaddatetime+"') or ";
+ }else if(i != idlist.length - 1){
+ sql += "(powerusers.name = '"+idlist[i].uuname+"' and "+dateWhereSql+" = '"+idlist[i].uploaddatetime+"') or ";
+ }else if(i == idlist.length - 1){
+ sql += "(powerusers.name = '"+idlist[i].uuname+"' and "+dateWhereSql+" = '"+idlist[i].uploaddatetime+"'))";
+ }
+ }
+ }
+ }
+ var url = path+"/statistics/exportExcelScanCount";
+ var startDate = getStartOrEndDate(dateFlag,"startTime");
+ var endDate = getStartOrEndDate(dateFlag,"endTime");
+ post(url, {
+ "startDate": startDate,
+ "endDate": endDate,
+ "name":$("#name").val(),
+ "isSearch":$("#isSearch").val(),
+ "sql":sql,
+ "dateFlag":dateFlag
+ });
+});