From 5a157ef70b6c011066464b5741835a370327c95e Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Sat, 22 Oct 2022 14:32:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AF=B9U=E5=B8=81=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Portal/interactBar.vue | 55 ++++++++++++++-------------
 src/views/article/ManageList.vue      | 44 +++++----------------
 src/views/course/ManageList.vue       | 47 +++++++++--------------
 src/views/portal/qa/Answer.vue        | 38 ++++++++++--------
 4 files changed, 79 insertions(+), 105 deletions(-)

diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue
index d3848d08..f064c8b7 100644
--- a/src/components/Portal/interactBar.vue
+++ b/src/components/Portal/interactBar.vue
@@ -347,21 +347,22 @@ export default {
               if(this.unicom) {
                 this.$store.dispatch("unicomPraises",false)
               }
-
-              let event = {
-                key: "cancelPraise",//
-                title: "取消点赞",//事件的标题
-                parameters:"author:"+this.data.sysCreateAid,//用户自定义参数 name:value,name:value
-                content: "取消点赞"+postData.title,//事件的内容
-                objId: this.data.id,//关联的id
-                objType: this.type,//关联的类型
-                objInfo: this.data.title,
-                aid: this.userInfo.aid, //当前登录人的id
-                aname: this.userInfo.name,//当前人的姓名
-                status: 1 //状态，直接写1
+              //自己给自己点赞不算
+              if(this.userInfo.aid!=this.data.sysCreateAid){
+                let event = {
+                  key: "CancelPraise",//
+                  title: "取消点赞",//事件的标题
+                  parameters:"author:"+this.data.sysCreateAid,//用户自定义参数 name:value,name:value
+                  content: "取消点赞"+postData.title,//事件的内容
+                  objId: this.data.id,//关联的id
+                  objType: this.type,//关联的类型
+                  objInfo: this.data.title,
+                  aid: this.userInfo.aid, //当前登录人的id
+                  aname: this.userInfo.name,//当前人的姓名
+                  status: 1 //状态，直接写1
+                }
+                this.$store.dispatch("userTrigger", event);
               }
-              this.$store.dispatch("userTrigger", event);
-
               this.$message({message:'取消点赞',type:'success'})
             }else{
               console.log('取消失败：'+res.message);
@@ -385,19 +386,21 @@ export default {
               // }
               this.isPraise=true;
               this.$message({message:'点赞成功',type:'success'})
-              let event = {
-                key: "Praise",//后台的事件key  发布文章且审核通过
-                title: "点赞",//事件的标题
-                parameters:"author:"+this.data.sysCreateAid,//用户自定义参数 name:value,name:value
-                content: "点赞"+postData.title,//事件的内容
-                objId: this.data.id,//关联的id
-                objType: this.type,//关联的类型
-                objInfo: this.data.title,
-                aid: this.userInfo.aid, //当前登录人的id
-                aname: this.userInfo.name,//当前人的姓名
-                status: 1 //状态，直接写1
+              if(this.userInfo.aid!=this.data.sysCreateAid){
+                let event = {
+                  key: "Praise",//后台的事件key  发布文章且审核通过
+                  title: "点赞",//事件的标题
+                  parameters:"author:"+this.data.sysCreateAid,//用户自定义参数 name:value,name:value
+                  content: "点赞"+postData.title,//事件的内容
+                  objId: this.data.id,//关联的id
+                  objType: this.type,//关联的类型
+                  objInfo: this.data.title,
+                  aid: this.userInfo.aid, //当前登录人的id
+                  aname: this.userInfo.name,//当前人的姓名
+                  status: 1 //状态，直接写1
+                }
+                this.$store.dispatch("userTrigger", event);
               }
-              this.$store.dispatch("userTrigger", event);
             }else{
               console.log('点赞失败：'+res.message);
             }
diff --git a/src/views/article/ManageList.vue b/src/views/article/ManageList.vue
index f59be91f..386b4ac5 100644
--- a/src/views/article/ManageList.vue
+++ b/src/views/article/ManageList.vue
@@ -1,23 +1,9 @@
 <template>
   <div class="u-page" style="padding-right:32px">
-    <Remark>
-      <ul>
-        <li>正文内容需求上要求显示两行，建议不显示 上架和下架图标待定</li>
-        <li>
-          上架和审核没有对应接口，先写好了，到时候换个名就行,数据传参也可以改一下
-        </li>
-        <li>点击标题打开新页面并且传参不会</li>
-      </ul>
-    </Remark>
     <div style="padding: 2px 0px 10px 8px;">
       <div style="display: flex; justify-content: flex-start">
         <div style="padding: 0px 5px">
-          <el-select
-            v-model="pageData.status"
-            style="width: 110px"
-            clearable
-            placeholder="审核状态"
-          >
+          <el-select   v-model="pageData.status"   style="width: 110px" clearable placeholder="审核状态" >
             <el-option label="全部" value=""></el-option>
             <el-option label="草稿" :value="1"></el-option>
             <el-option label="待审核" :value="2"></el-option>
@@ -27,19 +13,10 @@
           </el-select>
         </div>
         <div style="padding: 0px 5px">
-          <el-input
-            placeholder="关键词搜索"
-            v-model="pageData.keyword"
-            clearable
-          ></el-input>
+          <el-input placeholder="关键词搜索"  v-model="pageData.keyword" clearable ></el-input>
         </div>
         <div style="padding: 0px 5px">
-          <el-button
-            @click="getsearch"
-            icon="el-icon-search"
-            type="primary"
-            >搜索</el-button
-          >
+          <el-button @click="getsearch"  icon="el-icon-search"  type="primary">搜索</el-button >
           <!-- <el-button type="primary" >批量设置推荐</el-button> -->
         </div>
 
@@ -223,19 +200,16 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      })
-        .then(() => {
-          apiArticle
-            .del(item.id)
-            .then((res) => {
+      }).then(() => {
+          apiArticle.del(item.id).then((res) => {
               if (res.status == 200) {
                 this.$message.success('删除成功')
                  this.getArticleList()
                  let event = {
-                  key: "DeleteArticle",//后台的事件key  发布文章且审核通过
-                  title: '删除文章（被删除）',//事件的标题
-                  parameters:"",//用户自定义参数 name:value,name:value
-                  content: '删除文章（被删除）',//事件的内容
+                  key: "ArticleDelete",//被管理员删除
+                  title: '被管理员删除文章',//事件的标题
+                  parameters:"author:"+item.sysCreateAid,//用户自定义参数 name:value,name:value
+                  content: '被管理员删除文章',//事件的内容
                   objId: item.id,//关联的id
                   objType: "2",//关联的类型
                   objInfo:item.title,
diff --git a/src/views/course/ManageList.vue b/src/views/course/ManageList.vue
index 7993e521..84f36b93 100644
--- a/src/views/course/ManageList.vue
+++ b/src/views/course/ManageList.vue
@@ -1,15 +1,5 @@
 <template>
   <div >
-    <!-- <Remark>
-      1.课程的管理，状态：未发布，待审核，已审核，审核不通过，已发布
-      <br />
-      2.关于动态配置列，先记录下来，后续再设置。
-      <br />
-      3.课程的创建，可不可以先创建课程基本信息，然后再填写目录课程等资源内容？？
-      <br />
-      4."管理"的功能界面需要定一下,
-      <br />
-    </Remark> -->
     <div style="padding: 12px 12px 10px 22px;">
       <!-- <div style="display: flex;justify-content:flex-start;"> -->
         <!-- <el-row :gutter="5">
@@ -667,9 +657,9 @@ export default {
     },
     showQrimage(row) {
       this.qrcodeShow = true;
-      
+
       let urlPre=window.location.protocol+'//'+window.location.host;
-      
+
       //动态的地址
       //urlPre=urlPre+'/m?returnUrl='+urlPre+'/mobile/pages/login/loading?returnUrl=';
       //固定的地址
@@ -775,8 +765,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      })
-        .then(async() => {
+      }).then(async() => {
             let params = {
          id: row.id,
          title: row.name,
@@ -786,21 +775,23 @@ export default {
         //  {id:课程id,多个使用逗号分隔,Boolean erasable 是否物理删除,title:课程的名称, remark 备注}
         const {status} = await apiCourse.del(params);
         if(status === 200) {
-          this.$message.success('操作成功！');
-
-          let event = {
-            key: "DeleteCourse",//后台的事件key  发布文章且审核通过
-            title: '删除课程',//事件的标题
-            parameters:"",//用户自定义参数 name:value,name:value
-            content: '删除课程',//事件的内容
-            objId: row.id,//关联的id
-            objType: "1",//关联的类型
-            objInfo:row.name,
-            aid: this.userInfo.aid, //当前登录人的id
-            aname: this.userInfo.name,//当前人的姓名
-            status: 1 //状态，直接写1
+          this.$message.success('操作成功！'); //只是之前发布过的课程删除才可
+          if(!row.erasable){
+            let event = {
+              key: "CourseDelete",//被管理员删除
+              title: '被管理员删除课程',//事件的标题
+              parameters:"author:"+row.sysCreateAid,//作者，一般这种情况不是管理员自己添加的
+              content: '被管理员删除课程',//事件的内容
+              objId: row.id,//关联的id
+              objType: "1",//关联的类型
+              objInfo:row.name,
+              aid: this.userInfo.aid, //当前登录人的id
+              aname: this.userInfo.name,//当前人的姓名
+              status: 1 //状态，直接写1
+            }
+            this.$store.dispatch("userTrigger", event);
           }
-          this.$store.dispatch("userTrigger", event);
+         
           this.searchData();
         }
       } catch (error) {
diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue
index 494bbb18..e65b2834 100644
--- a/src/views/portal/qa/Answer.vue
+++ b/src/views/portal/qa/Answer.vue
@@ -9,7 +9,7 @@
           <div v-if="noData">
             <div class="qust-detail">
               <div class="xpage-detail-crumbs">
-                  <router-link to="/case"><span class="crumbs-first">问答列表</span></router-link>
+                  <router-link to="/qa"><span class="crumbs-first">问答列表</span></router-link>
                   <span class="crumbs-line">/</span>
                   <span class="crumbs-last">问答详情</span>
               </div>
@@ -49,7 +49,7 @@
 
             </div>
             <div style="background-color: #fff;">
-              <div class="wrt-answer" v-if="answerList.length > 0 || answerShow" style="margin-top: 30px;padding: 0px 40px;">
+              <div class="wrt-answer" v-if="answerList.length > 0 || answerShow" style="margin-top: 30px;padding: 50px 40px 20px 40px;">
                  <div class="answer-tit">
                    写回答
                  </div>
@@ -534,7 +534,7 @@ export default {
             res.result.list.forEach(item => {
               item.avatar = "";
               item.sex = null;
-              item.sign = " "; 
+              item.sign = " ";
               item.isAll = false;//字数过大时，显示隐藏控制
               allList.push(item);
               ids.push(item.sysCreateAid);
@@ -697,23 +697,29 @@ export default {
         const { id } = data;
         apiQa.delAnswer(id).then(res => {
           if (res.status == 200) {
+            this.$message({ message: "删除成功",  type: "success" });
+            let event = {
+              key: "DeleteAnswer",//自己删除自己的回答
+              title: "删除自己的回答",//事件的标题
+              parameters:"",//用户自定义参数 name:value,name:value
+              content: '删除了自己问题',//事件的内容
+              objId: id,//关联的id
+              objType: "5",//关联的类型
+              objInfo: this.detailData.title,
+              aid: this.userInfo.aid, //当前登录人的id
+              aname: this.userInfo.name,//当前人的姓名
+              status: 1 //状态，直接写1
+            }
+            this.$store.dispatch("userTrigger", event);
+
             this.loadAnswer();
             this.getQuestionDetail();
-            this.$message({
-              message: "删除成功",
-              type: "success"
-            });
+
           } else {
-            this.$message({
-              message: res.message,
-              type: "error"
-            });
+            this.$message({ message: res.message,  type: "error" });
           }
         }).catch(err => {
-          this.$message({
-            message: "删除失败",
-            type: "error"
-          });
+          this.$message({  message: "删除失败", type: "error" });
         });
       }).catch(() => { });
     },
@@ -1008,7 +1014,7 @@ export default {
   }
 
   .answer-body {
-    padding-left: 40px;
+    padding-left: 48px;
     .answer-text {
       //margin: 6px 0 15px;
       margin:6px 70px 15px 0px;//按ui图，让开右边区域位置