wenjy
/
aucma-scada-management-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

已经完成

Browse Source 
修改  bug
master
森屿海巷 4 years ago
parent 83fbf6edc8
commit 3faa1361b1
20 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File

4
ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html
Unescape Escape View File

@ -147,7 +147,6 @@
field: 'efficiency', field: 'efficiency',
title: '效率级别', title: '效率级别',
formatter: function(value, row, index) { formatter: function(value, row, index) {
console.log(efficiencyDatas)
return $.table.selectDictLabelLocation(efficiencyDatas, value); return $.table.selectDictLabelLocation(efficiencyDatas, value);
} }
@ -158,7 +157,8 @@
}, },
{ {
field: 'recordTime', field: 'recordTime',
title: '记录时间' title: '记录时间',
sortable: true
}, },
{ {
title: '操作', title: '操作',

2
ruoyi-admin/src/main/resources/templates/system/recorderror/add.html
Unescape Escape View File

@ -64,7 +64,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">任务状态：</label> <label class="col-sm-3 control-label">任务状态：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="taskStatus" class="form-control m-b" th:with="type=${@dict.getType('location_status')}"> <select name="taskStatus" class="form-control m-b" th:with="type=${@dict.getType('task_status')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</div> </div>

2
ruoyi-admin/src/main/resources/templates/system/recorderror/edit.html
Unescape Escape View File

@ -65,7 +65,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">任务状态：</label> <label class="col-sm-3 control-label">任务状态：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="taskStatus" class="form-control m-b" th:with="type=${@dict.getType('location_status')}"> <select name="taskStatus" class="form-control m-b" th:with="type=${@dict.getType('task_status')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{taskStatus}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{taskStatus}"></option>
</select> </select>
</div> </div>

12
ruoyi-admin/src/main/resources/templates/system/recorderror/recorderror.html
Unescape Escape View File

@ -18,7 +18,7 @@
<label>箱体编码：</label> <label>箱体编码：</label>
<input type="text" name="boxCode"/> <input type="text" name="boxCode"/>
</li> </li>
<li> <!-- <li>
<label>门体/物料编码：</label> <label>门体/物料编码：</label>
<input type="text" name="materialCode"/> <input type="text" name="materialCode"/>
</li> </li>
@ -41,19 +41,19 @@
<li> <li>
<label>操作类型：</label> <label>操作类型：</label>
<input type="text" name="operationType"/> <input type="text" name="operationType"/>
</li> </li>-->
<li> <li>
<label>任务类型：</label> <label>任务类型：</label>
<input type="text" name="taskType"/> <input type="text" name="taskType"/>
</li> </li>
<li> <li>
<label>任务状态：</label> <label>任务状态：</label>
<select name="taskStatus" th:with="type=${@dict.getType('location_status')}"> <select name="taskStatus" th:with="type=${@dict.getType('task_status')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li> <!-- <li>
<label>返回标识：</label> <label>返回标识：</label>
<input type="text" name="returnFlag"/> <input type="text" name="returnFlag"/>
</li> </li>
@ -68,7 +68,7 @@
<li> <li>
<label>记录时间：</label> <label>记录时间：</label>
<input type="text" class="time-input" placeholder="请选择记录时间" name="recordTime"/> <input type="text" class="time-input" placeholder="请选择记录时间" name="recordTime"/>
</li> </li>-->
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@ -101,7 +101,7 @@
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:recorderror:edit')}]]; var editFlag = [[${@permission.hasPermi('system:recorderror:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:recorderror:remove')}]]; var removeFlag = [[${@permission.hasPermi('system:recorderror:remove')}]];
var taskStatusDatas = [[${@dict.getType('location_status')}]]; var taskStatusDatas = [[${@dict.getType('task_status')}]];
var prefix = ctx + "system/recorderror"; var prefix = ctx + "system/recorderror";
$(function() { $(function() {

2
ruoyi-admin/src/main/resources/templates/system/recordtask/add.html
Unescape Escape View File

@ -65,7 +65,7 @@
<label class="col-sm-3 control-label">任务状态：</label> <label class="col-sm-3 control-label">任务状态：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="taskStatus" class="form-control m-b" th:with="type=${@dict.getType('location_status')}"> <select name="taskStatus" class="form-control m-b" th:with="type=${@dict.getType('task_status')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</div> </div>

2
ruoyi-admin/src/main/resources/templates/system/recordtask/edit.html
Unescape Escape View File

@ -66,7 +66,7 @@
<label class="col-sm-3 control-label">任务状态：</label> <label class="col-sm-3 control-label">任务状态：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="taskStatus" class="form-control m-b" th:with="type=${@dict.getType('location_status')}"> <select name="taskStatus" class="form-control m-b" th:with="type=${@dict.getType('task_status')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{locationStatus}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{locationStatus}"></option>
</select> </select>
</div> </div>

11
ruoyi-admin/src/main/resources/templates/system/recordtask/recordtask.html
Unescape Escape View File

@ -20,7 +20,7 @@
</li> </li>
<li> <li>
<label>任务状态：</label> <label>任务状态：</label>
<select name="taskStatus" th:with="type=${@dict.getType('location_status')}"> <select name="taskStatus" th:with="type=${@dict.getType('task_status')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
@ -58,6 +58,8 @@
var editFlag = [[${@permission.hasPermi('system:recordtask:edit')}]]; var editFlag = [[${@permission.hasPermi('system:recordtask:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:recordtask:remove')}]]; var removeFlag = [[${@permission.hasPermi('system:recordtask:remove')}]];
var taskstatus = [[${@dict.getType('task_status')}]];
var tasktype = [[${@dict.getType('task_type')}]];
var locationStatus = [[${@dict.getType('location_status')}]]; var locationStatus = [[${@dict.getType('location_status')}]];
@ -113,13 +115,16 @@
}, },
{ {
field: 'taskType', field: 'taskType',
title: '任务类型' title: '任务类型',
formatter: function(value, row, index) {
return $.table.selectDictLabel(tasktype, value);
}
}, },
{ {
field: 'taskStatus', field: 'taskStatus',
title: '任务状态', title: '任务状态',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(locationStatus, value); return $.table.selectDictLabel(taskstatus, value);
} }
}, },
{ {

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseEfficiencyLevel.java
Unescape Escape View File

@ -36,7 +36,7 @@ public class BaseEfficiencyLevel extends BaseEntity
private Long deleteFlag; private Long deleteFlag;
/** 记录时间 */ /** 记录时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date recordTime; private Date recordTime;

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseLocationInfo.java
Unescape Escape View File

@ -64,7 +64,7 @@ public class BaseLocationInfo extends BaseEntity
private Long deleteFlag; private Long deleteFlag;
/** 记录时间 */ /** 记录时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date recordTime; private Date recordTime;

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialInfo.java
Unescape Escape View File

@ -48,7 +48,7 @@ public class BaseMaterialInfo extends BaseEntity
private Long deleteFlag; private Long deleteFlag;
/** 记录时间 */ /** 记录时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date recordTime; private Date recordTime;

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialStore.java
Unescape Escape View File

@ -44,7 +44,7 @@ public class BaseMaterialStore extends BaseEntity
private Long deleteFlag; private Long deleteFlag;
/** 记录时间 */ /** 记录时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date recordTime; private Date recordTime;

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/BasePlcInfo.java
Unescape Escape View File

@ -52,7 +52,7 @@ public class BasePlcInfo extends BaseEntity
private Long deleteFlag; private Long deleteFlag;
/** 记录时间 */ /** 记录时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date recordTime; private Date recordTime;

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseStoreInfo.java
Unescape Escape View File

@ -48,7 +48,7 @@ public class BaseStoreInfo extends BaseEntity
private Long deleteFlag; private Long deleteFlag;
/** 记录时间 */ /** 记录时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date recordTime; private Date recordTime;

6
ruoyi-system/src/main/java/com/ruoyi/system/domain/PrepareInstoreInfo.java
Unescape Escape View File

@ -53,17 +53,17 @@ public class PrepareInstoreInfo extends BaseEntity
private Long instoreStatus; private Long instoreStatus;
/** 开始时间 */ /** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date beginTime; private Date beginTime;
/** 结束时间 */ /** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime; private Date endTime;
/** 记录时间 */ /** 记录时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date recordTime; private Date recordTime;

6
ruoyi-system/src/main/java/com/ruoyi/system/domain/PrepareOutstoreInfo.java
Unescape Escape View File

@ -57,17 +57,17 @@ public class PrepareOutstoreInfo extends BaseEntity
private Long outstoreStauts; private Long outstoreStauts;
/** 开始时间 */ /** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date beginTime; private Date beginTime;
/** 结束时间 */ /** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime; private Date endTime;
/** 记录时间 */ /** 记录时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date recordTime; private Date recordTime;

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordDirectiveOperation.java
Unescape Escape View File

@ -53,7 +53,7 @@ public class RecordDirectiveOperation extends BaseEntity
private String taskType; private String taskType;
/** 记录时间 */ /** 记录时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date recordTime; private Date recordTime;

6
ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordError.java
Unescape Escape View File

@ -65,17 +65,17 @@ public class RecordError extends BaseEntity
private String returnFlag; private String returnFlag;
/** 开始时间 */ /** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date beginTime; private Date beginTime;
/** 结束时间 */ /** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime; private Date endTime;
/** 记录时间 */ /** 记录时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date recordTime; private Date recordTime;

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordInstore.java
Unescape Escape View File

@ -53,7 +53,7 @@ public class RecordInstore extends BaseEntity
private String endTime; private String endTime;
/** 记录时间 */ /** 记录时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date recordTime; private Date recordTime;

6
ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordOutstore.java
Unescape Escape View File

@ -49,17 +49,17 @@ public class RecordOutstore extends BaseEntity
private Long outstoreStatus; private Long outstoreStatus;
/** 开始时间 */ /** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date beginTime; private Date beginTime;
/** 结束时间 */ /** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime; private Date endTime;
/** 记录时间 */ /** 记录时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date recordTime; private Date recordTime;

6
ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTask.java
Unescape Escape View File

@ -65,17 +65,17 @@ public class RecordTask extends BaseEntity
private String returnFlag; private String returnFlag;
/** 开始时间 */ /** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date beginTime; private Date beginTime;
/** 结束时间 */ /** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime; private Date endTime;
/** 记录时间 */ /** 记录时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date recordTime; private Date recordTime;

Write Preview
Loading…
Cancel
Save