“yueshang” 2 éve
szülő
commit
2f917d5666

BIN
src/assets/images/profile.jpg


BIN
src/assets/images/profile.png


+ 1 - 1
src/layout/indexCommon.vue

@@ -31,7 +31,7 @@
             >
               <div class="avatar-wrapper">
                 <img
-                  src="@/assets/images/profile.jpg"
+                  src="@/assets/images/profile.png"
                   class="head-img"
                 /><span>{{ logingName }}</span>
               </div>

+ 1 - 1
src/store/modules/user.js

@@ -9,7 +9,7 @@ import {
 	setToken,
 	removeToken
 } from '@/utils/auth'
-import defAva from '@/assets/images/profile.jpg'
+import defAva from '@/assets/images/profile.png'
 import useWebsoctStore from '@/store/modules/websocket'
 const useUserStore = defineStore(
 	'user', {

+ 2 - 2
src/views/department/Department.vue

@@ -272,7 +272,7 @@
             </div>
             <!-- 新建组织目录 -->
             <div>
-                <el-dialog v-model="directoryModal" title="扩容申请" width="55%">
+                <el-dialog v-model="directoryModal" title="新建目录" width="55%">
                     <el-form :data="v1form">
                         <el-form-item label="目录名称">
                             <el-input v-model="v1form.names"></el-input>
@@ -367,7 +367,7 @@ export default {
         // let tranvalue1 = ref([])
         let v1form = ref({
             names:"",
-            types:"",
+            types:"1",
             power:[],
             tranvalue1:[]
         })

+ 18 - 11
src/views/liveChat/index.vue

@@ -8,7 +8,7 @@ import { ref, reactive, toRaw, toRefs, nextTick } from "vue";
 import { useRouter, useRoute } from "vue-router";
 import useUserStore from "@/store/modules/user";
 import word from "@/assets/images/word2.png";
-import chat from "@/assets/images/profile.jpg";
+import chat from "@/assets/images/profile.png";
 import cebian from "@/assets/images/cebian.png";
 import send from "@/assets/images/send.png";
 import downFile from "@/assets/images/down-file.png";
@@ -95,6 +95,7 @@ const getMsgList = async () => {
     msgRecordEvent(sendCont.data.toId);
   }
 };
+const noMes = ref(false);
 //获取用户的聊天记录
 const msgRecordEvent = async (toIdValue) => {
   const queryParams = {
@@ -104,6 +105,11 @@ const msgRecordEvent = async (toIdValue) => {
   const resMsgData = await msgRecord(toIdValue, queryParams);
   resMsgData.rows.map((i) => (i.isForward = false));
   chatRecords.data = resMsgData.rows.reverse();
+  const PageNum = Math.ceil(chatRecords.data.length / 10) + 1;
+  if (PageNum * 10 >= resMsgData.total && !noMes.value) {
+      loading.value = false;
+      noMes.value = true;
+    }
   const nowtime = parseTime(new Date().getTime(), "{y}-{m}-{d}");
   chatRecords.data.map((i) => {
     if (nowtime == i.createTime.substr(0, 10))
@@ -270,10 +276,11 @@ watchEffect(() => {
 });
 // 滚动翻页========
 const mainContainer=ref(null)
-const noMes = ref(false);
+
 const handleScroll = (event) => {
   // 在滚动到顶部时,加载上一页的聊天记录
   const mainContainer2 = document.querySelector(".right-container");
+  console.log(' event.deltaY', mainContainer2.scrollTop,noMes.value,loading.value)
   if (
     event.deltaY < 0 &&
     mainContainer2.scrollTop <= 1 &&
@@ -290,7 +297,7 @@ const loadPreviousPage = async () => {
     pageNum: currentPageNum,
     pageSize: 10,
   };
-  setTimeout(async () => {
+  // setTimeout(async () => {
     const resMsgData = await msgRecord(sendCont.data.toId, queryParams);
     const previousPageData = resMsgData.rows.reverse();
     chatRecords.data = [...previousPageData, ...chatRecords.data];
@@ -305,16 +312,16 @@ const loadPreviousPage = async () => {
       noMes.value = true;
       return;
     }
-    await nextTick();
-    const mainContainer = document.querySelector(".right-container");
-  const newMessages = document.querySelectorAll(".message-container");
-  const firstNewMessage = newMessages[previousPageData.length];
-  const firstNewMessageTop = mainContainer.offsetHeight +  100;
-  console.log('firstNewMessageTop', firstNewMessageTop)
-  mainContainer.scrollTop = firstNewMessageTop;
+    // await nextTick();
+    // const mainContainer = document.querySelector(".right-container");
+    // const newMessages = document.querySelectorAll(".message-container");
+    // const firstNewMessage = newMessages[previousPageData.length];
+  // const firstNewMessageTop = mainContainer.offsetHeight;
+  // console.log('firstNewMessageTop', firstNewMessageTop)
+  // mainContainer.scrollTop = firstNewMessageTop;
     // 将加载的上一页聊天记录插入到 chatRecords.data 的前面
     loading.value = false;
-  }, 50);
+  // }, 50);
 };
 const transferFiles = (forwardVal, msgIds, indexs) => {
   chatRecords.data.map((i, index) => {

+ 1 - 1
src/views/login.vue

@@ -66,7 +66,7 @@
         :rules="loginRules"
         class="center_box"
       >
-        <span class="title">Sign up to Domino’s</span>
+        <span class="title">聚合智慧文档管理系统</span>
         <el-form-item prop="username">
           <span class="ipt_title">用户名</span>
           <el-input