From 654574f7bd0c818854e0f9f629e719aaac9b95db Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 28 八月 2023 10:37:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
src/utils/request.js | 13 +++++++++++--
src/views/laboratory/measure/Add.vue | 2 +-
src/views/laboratory/measure/index.vue | 3 ++-
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index aef5813..4218d62 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -61,8 +61,17 @@
type: 'warning',
duration: 5 * 1000
})
- localStorage.removeItem("user")
- this.$router.push({ path: '/login' })
+ sessionStorage.removeItem("user")
+ sessionStorage.setItem("flushPage",1)
+ this.$router.replace({path: '/login'});
+ location.reload()
+ }
+ if(res.code===403){
+ Message({
+ message: res.message,
+ type: 'warning',
+ duration: 5 * 1000
+ })
}
// Message({
// message: res.message || 'Error',
diff --git a/src/views/laboratory/measure/Add.vue b/src/views/laboratory/measure/Add.vue
index 224b34e..bbc0fe9 100644
--- a/src/views/laboratory/measure/Add.vue
+++ b/src/views/laboratory/measure/Add.vue
@@ -40,7 +40,7 @@
<el-col style="width:93%;height: 20vh;margin-top: 30px; margin-left: 40px;">
<el-button icon="el-icon-plus" @click="addcodePointsTable()" style="margin-bottom: 10px;"
type="primary">鏂板璁￠噺</el-button>
- <el-table ref="codePointsTable" :cell-style="{ textAlign: 'center' }"
+ <el-table max-height="300" ref="codePointsTable" :cell-style="{ textAlign: 'center' }"
:header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
:data="codePointsTable" style="width: 100%">
<el-table-column type="index" v-model="codePointsTable.index" label="搴忓彿" min-width="90" />
diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index 18e0146..e927978 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -157,7 +157,7 @@
</el-col>
</el-col>
<el-col style="width:93%;height: 20vh;margin-top: 30px; margin-left: 40px;">
- <el-table :data="measureData">
+ <el-table max-height="300" :data="measureData">
<el-table-column type="index" label="搴忓彿" />
<el-table-column prop="equipmentCode" label="浠櫒璁惧缂栧彿" />
<el-table-column prop="equipmentName" label="浠櫒璁惧鍚嶇О" />
@@ -388,6 +388,7 @@
},
async handleSizeChangePlan(num) {
this.pageSizePlan = num
+ this.currentPagePlan=1
await this.limitGetPlanMeasureInstrument()
},
async handleCurrentChangePllan(num) {
--
Gitblit v1.9.3