12.2

src/api/modules/rai/YanXuanApi.js

@@ -21,6 +21,10 @@ const YanXuanApi = {
   yanxuan_specialEnable: (params) => {
     return http.post("/cygx/yanxuan_special/enable", params);
   },
+  // 置顶、取消置顶
+  yanxuan_tope_change: (params) => {
+    return http.post("/cygx/activity/tope_change ", params);
+  },
 };
 
 export default YanXuanApi;

src/views/rai_manage/activityManage/activityManage.vue

@@ -61,17 +61,19 @@
         <el-table-column v-if="tabsPitchon === 2" align="center" label="路演回放" min-width="100">
           <template slot-scope="{ row }"> {{ row.IsUpload ? "已上传" : "" }} </template>
         </el-table-column>
-        <el-table-column align="center" width="146" label="操作">
+        <el-table-column align="center" width="156" label="操作">
           <template slot-scope="{ row }">
-            <span v-if="row.PublishStatus == 0 && tabsPitchon == 0" class="editsty" @click="operationBtn(row.ActivityId, '发布')">发布</span>
-            <span v-if="row.PublishStatus == 3" class="editsty" @click="operationBtn(row.ActivityId, '重新发布')">重新发布</span>
-            <span v-if="row.PublishStatus == 1" class="editsty" @click="operationBtn(row.ActivityId, '取消发布')">取消发布</span>
-            &nbsp;&nbsp;
-            <span class="editsty" @click="editBtn(row.ActivityId, row.PublishStatus)">编辑</span>
-            &nbsp;&nbsp;
-            <span class="deletesty" v-if="row.PublishStatus == 0 && tabsPitchon == 0" @click="operationBtn(row.ActivityId, '删除')">删除</span>
-            <span class="editsty" v-if="row.IsShowSigninButton" @click="handleDownLoadImg(row)">下载签到码</span>
-            <span v-if="row.ActivityTypeId === 8" class="editsty" @click="editBtn(row.ActivityId, row.PublishStatus)">取消置顶</span>
+            <div class="operate-box">
+              <p v-if="row.PublishStatus == 0 && tabsPitchon == 0" class="editsty" @click="operationBtn(row.ActivityId, '发布')">发布</p>
+              <p v-if="row.PublishStatus == 3" class="editsty" @click="operationBtn(row.ActivityId, '重新发布')">重新发布</p>
+              <p v-if="row.PublishStatus == 1" class="editsty" @click="operationBtn(row.ActivityId, '取消发布')">取消发布</p>
+              &nbsp;&nbsp;
+              <p class="editsty" @click="editBtn(row.ActivityId, row.PublishStatus)">编辑</p>
+              &nbsp;&nbsp;
+              <p class="deletesty" v-if="row.PublishStatus == 0 && tabsPitchon == 0" @click="operationBtn(row.ActivityId, '删除')">删除</p>
+              <p class="editsty" v-if="row.IsShowSigninButton" @click="handleDownLoadImg(row)">下载签到码</p>
+              <p v-if="row.ActivityTypeId === 8" class="editsty" @click="overheadHandler(row.ActivityId, '置顶')">&nbsp;&nbsp;{{ row.TopTime == 0 ? "置顶" : "取消置顶" }}</p>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -350,6 +352,15 @@ export default {
     childrenImgMeetingHandler() {
       this.$refs.imgUpload.clearFiles();
     },
+    // 是否置顶
+    async overheadHandler(id) {
+      const res = await raiInterface.yanxuan_tope_change({
+        ActivityId: id,
+      });
+      if (res.Ret !== 200) return;
+      this.$message.success("操作成功！");
+      this.getsummaryManageList();
+    },
   },
   /* 页面跳转前记录参数 */
   beforeRouteLeave(to, form, next) {
@@ -365,6 +376,7 @@ export default {
       activityLabel: this.activityLabel,
       publishDate: this.publishDate,
     };
+    ActivityId: id;
     sessionStorage.setItem("cativityBack", JSON.stringify(backData));
     next();
   },
@@ -419,5 +431,12 @@ export default {
   .customWidth {
     width: 550px !important;
   }
+  .operate-box {
+    display: flex;
+    flex-wrap: wrap;
+    p {
+      flex-shrink: 0;
+    }
+  }
 }
 </style>

src/views/rai_manage/activityManage/components/addComopnents/ResearchDeduct.vue

@@ -6,7 +6,7 @@
         <i class="el-icon-info" />
       </el-tooltip>
     </el-checkbox>
-    <el-checkbox v-if="isResearch && [1, 3, 5].includes(cactivityType)" v-model="isShowHz"> 同时在弘则活动页展示 </el-checkbox>
+    <el-checkbox v-if="isResearch && [1, 3, 5, 8].includes(cactivityType)" v-model="isShowHz"> 同时在弘则活动页展示 </el-checkbox>
     <el-checkbox v-if="cactivityType == 3" v-model="isExternalLabel"> 外部资源 </el-checkbox>
     <template v-if="cactivityType == 7 || cactivityType == 2">
       <el-checkbox v-model="isYidongConduct">
@@ -23,7 +23,6 @@
       </el-checkbox>
       <el-checkbox v-if="isYidongConduct && cactivityType == 2" v-model="isBClass"> B类非公开会议 </el-checkbox>
     </template>
-    <el-checkbox v-if="cactivityType === 8" v-model="isDeduct" style="margin-right: 20px"> 同时在弘则活动页展示 </el-checkbox>
     <template v-if="optionFormregion.includes('研选')">
       <el-checkbox v-model="isDeduct" style="margin-right: 20px"> 研选扣点 </el-checkbox>
       <el-select clearable @change="ObjectChangeHandler" v-model="PointsSet.PointsObject" placeholder="请选择扣点对象" v-if="isDeduct" style="width: 160px">

src/views/rai_manage/components/report_preview/summaryPre.vue

@@ -14,7 +14,12 @@
         </div>
       </div>
       <div class="report-disclaimer">注：请务必阅读<span @click="showDisclaimer">免责声明</span></div>
-      <div class="report-abstract">摘要：{{ reportInfo.Abstract }}</div>
+      <div class="report-abstract">
+        <div>摘要：</div>
+        <div>
+          {{ reportInfo.Abstract }}
+        </div>
+      </div>
       <div class="report-content-item">
         <div class="report-content" id="report-content" v-html="reportInfo.Body"></div>
       </div>
@@ -71,15 +76,16 @@ export default {
     display: flex;
     align-items: center;
     .report-author-name {
-        margin-right: 30px;
-        margin-bottom: 0px !important;
+      margin-right: 30px;
+      margin-bottom: 0px !important;
     }
   }
   .report-title {
     font-style: normal;
     font-weight: bold;
-    font-size: 18px;
+    font-size: 30px;
     color: #333333;
+    font-weight: 600;
     margin-bottom: 10px;
   }
   .report-author-box {
@@ -101,16 +107,17 @@ export default {
     .report-publishTime {
       font-style: normal;
       font-weight: 400;
-      font-size: 16px;
-      color: #999999;
+      font-size: 12px;
+      color: #b3b3b3;
     }
   }
   .report-disclaimer {
     font-style: normal;
     font-weight: 400;
-    font-size: 16px;
+    font-size: 14px;
     line-height: 22px;
     color: #999999;
+    margin: 15px 0;
     span {
       color: #3385ff;
       cursor: pointer;
@@ -118,27 +125,19 @@ export default {
     }
   }
   .report-abstract {
-    font-style: normal;
-    font-weight: 400;
-    font-size: 16px;
-    color: #666666;
-    padding: 12px 0;
-    text-indent: 14px;
-    word-break: break-all;
-    position: relative;
-    border-bottom: 1px dashed #dcdfe6;
-    &:before {
-      content: "";
-      height: 20px;
-      width: 4px;
-      background-color: #3385ff;
-      position: absolute;
-      left: 0;
-      top: 12px;
+    border-left: 3px solid #001529;
+    padding-left: 12px;
+    :nth-child(1){
+      margin-bottom: 0.6em;
+      font-size: 20px;
+      color: #000;
+      font-style: italic;
     }
   }
   .report-content-item {
-    margin-top: 10px;
+    margin-top: 20px;
+    padding-top: 20px;
+    border-top: 1px solid #f0f0f0;
   }
   .deeperReport {
     width: 128px;