diff --git a/backend/my_work/routers/apiUsers.go b/backend/my_work/routers/apiUsers.go index 5e4562e..0d5d77e 100644 --- a/backend/my_work/routers/apiUsers.go +++ b/backend/my_work/routers/apiUsers.go @@ -350,7 +350,14 @@ func ApiUser(r *gin.RouterGroup) { if models.DB.Where(&userinfo).First(&userinfo).Error == nil { redata["userInfo"] = userinfo } else { - redata["userInfo"] = nil + //无记录，创建一条 + userinfo.Username=user.Name + userinfo.FirstName=user.Email + userinfo.Birthdate=(time.Now()) + models.DB.Create(&userinfo) + //重新拉一条数据 + + redata["userInfo"] = userinfo } user.Pass = "" diff --git a/frontend/ops_vue_js/src/i18n/en.json b/frontend/ops_vue_js/src/i18n/en.json index 371fde9..cd0a3ac 100644 --- a/frontend/ops_vue_js/src/i18n/en.json +++ b/frontend/ops_vue_js/src/i18n/en.json @@ -150,7 +150,8 @@ "delete": "Delete", "copied": "Copied", "pasted": "Pasted", - "not_your_schedule": "This is not your schedule" + "not_your_schedule": "This is not your schedule", + "someone_schedule": "Created by {name}" }, "message": { "functionality_not_yet_developed": "Functionality not yet developed", @@ -239,7 +240,9 @@ "birthday_help": "Select your birthday for personalized services", "save_notice": "Your personal information will be updated after saving", "placeholder_name": "Enter your name", - "placeholder_remark": "Personal introduction or remark" + "placeholder_remark": "Personal introduction or remark", + "name_hint": "Display only, login name unchanged.", + "remark_hint": "Remark only" }, "button": { "submit": "Submit", diff --git a/frontend/ops_vue_js/src/i18n/zh-CN.json b/frontend/ops_vue_js/src/i18n/zh-CN.json index a13340e..fe9009c 100644 --- a/frontend/ops_vue_js/src/i18n/zh-CN.json +++ b/frontend/ops_vue_js/src/i18n/zh-CN.json @@ -150,7 +150,8 @@ "delete": "删除", "copied": "已复制", "pasted": "已粘贴", - "not_your_schedule": "这不是你的日程" + "not_your_schedule": "这不是你的日程", + "someone_schedule": "{name}创建的日程" }, "message": { "functionality_not_yet_developed": "功能未开发", @@ -239,7 +240,9 @@ "birthday_help": "选择您的生日，用于个性化服务", "save_notice": "保存后将更新您的个人信息", "placeholder_name": "请输入您的姓名", - "placeholder_remark": "个人简介或备注" + "placeholder_remark": "个人简介或备注", + "name_hint": "仅用于显示，不影响登录名", + "remark_hint": "仅备注" }, "button": { "submit": "提交", diff --git a/frontend/ops_vue_js/src/stores/users.js b/frontend/ops_vue_js/src/stores/users.js new file mode 100644 index 0000000..28cf270 --- /dev/null +++ b/frontend/ops_vue_js/src/stores/users.js @@ -0,0 +1,18 @@ +//用于保存其他用户的信息 + +import { defineStore } from 'pinia' +import { ref } from 'vue' + +export const useUsersStore = defineStore('users', () => { + const usersInfo =ref([]); + + function getUsernameFromUserID(userID){ + + return "123" + } + + return{ + usersInfo,getUsernameFromUserID, + } + +}) \ No newline at end of file diff --git a/frontend/ops_vue_js/src/views/scheduleView.vue b/frontend/ops_vue_js/src/views/scheduleView.vue index c8b02d2..c052e57 100644 --- a/frontend/ops_vue_js/src/views/scheduleView.vue +++ b/frontend/ops_vue_js/src/views/scheduleView.vue @@ -29,6 +29,10 @@ import { scheduleApi } from "@/api/schedule"; import { useDateUtils } from "@/composables/useDateUtils"; +import { useUsersStore } from "@/stores/users"; + +const usersStore =useUsersStore(); + const DateUtils = useDateUtils(); const router = useRouter(); @@ -59,6 +63,7 @@ const eventData = ref({ color: "#066FD1", // 默认蓝色工作事件 isEditing: false, //是否处于编辑模式，false就是添加模式 isEditable: false,//是否有权限编辑，无权限就让按钮灰掉 + userID:0, }); // 颜色选项 @@ -96,8 +101,30 @@ const pageData = reactive({//本页全局变量 copyTitle: "", copyColor: "", + eventBindUserID:[], + }) +//通过eventid获取用户id +function getUserIdFromEventID(eventID){ + + const target = pageData.eventBindUserID.find(item => item.eventID === eventID) + if(target){ + return target.userID + } + return 0; +} + +//通过用户id获取用户名 +function getUsernameFromUserID(userID){ + + if(userID==0){ + return ""; + } + + return usersStore.getUsernameFromUserID(userID); + +} function unseleEvent(eventID) { @@ -485,9 +512,16 @@ const getEvents = () => { calendarOptions.value.events = []; var events = r.raw.return.list; //console.log(events); - var eventstemp = []; + pageData.eventBindUserID=[]; events?.forEach((item) => { + var bind={ + eventID:item.ID, + userID:item.UserID, + } + pageData.eventBindUserID.push(bind); + + calendarOptions.value.events.push({ id: item.ID, // 后端 ID title: item.Title, // 标题 @@ -641,7 +675,7 @@ onMounted(() => {
- {{ userStore.isLoggedIn ? eventData.isEditing ? "xxx的日程" : "" : "" }} + {{ userStore.isLoggedIn ? eventData.isEditing ? t("schedule.someone_schedule", { name: getUsernameFromUserID(getUserIdFromEventID(eventData.id)) }) : "" : "" }}