Merge branch 'master' of http://maven.jgiot.com:7012/jiaxiaoqiang/SynthesisManagement

src/api/user/types.ts

@@ -12,7 +12,8 @@ export interface UserInfo {
   sysData: any[];
   canSetPermission: boolean; //是否有设置权限的权限
   canSetIP: boolean; //是否有设置IP的权限
-  canCreateMessage: boolean; //是否有创建消息的权限
+  canCreateMessage1: boolean; //是否有创建消息的权限
+  canCreateMessage2: boolean; //是否有创建消息的权限
   setRoles: boolean; //是否有设置角色的权限
   canSetMessageOrg: boolean; //是否有设置消息组织的权限
   canFileShare: boolean; //是否有设置消息组织的权限

src/components/TopTitle.vue

@@ -4,7 +4,7 @@
 
     <div class="title">{{ title }}</div>
     <i-ep-plus
-      v-if="messageType && userStore.user.canCreateMessage"
+      v-if="messageType && canCreateMessage"
       style="margin-left: 8px"
       @click="gotoList"
     />
@@ -22,6 +22,7 @@ const props = defineProps<{
     default: "";
     required: false;
   };
+  canCreateMessage: boolean;
 }>();
 
 const router = useRouter();

src/store/modules/user.ts

@@ -13,7 +13,8 @@ export const useUserStore = defineStore("user", () => {
     sysData: [],
     canSetPermission: false,
     canSetIP: false,
-    canCreateMessage: false,
+    canCreateMessage1: false,
+    canCreateMessage2: false,
     setRoles: false,
     canSetMessageOrg: false,
     canFileShare: false,
@@ -71,13 +72,15 @@ export const useUserStore = defineStore("user", () => {
               } else if (menu.id === 7) {
                 user.value.canSetIP = true;
               } else if (menu.id === 8) {
-                user.value.canCreateMessage = true;
+                user.value.canCreateMessage1 = true;
               } else if (menu.id === 9) {
                 user.value.setRoles = true;
               } else if (menu.id === 11) {
                 user.value.canSetMessageOrg = true;
               } else if (menu.id === 12) {
                 user.value.canFileShare = true;
+              } else if (menu.id === 13) {
+                user.value.canCreateMessage2 = true;
               }
             }
           });

src/views/main/fileList.vue

@@ -15,7 +15,7 @@
       </el-input>
     </div>
     <div class="list-box">
-      <el-scrollbar style="width: 100%; height: 200px">
+      <el-scrollbar style="width: 100%; height: 100%">
         <!--        <div>-->
         <!--          <div class="line">-->
         <!--            <div style="width: 100%" class="title">-->

src/views/main/message.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="common-box" style="margin-top: 20px">
-    <TopTitle :messageType="messageType" :title="title" icon="laba" />
+
+    <TopTitle :messageType="messageType" :title="title" v-if="messageType === '2'"
+              :canCreateMessage="userStore.user.canCreateMessage1" icon="laba"/>
+    <TopTitle :messageType="messageType" :title="title" v-else-if="messageType === '0'"
+              :canCreateMessage="userStore.user.canCreateMessage2" icon="laba"/>
     <div>
       <el-input
         v-model="searchText"
@@ -35,13 +39,19 @@
 import { getUserMessageNoPageList } from "@/api/message";
 import MessageDetail from "@/views/messages/MessageDetail.vue";
 import { Search } from "@element-plus/icons-vue";
+import {useUserStore} from "@/store";
 
+const userStore = useUserStore();
 const props = defineProps({
   // 消息类型 0 系统公告 1 工位消息 2-具体某些人员消息
   messageType: {
     type: String,
     default: "0",
   },
+  canCreateMessage: {
+    type: Boolean,
+    default: false,
+  },
   title: {
     type: String,
     default: "个人消息",

src/views/messages/MessageDetail.vue

@@ -8,9 +8,7 @@
   >
     <div class="message-detail">
       <h3>{{ messageObj.title }}</h3>
-      <div style="width: 80%">
-        <p style="word-break: break-word;">{{ messageObj.content }}</p>
-      </div>
+      <p style="word-break: break-word;">{{ messageObj.content }}</p>
       <div class="img-container">
         <el-image
           v-for="(item, index) in messageObj.photoLists"
@@ -45,7 +43,7 @@
 </template>
 
 <script lang="ts" setup>
-import { getMessageDetail } from "@/api/message";
+import {getMessageDetail} from "@/api/message";
 
 const drawerVisible = ref(false);
 
@@ -79,7 +77,7 @@ const downloadFile = (url: string) => {
   link.remove(); // 下载后移除链接元素
 };
 
-defineExpose({ handleOpenDrawer, handleCloseDrawer });
+defineExpose({handleOpenDrawer, handleCloseDrawer});
 </script>
 
 <style lang="scss" scoped>