12.2bug修复

src/views/rai_manage/activityManage/activityManage.vue

@@ -72,7 +72,7 @@
                 
               <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.ChartPermissionId === 31" class="editsty" @click="overheadHandler(row.ActivityId, '置顶')">&nbsp;&nbsp;{{ row.TopTime == 0 ? "置顶" : "取消置顶" }}</p>
+              <p v-if="row.ChartPermissionId === 31 && tabsPitchon == 0" class="editsty" @click="overheadHandler(row.ActivityId, '置顶')">&nbsp;&nbsp;{{ row.TopTime == 0 ? "置顶" : "取消置顶" }}</p>
             </div>
           </template>
         </el-table-column>

src/views/rai_manage/components/addSummary.vue

@@ -80,7 +80,7 @@
           </div>
         </el-form-item>
         <el-form-item class="form-item-bootm">
-          <div style="color:#f00;font-size: 16px;" v-if="isSource !== 'HZ'">*报告发布前，请在核心观点/核心结论下加分割线</div>
+          <div style="color: #f00; font-size: 16px" v-if="isSource !== 'HZ'">*报告发布前，请在核心观点/核心结论下加分割线</div>
           <el-button type="primary" @click="submitForm('预览')">预览</el-button>
           <el-button type="primary" @click="submitForm('保存')">保存</el-button>
           <el-button type="primary" @click="submitForm('发布')" v-if="isShowStatus">发布</el-button>
@@ -136,11 +136,11 @@ import VueFroala from "vue-froala-wysiwyg";
 import Clipboard from "clipboard";
 import chartDialogVue from "../../dataEntry_manage/components/chartDialog.vue";
 import AddIndustryMark from "../components/addIndustryMark.vue";
-import RichTextMixins from"./reportComponents/RichTextMixins"
+import RichTextMixins from "./reportComponents/RichTextMixins";
 export default {
   name: "",
   components: { AddIndustryMark },
-  mixins:[RichTextMixins],
+  mixins: [RichTextMixins],
   data() {
     var that = this;
     return {
@@ -294,9 +294,14 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX`,
           ChartPermissionId: this.addOfEditForm.industry,
         };
         if (type == "预览") {
-          sessionStorage.setItem("summaryPre", JSON.stringify(params));
-          let { href } = this.$router.resolve({ name: "预览研选报告" });
-          window.open(href, "_blank");
+          if (this.$route.query.id) {
+            let href = `${process.env.CYGX_WEB}/material/info/${this.$route.query.id}`;
+            window.open(href, "_blank");
+          } else {
+            sessionStorage.setItem("summaryPre", JSON.stringify(params));
+            let { href } = this.$router.resolve({ name: "预览研选报告" });
+            window.open(href, "_blank");
+          }
           return;
         } else {
           const res = this.isSource === "HZ" ? await raiInterface.reportPreserveAndPublish(params) : await raiInterface.preserveAndPublish(params);
@@ -391,10 +396,10 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX`,
     industrySelectFocus(value) {
       if (!value) return;
       if (this.addOfEditForm.industry || this.addOfEditForm.regions) {
-        this.getIndustry()
+        this.getIndustry();
       } else {
         this.industryArr = [];
-        this.$message.error(this.isSource === 'HZ' ? "请先选择行业" :'请先选择报告类型');
+        this.$message.error(this.isSource === "HZ" ? "请先选择行业" : "请先选择报告类型");
       }
     },
     //添加标的的点击事件