添加排除文件 修改日志查询模块

.gitignore

@@ -13,3 +13,4 @@ package-lock.json
 *.ntvs*
 *.njsproj
 *.sln
+dist.zip

src/views/BasicData/WorkStationAlarmLog/index.vue

@@ -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

src/views/QualityAssurance/InquiryTransitInformation/index.vue

@@ -286,9 +286,7 @@ export default {
         }
       })
     },
-    selectDate() {
-      this.tableData = []
-      this.loading = true
+    getParam(pageCurrent, pageSize) {
       let orderNumberValue_check, stationNumberValue_check, stationNumberValueN_check, assemblyNumberValue_check, engineTypeValue_check
       this.assemblyNumberValue ? assemblyNumberValue_check = 1 : (assemblyNumberValue_check = 0, this.assemblyNumberValue = '')
       this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
@@ -308,10 +306,16 @@ export default {
       param[9] = ['订单号', this.orderNumberValue]
       param[10] = ['机型_ischeck', engineTypeValue_check]
       param[11] = ['机型', this.engineTypeValue]
-      param[12] = ['PageCurrent', this.pageCurrent]
-      param[13] = ['PageSize', this.pageSize]
+      param[12] = ['PageCurrent', pageCurrent]
+      param[13] = ['PageSize', pageSize]
       param[14] = ['PageCount', '1111', 'int', '1']
       param[15] = ['ItemCount', '1111', 'int', '1']
+      return param
+    },
+    selectDate() {
+      this.tableData = []
+      this.loading = true
+      var param = this.getParam(this.pageCurrent, this.pageSize)
       var Data = this.CreateData('11', '质量数据查询_测量数据发动机在线状态_查询_NEW', param)
       this.ExecDatabase(Data).then(response => {
         if (response.data.result.length !== 0) {
@@ -323,29 +327,7 @@ export default {
     },
     exportExcel() {
       if (this.tableData.length !== 0) {
-        let orderNumberValue_check, stationNumberValue_check, stationNumberValueN_check, assemblyNumberValue_check, engineTypeValue_check
-        this.assemblyNumberValue ? assemblyNumberValue_check = 1 : (assemblyNumberValue_check = 0, this.assemblyNumberValue = '')
-        this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
-        this.stationNumberValueN ? stationNumberValueN_check = 1 : (stationNumberValueN_check = 0, this.stationNumberValueN = '')
-        this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
-        this.engineTypeValue ? engineTypeValue_check = 1 : (engineTypeValue_check = 0, this.engineTypeValue = '')
-        var param = []
-        param[0] = ['开始时间', this.dateTime[0]]
-        param[1] = ['结束时间', this.dateTime[1]]
-        param[2] = ['工位号N_ischeck', stationNumberValueN_check]
-        param[3] = ['工位号N', this.stationNumberValueN]
-        param[4] = ['发动机号_check', assemblyNumberValue_check]
-        param[5] = ['发动机号', this.assemblyNumberValue]
-        param[6] = ['工位号_check', stationNumberValue_check]
-        param[7] = ['工位号', this.stationNumberValue]
-        param[8] = ['订单号_ischeck', orderNumberValue_check]
-        param[9] = ['订单号', this.orderNumberValue]
-        param[10] = ['机型_ischeck', engineTypeValue_check]
-        param[11] = ['机型', this.engineTypeValue]
-        param[12] = ['PageCurrent', 1]
-        param[13] = ['PageSize', 99999999]
-        param[14] = ['PageCount', '1111', 'int', '1']
-        param[15] = ['ItemCount', '1111', 'int', '1']
+        var param = this.getParam(1, 99999999)
         var exportData = JSON.parse(this.CreateData('2005', '质量数据查询_测量数据发动机在线状态_查询_NEW', param))
         exportData.exportFileName = '过站信息查询'
         exportData.exportColumns = '机型=产品型号,发动机号=产品编号,工位号,托盘编号,到达时间,离开时间,在线时间=生产节拍(m),是否合格'