From 81ce913696eaad67b23ec3356e935e48fba999ff Mon Sep 17 00:00:00 2001
From: sunshine <1467939124@qq.com>
Date: Thu, 1 Aug 2024 16:00:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=8A=A5=E5=B7=A5=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8el-button=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page_report/reportForm.vue |  1 +
 src/pages/index.vue            |  2 +-
 src/pages/report.vue           | 48 ++++++++++++++++++----------------
 src/pages/work.vue             |  6 ++---
 4 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/page_report/reportForm.vue b/src/page_report/reportForm.vue
index 156e7b0..76bcfa3 100644
--- a/src/page_report/reportForm.vue
+++ b/src/page_report/reportForm.vue
@@ -221,6 +221,7 @@ export default {
                 update(this.customFormData).then(response => {
                   modal.msgSuccess("修改成功")
                   tab.navigateBack()
+                  uni.$emit('handleSuccess', true)
                 })
               }else {
                 this.customFormData.id = null
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 3fe6a50..47d0f34 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -340,7 +340,7 @@ function planProgress(plan){
   background-color: #f1f1f1;
   padding: 0 20rpx 20rpx 20rpx;
   .content {
-    margin: 20rpx 0;
+    margin: 0 0 20rpx 0;
     padding: 20rpx;
     background-color: #ffffff;
     border-radius: 10rpx;
diff --git a/src/pages/report.vue b/src/pages/report.vue
index 5ea7983..cf9929a 100644
--- a/src/pages/report.vue
+++ b/src/pages/report.vue
@@ -44,10 +44,10 @@
             </template>
             <!-- 自定义 footer-->
             <template v-slot:footer>
-              <el-button v-if="item.reportStatus === 0" type="primary" size="small"  :icon="Edit" circle @click="editOrAddReport(item.id)"/>
-              <el-button v-if="item.reportStatus === 0" type="success" size="small" :icon="Check" circle @click="updateReport(item.id,1,'提交')"/>
-              <el-button v-if="item.reportStatus === 0" type="danger" size="small" :icon="Delete" circle @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 === 0"  type="primary" icon="edit-pen" @click="editOrAddReport(item.id)"/>
+              <u-button v-if="item.reportStatus === 0" type="success" icon="share-square" @click="updateReport(item.id,1,'提交')"/>
+              <u-button v-if="item.reportStatus === 0" type="error" icon="trash" @click="deleteReport(item.id)"/>
+              <u-button v-if="item.reportStatus >= 1" type="primary" icon="view" @click="handleView(item.id)"/>
             </template>
           </uni-list-item>
         </uni-list>
@@ -84,10 +84,10 @@
             </template>
             <!-- 自定义 footer-->
             <template v-slot:footer>
-              <el-button v-if="item.reportStatus < 2" type="primary" size="small"  :icon="Edit" circle @click="addReplaceReport(item.id)"/>
-              <el-button v-if="item.reportStatus === 0" type="success" size="small" :icon="Promotion" circle @click="updateReport(item.id,1,'提交')"/>
-              <el-button v-if="item.reportStatus === 1" type="success" size="small" :icon="Check" circle @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="primary" icon="edit-pen" @click="addReplaceReport(item.id)"/>
+              <u-button v-if="item.reportStatus === 0" type="success" icon="share-square" @click="updateReport(item.id,1,'提交')"/>
+              <u-button v-if="item.reportStatus === 1" type="success" icon="checkmark"  @click="updateReport(item.id,2,'通过')"/>
+              <u-button v-if="item.reportStatus < 2" type="error" icon="trash" @click="deleteReport(item.id)"/>
 
             </template>
           </uni-list-item>
@@ -107,7 +107,7 @@
           </uni-forms-item>
         </uni-forms>
         <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 -->
             <template v-slot:header>
               <div onclick="">
@@ -123,11 +123,11 @@
             </template>
             <!-- 自定义 footer-->
             <template v-slot:footer>
-              <el-button v-if="item.reportStatus === 0" type="primary" size="small"  :icon="Edit" circle @click="addReplaceReport(item.id)"/>
-              <el-button v-if="item.reportStatus === 0" type="success" size="small" :icon="Promotion" circle @click="updateReport(item.id,1,'提交')"/>
-              <el-button v-if="item.reportStatus === 1" type="success" size="small" :icon="Check" circle @click="updateReport(item.id,2,'通过')"/>
-              <el-button v-if="item.reportStatus === 1" type="warning" size="small" :icon="Close" circle @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 === 0" type="primary" icon="edit-pen" @click="addReplaceReport(item.id)"/>
+              <u-button v-if="item.reportStatus === 0" type="success" icon="share-square" @click="updateReport(item.id,1,'提交')"/>
+              <u-button v-if="item.reportStatus === 1" type="success" icon="checkmark" @click="updateReport(item.id,2,'通过')"/>
+              <u-button v-if="item.reportStatus === 1" type="warning" icon="close" @click="updateReport(item.id,3,'驳回')"/>
+              <u-button v-if="item.reportStatus < 2" type="error" icon="trash" @click="deleteReport(item.id)"/>
             </template>
           </uni-list-item>
         </uni-list>
@@ -139,7 +139,6 @@
 
 <script>
 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 modal from "@/plugins/modal";
 import auth from "@/plugins/auth";
@@ -148,16 +147,9 @@ import { getCurrentDate, timestampToTime } from "@/utils/dateUtil";
 import { processTypes } from "@/api/system/dict/data";
 import { getOtherPersonalUser } from "@/api/mes/organization";
 import WorkReport from "@/pages/workReport.vue";
+
 export default {
   components: { WorkReport },
-  computed: {
-    Delete() { return Delete },
-    Promotion() { return Promotion },
-    Close() { return Close },
-    Edit() { return Edit },
-    Check() { return Check },
-    View() { return View }
-  },
   data() {
     return {
       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>
diff --git a/src/pages/work.vue b/src/pages/work.vue
index f600b69..318f9b3 100644
--- a/src/pages/work.vue
+++ b/src/pages/work.vue
@@ -127,7 +127,7 @@
         </u-list-item>
       </u-list>
     </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>
 </template>
 
@@ -201,7 +201,7 @@ function handleUpdate(id){
     if (res.confirm) {
       updateStatus(id, 2).then(response => {
         modal.msgSuccess("操作成功")
-        getList()
+        getDraftList()
       })
     }
   })
@@ -244,7 +244,7 @@ onLoad(() => {
   background-color: #f1f1f1;
   padding: 0 20rpx 20rpx 20rpx;
   .content {
-    margin: 20rpx 0;
+    margin: 0 0 20rpx 0;
     padding: 20rpx;
     background-color: #ffffff;
     border-radius: 10rpx;

From fc7167246d50dcaced7eec167b8fb964d3e62a69 Mon Sep 17 00:00:00 2001
From: sunshine <1467939124@qq.com>
Date: Fri, 2 Aug 2024 09:34:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=95=E5=85=A5=E6=8C=81=E4=B9=85?=
 =?UTF-8?q?=E5=8C=96=E6=8F=92=E4=BB=B6=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E5=90=8E=E4=B8=A2=E5=A4=B1token=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json              | 3 ++-
 src/store/index.ts        | 2 ++
 src/store/modules/user.ts | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e207eec..649e546 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,8 @@
     "dayjs": "^1.11.9",
     "element-plus": "^2.7.6",
     "mqtt": "4.1.0",
-    "pinia": "2.0.17",
+    "pinia": "2.0.28",
+    "pinia-plugin-persistedstate": "^3.1.0",
     "tslib": "^2.6.2",
     "uview-plus": "^3.1.45",
     "vue": "3.4.23",
diff --git a/src/store/index.ts b/src/store/index.ts
index 7f06d64..755e335 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -1,4 +1,6 @@
 import { createPinia } from "pinia"
+import piniaPluginPersistedState from 'pinia-plugin-persistedstate'
 
 const store = createPinia()
+store.use(piniaPluginPersistedState)
 export default store
\ No newline at end of file
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b44c1cd..d4ff043 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -91,6 +91,10 @@ const useUserStore = defineStore("user", {
       });
     },
   },
+  persist: {
+    key: 'user',
+    storage: localStorage
+  }
 });
 
 export default useUserStore;