添加排除文件 修改日志查询模块
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -13,3 +13,4 @@ package-lock.json
|
||||
*.ntvs*
|
||||
*.njsproj
|
||||
*.sln
|
||||
dist.zip
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<el-card class="topCard">
|
||||
<div class="topDiv">
|
||||
<span style="margin-left: 10px">工位号:</span>
|
||||
<el-select v-model="stationNumberValue" placeholder="工位号" filterable size="small" style="width:240px">
|
||||
<el-select v-model="stationNumberValue" placeholder="工位号" filterable clearable size="small" style="width:240px">
|
||||
<el-option v-for="item in stationNumber" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
<span style="margin-left: 10px">消息来源:</span>
|
||||
@@ -90,7 +90,7 @@ export default {
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.dateTime = [getBeforeOrAfterTime(-3), getNowShotTime()]
|
||||
this.dateTime = [getBeforeOrAfterTime(-2), getNowShotTime()]
|
||||
this.getStationNumber()
|
||||
},
|
||||
methods: {
|
||||
@@ -120,23 +120,13 @@ export default {
|
||||
param[4] = ['PageCount', '1111', 'int', '1']
|
||||
param[5] = ['ItemCount', '1111', 'int', '1']
|
||||
param[6] = ['开始日期', this.dateTime[0] + ' ' + '00:00:00']
|
||||
param[7] = ['结束日期', this.dateTime[1] + ' ' + '23:59:59']
|
||||
param[7] = ['结束日期', this.dateTime[1] + ' ' + '00:00:00']
|
||||
param[8] = ['内容', this.contentSearchValue]
|
||||
param[9] = ['消息来源', this.msgSourceNotLike]
|
||||
param[10] = ['消息类型', this.msgTypeValue]
|
||||
return param
|
||||
},
|
||||
validateSearch() {
|
||||
if (this.stationNumberValue === '') {
|
||||
this.$message.error('请选择工位号')
|
||||
return false
|
||||
}
|
||||
return true
|
||||
},
|
||||
searchTable() {
|
||||
if (!this.validateSearch()) {
|
||||
return
|
||||
}
|
||||
this.loading = true
|
||||
this.tableData = []
|
||||
var Data = this.CreateData('11', '日志_工位操作_查询', this.getParam(this.pageCurrent, this.pageSize))
|
||||
@@ -151,9 +141,6 @@ export default {
|
||||
})
|
||||
},
|
||||
exportExcel() {
|
||||
if (!this.validateSearch()) {
|
||||
return
|
||||
}
|
||||
if (this.tableData.length === 0) {
|
||||
this.$message.warning('暂无数据')
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user