dong 2 kuukautta sitten
vanhempi
commit
126c81bc97

+ 6 - 3
src/views/module_tpm/equipmentRunStatis/history.vue

@@ -6,7 +6,7 @@
           <a-col :xl="8" :lg="7" :md="8" :sm="24">
             <a-form-item label="设备名称">
               <a-select
-              v-model="queryParam.equipmentid"
+              v-model="queryParams.equipmentid"
               placeholder="请输入设备名称或设备编号"
               show-search
               :filterOption="filterOptions"
@@ -94,7 +94,7 @@ export default {
         date: '',
         pageNum: 1,
         pageSize: 1000,
-        equipmentid: '1780110297413861377',
+        equipmentid: '',
         // tagtype: null,
       },
       deviceOptions: [],
@@ -143,7 +143,7 @@ export default {
     this.$nextTick(() => {
       var now = this.dateformat(new Date()).substring(0, 10)
       this.queryParams.date = now
-      this.handleQuery()
+      // this.handleQuery()
       // this.getTest()
     })
   },
@@ -201,6 +201,9 @@ export default {
 
       return year + '-' + month + '-' + strDate + ' ' + hour + ':' + minute + ':' + second
     },
+    /** 查询设备运行状态时间段列表 */
+    loadData(arg) {
+    },
     // 后端好了需要删掉    
     getTest() {
       var _this = this;

+ 6 - 8
src/views/module_tpm/equipmentRunStatis/realtime.vue

@@ -6,7 +6,7 @@
           <a-col :xl="8" :lg="7" :md="8" :sm="24">
             <a-form-item label="设备名称">
               <a-select
-              v-model="queryParam.equipmentid"
+              v-model="queryParams.equipmentid"
               placeholder="请输入设备名称或设备编号"
               show-search
               :filterOption="filterOptions"
@@ -26,7 +26,7 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="loadData" icon="search">查询</a-button>
+              <a-button type="primary" @click="handleSearch" icon="search">查询</a-button>
             </span>
           </a-col>
         </a-row>
@@ -56,7 +56,7 @@ export default {
       echartsHeight: window.innerHeight - 450,
       // 查询参数
       queryParams: {
-        equipmentid: '1780110297413861377',
+        equipmentid: '',
         date: '',
       },
       url: {
@@ -192,12 +192,9 @@ export default {
     },
     /** 查询设备运行状态时间段列表 */
     loadData(arg) {
-      var _this = this
-      setTimeout(function() {
-        _this.getList();
-      }, 1000);
     },
     getList(){
+      console.log("this.queryParams", this.queryParams)
       var _this = this;
       if (!this.url.list) {
         this.$message.error('请设置url.list属性!')
@@ -323,7 +320,8 @@ export default {
     },
     /** 搜索按钮操作 */
     handleSearch(arg) {
-      this.loadData(arg)
+      console.log(1)
+      this.getList(arg)
     },
   },
 }