12.2 bug修复

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

src/views/rai_manage/reportManage/appletsReport.vue

@@ -4,9 +4,7 @@
     <el-card class="top-card-box">
       <div class="top-card">
         <div>
-          <span v-for="item in tabsList" :key="item.index" :class="tabs_index == item.index ? 'tab_active' : ''" @click="tabActive(item)">{{
-            item.name
-          }}</span>
+          <span v-for="item in tabsList" :key="item.index" :class="tabs_index == item.index ? 'tab_active' : ''" @click="tabActive(item)">{{ item.name }}</span>
         </div>
         <div class="input-box">
           <el-input placeholder="请输入报告标题" v-model="listFrom.KeyWord" @input="listFromInput" clearable>
@@ -20,81 +18,27 @@
       <!-- 筛选条件 -->
       <div class="screen-box">
         <div style="flex: 1">
-          <el-select
-            style="margin-bottom: 20px"
-            placeholder="行业"
-            v-model="listFrom.ChartPermissionId"
-            @clear="clearSelect"
-            clearable
-            @change="listChangeBtn"
-          >
-            <el-option
-              v-for="item in chartPermissionList"
-              :label="item.PermissionName"
-              :key="item.ChartPermissionId"
-              :value="item.ChartPermissionId"
-            ></el-option>
+          <el-select style="margin-bottom: 20px" placeholder="行业" v-model="listFrom.ChartPermissionId" @clear="clearSelect" clearable @change="listChangeBtn">
+            <el-option v-for="item in chartPermissionList" :label="item.PermissionName" :key="item.ChartPermissionId" :value="item.ChartPermissionId"></el-option>
           </el-select>
           <el-select placeholder="系列" v-model="listFrom.SubCategoryName" @focus="reportMappingist" clearable @change="listChangeBtn">
             <el-option v-for="(item, index) in themeList" :label="item.SubCategoryName" :key="index" :value="item.SubCategoryName"></el-option>
           </el-select>
-          <el-select
-            placeholder="报告类型"
-            v-model="listFrom.MatchTypeName"
-            v-show="tabs_index == 1"
-            @focus="reportMappingMatchTypeRep"
-            clearable
-            @change="listChangeBtn"
-          >
+          <el-select placeholder="报告类型" v-model="listFrom.MatchTypeName" v-show="tabs_index == 1" @focus="reportMappingMatchTypeRep" clearable @change="listChangeBtn">
             <el-option v-for="(item, index) in MatchTypeNameList" :label="item.MatchTypeName" :key="index" :value="item.MatchTypeName"></el-option>
           </el-select>
-          <el-select
-            placeholder="产业"
-            v-model="listFrom.IndustrialManagementId"
-            v-show="tabs_index == 1"
-            @focus="getIndustrialManagement"
-            clearable
-            @change="listChangeBtn"
-          >
+          <el-select placeholder="产业" v-model="listFrom.IndustrialManagementId" v-show="tabs_index == 1" @focus="getIndustrialManagement" clearable @change="listChangeBtn">
             <template>
-              <el-option
-                v-for="item in idustrialManagement"
-                :label="item.IndustryName"
-                :key="item.IndustrialManagementId"
-                :value="item.IndustrialManagementId"
-              ></el-option>
+              <el-option v-for="item in idustrialManagement" :label="item.IndustryName" :key="item.IndustrialManagementId" :value="item.IndustrialManagementId"></el-option>
             </template>
           </el-select>
-          <el-input
-            v-if="tabs_index == 1"
-            style="width: 230px; margin-right: 15px"
-            placeholder="请输入报告标签"
-            v-model="listFrom.relevance"
-            @input="listFromInput"
-            clearable
-          >
+          <el-input v-if="tabs_index == 1" style="width: 230px; margin-right: 15px" placeholder="请输入报告标签" v-model="listFrom.relevance" @input="listFromInput" clearable>
             <i slot="prefix" class="el-input__icon el-icon-search"></i>
           </el-input>
-          <el-input
-            v-if="tabs_index != 2"
-            style="width: 230px; margin-right: 15px"
-            placeholder="请输入个股标签"
-            v-model="listFrom.reportLabel"
-            @input="listFromInput"
-            clearable
-          >
+          <el-input v-if="tabs_index != 2" style="width: 230px; margin-right: 15px" placeholder="请输入个股标签" v-model="listFrom.reportLabel" @input="listFromInput" clearable>
             <i slot="prefix" class="el-input__icon el-icon-search"></i>
           </el-input>
-          <date-picker
-            style="margin-bottom: 30px"
-            type="date"
-            range
-            v-model="createdate"
-            placeholder="发布时间"
-            value-type="format"
-            @change="listChangeBtn"
-          >
-          </date-picker>
+          <date-picker style="margin-bottom: 30px" type="date" range v-model="createdate" placeholder="发布时间" value-type="format" @change="listChangeBtn"> </date-picker>
         </div>
         <div style="width: 220px">
           <el-button type="primary" style="margin-bottom: 30px" v-if="IsShowButton" @click="$router.push('/appIndustry')">产业管理</el-button>
@@ -118,11 +62,7 @@
             <template slot-scope="scope">
               <div>
                 <span>{{ scope.row.MatchTypeName }}</span>
-                <img
-                  @click="modification(scope.row.ReportId)"
-                  :src="$icons.amend"
-                  style="color: #fff; width: 12px; height: 12px; margin-left: 5px; vertical-align: middle"
-                />
+                <img @click="modification(scope.row.ReportId)" :src="$icons.amend" style="color: #fff; width: 12px; height: 12px; margin-left: 5px; vertical-align: middle" />
               </div>
             </template>
           </el-table-column>
@@ -154,25 +94,14 @@
           <el-table-column align="center" label="操作" min-width="120">
             <template slot-scope="scope">
               <div v-if="scope.row.SubCategoryName == '专项调研'">
-                <span class="editsty" @click="operationBtn(scope.row.ArticleId, '发布')"
-                  >{{ scope.row.PublishStatus == 0 ? "发布" : "取消发布" }} &nbsp;&nbsp;</span
-                >
+                <span class="editsty" @click="operationBtn(scope.row.ArticleId, '发布')">{{ scope.row.PublishStatus == 0 ? "发布" : "取消发布" }} &nbsp;&nbsp;</span>
                 <span class="editsty" @click="addSummary(scope.row.ArticleId)">编辑 &nbsp;&nbsp;</span>
-                <span class="deletesty" v-if="scope.row.PublishStatus == 0" @click="operationBtn(scope.row.ArticleId, '删除')"
-                  >删除 &nbsp;&nbsp;</span
-                >
+                <span class="deletesty" v-if="scope.row.PublishStatus == 0" @click="operationBtn(scope.row.ArticleId, '删除')">删除 &nbsp;&nbsp;</span>
               </div>
               <div v-else>
                 <el-button type="text" v-if="(tabs_index == 0 || tabs_index == 2) && IsShowButton" @click="classifyBtn(scope.row)">归类</el-button>
-                <el-button type="text" v-if="scope.row.ShowButton && tabs_index == 1 && IsShowButton" @click="classifyBtn(scope.row)"
-                  >修改归类</el-button
-                >
-                <el-button
-                  type="text"
-                  v-if="scope.row.ShowButton && (tabs_index == 0 || tabs_index == 1) && IsShowButton"
-                  @click="filtrationBtn(scope.row.ReportId)"
-                  >过滤</el-button
-                >
+                <el-button type="text" v-if="scope.row.ShowButton && tabs_index == 1 && IsShowButton" @click="classifyBtn(scope.row)">修改归类</el-button>
+                <el-button type="text" v-if="scope.row.ShowButton && (tabs_index == 0 || tabs_index == 1) && IsShowButton" @click="filtrationBtn(scope.row.ReportId)">过滤</el-button>
               </div>
             </template>
           </el-table-column>
@@ -199,40 +128,13 @@
       </div>
       <el-form :model="chartPermissionPost" :rules="rules" ref="ruleForm">
         <el-form-item prop="IndustrialManagementId">
-          <el-select
-            clearable
-            placeholder="请选择所属产业"
-            style="width: 100%"
-            filterable
-            @clear="clearSelectChart"
-            @change="chartPermissionPostChange"
-            multiple
-            v-model="chartPermissionPostOptins"
-          >
-            <el-option
-              v-for="item in idustrialManagement"
-              :label="item.IndustryName"
-              :key="item.IndustrialManagementId"
-              :value="item.IndustrialManagementId"
-            ></el-option>
+          <el-select clearable placeholder="请选择所属产业" style="width: 100%" filterable @clear="clearSelectChart" @change="chartPermissionPostChange" multiple v-model="chartPermissionPostOptins">
+            <el-option v-for="item in idustrialManagement" :label="item.IndustryName" :key="item.IndustrialManagementId" :value="item.IndustrialManagementId"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
-      <el-select
-        placeholder="请选择关联标的"
-        v-model="optionS"
-        style="width: 100%; margin-bottom: 40px; margin-top: 30px"
-        @change="optionsChange"
-        @focus="getIndustrialSubject"
-        multiple
-        clearable
-      >
-        <el-option
-          v-for="item in listSubject"
-          :label="item.SubjectName"
-          :key="item.IndustrialSubjectId"
-          :value="item.IndustrialSubjectId"
-        ></el-option>
+      <el-select placeholder="请选择关联标的" v-model="optionS" style="width: 100%; margin-bottom: 40px; margin-top: 30px" @change="optionsChange" @focus="getIndustrialSubject" multiple clearable>
+        <el-option v-for="item in listSubject" :label="item.SubjectName" :key="item.IndustrialSubjectId" :value="item.IndustrialSubjectId"></el-option>
       </el-select>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="classifyClick">保存</el-button>
@@ -349,21 +251,8 @@ export default {
   created() {},
   mounted() {
     if (sessionStorage.getItem("appletsReportPageBack")) {
-      let {
-        tabsIndex,
-        page,
-        KeyWord,
-        ChartPermissionId,
-        SubCategoryName,
-        MatchTypeName,
-        IndustrialManagementId,
-        relevance,
-        reportLabel,
-        createdate,
-        IsClass,
-        IsFilter,
-        chartPermissionList,
-      } = JSON.parse(sessionStorage.getItem("appletsReportPageBack"));
+      let { tabsIndex, page, KeyWord, ChartPermissionId, SubCategoryName, MatchTypeName, IndustrialManagementId, relevance, reportLabel, createdate, IsClass, IsFilter, chartPermissionList } =
+        JSON.parse(sessionStorage.getItem("appletsReportPageBack"));
       this.tabs_index = tabsIndex;
       this.page_no = page;
       this.createdate = createdate;
@@ -406,16 +295,8 @@ export default {
       return h("div", { attrs: { style: "padding:0;" } }, [
         h("span", column.label),
         h("el-tooltip", { props: { placement: "top" } }, [
-          h(
-            "p",
-            { slot: "content", attrs: { style: "display:block;padding:5px 0;width:420px;" } },
-            "pv：报告被打开的次数，每次打开都计算一次（只统计有权限用户）"
-          ),
-          h(
-            "p",
-            { slot: "content", attrs: { style: "display:block;padding:5px 0;width:420px;" } },
-            "uv：访问报告的人数，每篇报告同一个人访问只计算一次（只统计有权限用户）"
-          ),
+          h("p", { slot: "content", attrs: { style: "display:block;padding:5px 0;width:420px;" } }, "pv：报告被打开的次数，每次打开都计算一次（只统计有权限用户）"),
+          h("p", { slot: "content", attrs: { style: "display:block;padding:5px 0;width:420px;" } }, "uv：访问报告的人数，每篇报告同一个人访问只计算一次（只统计有权限用户）"),
           h("el-button", { props: { icon: "el-icon-info" }, attrs: { style: "border:none;background:none;pading:2px" } }, ""),
         ]),
       ]);
@@ -558,31 +439,27 @@ export default {
     //获取产业
     getIndustrialManagement() {
       if (this.listFrom.ChartPermissionId == "") return;
-      raiInterface
-        .getIndustrialManagement({ ChartPermissionId: this.listFrom.ChartPermissionId - 0 || this.chartPermissionPost.ChartPermissionId - 0 })
-        .then((res) => {
-          if (res.Ret !== 200) return;
-          if (res.Data.List) {
-            this.idustrialManagement = res.Data.List;
-          } else {
-            this.idustrialManagement = [];
-          }
-        });
+      raiInterface.getIndustrialManagement({ ChartPermissionId: this.listFrom.ChartPermissionId - 0 || this.chartPermissionPost.ChartPermissionId - 0 }).then((res) => {
+        if (res.Ret !== 200) return;
+        if (res.Data.List) {
+          this.idustrialManagement = res.Data.List;
+        } else {
+          this.idustrialManagement = [];
+        }
+      });
     },
     //弹窗获取产业
     getIndustrialManagementDalg() {
       this.listSubject = [];
       this.optionS = [];
-      raiInterface
-        .getIndustrialManagement({ ChartPermissionId: this.listFrom.ChartPermissionId - 0 || this.chartPermissionPost.ChartPermissionId - 0 })
-        .then((res) => {
-          if (res.Ret !== 200) return;
-          if (res.Data.List) {
-            this.idustrialManagement = res.Data.List;
-          } else {
-            this.idustrialManagement = [];
-          }
-        });
+      raiInterface.getIndustrialManagement({ ChartPermissionId: this.listFrom.ChartPermissionId - 0 || this.chartPermissionPost.ChartPermissionId - 0 }).then((res) => {
+        if (res.Ret !== 200) return;
+        if (res.Data.List) {
+          this.idustrialManagement = res.Data.List;
+        } else {
+          this.idustrialManagement = [];
+        }
+      });
     },
     //弹窗获取标的
     getIndustrialSubject() {
@@ -602,13 +479,15 @@ export default {
     },
     //报告类型
     reportMappingMatchTypeRep() {
-      if(!this.listFrom.ChartPermissionId) return this.$message.error('请先选择行业')
-      raiInterface.reportMappingMatchTypeRep({
-         ChartPermissionId: this.listFrom.ChartPermissionId,
-      }).then((res) => {
-        if (res.Ret !== 200) return;
-        this.MatchTypeNameList = res.Data.List;
-      });
+      if (!this.listFrom.ChartPermissionId) return this.$message.error("请先选择行业");
+      raiInterface
+        .reportMappingMatchTypeRep({
+          ChartPermissionId: this.listFrom.ChartPermissionId,
+        })
+        .then((res) => {
+          if (res.Ret !== 200) return;
+          this.MatchTypeNameList = res.Data.List;
+        });
     },
     //报告归类确定事件
     classifyClick() {
@@ -668,11 +547,18 @@ export default {
       this.status = "";
     },
     //文章详情
-    lookDetail(item) {
-      // let href = `https://vmp.hzinsights.com/v2/articles/${item.ArticleId}`;
-      // window.open(href, "_blank");
-      let href = `${process.env.CYGX_WEB}/material/info/${item.ArticleId}`
-      window.open(href, "_blank");
+    async lookDetail(item) {
+      if (item.PublishStatus === 1) {
+        let href = `${process.env.CYGX_WEB}/material/info/${item.ArticleId}`;
+        window.open(href, "_blank");
+      } else {
+        const res = await raiInterface.reportArticleDetail({ ArticleId: item.ArticleId });
+        if (res.Ret === 200) {
+          sessionStorage.setItem("summaryPre", JSON.stringify(res.Data));
+          let { href } = this.$router.resolve({ name: "预览研选报告" });
+          window.open(href, "_blank");
+        }
+      }
     },
     //筛选行业的清除事件
     clearSelect() {

src/views/rai_manage/reportManage/summaryManage.vue

@@ -30,7 +30,7 @@
       <el-table :data="dataList" style="width: 100%" border>
         <el-table-column key="title" align="center" label="报告标题" min-width="300">
           <template slot-scope="scope">
-            <span class="editsty" style="color: #409eff" @click="lookDetail(scope.row.ArticleId)">{{ scope.row.Title }}</span>
+            <span class="editsty" style="color: #409eff" @click="lookDetail(scope.row)">{{ scope.row.Title }}</span>
           </template>
         </el-table-column>
         <el-table-column key="category" prop="ArticleTypeName" align="center" label="报告类型" min-width="95"></el-table-column>
@@ -251,15 +251,18 @@ export default {
       });
     },
     //文章详情
-    lookDetail(id) {
-      // let url =
-      //   process.env.NODE_ENV === "production"
-      //     ? "https://details.hzinsights.com/cygx/report"
-      //     : process.env.NODE_ENV === "test"
-      //     ? "http://xcxh5test.hzinsights.com/xcx_h5/cygx/report"
-      //     : "http://xcxh5test.hzinsights.com/xcx_h5/cygx/report";
-      let href = `${process.env.CYGX_WEB}/material/info/${id}`
-      window.open(href, "_blank");
+    async lookDetail(item) {
+      if (item.PublishStatus === 1) {
+        let href = `${process.env.CYGX_WEB}/material/info/${item.ArticleId}`;
+        window.open(href, "_blank");
+      } else {
+        const res = await raiInterface.getsummaryManagedetail({ ArticleId: item.ArticleId });
+        if (res.Ret === 200) {
+          sessionStorage.setItem("summaryPre", JSON.stringify(res.Data));
+          let { href } = this.$router.resolve({ name: "预览研选报告" });
+          window.open(href, "_blank");
+        }
+      }
     },
     //列表
     getsummaryManageList() {