From 592c506c231d0e450830769fb4a16532681ea63a Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Wed, 29 Jun 2022 14:34:42 +0800
Subject: [PATCH] =?UTF-8?q?341=E4=B8=AA=E4=BA=BA=E5=8A=9E=E5=85=AC-?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8A=A8=E6=80=81-=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/activiti/my-work-dynamics.vue     | 338 +++++++++---------
 .../src/views/demandCenter/demandDetails.vue  |  37 +-
 2 files changed, 189 insertions(+), 186 deletions(-)

diff --git a/back/src/views/modules/activiti/my-work-dynamics.vue b/back/src/views/modules/activiti/my-work-dynamics.vue
index 2c49710e..144991c8 100644
--- a/back/src/views/modules/activiti/my-work-dynamics.vue
+++ b/back/src/views/modules/activiti/my-work-dynamics.vue
@@ -340,15 +340,15 @@
 <script>
 // @ is an alias to /src
 export default {
-  data() {
+  data () {
     return {
-      fileUploadUrl: window.SITE_CONFIG.apiURL + "/upload",
+      fileUploadUrl: window.SITE_CONFIG.apiURL + '/upload',
       // 表格筛选条件对象
       queryData: {
-        keyworld: "",
+        keyworld: '',
         pageIndex: 1,
         pageSize: 10,
-        total: 0,
+        total: 0
       },
       // 表格数据数组对象
       tableData: [],
@@ -359,307 +359,307 @@ export default {
       // imageUrl: '',
       // 新增数据表单对象
       addDataFrom: {
-        title: "",
-        note1: "",
-        content: "",
-        imageUrl: "",
-        delFlag: 0,
+        title: '',
+        note1: '',
+        content: '',
+        imageUrl: '',
+        delFlag: 0
       },
       // 新增数据表单验证对象
       addDataFromRules: {
-        title: [{ required: true, message: "请输入标题", trigger: "blur" }],
-        note1: [{ required: true, message: "请输入摘要", trigger: "blur" }],
-        content: [{ required: true, message: "请输入内容", trigger: "blur" }],
+        title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
+        note1: [{ required: true, message: '请输入摘要', trigger: 'blur' }],
+        content: [{ required: true, message: '请输入内容', trigger: 'blur' }],
         imageUrl: [
-          { required: true, message: "请输入图片地址", trigger: "blur" },
-        ],
+          { required: true, message: '请输入图片地址', trigger: 'blur' }
+        ]
       },
       editDataDialogVisabled: false,
       eidtDataForm: {
-        title: "",
-        note1: "",
-        content: "",
-        imageUrl: "",
+        title: '',
+        note1: '',
+        content: '',
+        imageUrl: ''
       },
       eidtDataFromRules: {
-        title: [{ required: true, message: "请输入标题", trigger: "blur" }],
-        note1: [{ required: true, message: "请输入摘要", trigger: "blur" }],
-        content: [{ required: true, message: "请输入内容", trigger: "blur" }],
+        title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
+        note1: [{ required: true, message: '请输入摘要', trigger: 'blur' }],
+        content: [{ required: true, message: '请输入内容', trigger: 'blur' }],
         imageUrl: [
-          { required: true, message: "请输入图片地址", trigger: "blur" },
-        ],
+          { required: true, message: '请输入图片地址', trigger: 'blur' }
+        ]
       },
       perviewDataDialogVisabled: false,
       previewData: {
-        title: "",
-        note1: "",
-        content: "",
-        imageUrl: "",
-        delFlag: 0,
+        title: '',
+        note1: '',
+        content: '',
+        imageUrl: '',
+        delFlag: 0
       },
-      previewImg: "", // 预览图片
+      previewImg: '', // 预览图片
       deleteDataArr: [],
-      dialogVisibleImg: false,
-    };
+      dialogVisibleImg: false
+    }
   },
-  created() {
-    this.getTableData();
+  created () {
+    this.getTableData()
   },
   methods: {
-    tableChange(val) {
-      this.deleteDataArr = val.map((item) => item.id);
-      console.log(this.deleteDataArr);
+    tableChange (val) {
+      this.deleteDataArr = val.map((item) => item.id)
+      console.log(this.deleteDataArr)
     },
-    restTableData() {
-      this.queryData.keyworld = "";
-      this.getTableData();
+    restTableData () {
+      this.queryData.keyworld = ''
+      this.getTableData()
     },
-    showView(file) {
-      this.previewImg = file.url;
-      this.dialogVisibleImg = true;
+    showView (file) {
+      this.previewImg = file.url
+      this.dialogVisibleImg = true
     },
-    getTableData() {
+    getTableData () {
       this.$http
-        .get("/workdynamics/page", {
+        .get('/workdynamics/page', {
           params: {
             limit: this.queryData.pageSize,
             page: this.queryData.pageIndex,
-            name: this.queryData.keyworld,
-          },
+            name: this.queryData.keyworld
+          }
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
-          this.tableData = res.data.list;
-          this.queryData.total = res.data.total;
+          this.tableData = res.data.list
+          this.queryData.total = res.data.total
         })
-        .catch(() => {});
+        .catch(() => {})
     },
-    flashTableData() {
-      this.queryData.pageIndex = 1;
-      this.getTableData();
+    flashTableData () {
+      this.queryData.pageIndex = 1
+      this.getTableData()
     },
     // 分页大小更改
-    handleSizeChange(value) {
-      this.queryData.pageSize = value;
-      this.getTableData();
+    handleSizeChange (value) {
+      this.queryData.pageSize = value
+      this.getTableData()
     },
     // 当前索引更改
-    handleCurrentChange(val) {
-      this.queryData.pageIndex = val;
-      this.getTableData();
+    handleCurrentChange (val) {
+      this.queryData.pageIndex = val
+      this.getTableData()
     },
     // 新增数据窗口关闭事件
-    addDataDialogClose() {
-      this.$refs.addDataFormRef.resetFields();
-      this.addDataFrom.imageUrl = "";
-      this.$refs.addUpload.clearFiles();
+    addDataDialogClose () {
+      this.$refs.addDataFormRef.resetFields()
+      this.addDataFrom.imageUrl = ''
+      this.$refs.addUpload.clearFiles()
       // this.addDataFrom.imagesFiles = []
       // this.$refs.addDataFromUploadRef.clearFiles()
     },
-    editDataDialogClose() {
-      this.$refs.editDataFormRef.resetFields();
-      this.eidtDataForm.imageUrl = "";
-      this.$refs.editUpload.clearFiles();
+    editDataDialogClose () {
+      this.$refs.editDataFormRef.resetFields()
+      this.eidtDataForm.imageUrl = ''
+      this.$refs.editUpload.clearFiles()
     },
     // 追加数据
-    addDataDialogConfirm() {
+    addDataDialogConfirm () {
       this.$refs.addDataFormRef.validate(async (valid) => {
         if (valid) {
-          //console.log("新增新增", this.addDataFrom);
+          // console.log("新增新增", this.addDataFrom);
           this.$http
-            .post("/workdynamics/insert", this.addDataFrom)
+            .post('/workdynamics/insert', this.addDataFrom)
             .then(({ data: res }) => {
               if (res.code !== 0) {
-                return this.$message.error(res.msg);
+                return this.$message.error(res.msg)
               }
-              this.$message.success("新增成功");
-              this.addDataDialogVisabled = false;
-              this.getTableData();
+              this.$message.success('新增成功')
+              this.addDataDialogVisabled = false
+              this.getTableData()
             })
-            .catch(() => {});
+            .catch(() => {})
         } else {
-          this.$message.success("表单数据填写不完整");
+          this.$message.success('表单数据填写不完整')
         }
-      });
+      })
     },
     // 限定图片
-    handleExceed() {
-      this.$message({ type: "error", message: "最多支持一张图片上传" });
+    handleExceed () {
+      this.$message({ type: 'error', message: '最多支持一张图片上传' })
     },
     // 限制标题
-    titleExceed(str) {
+    titleExceed (str) {
       if (str.length >= 200) {
-        this.$message.error("标题文字不能超过200字");
+        this.$message.error('标题文字不能超过200字')
       }
     },
     // 限制内容
-    contentExceed(str) {
+    contentExceed (str) {
       if (str.length >= 2000) {
-        this.$message.error("内容文字不能超过2000字");
+        this.$message.error('内容文字不能超过2000字')
       }
     },
-    //限制摘要
-    noteExceed(str) {
+    // 限制摘要
+    noteExceed (str) {
       if (str.length >= 1000) {
-        this.$message.error("摘要文字不能超过1000字");
+        this.$message.error('摘要文字不能超过1000字')
       }
     },
     // 删除数据
-    deleteData(row) {
-      console.log(row);
-      this.$confirm("此操作将删除当前数据, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+    deleteData (row) {
+      console.log(row)
+      this.$confirm('此操作将删除当前数据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(async () => {
-          let ids = [];
+          let ids = []
           if (this.deleteDataArr.length > 1) {
-            ids = this.deleteDataArr;
+            ids = this.deleteDataArr
           } else {
-            ids = [row.id];
+            ids = [row.id]
           }
-          console.log(ids);
+          console.log(ids)
           this.$http
-            .delete("/workdynamics/delete", {
-              data: ids,
+            .delete('/workdynamics/delete', {
+              data: ids
             })
             .then(({ data: res }) => {
               if (res.code !== 0) {
-                return this.$message.error(res.msg);
+                return this.$message.error(res.msg)
               }
               this.$message({
-                type: "success",
-                message: "删除成功!",
-              });
-              this.getTableData();
-            });
+                type: 'success',
+                message: '删除成功!'
+              })
+              this.getTableData()
+            })
         })
         .catch(() => {
           this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
     },
-    //预览工作动态信息
-    async openPreviewData(row) {
-      console.log("预览预览", row);
+    // 预览工作动态信息
+    async openPreviewData (row) {
+      console.log('预览预览', row)
       const { data: res } = await this.$http.get(
         `workdynamics/select/${row.id}`
-      );
+      )
 
       if (res.code !== 0) {
-        return this.$message.error(res.msg);
+        return this.$message.error(res.msg)
       }
 
-      this.previewData = res.data;
+      this.previewData = res.data
 
-      this.perviewDataDialogVisabled = true;
+      this.perviewDataDialogVisabled = true
     },
-    perviewDataDialogClose() {
-      this.perviewDataDialogVisabled = false;
+    perviewDataDialogClose () {
+      this.perviewDataDialogVisabled = false
     },
-    handleAvatarSuccess(res, file) {
+    handleAvatarSuccess (res, file) {
       if (res.code !== 0) {
-        return this.$message.error(res.msg);
+        return this.$message.error(res.msg)
       }
 
-      this.addDataFrom.imageUrl = res.data;
+      this.addDataFrom.imageUrl = res.data
       // this.imageUrl = URL.createObjectURL(file.raw);
     },
-    beforeAvatarUpload(file) {
+    beforeAvatarUpload (file) {
       const isImage =
-        file.type === "image/jpeg" ||
-        file.type === "image/jpg" ||
-        file.type === "image/png";
-      const isLt2M = file.size / 1024 / 1024 < 2;
+        file.type === 'image/jpeg' ||
+        file.type === 'image/jpg' ||
+        file.type === 'image/png'
+      const isLt2M = file.size / 1024 / 1024 < 2
 
       if (!isImage) {
-        this.$message.error("上传头像图片只能是 JPG 格式!");
+        this.$message.error('上传头像图片只能是 JPG 格式!')
       }
       if (!isLt2M) {
-        this.$message.error("上传头像图片大小不能超过 2MB!");
+        this.$message.error('上传头像图片大小不能超过 2MB!')
       }
-      return isImage && isLt2M;
+      return isImage && isLt2M
     },
-    eidtHandleAvatarSuccess(res, file) {
+    eidtHandleAvatarSuccess (res, file) {
       if (res.code !== 0) {
-        return this.$message.error(res.msg);
+        return this.$message.error(res.msg)
       }
 
-      this.eidtDataForm.imageUrl = res.data;
+      this.eidtDataForm.imageUrl = res.data
       // this.imageUrl = URL.createObjectURL(file.raw);
     },
-    editBeforeAvatarUpload(file) {
+    editBeforeAvatarUpload (file) {
       const isImage =
-        file.type === "image/jpeg" ||
-        file.type === "image/jpg" ||
-        file.type === "image/png";
-      const isLt2M = file.size / 1024 / 1024 < 2;
+        file.type === 'image/jpeg' ||
+        file.type === 'image/jpg' ||
+        file.type === 'image/png'
+      const isLt2M = file.size / 1024 / 1024 < 2
 
       if (!isImage) {
-        this.$message.error("上传头像图片只能是 JPG 格式!");
+        this.$message.error('上传头像图片只能是 JPG 格式!')
       }
       if (!isLt2M) {
-        this.$message.error("上传头像图片大小不能超过 2MB!");
+        this.$message.error('上传头像图片大小不能超过 2MB!')
       }
-      return isImage && isLt2M;
+      return isImage && isLt2M
     },
-    async openEditDialog(row) {
+    async openEditDialog (row) {
       const { data: res } = await this.$http.get(
         `workdynamics/select/${row.id}`
-      );
+      )
 
       if (res.code !== 0) {
-        return this.$message.error(res.msg);
+        return this.$message.error(res.msg)
       }
 
-      this.eidtDataForm = res.data;
+      this.eidtDataForm = res.data
 
-      this.editDataDialogVisabled = true;
+      this.editDataDialogVisabled = true
     },
-    eidtDataDialogConfirm() {
+    eidtDataDialogConfirm () {
       this.$refs.editDataFormRef.validate(async (valid) => {
         if (valid) {
-          console.log(this.eidtDataForm);
+          console.log(this.eidtDataForm)
           this.$http
-            .put("/workdynamics/update", this.eidtDataForm)
+            .put('/workdynamics/update', this.eidtDataForm)
             .then(({ data: res }) => {
               if (res.code !== 0) {
-                return this.$message.error(res.msg);
+                return this.$message.error(res.msg)
               }
-              this.$message.success("编辑成功");
-              this.editDataDialogVisabled = false;
-              this.getTableData();
+              this.$message.success('编辑成功')
+              this.editDataDialogVisabled = false
+              this.getTableData()
             })
-            .catch(() => {});
+            .catch(() => {})
         } else {
-          this.$message.success("表单数据填写不完整");
+          this.$message.success('表单数据填写不完整')
         }
-      });
+      })
     },
-    addUploadRemoveFile(file, fileList) {
-      this.$refs.addUpload.clearFiles();
-      this.addDataFrom.imageUrl = "";
-    },
-    editUploadRemoveFile(file, fileList) {
-      this.$refs.editUpload.clearFiles();
-      this.eidtDataForm.imageUrl = "";
+    addUploadRemoveFile (file, fileList) {
+      this.$refs.addUpload.clearFiles()
+      this.addDataFrom.imageUrl = ''
     },
+    editUploadRemoveFile (file, fileList) {
+      this.$refs.editUpload.clearFiles()
+      this.eidtDataForm.imageUrl = ''
+    }
   },
   computed: {
-    editDialogShowFileList() {
+    editDialogShowFileList () {
       if (this.eidtDataForm.imageUrl) {
         return [
-          { name: this.eidtDataForm.imageUrl, url: this.eidtDataForm.imageUrl },
-        ];
+          { name: this.eidtDataForm.imageUrl, url: this.eidtDataForm.imageUrl }
+        ]
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 <style scoped lang="scss">
 ::v-deep .el-checkbox__input.is-checked .el-checkbox__inner,
@@ -728,7 +728,7 @@ export default {
 
   .preview-title {
     width: 100%;
-    height: 90px;
+    min-height: 90px;
     //margin-top: -40px;
     border-bottom: solid #c6c6c6 1px;
     .title-text {
@@ -752,7 +752,7 @@ export default {
   }
   .preview-note {
     width: 100%;
-    height: 100px;
+    min-height: 100px;
     text-align: left;
     margin-top: 24px;
     text-indent: 2em;
diff --git a/front/src/views/demandCenter/demandDetails.vue b/front/src/views/demandCenter/demandDetails.vue
index cbf6ca70..40b0669f 100644
--- a/front/src/views/demandCenter/demandDetails.vue
+++ b/front/src/views/demandCenter/demandDetails.vue
@@ -231,6 +231,7 @@
             size="small"
             pageSize="8"
             :total="total"
+            v-model:current="page"
             @change="handleCurrentChange"
           />
         </a-list>
@@ -248,7 +249,7 @@
   import {
     demandComment,
     demandCommentPage,
-    demandCommentDelete,
+    // demandCommentDelete,
     demandCommentApply,
   } from '@/api/demandCenter'
   import { getUser, getUserInfo } from '@/api/home'
@@ -264,15 +265,15 @@
     })
   })
   //删除提示框
-  const confirm = (item) => {
-    console.log(item)
-    evaluateDelete(item)
-  }
+  // const confirm = (item) => {
+  //   console.log(item)
+  //   evaluateDelete(item)
+  // }
 
-  const cancel = (e) => {
-    console.log(e)
-    message.error('已取消删除')
-  }
+  // const cancel = (e) => {
+  //   console.log(e)
+  //   message.error('已取消删除')
+  // }
   // const store = useStore()
   const router = useRouter()
 
@@ -322,14 +323,14 @@
   //   })
   // }
 
-  const evaluateDelete = (item) => {
-    demandCommentDelete([item.id]).then((res) => {
-      if (res.data.code == 0) {
-        message.success('删除评论成功！')
-      }
-      evaluateList()
-    })
-  }
+  // const evaluateDelete = (item) => {
+  //   demandCommentDelete([item.id]).then((res) => {
+  //     if (res.data.code == 0) {
+  //       message.success('删除评论成功！')
+  //     }
+  //     evaluateList()
+  //   })
+  // }
   const evaluateList = () => {
     const params = {
       page: page.value,
@@ -339,6 +340,7 @@
     demandCommentPage(params).then((res) => {
       evaluateData.value = res.data.data.list
       total.value = res.data.data.total
+      console.log(evaluateData, 'evaluateData')
     })
   }
 
@@ -382,6 +384,7 @@
     // formName.value = formData.value
     const id = router.currentRoute.value.query.id
     getDemandForm(id).then((res) => {
+      console.log(res, 'res')
       const { data } = res.data
       formName.value.applyUserName = data.applyUserName
       formName.value.applyUserPhone = data.applyUserPhone