fixbug

src/views/alarm/device/components/search.vue

+<template>
+  <div>
+    <el-form class="search-form" :model="form" ref="form" label-width="80px" :inline="true" size="mini">
+      <el-form-item label="网元设备" >
+        <el-input v-model="form.pointDeviceName" clearable placeholder="请输入网元设备"></el-input>
+      </el-form-item>
+      <el-form-item label="上传时间">
+      
+         <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="success"  @click="toSearch">查询</el-button>
+        <el-button type="primary"  @click="reset">重置</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { ConnectStatusEnum } from '@/const/index'
+export default {
+  name: 'search',
+  data() {
+    return {
+      form: formInit(),
+      ConnectStatusEnum,
+       dateRange: [],
+    }
+  },
+  
+  mounted() {
+  },
+  methods: {
+    toSearch() {
+      this.form.startUploadTime = this.dateRange[0]
+      this.form.endUploadTime = this.dateRange[1]
+      this.$emit('search', this.form)
+    },
+    reset() {
+      this.dateRange = []
+      this.form = formInit()
+      this.$emit('search')
+    },
+  }
+}
+
+function formInit() {
+  return {
+    pointDeviceName: '',
+    pointConnectStatus: '',
+    startUploadTime:'',
+    endUploadTime:''
+  }
+}
+</script>
+<style scoped lang="scss">
+.w200 {
+  width: 200px;
+}
+.search-form {
+  padding: 10px;
+  background-color: #EAF1FE;
+  margin-bottom: 20px;
+  border-radius: 8px;
+  .el-form-item--mini.el-form-item, .el-form-item--small.el-form-item {
+    margin-bottom: 0;
+  }
+}
+</style>
\ No newline at end of file

src/views/alarm/device/index.vue

@@ -136,7 +136,7 @@
 <script>
 import { deviceList, deviceConfirm, deviceCancel } from "../api";
 import { exportConnet } from "@/api/export";
-import search from "@/views/monitor/equipment/components/search.vue";
+import search from "./components/search.vue";
 import download from "@/utils/download";
 import socket from "@/utils/websocket";
 export default {

src/views/history/deviceLinkRepair/components/search.vue

@@ -45,6 +45,7 @@ export default {
     reset() {
       this.dateRange = []
       this.form = formInit()
+      this.$emit('search')
     },
   }
 }

src/views/history/deviceLinkRepair/index.vue

@@ -95,10 +95,7 @@ export default {
       this.getTableData();
     },
     refresh() {
-      this.getTableData();
-      if (this.$refs.reset != undefined) {
-        this.$refs.reset.reset();
-      }
+      this.$refs.reset != undefined ? (this.$refs.reset.reset()) : (this.getTableData())
     },
     getTableData(option) {
       this.searchOption = option;

src/views/history/deviceLinkStatus/components/search.vue

@@ -57,6 +57,7 @@ export default {
       this.uploadRange = []
       this.cancelRange = []
       this.form = formInit()
+      this.$emit('search')
     },
   }
 }

src/views/history/deviceLinkStatus/index.vue

@@ -96,10 +96,7 @@ export default {
       this.getTableData();
     },
     refresh() {
-      this.getTableData();
-      if (this.$refs.reset != undefined) {
-        this.$refs.reset.reset();
-      }
+      this.$refs.reset != undefined ? (this.$refs.reset.reset()) : (this.getTableData())
     },
     getTableData(option) {
       this.searchOption = option;

src/views/history/leakyCableRepair/components/search.vue

@@ -53,6 +53,7 @@ export default {
     },
     reset() {
       this.form = formInit()
+      this.$emit('search')
     },
     getInit() {
       commonQuery().then(res => {

src/views/history/leakyCableRepair/index.vue

@@ -95,10 +95,7 @@ export default {
       this.getTableData();
     },
     refresh() {
-      this.getTableData();
-      if (this.$refs.reset != undefined) {
-        this.$refs.reset.reset();
-      }
+      this.$refs.reset != undefined ? (this.$refs.reset.reset()) : (this.getTableData())
     },
     getTableData(option) {
       this.searchOption = option;

src/views/history/leakyCableStatus/components/search.vue

@@ -41,6 +41,7 @@ export default {
     },
     reset() {
       this.form = formInit()
+      this.$emit('search')
     },
     getInit() {
       commonQuery().then(res => {

src/views/history/leakyCableStatus/index.vue

@@ -84,10 +84,7 @@ export default {
       this.getTableData();
     },
     refresh() {
-      this.getTableData();
-      if (this.$refs.reset != undefined) {
-        this.$refs.reset.reset();
-      }
+      this.$refs.reset != undefined ? (this.$refs.reset.reset()) : (this.getTableData())
     },
     getTableData(option) {
       this.searchOption = option;

src/views/monitor/equipment/components/search.vue

@@ -40,6 +40,7 @@ export default {
     },
     reset() {
       this.form = formInit()
+      this.$emit('search')
     },
   }
 }

src/views/monitor/equipment/index.vue

@@ -108,10 +108,7 @@ export default {
       }
     },
     refresh() {
-      this.getTableData();
-      if (this.$refs.reset != undefined) {
-        this.$refs.reset.reset();
-      }
+      this.$refs.reset != undefined ? (this.$refs.reset.reset()) : (this.getTableData())
     },
 
     handlePageChange(pageData) {

src/views/monitor/leakageCable/components/search.vue

@@ -52,6 +52,7 @@ export default {
     },
     reset() {
       this.form = formInit()
+      this.$emit('search')
     },
     getInit() {
       commonQuery().then(res => {

src/views/monitor/leakageCable/index.vue

@@ -94,10 +94,7 @@ export default {
     },
     refresh() {
       this.searchOption = {};
-      this.getTableData();
-      if (this.$refs.reset != undefined) {
-        this.$refs.reset.reset();
-      }
+      this.$refs.reset != undefined ? this.$refs.reset.reset() : this.getTableData();
     },
     handlePageChange(pageData) {
       this.params.size = pageData.size;

src/views/setting/statistics/comp/fsuTable.vue

@@ -194,8 +194,7 @@ export default {
       });
     },
     refresh() {
-      this.reset();
-      this.getTableData();
+      this.reset();     
     },
     searchQuery() {
       this.istrue = 1;
@@ -203,6 +202,7 @@ export default {
     },
     reset() {
       this.FSUForm = formInit();
+      this.getTableData();
     },
     exportData() {
       // let ids = [];

src/views/setting/statistics/comp/leakyTable.vue

@@ -251,8 +251,7 @@ export default {
       });
     },
     refresh() {
-      this.reset();
-      this.getTableData();
+      this.reset();    
     },
     searchQuery() {
       this.istrue = 1;
@@ -260,6 +259,7 @@ export default {
     },
     reset() {
       this.leakyCableForm = formInit();
+      this.getTableData();
     },
 
     exportData() {

src/views/setting/statistics/comp/monitorTable.vue

@@ -206,7 +206,6 @@ export default {
     },
     refresh() {
       this.reset();
-      this.getTableData();
     },
     searchQuery() {
       this.istrue = 1;
@@ -214,6 +213,7 @@ export default {
     },
     reset() {
       this.monitorForm = formInit();
+      this.getTableData();
     },
 
     exportData() {

src/views/setting/statistics/comp/railWayTable.vue

@@ -158,8 +158,7 @@ export default {
       });
     },
     refresh() {
-      this.reset();
-      this.getTableData();
+      this.reset();  
     },
     searchQuery() {
       this.istrue = 1;
@@ -167,6 +166,7 @@ export default {
     },
     reset() {
       this.railData = formInit();
+       this.getTableData();
     },
 
     exportData() {

src/views/setting/statistics/comp/stationTable.vue

@@ -159,7 +159,7 @@ export default {
     },
     refresh() {
       this.reset();
-      this.getTableData();
+      
     },
     searchQuery() {
       this.istrue = 1;
@@ -167,6 +167,7 @@ export default {
     },
     reset() {
       this.siteForm = formInit();
+      this.getTableData();
     },
     exportData() {
       exportSite({ ids: this.exids }).then((res) => {

src/views/user/userLog/components/search.vue

@@ -62,6 +62,7 @@ export default {
     },
     reset() {
       this.form = formInit()
+      this.$emit('search')
     },
     getInit() {
       selectDictType({dictType: '06'}).then(res => {

src/views/user/userLog/index.vue

@@ -4,13 +4,13 @@
     <div class="leakage-top">
       <div style="color: #666666"></div>
       <div class="operate-btn">
-        <el-button type="primary" @click="getTableData">刷新</el-button>
+        <el-button type="primary" @click="refresh">刷新</el-button>
         <el-button type="primary" @click="isQuery = !isQuery">查询</el-button>
         <el-button type="primary" @click="exportLog">导出</el-button>
       </div>
     </div>
     <div v-if="isQuery">
-      <search @search="getTableData" />
+      <search @search="getTableData"  ref="reset" />
     </div>
     <el-table
       :data="tableData"
@@ -69,6 +69,9 @@ export default {
       this.params.size = pageData.size;
       this.params.current = pageData.page;
       this.getTableData()
+    },
+     refresh() {
+      this.$refs.reset != undefined ? (this.$refs.reset.reset()) : (this.getTableData()) 
     },
     getTableData(option) {
       this.searchOption = option