From 5c835806f68875806f3c3ae4da639e76bc8d481b Mon Sep 17 00:00:00 2001
From: Tuzki <1720599558@qq.com>
Date: Tue, 12 Aug 2025 20:52:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(user):=20=E6=B7=BB=E5=8A=A0=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E7=B1=BB=E5=9E=8B=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
=?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在 store 中添加 userType 字段，用于存储用户类型
- 在各个页面中根据用户类型显示不同内容和功能
- 优化首页布局，增加企业管理员和检查员的专属功能
- 调整检查历史和复查历史的显示逻辑
- 修复 AI 问答中添加按钮的显示问题
- 优化重新添加安全检查中的文本域样式
---
pageIndex/addSafeCheck/readdSafeCheck.vue | 6 +-
pageIndex/aiAsk/aiAsk.vue | 4 +-
pageIndex/checkHsitory/checkHsitory.vue | 9 +--
pageIndex/checkHsitory/recheckHsitory.vue | 5 +-
pages/index.vue | 71 ++++++++++++++++++-----
pages/mine/index.vue | 5 +-
store/getters.js | 3 +-
store/modules/user.js | 10 +++-
utils/constant.js | 3 +-
utils/storage.js | 2 +-
10 files changed, 89 insertions(+), 29 deletions(-)
diff --git a/pageIndex/addSafeCheck/readdSafeCheck.vue b/pageIndex/addSafeCheck/readdSafeCheck.vue
index fe0428d..9bda4e7 100644
--- a/pageIndex/addSafeCheck/readdSafeCheck.vue
+++ b/pageIndex/addSafeCheck/readdSafeCheck.vue
@@ -74,12 +74,12 @@
整改依据
-
整改建议
-
@@ -100,7 +100,7 @@
备注
-
diff --git a/pageIndex/aiAsk/aiAsk.vue b/pageIndex/aiAsk/aiAsk.vue
index 60f7bc3..5cdb9ad 100644
--- a/pageIndex/aiAsk/aiAsk.vue
+++ b/pageIndex/aiAsk/aiAsk.vue
@@ -21,7 +21,7 @@
{{ msg.content }}
-
+
- 修改
+ 修改
签字
查看报告
- 复查
+ 复查
查看详情
@@ -106,7 +106,7 @@
检查人与企业签字
-->
-
+
@@ -115,7 +115,7 @@
检查人签字
-
+
@@ -196,6 +196,7 @@ export default {
reviewName: '',
checkType: '',
status: '',
+ userType: this.$store.state.user.userType,
maps: {
text: 'label',
value: 'value'
diff --git a/pageIndex/checkHsitory/recheckHsitory.vue b/pageIndex/checkHsitory/recheckHsitory.vue
index ccf8fa0..72f4eae 100644
--- a/pageIndex/checkHsitory/recheckHsitory.vue
+++ b/pageIndex/checkHsitory/recheckHsitory.vue
@@ -75,9 +75,9 @@
// 复制报告链接
// 签字 -->
查看报告
- 复查
- 同步到学一学
@@ -168,6 +168,7 @@ export default {
status: '',
reviewName: '',
formData:null,
+ userType: this.$store.state.user.userType,
}
},
computed: {
diff --git a/pages/index.vue b/pages/index.vue
index 9384760..4ede54a 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -13,8 +13,8 @@
{{ name }}
-
-
+ {{ userType }}
+
{{ servingTotalEnterpriseNum }}
服务企业总数
@@ -30,11 +30,12 @@
本月已复查企业
-
+
工作管理
-
+
安全检查
查看计划信息
@@ -56,8 +57,8 @@
-->
-
-
+
+
检查记录
@@ -80,6 +81,29 @@
+
+
+ 检查记录
+ 查看检查记录
+
+
+
+
+
+
+
+
+ 安全复查
+ 查看复查信息
+
+
+
+
+
+
+
@@ -108,7 +132,7 @@
- 待复查任务
+ {{ userType == 1||userType == 2? "待复查任务" : "待整改项目" }}
@@ -160,6 +184,7 @@
import { parseTime } from '@/utils/ruoyi.js';
import menusBar from '@/components/menusBar/menusBar';
import * as Api from '@/api/index/index'
+import store from '@/store'
export default {
components: {
menusBar
@@ -169,8 +194,9 @@ export default {
servingTotalEnterpriseNum: 0,
thisMonthCheckedEnterpriseNum: 0,
thisMonthAgainCheckedEnterpriseNum: 0,
- // name: this.$store.state.user.name,
- name: "河北省文化和旅游厅市场管理处",
+ name: this.$store.state.user.name,
+ userType: this.$store.state.user.userType,
+ // name: "河北省文化和旅游厅市场管理处",
choseindex: 0,
mocNews: [
// {
@@ -214,9 +240,15 @@ export default {
this.getJobs()
},
mounted() {
-
+ console.log(store.state.user)
},
methods: {
+ viewDetails(item,val,type){
+ const data = encodeURIComponent(JSON.stringify(item))
+ uni.navigateTo({
+ url: '/pageIndex/addSafeCheck/readdSafeCheck?data='+data+'&val='+val+'&type='+type
+ })
+ },
getEvents() {
Api.getDataStatistics().then(res => {
this.servingTotalEnterpriseNum = res.data.servingTotalEnterpriseNum;
@@ -289,12 +321,18 @@ export default {
scoped>
@import '@/static/scss/index/index.scss';
+ page {
+ min-height: auto;
+ background-color: #F6F8FC;
+ }
+
.content {
display: flex;
flex-direction: column;
align-items: center;
- justify-content: center;
+ justify-content: start;
background: #F6F8FC;
+ min-height: 100vh;
}
.head-bg {
@@ -347,7 +385,6 @@ export default {
align-items: center;
justify-content: space-evenly;
margin-top: 40rpx;
- margin-bottom: 40rpx;
position: relative;
z-index: 9;
@@ -371,6 +408,10 @@ export default {
}
}
+ .mt40 {
+ margin-top: 40rpx;
+ }
+
.jobs-content {
justify-content: space-between;
@@ -480,6 +521,10 @@ export default {
color: #4D3706;
}
}
+
+ .three1{
+ margin-top: 0;
+ }
.four {
background: linear-gradient(90deg, #B0E8F5 0%, #DCF5FA 100%);
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index e058adf..9b66210 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -107,8 +107,9 @@ export default {
},
data() {
return {
- // name: this.$store.state.user.name,
- name: "河北省文化和旅游厅市场管理处",
+ name: this.$store.state.user.name,
+ userType: this.$store.state.user.userType,
+ // name: "河北省文化和旅游厅市场管理处",
version: getApp().globalData.config.appInfo.version
}
},
diff --git a/store/getters.js b/store/getters.js
index 8854794..c027e56 100644
--- a/store/getters.js
+++ b/store/getters.js
@@ -3,6 +3,7 @@ const getters = {
avatar: state => state.user.avatar,
name: state => state.user.name,
roles: state => state.user.roles,
- permissions: state => state.user.permissions
+ permissions: state => state.user.permissions,
+ userType: state => state.user.userType,
}
export default getters
diff --git a/store/modules/user.js b/store/modules/user.js
index b1ae9bc..822c6e5 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -12,7 +12,8 @@ const user = {
name: storage.get(constant.name),
avatar: storage.get(constant.avatar),
roles: storage.get(constant.roles),
- permissions: storage.get(constant.permissions)
+ permissions: storage.get(constant.permissions),
+ userType: storage.get(constant.userType)
},
mutations: {
@@ -23,6 +24,10 @@ const user = {
state.name = name
storage.set(constant.name, name)
},
+ SET_USER_TYPE: (state, userType) => {
+ state.userType = userType
+ storage.set(constant.userType, userType)
+ },
SET_AVATAR: (state, avatar) => {
state.avatar = avatar
storage.set(constant.avatar, avatar)
@@ -59,6 +64,7 @@ const user = {
GetInfo({ commit, state }) {
return new Promise((resolve, reject) => {
getInfo().then(res => {
+ debugger
res = res.data; // 读取 data 数据
const user = res.user
// const avatar = (user == null || user.avatar === "" || user.avatar == null) ? require("@https://mp-df79fe8b-b924-41b0-bcb1-960be6b4a619.cdn.bspapp.com/images/user/user-head@2x.png") : user.avatar
@@ -66,6 +72,7 @@ const user = {
const avatar = (user == null || user.avatar === "" || user.avatar == null) ? "https://i.postimg.cc/B6DXHJZL/user-head-2x.png" : user.avatar
const nickname = (user == null || user.nickname === "" || user.nickname == null) ? "" : user.nickname
const userId = (user == null || user.id === "" || user.id == null) ? "" : user.id
+ const userType = (user == null || user.userType === "" || user.userType == null) ? "" : user.userType // 0企业管理员 1检查员
if (res.roles && res.roles.length > 0) {
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)
@@ -75,6 +82,7 @@ const user = {
commit('SET_NAME', nickname)
commit('SET_ID', userId)
commit('SET_AVATAR', avatar)
+ commit('SET_USER_TYPE', userType)
resolve(res)
}).catch(error => {
reject(error)
diff --git a/utils/constant.js b/utils/constant.js
index 8becd84..a481ee1 100644
--- a/utils/constant.js
+++ b/utils/constant.js
@@ -2,7 +2,8 @@ const constant = {
avatar: 'vuex_avatar',
name: 'vuex_name',
roles: 'vuex_roles',
- permissions: 'vuex_permissions'
+ permissions: 'vuex_permissions',
+ userType: 'vuex_userType'
}
export default constant
diff --git a/utils/storage.js b/utils/storage.js
index dd5c38b..66ee1ad 100644
--- a/utils/storage.js
+++ b/utils/storage.js
@@ -4,7 +4,7 @@ import constant from './constant'
let storageKey = 'storage_data'
// 存储节点变量名
-let storageNodeKeys = [constant.avatar, constant.name, constant.roles, constant.permissions]
+let storageNodeKeys = [constant.avatar, constant.name, constant.roles, constant.permissions,constant.userType]
// 存储的数据
let storageData = uni.getStorageSync(storageKey) || {}