From e12aefb61b67a506c6561696d8c33c10425e68cf Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Wed, 12 Oct 2022 19:45:31 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Article/ucItems.vue     | 51 ++++++++++++++------------
 src/layout/components/TopNav/Index.vue |  5 ++-
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/components/Article/ucItems.vue b/src/components/Article/ucItems.vue
index 0f645f89..4f142003 100644
--- a/src/components/Article/ucItems.vue
+++ b/src/components/Article/ucItems.vue
@@ -1,16 +1,8 @@
 <template>
   <div>
-    <Remark :fixed="false">
-      <ul>
-        <li>class名为problem的dom(即时间)无法直接垂直居中</li>
-        <li>状态有草稿、待审核、未通过、已通过、已发布</li>
-        <li>状态为已发布时才显示点赞收藏图标</li>
-        <li>点击编辑时没有跳转到新页面</li>
-      </ul>
-    </Remark>
     <div class="article-list" v-for="(item, idx) in items" :key="idx" @click="jumpDetail(item)">
       <div class="article-info">
-        <div class="article-info-title one-line-ellipsis"  
+        <div class="article-info-title one-line-ellipsis"
         >
           <!-- <span v-if="item.enabled" :class="classFilter(item.status).className">{{classFilter(item.status).text}}</span> -->
           <!-- <span v-else class="article-status8">【已下架】</span> -->
@@ -53,6 +45,7 @@
 </template>
 
 <script>
+import { mapGetters } from "vuex";
 import interactBar from '@/components/Portal/interactBar.vue';
 import apiArticle from '@/api/modules/article.js';
 import editItems from '@/components/Article/editItems.vue';
@@ -60,6 +53,9 @@ export default {
   components: {
     interactBar,editItems
   },
+  computed: {
+    ...mapGetters(["userInfo"]),
+  },
   name: 'articleItems',
   props: {
     items: {
@@ -78,7 +74,7 @@ export default {
       }
     };
   },
-  
+
   filters:{
     sysCreateTimeFilter(item){
       return item.split(' ')[0]
@@ -146,26 +142,35 @@ 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.$emit('update',true)
                 this.$message.success('删除成功');
-                console.log('shanchushanchu')
+                //发送删除事件
+                let event = {
+                  key: "DeleteArticle",//后台的事件key  发布文章且审核通过
+                  title: "删除文章",//事件的标题
+                  parameters:"",//用户自定义参数 name:value,name:value
+                  content: "删除文章",//事件的内容
+                  source:'page',
+                  objId: item.id,//关联的id
+                  objType: "2",//关联的类型
+                  objInfo: item.title,
+                  aid: this.userInfo.aid, //当前登录人的id
+                  aname: this.userInfo.name,//当前人的姓名
+                  status: 1 //状态，直接写1
+                }
+                this.$store.dispatch("userTrigger", event);
+
 
               }else{
-                this.$message.error('删除失败');
+                this.$message.error('删除失败:'+res.message);
               }
-            })
-            .catch(err => {
+            }).catch(err => {
               this.$message.error('删除失败');
             });
-        })
-        .catch(() => {});
+        }).catch(() => {});
     }
   }
 };
@@ -275,7 +280,7 @@ export default {
 width: 100%;
     font-size: 18px;
     // font-weight: 400;
-    
+
     // height: 40px;
     margin-top: 7px;
     // line-height: 40px;
diff --git a/src/layout/components/TopNav/Index.vue b/src/layout/components/TopNav/Index.vue
index fe1e379c..c8153d7f 100644
--- a/src/layout/components/TopNav/Index.vue
+++ b/src/layout/components/TopNav/Index.vue
@@ -41,7 +41,7 @@
           <!-- </div> -->
           <div>
             <el-badge :value="userMsg" :hidden="userMsg==0" class="message-count">
-              <el-link type="primary" :href="`${webBaseUrl}/message/center/index`" target="_blank" :underline="false">
+              <el-link type="primary" :href="`${webBaseUrl}/message/center/index`" :underline="false">
                 <svg-icon style="margin-right: 0;font-size:26px;" icon-class="messfff"></svg-icon>
               </el-link>
             </el-badge>
@@ -126,6 +126,7 @@ export default {
   components:{InterestCollection,GuideBox},
   data() {
     return {
+      isTiao:false,
       interestShow:false,
       checked:true,
       signInShow: false,
@@ -430,7 +431,7 @@ export default {
         color:#409EFF;
       }
     }
-   
+
     .el-button{
 		margin-top: 1px;
       // margin-left: 20px;

From 660bccd777a0abcd0eabf87758253df6152e395f Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Wed, 12 Oct 2022 19:55:15 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E9=98=85=E8=AF=BB=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=A2=9E=E5=8A=A060?=
 =?UTF-8?q?=E7=A7=92=E7=9A=84=E5=AD=A6=E4=B9=A0=E6=97=B6=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/article/Detail.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/portal/article/Detail.vue b/src/views/portal/article/Detail.vue
index 43f1b72a..0bff7c24 100644
--- a/src/views/portal/article/Detail.vue
+++ b/src/views/portal/article/Detail.vue
@@ -249,9 +249,10 @@ export default {
             this.setTime = setTimeout(()=>{
               event.key = 'ReadArticle';
               event.title = "阅读文章";
+              event.parameters='second:60';//增加60秒的学习时长
               event.content = "阅读了文章"
               $this.$store.dispatch("userTrigger", event);
-            },2000);
+            },61000);//1分钟后记录
           //}
         }else{
           this.noData = false;

From 702ddadf88171db5f550fdc275654981551dcbae Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Thu, 13 Oct 2022 09:22:25 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                      |  2 +-
 src/components/Portal/interactBar.vue | 21 ++++++++++++++++++---
 vue.config.js                         |  4 ++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.env.development b/.env.development
index 39d80e88..734c2c07 100644
--- a/.env.development
+++ b/.env.development
@@ -10,7 +10,7 @@ VUE_APP_BASE_API = '/systemapi'
 VUE_APP_BOE_BASE_API = '/uboeApi'
 
 # 资源位的api
-VUE_APP_CESOURCE_BASE_API = '/subgroupApi'
+VUE_APP_CESOURCE_BASE_API = '/socialApi'
 
 # 事件的api
 VUE_APP_STAT_BASE_API = '/statApi'
diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue
index 14123306..d9e2a60d 100644
--- a/src/components/Portal/interactBar.vue
+++ b/src/components/Portal/interactBar.vue
@@ -26,7 +26,7 @@
         </el-tooltip>
         <span class="interact-bar-value"> {{data.comments}}</span>
       </div>
-      
+
       <div v-if="praises" @click="addPraise()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="点赞" placement="top" :visible-arrow="false" popper-class="text-tooltip">
           <svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon>
@@ -336,6 +336,21 @@ 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: "取消点赞"+this.data.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.$message({message:'取消点赞',type:'success'})
             }else{
               console.log('取消失败：'+res.message);
@@ -362,7 +377,7 @@ export default {
               let event = {
                 key: "Praise",//后台的事件key  发布文章且审核通过
                 title: "点赞",//事件的标题
-                parameters:"",//用户自定义参数 name:value,name:value
+                parameters:"author:"+this.data.sysCreateAid,//用户自定义参数 name:value,name:value
                 content: "点赞"+this.data.title,//事件的内容
                 objId: this.data.id,//关联的id
                 objType: this.type,//关联的类型
@@ -552,7 +567,7 @@ export default {
                    }
                  }
                  let event = {
-                  key: "Share",//后台的事件key  
+                  key: "Share",//后台的事件key
                   title: "被分享",//事件的标题
                   parameters:"",//用户自定义参数 name:value,name:value
                   content: '被分享',//事件的内容
diff --git a/vue.config.js b/vue.config.js
index ed2e58eb..721dca5c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -141,14 +141,14 @@ module.exports = {
                   '^/statApi': ''
                 }
               },
-              '/subgroupApi': {
+              '/socialApi': {
                 // 目标代理服务器地址
                 target: 'http://192.168.0.11:9081',
                 changeOrigin: true,
                 logLevel:'debug',
                 secure: false,
                 pathRewrite: {
-                  '^/subgroupApi': ''
+                  '^/socialApi': ''
                 }
               },
         },

From 8d1d2b6edb3b8e589315800b18a54ed87d18b8e8 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Thu, 13 Oct 2022 10:26:39 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PortalHeader.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index 289f8486..49a2292b 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -74,7 +74,7 @@
               <el-badge class="person-action-index message-count"  :value="userMsg" :hidden="userMsg == 0">
                 <el-tooltip   content="消息" placement="bottom" effect="light" :visible-arrow="false" popper-class="text-tooltip">
                    <el-link  type="primary" :href="`${webBaseUrl}/message/center/index`" :underline="false">
-                    <svg-icon v-if="current == 'qa'"  style="margin-right: 0;font-size:26px;" icon-class="message"></svg-icon>
+                    <svg-icon v-if="current == 'qa' || 'index'"  style="margin-right: 0;font-size:26px;" icon-class="message"></svg-icon>
                     <svg-icon v-else style="margin-right: 0;font-size:26px;" icon-class="messfff"></svg-icon>
                    </el-link>
                 </el-tooltip>

From 2306008f81a3e347452d05de9099ff69f8d0c76a Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Thu, 13 Oct 2022 10:33:48 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E6=97=B6=E9=95=BF=E9=9D=9E=E9=9F=B3=E8=A7=86=E9=A2=91=E7=B1=BB?=
 =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/study/coursenew.vue | 53 +++++++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 5 deletions(-)

diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index c6aecf02..a712c802 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -329,6 +329,7 @@
         notetab: 1,
         localTimeKey:'boeu-study-time' ,//本地存储的学习时长的key   json格式
         localTimeValue:0,//计算的时间
+        appendStudyOtherHandle:null,
       }
     },
     mounted() {
@@ -372,6 +373,40 @@
       }
     },
     methods: {
+      //非音视频课学习时长的增加,每一分钟保存一次
+      appendStudyOtherTime() {
+        //console.log('开始追加学习时长',this.isAppendTime);
+        if (this.studyId == '') {
+          return;
+        }
+        if (!this.contentData.id) {
+          return;
+        }
+        let postData={
+            "key": "StudyCourseOther",//课程学习的key
+            "title": "非音视频课内容",//事件的标题
+            "parameters":"second:60",//second:value 本次的学习时长
+            "content": "学习课程【"+this.courseInfo.name+"】",//事件的内容
+            "objId": this.contentData.id,//课程的内容id
+            "objType": "1",//类型
+            "source":"page",
+            "objInfo": ""+this.contentData.contentName,
+            "aid":this.userInfo.aid, //当前登录人的id
+            "aname":this.userInfo.name,//当前人的姓名
+            "status": 1 //状态
+          }
+          //静默处理
+          apiStat.sendEvent(postData).then(rs=>{
+              if(rs.status != 200) {
+                console.log(rs.message);
+              }
+          });
+          //每一分钟保存一次
+          this.appendStudyOtherHandle = setTimeout(function() {
+            $this.appendStudyOtherTime();
+          }, 1000*60);
+
+      },
       //关注功能
       toFollow(item) {
         apiFollow.save(item.teacherId).then(res => {
@@ -529,8 +564,16 @@
           this.contentData.status = 2; //进行中
         }
         if (this.contentData.contentType > 20) { //非视频类的
-         //用户的学习时长，只是视听课的学习时长，所以这里不要追加学习时长
+         //用户的学习时长，非音视频课程学习,单独的处理
           this.isAppendTime = false;
+
+          if(this.appendStudyOtherHandle!=null){
+            windows.clearTimeout(this.appendStudyOtherHandle);
+          }
+
+          this.appendStudyOtherHandle = setTimeout(function() {
+            $this.appendStudyOtherTime();
+          }, 1000*60*2); //非音视频课程学习,2分钟后记录，因为一次记录是60秒
           //this.appendStudyTime();
           this.handleTimeout = setTimeout(function() {
             $this.saveStudyInfo();
@@ -1034,7 +1077,7 @@
       saveStudyDuration(duration) { //保存本地存储的学习时长
         if (duration > 0) {
           //发送用户学习事件
-          console.log('保存到后台学习时长='+duration);
+          //console.log('保存到后台学习时长='+duration);
           let postData={
               "key": "StudyCourse",//课程学习的key
               "title": "学习课程",//事件的标题
@@ -1042,7 +1085,7 @@
               "content": "学习课程【"+this.courseInfo.name+"】",//事件的内容
               "objId": this.courseInfo.id,//课程的id
               "objType": "1",//类型
-              "source":"页面事件",
+              "source":"page",
               "objInfo": ""+this.courseInfo.name,
               "aid":this.userInfo.aid, //当前登录人的id
               "aname":this.userInfo.name,//当前人的姓名
@@ -1079,7 +1122,7 @@
       },
       //结束追加学习时长
       stopStudyTime(){
-          console.log('停止追加学习时长');
+          //console.log('停止追加学习时长');
           this.isAppendTime=false;
           if (this.appendHandle != null) {
               window.clearTimeout(this.appendHandle);
@@ -1104,7 +1147,7 @@
         }
         //首先从本地读取
         let duration = studyUtil.getStudyDuration();
-        console.log('追加学习时长，当前本地积累的学习时长='+duration);
+        //console.log('追加学习时长，当前本地积累的学习时长='+duration);
         //追加学习长
         let $this = this;
         if (this.appendStartTime == null) {

From fa7662e96ea133bee526e841b5c9216cb9613a02 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Thu, 13 Oct 2022 10:58:54 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/orgaimg.png       | Bin 0 -> 567 bytes
 public/images/specimg.png       | Bin 0 -> 597 bytes
 src/views/portal/case/Index.vue |  44 +++++++++++++++++---------------
 3 files changed, 23 insertions(+), 21 deletions(-)
 create mode 100644 public/images/orgaimg.png
 create mode 100644 public/images/specimg.png

diff --git a/public/images/orgaimg.png b/public/images/orgaimg.png
new file mode 100644
index 0000000000000000000000000000000000000000..157da35c63bcdf42f3fd61ac465c9f9dfcdf6517
GIT binary patch
literal 567
zcmV-70?7S|P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px$@kvBMR7gwRmA`9LK@i8k-`V%hUsxH5dLmeeD5zcjfq>Q)XF5Br;t#YE4tW?s
zEEK^sYG)@`SSwfy=~S>(5XA&z6;!<UcD}NA3Em~=$)Q*1cC*ZUcIP`gvjl)fQPd`}
zWx}fVHUgIRMqL8jv)Y#>d|Pf6MVkq_7ue@j2&2LV`CAs_d*B^si<^5w)!zO$plghn
z)mC`EId@=K`jx_r16N6OGLjGtxRx<K`qgEUEWFU1J2>pNCG7@W3pw>T`IX{H7^iai
zm0@xJAvhvjc43;-a#v$c81XD1-ufdc<S`dF9dYVJ0-5-P`u>U*%F)5%WEH}W-axr#
zl1*dZYsg~!3~FipAsdPpVaFp-5d65#dFQJAsqa8&cL0h2f7-jh0bC+nr~E}mwR#;(
zh1q21jPt$wmDmvNSdQ2n2zF{~bURGiDG+Z0^xUiRr4d=uIKmq#Fu+<#V;3sR@}m)$
zmT(Bty<q;@#IGI6)*7TlxD9AOft616fjVFh45|-$6%Kv?{0zXwR8v5k0lv)<FZF>d
z*h5J38MV;uux{!w)dzJRJb`~oQ;Aa`XEXTee;i!WE<!xp)vKd%+o*GJ?iw`RU|MwX
zE`i$WYj9BabNQW)6u%pr!@6te*c{uSAKTZI(iz8R`U8?NMntgeks1I1002ovPDHLk
FV1lK@0&4&O

literal 0
HcmV?d00001

diff --git a/public/images/specimg.png b/public/images/specimg.png
new file mode 100644
index 0000000000000000000000000000000000000000..6309ebe618880f68c5d397786b563f20c58a40e7
GIT binary patch
literal 597
zcmV-b0;>IqP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px%4@pEpR7gwZmCtGvK@i5juexV;%^D&`4MY?{@gM<TArOxd1n~s~5kwDq5QCRR
zP}vs{L?IBoMLdXJ#D520K=c8Oxfm4!8aHNUx=MN>vNIcnQTJpYtGj<)f4-_F0Gw*K
z(~0i3U5V%jX%cO9ml-uz>8^~de_m|2Ge+ov!tD#exw^2e&N~;vJ0F&L{&HtBbz%Fz
zfNnCf;MREY%FRR7@C(sB3O7-DOzlGoeENA=coe{Rs`k9<R7?vm&D}WMzfl-R3vbV0
zSn9Wv*e`i8orquG5KbF$9kew7_nQUoRN;eQ+TKFA&<vRAKm6U{l{YyNU{ew5f}J&B
zMLib)dr*bf0*moNpxyETXA<CTd^iJktH(W2cKXv&3!DU;&K>Rw*hzyuj^G@a3XZqM
za4uDQy%}XKa7=|7#!PgcV28n$B9w-!4Yil0npBGyXw6*s2!_c@@!qF-ah&4wjB-$W
za3nC!RiW|TfXC5jDvd&PM;UCZ-k6ydN$}|yRd)tqOTc9-vTso>zx7yYBbo5YK*Jc+
zn;i?nhX#}yDtgX<*?yhZ%CQSL83ZqyiX$Z{3Kj*tma4t^qvHK%;M~|Mygnt^trW1)
z$Yo|D(byQQ?2UTUS+DZ(mpSfrld;8$+yqz^V>jyDfbsI=lP{k3wIsK##^&G7=HA#G
j+MplW*A&AZ#%KBigGgLZbA$t>00000NkvXXu0mjfyF?8q

literal 0
HcmV?d00001

diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 391ebf1d..617dd1ed 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -16,7 +16,8 @@
                 <div class="search-item">
                     <div style="margin-top:10px; display: flex;">
                       <div style="line-height: 25px;padding-right: 10px;">
-                        <span class="item-title" style="padding-right: 5px;">组织领域</span>
+                        <img class="orgaicon" src="../../../../public/images/orgaimg.png" alt="">
+                        <span class="item-title" >组织领域</span>
                         <span class="item-line"></span>
                       </div>
                       <div style="flex:1;">
@@ -32,7 +33,8 @@
 
                       <div style="margin-top:10px; display: flex;">
                         <div style="line-height: 25px;padding-right: 10px;">
-                      <span class="item-title" style="padding-right: 5px;">专业分类</span>
+                           <img class="orgaicon" src="../../../../public/images/specimg.png" alt="">
+                      <span class="item-title" >专业分类</span>
                       <span class="item-line"></span>
                        </div>
                        <div style="flex:1" id="searchBox">
@@ -714,6 +716,16 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.orgaicon{
+  width: 22px;
+  height: 22px;
+  vertical-align: middle;
+  margin-right: 8px;
+  img{
+    width: 100%;
+    height: 100%;
+  }
+}
 .course-resources{
   margin-top: 26px;
   img{
@@ -834,37 +846,27 @@ export default {
   //box-shadow: none!important;
 }
 
-.item-title {
-  margin: 10px 10px 10px 0;
-  //font-size: 14px;
-  font-weight: 600;
-  color: #333333;
-  // line-height: 20px;
+::v-deep.item-title {
+  margin: 15px 10px 10px 0;
+  font-size: 16px !important;
+  font-weight: 400;
+  color: #6B7C85;
+  line-height: 25px;
 }
 .item-line {
   padding-left: 2px;
   height: 20px;
-
-  background: #ddd;
+  // background: #ddd;
 }
 
 .portal-content {
   display: flex;
   justify-content: space-between;
-  // .item-title{
-  //   margin-bottom: 5px;
-  //   line-height: 36px;
-  //   font-size: 14px;
-  //   font-weight: 600;
-  //   color: #333333;
-  // }
+  
 }
 .searchbar {
   background-color: #ffffff;
-  // border: 1px solid #f3f3f3;
-  // width: 1200px;
-  // padding: 5px 20px;
-  // margin-bottom: 10px;
+ 
 }
 
 .fixed {

From b36afd724482dc5ba004cf7e42598af54a557fe9 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Thu, 13 Oct 2022 11:17:09 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=AAthis?=
 =?UTF-8?q?=E6=8C=87=E5=90=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/study/coursenew.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index a712c802..b43d278f 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -402,6 +402,7 @@
               }
           });
           //每一分钟保存一次
+          let $this=this;
           this.appendStudyOtherHandle = setTimeout(function() {
             $this.appendStudyOtherTime();
           }, 1000*60);
@@ -570,7 +571,8 @@
           if(this.appendStudyOtherHandle!=null){
             windows.clearTimeout(this.appendStudyOtherHandle);
           }
-
+          
+          
           this.appendStudyOtherHandle = setTimeout(function() {
             $this.appendStudyOtherTime();
           }, 1000*60*2); //非音视频课程学习,2分钟后记录，因为一次记录是60秒

From d359743a30d7e8946a1214ea7678f45a80acad6b Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Thu, 13 Oct 2022 11:26:23 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Portal/comments.vue |  3 ++-
 src/views/portal/case/Detail.vue   | 28 +++++++++++++++++++++-------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/components/Portal/comments.vue b/src/components/Portal/comments.vue
index e2eb33fe..881f231a 100644
--- a/src/components/Portal/comments.vue
+++ b/src/components/Portal/comments.vue
@@ -53,7 +53,7 @@
               show-word-limit
               v-model="inputValue"
               maxlength="800"
-              placeholder="写下您的评论(800字以内)，可以@案主哦～"
+              placeholder="写下您的评论～"
             ></el-input>
 
 
@@ -793,6 +793,7 @@
 </script>
 
 <style lang="scss" scoped>
+
 .publish-button{
   // line-height: 30px;
   padding-top: 7px;
diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index 1ffe8b97..7bdc3e22 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -13,7 +13,10 @@
                       <span class="crumbs-line">/</span>
                       <span class="crumbs-last">案例详情</span>
                   </div>
-                  <div class="title">{{ caseDetail.title }}</div>
+                  <div class="title">
+                    <h5>{{ caseDetail.title }}</h5>
+                    <span style="text-align: right;" v-if="caseDetail.sysCreateTime"> <i class="el-icon-time"></i> {{ caseDetail.sysCreateTime.substring(0,10) }}</span>
+                  </div>
                   <div class="label">
                     <author :onlyAvatar="true" :avatar="authorInfo.avatar" :sex="authorInfo.sex" ></author>
                     <span>案主：{{ authorInfo.name }} ({{authorInfo.orgInfo}})</span>
@@ -21,7 +24,6 @@
                     <span>工号：{{ authorInfo.code }}</span>
                     <span>组织：{{ authorInfo.orgInfo }} </span> -->
                     <span> {{authorInfo.sign}}</span>
-                    <span style="text-align: right;" v-if="caseDetail.sysCreateTime">{{ caseDetail.sysCreateTime.substring(0,10) }}</span>
                   </div>
                   <!-- <div class="label">
                     <span style="margin-left:0px;" v-if="caseDetail.sysCreateTime">{{ caseDetail.sysCreateTime.substring(0,10) }}</span>
@@ -529,6 +531,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
+
   .case-banner{
     height: 240px;
     background: url('/images/case-banner.png');
@@ -630,11 +633,21 @@ export default {
   background-color: #fff;
   padding: 50px;
   .title {
-    font-size: 20px;
-    line-height: 45px;
-    font-weight: 600;
-    margin: 10px 0px;
-    word-break:break-all;
+    display: flex;
+    width: 100%;
+    h5{
+      margin: 0;
+      font-size: 20px;
+      line-height: 45px;
+      font-weight: 600;
+      flex: 1;
+    }
+    span{
+      margin-left: auto;
+      line-height: 45px;
+      color: #999999;
+      font-size: 14px;
+    }
   }
   .label {
     font-size: 15px;
@@ -802,6 +815,7 @@ export default {
   .aligh-title{
     font-size: 14px;
     color: #333333;
+    
   }
   .ranking-data {
     margin: 10px 0;

From 8fcdc73be56ac3073d3075440e930d88d4db7781 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Thu, 13 Oct 2022 11:59:05 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/user/Message.vue | 48 ++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/views/portal/user/Message.vue b/src/views/portal/user/Message.vue
index c7190d28..2c9999a6 100644
--- a/src/views/portal/user/Message.vue
+++ b/src/views/portal/user/Message.vue
@@ -6,7 +6,7 @@
       </ul>  
     </Remark>
     <portal-header :goSearch="10"></portal-header> -->
-    <div class="xcontent portal-content">
+    <div class=" portal-content">
       <div class="msg-nav">
         <div style="display: flex;align-items: center;">
           <div><el-checkbox v-model="checkAll" :indeterminate="isIndeterminate">多选</el-checkbox></div>
@@ -32,14 +32,22 @@
               <span>{{ item.title }}</span>
               <!-- <span class="msg-time"></span> -->
             </div>
-            <div><el-button type="danger" size="small" @click="delItem(item)">删除</el-button></div>
+            <!-- <div><el-button type="danger" size="small" @click="delItem(item)">删除</el-button></div> -->
           </div>
           <div class="msg-body">
-            <!-- {{ filterContent(item.content)[0] }}- -->
+            <div class="msg-body-content">
+               <!-- {{ filterContent(item.content)[0] }}- -->
             {{item.tip}}-
             <a :href="returnRouter(item)">{{ item.content }}</a>
+            </div>
+
+            <div class="msg-body-but">
+                <el-button type="danger" plain   @click="delItem(item)">删除</el-button>
+            </div>
           </div>
           <div class="msg-time">{{ item.msgTime }}</div>
+
+
         </div>
       </div>
       <div style="text-align: center;margin-top: 50px" v-if="total > queryData.pageSize">
@@ -274,11 +282,37 @@ export default {
     line-height: 30px;
   }
   .msg-body {
-    word-break:break-all;
     padding: 10px 10px 10px 25px;
-    color: #727272;
-    a:hover {
-      color: #409eff;
+    display: flex;
+    width: 100%;
+    .msg-body-content{
+      flex: 1;
+      word-break:break-all;
+      color: #727272;
+      a:hover {
+        color: #409eff;
+      }
+    }
+    .msg-body-but{
+      margin-left: auto;
+     
+      button{
+         width: 88px;
+         height: 32px;
+         background-color: #fff;
+         border-radius: 16px;
+         padding: 0;
+         color: #F52F3E;
+         line-height: 32px;
+         text-align: center;
+         border: 1px solid #F52F3E;
+      }
+      button:hover{
+         background-color: rgba(255,101,98,0.13);
+         color: #F52F3E;
+
+
+      }
     }
   }
   .msg-time {

From a5d2f3f99b703a1551220ee6303eec83e265b8f7 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Thu, 13 Oct 2022 12:08:24 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=EF=BC=8C=E9=97=AE=E7=AD=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PortalFloatTools.vue |  8 ++++----
 src/components/Qa/ucList.vue        | 23 +++++++++++++++++++++--
 src/views/qa/MyList.vue             | 12 ------------
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/components/PortalFloatTools.vue b/src/components/PortalFloatTools.vue
index 78cb267a..bc23fd6c 100644
--- a/src/components/PortalFloatTools.vue
+++ b/src/components/PortalFloatTools.vue
@@ -164,13 +164,13 @@ export default {
                 this.feedbackDlgShow=false;
 
                 let event = {
-                  key: "Feedback",//后台的事件key  
+                  key: "Feedback",//后台的事件key
                   title: "意见反馈",//事件的标题
                   parameters:"",//用户自定义参数 name:value,name:value
                   content: '意见反馈',//事件的内容
-                  // objId: this.data.id,//关联的id
-                  // objType: this.type,//关联的类型
-                  // objInfo: this.data.title,
+                  objId: res.result.id,//关联的id
+                  objType:'99',//关联的类型
+                  objInfo: "意见反馈",
                   aid: this.userInfo.aid, //当前登录人的id
                   aname: this.userInfo.name,//当前人的姓名
                   status: 1 //状态，直接写1
diff --git a/src/components/Qa/ucList.vue b/src/components/Qa/ucList.vue
index a9238e59..963bad12 100644
--- a/src/components/Qa/ucList.vue
+++ b/src/components/Qa/ucList.vue
@@ -32,7 +32,7 @@
                 <span v-if="item.status==0||item.status==2" style="color: red">{{statusText(item.status)}}</span>
               <!-- <div class="article-info-tools-btns"> -->
               <!-- <interactBar :data="item" :type="0" class="test" :answers="true" :comments="false" :shares="false" :views="false"></interactBar> -->
-             
+
              <div class="button-cla"><interactBar nodeWidth="60px" :readonly="true"  :type="4" :data="item" :shares="true" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar></div>
             </div>
             <!-- <el-link icon="el-icon-chat-line-round" class="article-info-tools-btn" >回答57</el-link>
@@ -78,12 +78,16 @@
 
 <script>
 // import interactBar from '@/components/Portal/interactBar';
+import { mapGetters } from "vuex";
 import imageUpload from '@/components/ImageUpload/index.vue';
 import apiQa from '@/api/modules/qa.js'
 import interactBar from '@/components/Portal/interactBar.vue';
 export default {
   name: 'articleItems',
   components: { imageUpload,interactBar },
+  computed: {
+    ...mapGetters(["userInfo"]),
+  },
   props: {
     items: {
       //name,
@@ -200,7 +204,22 @@ export default {
           apiQa.del(item.id).then(res=>{
             if(res.status==200){
               this.$message({ type: 'success', message: '删除成功!' });
-              this.$emit('sure',true)
+              this.$emit('sure',true);
+              //发送删除问题事件
+              let event = {
+                key: "DeleteQuestion",//
+                title: "删除提问",//事件的标题
+                parameters:"author:"+item.sysCreateAid,//作者参数
+                content: "删除提问【"+item.title+"】",//事件的内容
+                source:'page',
+                objId: item.id,//关联的id
+                objType: "2",//关联的类型
+                objInfo: item.title,
+                aid: this.userInfo.aid, //当前登录人的id
+                aname: this.userInfo.name,//当前人的姓名
+                status: 1 //状态，直接写1
+              }
+              this.$store.dispatch("userTrigger", event);
             }
           })
         })
diff --git a/src/views/qa/MyList.vue b/src/views/qa/MyList.vue
index f90633db..a3820602 100644
--- a/src/views/qa/MyList.vue
+++ b/src/views/qa/MyList.vue
@@ -1,18 +1,6 @@
 <template>
   <div>
-    <Remark>
-      1.我的问答，我发的问题列表信息
-      <br />
-      2.关于问题标题是否是必须的可以讨论下
-      <br />
-    </Remark>
     <div style="display: flex;justify-content: space-between;height: 40px;">
-      <!-- <div style="padding-top: 5px;"> -->
-      <!--
-        <el-tag type="primary" style="margin-right: 20px;">最新</el-tag>
-        <el-tag type="info">最热</el-tag>
-        -->
-      <!-- </div> -->
       <div>
         <div style="display: flex;justify-content:space-around;padding: 12px 22px 10px 18px;">
           <!--<div style="padding: 0px 5px;"><el-cascader clearable v-model="params.type" :options="typeList"></el-cascader></div>-->