feat:添加个人中心

Yi.BBS.Vue3/src/views/Article.vue

@@ -66,8 +66,10 @@
 
                     <li>
                       <el-button type="primary" size="default"
+                      v-hasPer="['bbs:discuss:edit']"
                         @click="updateHander(route.params.discussId)">编辑</el-button>
                       <el-button style="margin-left: 1rem" type="danger"
+                      v-hasPer="['bbs:discuss:remove']"
                         @click="delHander(route.params.discussId)">删除</el-button>
                     </li>
                     <li>分类： <span>文章</span></li>

Yi.BBS.Vue3/src/views/Discuss.vue

@@ -17,7 +17,7 @@
  
             <el-button>重置</el-button>
              <el-button type="primary" @click="async()=>{ await loadDiscussList();}">查询</el-button>
-             <el-button @click="enterEditArticle" type="primary">分享</el-button>    
+             <el-button @click="enterEditArticle" type="primary"     v-hasPer="['bbs:discuss:add']">分享</el-button>    
              <el-dropdown>
     <span class="el-dropdown-link">
       展开

Yi.BBS.Vue3/src/views/EditArticle.vue

@@ -30,7 +30,6 @@
           <el-input placeholder="请输入" v-model="editForm.introduction" />
         </el-form-item>
         <el-form-item label="内容：" prop="content">
-          {{ editForm.content + "*" }}
           <MavonEdit
             height="30rem"
             v-model="editForm.content"

Yi.BBS.Vue3/src/views/Login.vue

@@ -1,8 +1,8 @@
 <template>
   <h2>  登录-欢迎</h2>
     <el-input v-model="loginForm.userName" placeholder="用户名" />
-    <el-input v-model="loginForm.password" placeholder="密码" />
-    <el-button class="login-btn" type="primary" @click="login">登录</el-button>
+    <el-input v-model="loginForm.password" placeholder="密码" show-password />
+    <el-button class="login-btn" type="primary" @click="login" >登录</el-button>
 </template>
 <script setup>
 import { reactive } from 'vue';

Yi.BBS.Vue3/src/views/Test.vue

@@ -0,0 +1 @@
+<template></template>

Yi.BBS.Vue3/src/views/profile/Index.vue

@@ -0,0 +1,123 @@
+<template>
+   <div class="app-container" style="width: 1400px;">
+      <el-row :gutter="20">
+         <el-col :span="6" :xs="24">
+            <el-card class="box-card">
+               <template v-slot:header>
+                 <div class="clearfix">
+                   <span>个人信息</span>
+                 </div>
+               </template>
+               <div>
+                  <div class="text-center">
+                     <userAvatar :user="state.user" />
+                  </div>
+                  <ul class="list-group list-group-striped">
+                     <li class="list-group-item">
+                        <el-icon><User /></el-icon>  用户名称
+                        <div class="pull-right">{{ state.user.userName }}</div>
+                     </li>
+                     <li class="list-group-item">
+                        <el-icon><Phone /></el-icon>   手机号码
+                        <div class="pull-right">{{ state.user.phone }}</div>
+                     </li>
+                     <li class="list-group-item">
+                        <el-icon><Message /></el-icon>  用户邮箱
+                        <div class="pull-right">{{ state.user.email }}</div>
+                     </li>
+                     <li class="list-group-item">
+                        <el-icon><HelpFilled /></el-icon>   所属部门
+                        <div class="pull-right" v-if="state.dept">{{ state.dept.deptName }}</div>
+                     </li>
+                     <li class="list-group-item">
+                        <el-icon><Avatar /></el-icon>  所属角色
+                        <div class="pull-right"><span v-for="role in state.roles" :key="role.id">{{ role.roleName }} /</span></div>
+                     </li>
+                     <li class="list-group-item">
+                        <el-icon><Stopwatch /></el-icon> 创建日期
+                        <div class="pull-right">{{ state.user.creationTime }}</div>
+                     </li>
+                  </ul>
+               </div>
+            </el-card>
+         </el-col>
+         <el-col :span="18" :xs="24">
+            <el-card>
+               <template v-slot:header>
+                 <div class="clearfix">
+                   <span>基本资料</span>
+                 </div>
+               </template>
+               <el-tabs v-model="activeTab">
+                  <el-tab-pane label="基本资料" name="userinfo">
+                     <userInfo :user="state.user" />
+                  </el-tab-pane>
+                  <el-tab-pane label="修改密码" name="resetPwd">
+                     <resetPwd />
+                  </el-tab-pane>
+               </el-tabs>
+            </el-card>
+         </el-col>
+      </el-row>
+   </div>
+</template>
+
+<script setup name="Profile">
+import userAvatar from "./UserAvatar.vue";
+import userInfo from "./UserInfo.vue";
+import resetPwd from "./ResetPwd.vue";
+import { getUserProfile } from "@/apis/userApi.js";
+import { onMounted ,ref,reactive} from "vue";
+
+const activeTab = ref("userinfo");
+const state = reactive({
+  user: {},
+  dept: {},
+  roles: [],
+  roleGroup: {},
+  postGroup: {}
+});
+
+function getUser() {
+  getUserProfile().then(response => {
+    state.user = response.user;
+    state.dept=response.dept;
+    state.roles=response.roles;
+    state.roleGroup = response.roleGroup;
+    state.postGroup = response.postGroup;
+  });
+};
+onMounted(()=>{
+   getUser(); 
+})
+
+</script>
+<style scoped>
+.pull-right {
+	float: right !important;
+}
+.list-group-striped > .list-group-item {
+	border-left: 0;
+	border-right: 0;
+	border-radius: 0;
+	padding-left: 0;
+	padding-right: 0;
+}
+
+.list-group {
+	padding-left: 0px;
+	list-style: none;
+}
+
+.list-group-item {
+	border-bottom: 1px solid #e7eaec;
+	border-top: 1px solid #e7eaec;
+	margin-bottom: -1px;
+	padding: 11px 0px;
+	font-size: 13px;
+}
+
+.app-container {
+  padding: 20px;
+}
+</style>

Yi.BBS.Vue3/src/views/profile/ResetPwd.vue

@@ -0,0 +1,59 @@
+<template>
+   <el-form ref="pwdRef" :model="user" :rules="rules" label-width="80px">
+      <el-form-item label="旧密码" prop="oldPassword">
+         <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password />
+      </el-form-item>
+      <el-form-item label="新密码" prop="newPassword">
+         <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password />
+      </el-form-item>
+      <el-form-item label="确认密码" prop="confirmPassword">
+         <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
+      </el-form-item>
+      <el-form-item>
+      <el-button type="primary" @click="submit">保存</el-button>
+      <el-button type="danger" @click="close">关闭</el-button>
+      </el-form-item>
+   </el-form>
+</template>
+
+<script setup>
+import { updateUserPwd } from "@/apis/userApi";
+import { ref,reactive } from "vue";
+
+const pwdRef=ref(null);
+
+const user = reactive({
+  oldPassword: undefined,
+  newPassword: undefined,
+  confirmPassword: undefined
+});
+
+const equalToPassword = (rule, value, callback) => {
+  if (user.newPassword !== value) {
+    callback(new Error("两次输入的密码不一致"));
+  } else {
+    callback();
+  }
+};
+const rules = ref({
+  oldPassword: [{ required: true, message: "旧密码不能为空", trigger: "blur" }],
+  newPassword: [{ required: true, message: "新密码不能为空", trigger: "blur" }, { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }],
+  confirmPassword: [{ required: true, message: "确认密码不能为空", trigger: "blur" }, { required: true, validator: equalToPassword, trigger: "blur" }]
+});
+
+/** 提交按钮 */
+function submit() {
+  pwdRef.value.validate(valid => {
+    if (valid) {
+      updateUserPwd(user.oldPassword, user.newPassword).then(response => {
+      alert("修改成功");
+      });
+    }
+  });
+};
+/** 关闭按钮 */
+function close() {
+  alert("关闭")
+  // proxy.$tab.closePage();
+};
+</script>

Yi.BBS.Vue3/src/views/profile/UserAvatar.vue

@@ -0,0 +1,174 @@
+<template>
+  <div class="user-info-head" @click="editCropper()"><img :src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
+  <el-dialog :title="title" v-model="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog">
+    <el-row>
+      <el-col :xs="24" :md="12" :style="{height: '350px'}">
+        <vue-cropper
+            ref="cropper"
+            :img="options.img"
+            :info="true"
+            :autoCrop="options.autoCrop"
+            :autoCropWidth="options.autoCropWidth"
+            :autoCropHeight="options.autoCropHeight"
+            :fixedBox="options.fixedBox"
+            @realTime="realTime"
+            v-if="visible"
+        />
+      </el-col>
+      <el-col :xs="24" :md="12" :style="{height: '350px'}">
+        <div class="avatar-upload-preview">
+          <img :src="options.previews.url" :style="options.previews.img"/>
+        </div>
+      </el-col>
+    </el-row>
+    <br/>
+    <el-row>
+      <el-col :lg="2" :md="2">
+        <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
+          <el-button>
+            选择
+            <el-icon class="el-icon--right"><Upload /></el-icon>
+          </el-button>
+        </el-upload>
+      </el-col>
+      <el-col :lg="{span: 1, offset: 2}" :md="2">
+        <el-button icon="Plus" @click="changeScale(1)"></el-button>
+      </el-col>
+      <el-col :lg="{span: 1, offset: 1}" :md="2">
+        <el-button icon="Minus" @click="changeScale(-1)"></el-button>
+      </el-col>
+      <el-col :lg="{span: 1, offset: 1}" :md="2">
+        <el-button icon="RefreshLeft" @click="rotateLeft()"></el-button>
+      </el-col>
+      <el-col :lg="{span: 1, offset: 1}" :md="2">
+        <el-button icon="RefreshRight" @click="rotateRight()"></el-button>
+      </el-col>
+      <el-col :lg="{span: 2, offset: 6}" :md="2">
+        <el-button type="primary" @click="uploadImg()">上传</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script setup>
+import "vue-cropper/dist/index.css";
+import { VueCropper } from "vue-cropper";
+import { upload } from "@/apis/fileApi";
+import { updateUserIcon } from "@/apis/userApi";
+import useUserStore from '@/stores/user'
+import { ref ,reactive } from "vue";
+
+const userStore = useUserStore()
+
+const cropper=ref(null);
+
+const open = ref(false);
+const visible = ref(false);
+const title = ref("修改头像");
+
+//图片裁剪数据
+const options = reactive({
+  img: userStore.icon, // 裁剪图片的地址
+  autoCrop: true, // 是否默认生成截图框
+  autoCropWidth: 200, // 默认生成截图框宽度
+  autoCropHeight: 200, // 默认生成截图框高度
+  fixedBox: true, // 固定截图框大小 不允许改变
+  previews: {} //预览数据
+});
+
+/** 编辑头像 */
+function editCropper() {
+  open.value = true;
+};
+/** 打开弹出层结束时的回调 */
+function modalOpened() {
+  visible.value = true;
+};
+/** 覆盖默认上传行为 */
+function requestUpload() {
+};
+/** 向左旋转 */
+function rotateLeft() {
+cropper.value.rotateLeft();
+};
+/** 向右旋转 */
+function rotateRight() {
+  cropper.value.rotateRight();
+};
+/** 图片缩放 */
+function changeScale(num) {
+  num = num || 1;
+  cropper.value.changeScale(num);
+};
+/** 上传预处理 */
+function beforeUpload(file) {
+  if (file.type.indexOf("image/") == -1) {
+    alert("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");
+  } else {
+    const reader = new FileReader();
+    reader.readAsDataURL(file);
+    reader.onload = () => {
+      options.img = reader.result;
+    };
+    
+  }
+};
+/** 上传图片 */
+function uploadImg() {
+  cropper.value.getCropBlob(data => {
+    let formData = new FormData();
+    formData.append("file", data);
+    upload(formData).then(response => {
+      open.value = false;
+      options.img = import.meta.env.VITE_APP_BASE_API +"/file/"+response[0].id;
+      userStore.icon = options.img;
+      updateUserIcon(response[0].id).then(response2=>{
+     alert("修改成功");
+      visible.value = false;
+      })
+
+
+
+
+
+
+
+    });
+  });
+};
+/** 实时预览 */
+function realTime(data) {
+  options.previews = data;
+};
+/** 关闭窗口 */
+function closeDialog() {
+  options.img = userStore.iocn;
+  options.visible = false;
+};
+</script>
+
+<style lang='scss' scoped>
+.user-info-head {
+  position: relative;
+  display: inline-block;
+  height: 120px;
+}
+
+.user-info-head:hover:after {
+  content: "+";
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  color: #eee;
+  background: rgba(0, 0, 0, 0.5);
+  font-size: 24px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  cursor: pointer;
+  line-height: 110px;
+  border-radius: 50%;
+}
+</style>

Yi.BBS.Vue3/src/views/profile/UserInfo.vue

@@ -0,0 +1,58 @@
+<template>
+   <el-form ref="userRef" :model="user" :rules="rules" label-width="80px">
+      <el-form-item label="用户昵称" prop="nickName">
+         <el-input v-model="user.nick" maxlength="30" />
+      </el-form-item>
+      <el-form-item label="手机号码" prop="phone">
+         <el-input v-model="user.phone" maxlength="11" />
+      </el-form-item>
+      <el-form-item label="邮箱" prop="email">
+         <el-input v-model="user.email" maxlength="50" />
+      </el-form-item>
+      <el-form-item label="性别">
+         <el-radio-group v-model="user.sex">
+            <el-radio :label="0">男</el-radio>
+            <el-radio :label="1">女</el-radio>
+         </el-radio-group>
+      </el-form-item>
+      <el-form-item>
+      <el-button type="primary" @click="submit">保存</el-button>
+      <el-button type="danger" @click="close">关闭</el-button>
+      </el-form-item>
+   </el-form>
+</template>
+
+<script setup>
+import { updateUserProfile } from "@/apis/userApi";
+import { ref } from "vue";
+
+const props = defineProps({
+  user: {
+    type: Object
+  }
+});
+
+const userRef=ref(null);
+
+const rules = ref({
+  nick: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
+  email: [{ required: true, message: "邮箱地址不能为空", trigger: "blur" }, { type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
+  phone: [{ required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
+});
+
+/** 提交按钮 */
+function submit() {
+  userRef.value.validate(valid => {
+    if (valid) {
+      updateUserProfile(props.user).then(response => {
+       alert("修改成功");
+      });
+    }
+  });
+};
+/** 关闭按钮 */
+function close() {
+  alert("关闭")
+  proxy.$tab.closePage();
+};
+</script>