From f29a96ac3cf82e0dc06e1b3874ab2abed2ebaeaa Mon Sep 17 00:00:00 2001
From: 15179599649 <zhangyiyao89@qq.com>
Date: Mon, 08 Jan 2024 14:46:00 +0800
Subject: [PATCH] '完善内容'
---
src/api/hfiveget/index.js | 2 +-
src/views/toAppraising/index.vue | 1 +
src/styles/base/index.scss | 3 ++-
src/views/Appraising/index.vue | 2 +-
src/views/message/index.vue | 47 +++++++++++++++++++++++++----------------------
5 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/src/api/hfiveget/index.js b/src/api/hfiveget/index.js
index 6070efe..bbc9c81 100644
--- a/src/api/hfiveget/index.js
+++ b/src/api/hfiveget/index.js
@@ -97,7 +97,7 @@
return request({
// url: "/api/evaluate/evaluateTask/taskList/" + params.dept_id + "/" + params.user_id,
// url: "/api/evaluate/evaluateCandidateAssessor/listByAssessor",
- url: '/api/evaluate/evaluateTask/selfList',
+ url: '/api/evaluate/evaluateTask/taskListByPolling',
method: "get",
apiKey: true,
params: {
diff --git a/src/styles/base/index.scss b/src/styles/base/index.scss
index 93da2d3..7962436 100644
--- a/src/styles/base/index.scss
+++ b/src/styles/base/index.scss
@@ -69,7 +69,8 @@
// }
::-webkit-scrollbar {
- display: none; //1111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+ display: none;
+ //1111111111111111111111111111111111111111111111111111111111111111111111111111111111111
width: 8px;
height: 8px;
background-color: none;
diff --git a/src/views/Appraising/index.vue b/src/views/Appraising/index.vue
index 2587b35..6f8d895 100644
--- a/src/views/Appraising/index.vue
+++ b/src/views/Appraising/index.vue
@@ -52,7 +52,7 @@
// 评优任务列表
evaluateTaskData() {
let data = {
- type: 0
+ candidateState: 1
// userId: localStorage.getItem("tokensave")
// dept_id: localStorage.getItem("dept_id")
};
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index 1d3e505..18a6eb1 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -54,8 +54,8 @@
<van-uploader :after-read="(file) => afterread(file, index)" multiple>
<img src="images/pic.png" class="pic" />
</van-uploader>
- <img src="images/anonymous.png" class="anonymous" @click="SubmitComment(1,item)" />
- <div class="notanonymous" v-show="isshownotnm" @click="SubmitComment(2,item)">
+ <img src="images/anonymous.png" class="anonymous" @click="SubmitComment(1,item,index)" />
+ <div class="notanonymous" v-show="isshownotnm" @click="SubmitComment(2,item,index)">
<img src="images/notanonymous.png" />
</div>
</div>
@@ -83,7 +83,9 @@
return {
isshownotnm: true,
messageData: [],
- pageswitch: { current: 1, size: 10, descs: "update_time" }
+ pageswitch: { current: 1, size: 5, descs: "update_time" },
+ scrollBottom: "",
+ lastscrollBottom: ""
};
},
@@ -102,22 +104,22 @@
mounted() {},
methods: {
getScroll(event) {
- let scrollBottom =
+ this.scrollBottom =
event.target.scrollHeight -
event.target.scrollTop -
event.target.clientHeight;
- if (scrollBottom < 200) {
- this.pageswitch.size += 10;
- this.current.current += 1;
- this.getmessagelist(this.pageswitch);
+ if (this.scrollBottom < 200) {
+ if (this.lastscrollBottom > this.scrollBottom) {
+ this.pageswitch.current += 1;
+ this.getmessagelist();
+ }
}
+ this.lastscrollBottom = this.scrollBottom;
},
// 获取数据
getmessagelist() {
leaveWordslist(this.pageswitch).then(res => {
- const mergedArray = this.messageData.concat(res.data.data.records);
- this.messageData = mergedArray;
- this.messageData.forEach((item, indexto) => {
+ res.data.data.records.forEach((item, indexto) => {
if (item.imageUrls != "") {
item.imageUrls = item.imageUrls.split(",");
}
@@ -129,6 +131,8 @@
});
}
});
+ const mergedArray = this.messageData.concat(res.data.data.records);
+ this.messageData = mergedArray;
let kehuarray = [];
if (localStorage.getItem("tokensave") == "111") {
this.messageData.forEach((item, indexto) => {
@@ -140,11 +144,8 @@
}
});
},
- handScroll(event) {
- console.log(event);
- },
// 提交评论：1匿名提交，2不匿名提交
- SubmitComment(key, item) {
+ SubmitComment(key, item, index) {
if (item.inputValue == undefined && item.imageDatatoup == undefined) {
this.$toast.fail("请输入留言内容");
} else {
@@ -162,12 +163,14 @@
toData.userDept = localStorage.getItem("dept_name");
toData.userPost = localStorage.getItem("post_name");
}
- leaveWords(toData).then(res => {
- if (res.data.code == 200) {
- this.$toast.success("评论成功");
- this.getmessagelist();
- }
- });
+ item.children.push(toData);
+ console.log(this.messageData);
+ // leaveWords(toData).then(res => {
+ // if (res.data.code == 200) {
+ // this.$toast.success("评论成功");
+ // this.getmessagelist();
+ // }
+ // });
}
},
// 删除图片
@@ -226,7 +229,7 @@
<style scoped lang="scss">
.boxliuyan {
- height: 100%;
+ height: 100vh;
overflow: auto;
.Stay {
width: 100%;
diff --git a/src/views/toAppraising/index.vue b/src/views/toAppraising/index.vue
index f61e3a2..db41407 100644
--- a/src/views/toAppraising/index.vue
+++ b/src/views/toAppraising/index.vue
@@ -152,6 +152,7 @@
this.$toast.fail("请输入推荐理由");
} else {
this.disabledsubmit = true;
+ this.submitdata.remark = this.remark;
this.poepleinfo.jsonArr.push(this.submitdata);
setTimeout(() => {
this.$router.push({
--
Gitblit v1.9.3