引入持久化插件,解决刷新后丢失token,导致需要重新登录bug

Merge pull request !15 from guopeiyu/guopeiyu
main
guopeiyu 2 years ago committed by Gitee
commit 461dddb0b8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

@ -64,7 +64,8 @@
"dayjs": "^1.11.9", "dayjs": "^1.11.9",
"element-plus": "^2.7.6", "element-plus": "^2.7.6",
"mqtt": "4.1.0", "mqtt": "4.1.0",
"pinia": "2.0.17", "pinia": "2.0.28",
"pinia-plugin-persistedstate": "^3.1.0",
"tslib": "^2.6.2", "tslib": "^2.6.2",
"uview-plus": "^3.1.45", "uview-plus": "^3.1.45",
"vue": "3.4.23", "vue": "3.4.23",

@ -221,6 +221,7 @@ export default {
update(this.customFormData).then(response => { update(this.customFormData).then(response => {
modal.msgSuccess("修改成功") modal.msgSuccess("修改成功")
tab.navigateBack() tab.navigateBack()
uni.$emit('handleSuccess', true)
}) })
}else { }else {
this.customFormData.id = null this.customFormData.id = null

@ -340,7 +340,7 @@ function planProgress(plan){
background-color: #f1f1f1; background-color: #f1f1f1;
padding: 0 20rpx 20rpx 20rpx; padding: 0 20rpx 20rpx 20rpx;
.content { .content {
margin: 20rpx 0; margin: 0 0 20rpx 0;
padding: 20rpx; padding: 20rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 10rpx; border-radius: 10rpx;

@ -44,10 +44,10 @@
</template> </template>
<!-- 自定义 footer--> <!-- 自定义 footer-->
<template v-slot:footer> <template v-slot:footer>
<el-button v-if="item.reportStatus === 0" type="primary" size="small" :icon="Edit" circle @click="editOrAddReport(item.id)"/> <u-button v-if="item.reportStatus === 0" type="primary" icon="edit-pen" @click="editOrAddReport(item.id)"/>
<el-button v-if="item.reportStatus === 0" type="success" size="small" :icon="Check" circle @click="updateReport(item.id,1,'提交')"/> <u-button v-if="item.reportStatus === 0" type="success" icon="share-square" @click="updateReport(item.id,1,'提交')"/>
<el-button v-if="item.reportStatus === 0" type="danger" size="small" :icon="Delete" circle @click="deleteReport(item.id)"/> <u-button v-if="item.reportStatus === 0" type="error" icon="trash" @click="deleteReport(item.id)"/>
<el-button v-if="item.reportStatus >= 1" type="primary" size="small" :icon="View" circle @click="handleView(item.id)"/> <u-button v-if="item.reportStatus >= 1" type="primary" icon="view" @click="handleView(item.id)"/>
</template> </template>
</uni-list-item> </uni-list-item>
</uni-list> </uni-list>
@ -84,10 +84,10 @@
</template> </template>
<!-- 自定义 footer--> <!-- 自定义 footer-->
<template v-slot:footer> <template v-slot:footer>
<el-button v-if="item.reportStatus < 2" type="primary" size="small" :icon="Edit" circle @click="addReplaceReport(item.id)"/> <u-button v-if="item.reportStatus < 2" type="primary" icon="edit-pen" @click="addReplaceReport(item.id)"/>
<el-button v-if="item.reportStatus === 0" type="success" size="small" :icon="Promotion" circle @click="updateReport(item.id,1,'提交')"/> <u-button v-if="item.reportStatus === 0" type="success" icon="share-square" @click="updateReport(item.id,1,'提交')"/>
<el-button v-if="item.reportStatus === 1" type="success" size="small" :icon="Check" circle @click="updateReport(item.id,2,'通过')"/> <u-button v-if="item.reportStatus === 1" type="success" icon="checkmark" @click="updateReport(item.id,2,'通过')"/>
<el-button v-if="item.reportStatus < 2" type="danger" size="small" :icon="Delete" circle @click="deleteReport(item.id)"/> <u-button v-if="item.reportStatus < 2" type="error" icon="trash" @click="deleteReport(item.id)"/>
</template> </template>
</uni-list-item> </uni-list-item>
@ -107,7 +107,7 @@
</uni-forms-item> </uni-forms-item>
</uni-forms> </uni-forms>
<uni-list :border="true"> <uni-list :border="true">
<uni-list-item v-for="(item, index) in otherReportList" key="index"> <uni-list-item v-for="(item, index) in otherReportList" :key="index">
<!-- 自定义 header --> <!-- 自定义 header -->
<template v-slot:header> <template v-slot:header>
<div onclick=""> <div onclick="">
@ -123,11 +123,11 @@
</template> </template>
<!-- 自定义 footer--> <!-- 自定义 footer-->
<template v-slot:footer> <template v-slot:footer>
<el-button v-if="item.reportStatus === 0" type="primary" size="small" :icon="Edit" circle @click="addReplaceReport(item.id)"/> <u-button v-if="item.reportStatus === 0" type="primary" icon="edit-pen" @click="addReplaceReport(item.id)"/>
<el-button v-if="item.reportStatus === 0" type="success" size="small" :icon="Promotion" circle @click="updateReport(item.id,1,'提交')"/> <u-button v-if="item.reportStatus === 0" type="success" icon="share-square" @click="updateReport(item.id,1,'提交')"/>
<el-button v-if="item.reportStatus === 1" type="success" size="small" :icon="Check" circle @click="updateReport(item.id,2,'通过')"/> <u-button v-if="item.reportStatus === 1" type="success" icon="checkmark" @click="updateReport(item.id,2,'通过')"/>
<el-button v-if="item.reportStatus === 1" type="warning" size="small" :icon="Close" circle @click="updateReport(item.id,3,'驳回')"/> <u-button v-if="item.reportStatus === 1" type="warning" icon="close" @click="updateReport(item.id,3,'驳回')"/>
<el-button v-if="item.reportStatus < 2" type="danger" size="small" :icon="Delete" circle @click="deleteReport(item.id)"/> <u-button v-if="item.reportStatus < 2" type="error" icon="trash" @click="deleteReport(item.id)"/>
</template> </template>
</uni-list-item> </uni-list-item>
</uni-list> </uni-list>
@ -139,7 +139,6 @@
<script> <script>
import { getMyList, getOtherList, updateStatus,deleteByReportId } from "@/api/mes/report"; import { getMyList, getOtherList, updateStatus,deleteByReportId } from "@/api/mes/report";
import { Check, Delete, Edit,Promotion,Close,View } from '@element-plus/icons-vue'
import tab from "@/plugins/tab"; import tab from "@/plugins/tab";
import modal from "@/plugins/modal"; import modal from "@/plugins/modal";
import auth from "@/plugins/auth"; import auth from "@/plugins/auth";
@ -148,16 +147,9 @@ import { getCurrentDate, timestampToTime } from "@/utils/dateUtil";
import { processTypes } from "@/api/system/dict/data"; import { processTypes } from "@/api/system/dict/data";
import { getOtherPersonalUser } from "@/api/mes/organization"; import { getOtherPersonalUser } from "@/api/mes/organization";
import WorkReport from "@/pages/workReport.vue"; import WorkReport from "@/pages/workReport.vue";
export default { export default {
components: { WorkReport }, components: { WorkReport },
computed: {
Delete() { return Delete },
Promotion() { return Promotion },
Close() { return Close },
Edit() { return Edit },
Check() { return Check },
View() { return View }
},
data() { data() {
return { return {
currentPaneName: '', currentPaneName: '',
@ -369,4 +361,14 @@ export default {
} }
} }
} }
.u-button {
width: 50rpx;
height: 50rpx;
border-radius: 50%;
margin-right: 10rpx;
}
:deep(.u-icon__icon) {
font-size: 30rpx !important;
margin: 0 !important;
}
</style> </style>

@ -127,7 +127,7 @@
</u-list-item> </u-list-item>
</u-list> </u-list>
</view> </view>
<uni-fab v-if="auth.hasPermi('mes:feeding-record:create')" ref="fab" :pattern="pattern" @fabClick="handleAdd" /> <uni-fab v-if="auth.hasPermi('mes:feeding-record:create') && current===0" ref="fab" :pattern="pattern" @fabClick="handleAdd" />
</view> </view>
</template> </template>
@ -201,7 +201,7 @@ function handleUpdate(id){
if (res.confirm) { if (res.confirm) {
updateStatus(id, 2).then(response => { updateStatus(id, 2).then(response => {
modal.msgSuccess("操作成功") modal.msgSuccess("操作成功")
getList() getDraftList()
}) })
} }
}) })
@ -244,7 +244,7 @@ onLoad(() => {
background-color: #f1f1f1; background-color: #f1f1f1;
padding: 0 20rpx 20rpx 20rpx; padding: 0 20rpx 20rpx 20rpx;
.content { .content {
margin: 20rpx 0; margin: 0 0 20rpx 0;
padding: 20rpx; padding: 20rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 10rpx; border-radius: 10rpx;

@ -1,4 +1,6 @@
import { createPinia } from "pinia" import { createPinia } from "pinia"
import piniaPluginPersistedState from 'pinia-plugin-persistedstate'
const store = createPinia() const store = createPinia()
store.use(piniaPluginPersistedState)
export default store export default store

@ -91,6 +91,10 @@ const useUserStore = defineStore("user", {
}); });
}, },
}, },
persist: {
key: 'user',
storage: localStorage
}
}); });
export default useUserStore; export default useUserStore;

Loading…
Cancel
Save