Revert "3.切换页面前,保留查询条件"

This reverts commit 76ffe650.

src/views/equipment/draw.vue

@@ -96,10 +96,10 @@
           </template>
         </el-table-column>
         <el-table-column label="解锁人" prop="pnumber">
-          <template slot-scope="scope">
-            {{ scope.row.unlockUsername|| '-' }}
-          </template>
-        </el-table-column>
+        <template slot-scope="scope">
+          {{ scope.row.unlockUsername|| '-' }}
+        </template>
+      </el-table-column>
         <el-table-column label="解锁时间" prop="pnumber">
           <template slot-scope="scope">
             {{ parseTime(scope.row.unlockDate, '{y}-{m}-{d}  {h}:{i}') || '-' }}
@@ -365,7 +365,7 @@
       </div>
       <el-form ref="form" :model="loginform" label-width="80px">
         <el-form-item label="用户名">
-          <el-input v-model="loginform.password" placeholder="请输入用户名" />
+          <el-input v-model="loginform.password"  placeholder="请输入用户名" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleConfirm">确定</el-button>
@@ -493,19 +493,15 @@ export default {
   },
   /** 路由离开前存储筛选条件*/
   beforeRouteLeave(to, from, next) {
-    sessionStorage.setItem('equipmentParams', JSON.stringify(this.queryParams))
+    this.$store.dispatch('searchSave/searchParamsSet', {
+      path: this.$route.path,
+      param: {
+        ...this.queryParams
+      }
+    })
     next()
-    // this.$store.dispatch('searchSave/searchParamsSet', {
-    //   path: this.$route.path,
-    //   param: {
-    //     ...this.queryParams
-    //   }
-    // })
   },
   created() {
-    if (sessionStorage.getItem('equipmentParams')) {
-      this.queryParams = JSON.parse(sessionStorage.getItem('equipmentParams'))
-    }
     this.getDict()
     this.getList()
     this.getCodeDict()

src/views/equipment/equipmentCheck/index.vue

@@ -212,23 +212,20 @@ export default {
   },
   /** 路由离开前存储筛选条件*/
   beforeRouteLeave(to, from, next) {
-    sessionStorage.setItem('twoRecord', JSON.stringify(this.queryEntity))
-    sessionStorage.setItem('twoDateRange', JSON.stringify(this.dateRange))
+    this.$store.dispatch('searchSave/searchParamsSet', {
+      path: this.$route.path,
+      param: {
+        ...this.queryParams
+      }
+    })
     next()
   },
   created() {
-    if (sessionStorage.getItem('twoRecord')) {
-      this.queryEntity = JSON.parse(sessionStorage.getItem('twoRecord'))
-    }
-    if (sessionStorage.getItem('twoDateRange')) {
-      this.dateRange = JSON.parse(sessionStorage.getItem('twoDateRange'))
-      if (this.dateRange !== null) {
-        this.queryParams.beginTime = this.dateRange[0] + ' 00:00:00'
-        this.queryParams.endTime = this.dateRange[1] + ' 23:59:00'
-      } else {
-        this.queryParams.beginTime = ''
-        this.queryParams.endTime = ''
-      }
+    if (this.$store.getters.searchParams[this.$route.path]) {
+      const { searchParams } = this.$store.getters
+      const { path } = this.$route
+      const param = JSON.parse(searchParams[path]) // 保留着的查询条件
+      this.queryParams = { ...param }
     }
     this.getList()
   },
@@ -262,7 +259,6 @@ export default {
       if (this.queryParams.beginTime === '' || this.queryParams.endTime === '') {
         this.dateRange = []
       }
-      console.log('dateRange',this.dateRange)
       listdevice(this.queryParams, this.addDateRange(this.queryEntity, this.dateRange)).then(response => {
         // console.log('list', response)
         this.equipmentList = response.rows

src/views/equipment/inventoryRecord/index.vue

@@ -442,16 +442,19 @@ export default {
   },
   /** 路由离开前存储筛选条件*/
   beforeRouteLeave(to, from, next) {
-    sessionStorage.setItem('oneRecord', JSON.stringify(this.queryEntity))
-    sessionStorage.setItem('oneDateRange', JSON.stringify(this.dateRange))
+    this.$store.dispatch('searchSave/searchParamsSet', {
+      path: this.$route.path,
+      param: {
+        ...this.queryParams
+      }
+    })
     next()
   },
   created() {
-    if (sessionStorage.getItem('oneRecord')) {
-      this.queryEntity = JSON.parse(sessionStorage.getItem('oneRecord'))
-    }
-    if (sessionStorage.getItem('oneDateRange')) {
-      this.dateRange = JSON.parse(sessionStorage.getItem('oneDateRange'))
+    if (this.$store.getters.searchParams[this.$route.path]) {
+      const { searchParams } = this.$store.getters; const { path } = this.$route
+      const param = JSON.parse(searchParams[path]) // 保留着的查询条件
+      this.queryParams = { ...param }
     }
     this.getList()
     this.getDict()

src/views/equipment/printingCheck/index.vue

@@ -421,24 +421,15 @@ export default {
   },
   /** 路由离开前存储筛选条件*/
   beforeRouteLeave(to, from, next) {
-    sessionStorage.setItem('threeRecord', JSON.stringify(this.queryEntity))
-    sessionStorage.setItem('threeDateRange', JSON.stringify(this.dateRange))
+    this.$store.dispatch('searchSave/searchParamsSet', {
+      path: this.$route.path,
+      param: {
+        ...this.queryParams
+      }
+    })
     next()
   },
   created() {
-    if (sessionStorage.getItem('threeRecord')) {
-      this.queryEntity = JSON.parse(sessionStorage.getItem('threeRecord'))
-    }
-    if (sessionStorage.getItem('threeDateRange')) {
-      this.dateRange = JSON.parse(sessionStorage.getItem('threeDateRange'))
-      if (this.dateRange !== null) {
-        this.queryParams.beginTime = this.dateRange[0] + ' 00:00:00'
-        this.queryParams.endTime = this.dateRange[1] + ' 23:59:00'
-      } else {
-        this.queryParams.beginTime = ''
-        this.queryParams.endTime = ''
-      }
-    }
     this.getUserName()
     this.getYsList()
     this.getDict()

src/views/processManagement/draw.vue

@@ -545,13 +545,15 @@ export default {
   },
   /** 路由离开前存储筛选条件*/
   beforeRouteLeave(to, from, next) {
-    sessionStorage.setItem('fourParams', JSON.stringify(this.queryParams))
+    this.$store.dispatch('searchSave/searchParamsSet', {
+      path: this.$route.path,
+      param: {
+        ...this.queryParams
+      }
+    })
     next()
   },
   created() {
-    if (sessionStorage.getItem('fourParams')) {
-      this.queryParams = JSON.parse(sessionStorage.getItem('fourParams'))
-    }
     this.getDict()
     this.getList()
   },

src/views/processManagement/inventoryQuery/index.vue

@@ -572,13 +572,15 @@ export default {
 
   /** 路由离开前存储筛选条件*/
   beforeRouteLeave(to, from, next) {
-    sessionStorage.setItem('sixParams', JSON.stringify(this.queryParams))
+    this.$store.dispatch('searchSave/searchParamsSet', {
+      path: this.$route.path,
+      param: {
+        ...this.queryParams
+      }
+    })
     next()
   },
   created() {
-    if (sessionStorage.getItem('sixParams')) {
-      this.queryParams = JSON.parse(sessionStorage.getItem('sixParams'))
-    }
     this.getDict()
     this.getList()
   },

src/views/processManagement/inventoryRecord/index.vue

@@ -442,16 +442,20 @@ export default {
   },
   /** 路由离开前存储筛选条件*/
   beforeRouteLeave(to, from, next) {
-    sessionStorage.setItem('fiveRecord', JSON.stringify(this.queryEntity))
-    sessionStorage.setItem('fiveDateRange', JSON.stringify(this.dateRange))
+    this.$store.dispatch('searchSave/searchParamsSet', {
+      path: this.$route.path,
+      param: {
+        ...this.queryParams
+      }
+    })
     next()
   },
   created() {
-    if (sessionStorage.getItem('fiveRecord')) {
-      this.queryEntity = JSON.parse(sessionStorage.getItem('fiveRecord'))
-    }
-    if (sessionStorage.getItem('fiveDateRange')) {
-      this.dateRange = JSON.parse(sessionStorage.getItem('fiveDateRange'))
+    if (this.$store.getters.searchParams[this.$route.path]) {
+      const {searchParams} = this.$store.getters;
+      const {path} = this.$route
+      const param = JSON.parse(searchParams[path]) // 保留着的查询条件
+      this.queryParams = {...param}
     }
     this.getList()
     this.getDict()

src/views/processManagement/processesCheck/index.vue

@@ -200,23 +200,19 @@ export default {
   },
   /** 路由离开前存储筛选条件*/
   beforeRouteLeave(to, from, next) {
-    sessionStorage.setItem('sevenRecord', JSON.stringify(this.queryEntity))
-    sessionStorage.setItem('sevenDateRange', JSON.stringify(this.dateRange))
+    this.$store.dispatch('searchSave/searchParamsSet', {
+      path: this.$route.path,
+      param: {
+        ...this.queryParams
+      }
+    })
     next()
   },
   created() {
-    if (sessionStorage.getItem('sevenRecord')) {
-      this.queryEntity = JSON.parse(sessionStorage.getItem('sevenRecord'))
-    }
-    if (sessionStorage.getItem('sevenDateRange')) {
-      this.dateRange = JSON.parse(sessionStorage.getItem('sevenDateRange'))
-      if (this.dateRange !== null) {
-        this.queryParams.beginTime = this.dateRange[0] + ' 00:00:00'
-        this.queryParams.endTime = this.dateRange[1] + ' 23:59:00'
-      } else {
-        this.queryParams.beginTime = ''
-        this.queryParams.endTime = ''
-      }
+    if (this.$store.getters.searchParams[this.$route.path]) {
+      const { searchParams } = this.$store.getters; const { path } = this.$route
+      const param = JSON.parse(searchParams[path]) // 保留着的查询条件
+      this.queryParams = { ...param }
     }
     this.getList()
   },

src/views/sample/basicInformation/index.vue

@@ -188,15 +188,7 @@ export default {
       basicinfoMationList: []
     }
   },
-  /** 路由离开前存储筛选条件*/
-  beforeRouteLeave(to, from, next) {
-    sessionStorage.setItem('sampleOneParams', JSON.stringify(this.queryParams))
-    next()
-  },
   created() {
-    if (sessionStorage.getItem('sampleOneParams')) {
-      this.queryParams = JSON.parse(sessionStorage.getItem('sampleOneParams'))
-    }
     this.getList()
   },
   methods: {

src/views/sample/correctionLibrary/index.vue

@@ -170,15 +170,7 @@ export default {
       basicinfoMationList: []
     }
   },
-  /** 路由离开前存储筛选条件*/
-  beforeRouteLeave(to, from, next) {
-    sessionStorage.setItem('sampleThreeParams', JSON.stringify(this.queryParams))
-    next()
-  },
   created() {
-    if (sessionStorage.getItem('sampleThreeParams')) {
-      this.queryParams = JSON.parse(sessionStorage.getItem('sampleThreeParams'))
-    }
     this.getList()
   },
   methods: {

src/views/sample/errorRecord/index.vue

@@ -311,24 +311,15 @@ export default {
   },
   /** 路由离开前存储筛选条件*/
   beforeRouteLeave(to, from, next) {
-    sessionStorage.setItem('sampleFiveRecord', JSON.stringify(this.queryEntity))
-    sessionStorage.setItem('sampleFiveDateRange', JSON.stringify(this.dateRange))
+    this.$store.dispatch('searchSave/searchParamsSet', {
+      path: this.$route.path,
+      param: {
+        ...this.queryParams
+      }
+    })
     next()
   },
   created() {
-    if (sessionStorage.getItem('sampleFiveRecord')) {
-      this.queryEntity = JSON.parse(sessionStorage.getItem('sampleFiveRecord'))
-    }
-    if (sessionStorage.getItem('sampleFiveDateRange')) {
-      this.dateRange = JSON.parse(sessionStorage.getItem('sampleFiveDateRange'))
-      if (this.dateRange !== null) {
-        this.queryParams.beginTime = this.dateRange[0] + ' 00:00:00'
-        this.queryParams.endTime = this.dateRange[1] + ' 23:59:00'
-      } else {
-        this.queryParams.beginTime = ''
-        this.queryParams.endTime = ''
-      }
-    }
     this.getList()
   },
   // 监听回车

src/views/sample/inventoryRecord/index.vue

@@ -344,24 +344,15 @@ export default {
   },
   /** 路由离开前存储筛选条件*/
   beforeRouteLeave(to, from, next) {
-    sessionStorage.setItem('sampleFourRecord', JSON.stringify(this.queryEntity))
-    sessionStorage.setItem('sampleFourDateRange', JSON.stringify(this.dateRange))
+    this.$store.dispatch('searchSave/searchParamsSet', {
+      path: this.$route.path,
+      param: {
+        ...this.queryParams
+      }
+    })
     next()
   },
   created() {
-    if (sessionStorage.getItem('sampleFourRecord')) {
-      this.queryEntity = JSON.parse(sessionStorage.getItem('sampleFourRecord'))
-    }
-    if (sessionStorage.getItem('sampleFourDateRange')) {
-      this.dateRange = JSON.parse(sessionStorage.getItem('sampleFourDateRange'))
-      if (this.dateRange !== null) {
-        this.queryParams.beginTime = this.dateRange[0] + ' 00:00:00'
-        this.queryParams.endTime = this.dateRange[1] + ' 23:59:00'
-      } else {
-        this.queryParams.beginTime = ''
-        this.queryParams.endTime = ''
-      }
-    }
     this.getList()
   },
   // 监听回车

src/views/sample/sampleType/index.vue

@@ -199,15 +199,7 @@ export default {
       basicinfoMationList: []
     }
   },
-  /** 路由离开前存储筛选条件*/
-  beforeRouteLeave(to, from, next) {
-    sessionStorage.setItem('sampleTwoParams', JSON.stringify(this.queryParams))
-    next()
-  },
   created() {
-    if (sessionStorage.getItem('sampleTwoParams')) {
-      this.queryParams = JSON.parse(sessionStorage.getItem('sampleTwoParams'))
-    }
     this.getList()
   },
   methods: {