解决merge冲突

src/views/Home.vue

@@ -62,7 +62,7 @@
                   </template>
                   <el-menu-item
                     v-for="child in item.children"
-                    :index="child.path=='etaForum'?null:child.path"
+                    :index="child.path=='etaForum'?'etaForum':child.path"
                     :path="child.path"
                     :key="child.path"
                     v-show="!child.hidden"
@@ -925,7 +925,7 @@ export default {
       this.$router.push({ path: "/resetpsd" });
     },
     handleselect: function (a, b) {
-      
+
       // 清除筛选条件
       sessionStorage.removeItem('pickListBack');
       sessionStorage.removeItem('customSearchBack');

src/views/custom_manage/contacts/compontents/chartItem.vue

@@ -25,6 +25,9 @@ export default {
       type: "string",
       default: "",
     },
+    activeTypeName: {
+      type: Number,
+    },
   },
   data() {
     return {
@@ -46,6 +49,7 @@ export default {
         Source: 4,
         PageSize: this.pageSize,
         CurrentIndex: this.page,
+        ClassType: this.activeTypeName,
       });
       if (res.Ret === 200) {
         this.publicHaveMoveCompany = !res.Data.Paging.IsEnd;

src/views/custom_manage/contacts/compontents/contactsColums.js

@@ -35,7 +35,7 @@ export const tableColums = (type) => {
         },
         {
           label: "阅读来源",
-          key: "RegisterPlatform",
+          key: "RegisterPlatformText",
           widthsty: 80,
         },
       ]
@@ -249,7 +249,94 @@ export const tableColums = (type) => {
           key: "CreateTime",
           // widthsty: 300,
         },
-    ]      
+      ]
+    : type === 11
+    ? [
+        {
+          label: "文章标题",
+          key: "Title",
+        },
+        {
+          label: "文章类型",
+          key: "SpecialType",
+          // widthsty: 200,
+        },
+        {
+          label: "标签",
+          key: "IndustryName",
+          // widthsty: 300,
+        },
+        {
+          label: "发布时间",
+          key: "PublishDate",
+          // widthsty: 300,
+        },
+        {
+          label: "阅读时间",
+          key: "CreateTime",
+          // widthsty: 300,
+        },
+        {
+          label: "阅读时长",
+          key: "StopTime",
+          // widthsty: 300,
+        },
+        {
+          label: "阅读来源",
+          key: "RegisterPlatformText",
+          // widthsty: 300,
+        },
+      ]
+    : type === 12
+    ? [
+        {
+          label: "文章标题",
+          key: "Title",
+        },
+        {
+          label: "文章类型",
+          key: "SpecialType",
+          // widthsty: 200,
+        },
+        {
+          label: "标签",
+          key: "IndustryName",
+          // widthsty: 300,
+        },
+        {
+          label: "发布时间",
+          key: "PublishDate",
+          // widthsty: 300,
+        },
+        {
+          label: "收藏时间",
+          key: "CreateTime",
+          // widthsty: 300,
+        },
+      ]
+    : type === 13
+    ? [
+        {
+          label: "专栏名称",
+          key: "Title",
+        },
+        {
+          label: "作者昵称",
+          key: "NickName",
+        },
+        {
+          label: "关注时间",
+          key: "CreateTime",
+        },
+        {
+          label: "已发布文章",
+          key: "ArticleNum",
+        },
+        {
+          label: "粉丝",
+          key: "FansNum",
+        },
+      ]
     : [];
 };
 
@@ -272,7 +359,7 @@ export const interactionColums = [
         label: "阅读时长",
         key: "StopTime",
         widthsty: 80,
-      }
+      },
     ],
   },
   {
@@ -407,10 +494,9 @@ export const organizationTableColums = (type) => {
         },
         {
           label: "阅读来源",
-          key: "RegisterPlatform",
+          key: "RegisterPlatformText",
           widthsty: 80,
         },
-        
       ]
     : type === 2
     ? [
@@ -673,7 +759,7 @@ export const organizationTableColums = (type) => {
         {
           label: "活动类型",
           key: "ActivityTypes",
-        },        
+        },
         {
           label: "相关产业",
           key: "SubjectNames",
@@ -688,6 +774,43 @@ export const organizationTableColums = (type) => {
           key: "CreateTime",
         },
       ]
+    : type === 11
+    ? [
+        {
+          label: "文章标题",
+          key: "Title",
+        },
+        {
+          label: "文章类型",
+          key: "SpecialType",
+          // widthsty: 200,
+        },
+        {
+          label: "标签",
+          key: "IndustryName",
+          // widthsty: 300,
+        },
+        {
+          label: "发布时间",
+          key: "PublishDate",
+          // widthsty: 300,
+        },
+        {
+          label: "阅读时间",
+          key: "CreateTime",
+          // widthsty: 300,
+        },
+        {
+          label: "阅读时长",
+          key: "StopTime",
+          // widthsty: 300,
+        },
+        {
+          label: "阅读来源",
+          key: "RegisterPlatformText",
+          // widthsty: 300,
+        },
+      ]
     : [];
 };
 
@@ -747,7 +870,7 @@ export const wholeOrganizationTableColums = (type) => {
         },
         {
           label: "阅读来源",
-          key: "RegisterPlatform",
+          key: "RegisterPlatformText",
           widthsty: 80,
         },
       ]
@@ -1099,5 +1222,92 @@ export const wholeOrganizationTableColums = (type) => {
           key: "CreateTime",
         },
       ]
+    : type === 11
+    ? [
+        {
+          label: "文章标题",
+          key: "Title",
+        },
+        {
+          label: "文章类型",
+          key: "SpecialType",
+          // widthsty: 200,
+        },
+        {
+          label: "标签",
+          key: "IndustryName",
+          // widthsty: 300,
+        },
+        {
+          label: "发布时间",
+          key: "PublishDate",
+          // widthsty: 300,
+        },
+        {
+          label: "阅读时间",
+          key: "CreateTime",
+          // widthsty: 300,
+        },
+        {
+          label: "阅读时长",
+          key: "StopTime",
+          // widthsty: 300,
+        },
+        {
+          label: "阅读来源",
+          key: "RegisterPlatformText",
+          // widthsty: 300,
+        },
+      ]
+    : type === 12
+    ? [
+        {
+          label: "文章标题",
+          key: "Title",
+        },
+        {
+          label: "文章类型",
+          key: "SpecialType",
+          // widthsty: 200,
+        },
+        {
+          label: "标签",
+          key: "IndustryName",
+          // widthsty: 300,
+        },
+        {
+          label: "发布时间",
+          key: "PublishDate",
+          // widthsty: 300,
+        },
+        {
+          label: "收藏时间",
+          key: "CreateTime",
+          // widthsty: 300,
+        },
+      ]
+    : type === 13
+    ? [
+        {
+          label: "专栏名称",
+          key: "Title",
+        },
+        {
+          label: "作者昵称",
+          key: "NickName",
+        },
+        {
+          label: "关注时间",
+          key: "CreateTime",
+        },
+        {
+          label: "已发布文章",
+          key: "ArticleNum",
+        },
+        {
+          label: "粉丝",
+          key: "FansNum",
+        },
+      ]
     : [];
 };

src/views/custom_manage/contacts/compontents/details.scss

@@ -16,6 +16,38 @@
   }
 }
 
+.department-tabs {
+  display: flex;
+  flex-wrap: wrap;
+  margin: 20px 0 10px;
+  .item {
+    cursor: pointer;
+    background: #FFF;
+    border: 1px solid #DCDFE6;
+    font-weight: 500;
+    color: #606266;
+    text-align: center;
+    box-sizing: border-box;
+    position: relative;
+    cursor: pointer;
+    padding: 8px 20px;
+    font-size: 14px;
+  }
+  .item:first-child{
+    border-radius: 4px 0 0 4px;
+
+  }
+  .item:last-child{
+    border-left: none;
+    border-radius: 0 4px 4px 0;
+
+  }
+  .active {
+    background-color: #409eff;
+    color: #fff;
+  }
+}
+
 .tooltip-item {
   margin-left: 20px;
 }

src/views/custom_manage/contacts/mixins/mutualAssistance.js

@@ -1,5 +1,5 @@
 import { screenList, meetingList } from "../compontents/contactsColums";
-import { customInterence, equityContacts } from "@/api/api.js";
+import { customInterence } from "@/api/api.js";
 
 var moment = require("moment");
 moment().format();
@@ -45,6 +45,11 @@ export const mutualMixin = {
       dialogVisibleActivity: false, //专项调研
       specialDetailId: null,
       dialogTitle: "",
+      typeList: [
+        { label: "权益", value: 1 },
+        { label: "研选", value: 2 },
+      ],
+      activeTypeName: 1,
     };
   },
   computed: {
@@ -54,6 +59,13 @@ export const mutualMixin = {
     meetingList() {
       return meetingList;
     },
+    showSelectBox() {
+      return this.activeName === 1 || this.activeName === 2 || this.activeName === 11 || this.activeName === 12;
+    },
+    tableColumsList() {
+      let arr = this.activeTypeName === 2 ? this.tableColums.filter((_) => _.key != "PermissionName") : this.tableColums;
+      return arr;
+    },
   },
   methods: {
     /* 获取销售 */
@@ -102,31 +114,14 @@ export const mutualMixin = {
     handleRowStyle(key) {
       const style = {
         Title: "color: #409eff; cursor: pointer",
-        ActivityName: "color: #409eff; cursor: pointer",
+        ActivityName: this.activeName == 1 || this.activeName == 8 ? "color: #409eff; cursor: pointer" : "",
       };
-      return style[key] && (this.activeName == 1 || this.activeName == 8) ? style[key] : "";
+      return style[key] ? style[key] : "";
     },
     /* 表格行的点击事件 */
     handleRowClick(row, key) {
       if (key === "Title") {
-        if (row.SpecialType > 0) {
-          let href = `${process.env.CYGX_WEB}/column/detail/${row.ArticleId}`;
-          window.open(href, "_blank");
-          return;
-        }
-        if (row.ArticleType == 1) {
-          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 = `${url}?id=${row.ArticleIdMd5}`;
-          window.open(href, "_blank");
-        } else {
-          let href = `https://vmp.hzinsights.com/v2/articles/${row.ArticleId}`;
-          window.open(href, "_blank");
-        }
+        window.open(row.HttpUrl, "_blank");
       } else if (key === "ActivityName" && this.activeName === 8) {
         this.themeDetails(row.ActivityId);
       }
@@ -144,8 +139,8 @@ export const mutualMixin = {
         return row[key] == 1 ? "纪要" : row[key] == 2 ? "图表" : row[key] == 3 ? "纪要/图表" : row[key] == 4 ? "产业资源包" : row[key] == 5 ? "报告" : "活动";
       } else if (key == "ActivityType") {
         return row[key] == 1 ? "线上" : `线下(${row["City"]})`;
-      } else if (key == "RegisterPlatform") {
-        return row[key] == 1 ? "小程序" : row[key] == 2 ? "网页版" : row[key] == 3 ? "策略平台" : "";
+      } else if (key == "SpecialType") {
+        return row[key] == 1 ? "笔记" : row[key] == 2 ? "观点" : "";
       } else {
         return row[key];
       }

src/views/custom_manage/contacts/mutualList.vue

@@ -5,10 +5,14 @@
         <span class="intro">{{ userForm.UserName }}-{{ userForm.Mobile }}-{{ userForm.ComapnyName }}</span>
         <span class="organization-details" @click="goWholeDetail">构互动详情>></span>
       </div>
+      <div class="department-tabs">
+        <span :class="['item', activeTypeName == item.value && 'active']" v-for="item in typeList" :key="item.value" @click="typeHandleClick(item)">{{ item.label }}</span>
+      </div>
       <div class="tabs">
         <span :class="['item', activeName == item.Source && 'active']" v-for="item in list" :key="item.Source" @click="handleTabsClick(item)">{{ item.PermissionName }} ({{ item.TotalNum }})</span>
       </div>
-      <div class="son-box" v-if="activeName === 2 || activeName === 1">
+      <!--  -->
+      <div class="son-box" v-if="showSelectBox">
         <div style="display: flex; align-items: center" v-if="activeName === 2">
           <el-checkbox-group v-model="checkActiveList" @change="dataChangeHandler">
             <el-checkbox :label="item.key" v-for="item in screenList" :key="item.key">{{ item.name }}</el-checkbox>
@@ -26,7 +30,7 @@
             type="date"
             range
             value-type="format"
-            :placeholder="activeName === 1 ? '阅读时间' : '活动时间'"
+            :placeholder="activeName === 2 ? '活动时间' : '阅读时间'"
             :editable="false"
             @change="dateChange"
             style="width: 200px; margin-right: 20px"
@@ -44,7 +48,7 @@
       </div>
       <template v-if="activeName != 4">
         <el-table style="margin-top: 20px" :data="tableData" v-loading="tableLoading" element-loading-text="数据加载中..." border>
-          <el-table-column v-for="item in tableColums" :key="item.label" :label="item.label" :width="item.widthsty" :min-width="item.minwidthsty" align="center">
+          <el-table-column v-for="item in tableColumsList" :key="item.label" :label="item.label" :width="item.widthsty" :min-width="item.minwidthsty" align="center">
             <template slot-scope="{ row }">
               <span @click="handleRowClick(row, item.key)" :style="handleRowStyle(item.key)">{{ handleRowContent(row, item.key) }}</span>
             </template>
@@ -109,6 +113,7 @@ export default {
         EndDate: this.end_date,
         StartDate: this.start_date,
         KeyWord: this.searchVal,
+        ClassType: this.activeTypeName,
       };
       for (let key in params) {
         paramStr = `${paramStr}&${key}=${params[key]}`;
@@ -120,17 +125,25 @@ export default {
     return {};
   },
   mixins: [mutualMixin],
-  watch: {},
   created() {},
   mounted() {
     this.tableColums = tableColums(1);
     this.getCygxMutualList();
   },
   methods: {
+    // 类型的点击事件
+    typeHandleClick(item) {
+      if (this.activeTypeName == item.value) return;
+      this.activeTypeName = item.value;
+      this.activeName = 1;
+      this.tableColums = tableColums(this.activeName);
+      this.getCygxMutualList();
+    },
     //获取基础数据
     async getCygxMutualList() {
       const res = await equityContacts.getCygxMutualList({
         UserId: Number(this.$route.query.id),
+        ClassType: this.activeTypeName,
       });
       if (res.Ret === 200) {
         this.list = res.Data.List || [];
@@ -150,6 +163,7 @@ export default {
         MeetType: this.checkActiveList.join(","),
         EndDate: this.end_date,
         StartDate: this.start_date,
+        ClassType: this.activeTypeName,
         KeyWord: this.searchVal,
       });
       if (res.Ret === 200) {
@@ -164,6 +178,7 @@ export default {
         Source: this.activeName,
         PageSize: this.pageSize,
         CurrentIndex: this.page_no,
+        ClassType: this.activeTypeName,
       });
       if (res.Ret === 200) {
         this.publicHaveMove = res.Data ? this.page_no < res.Data.Paging.Pages : false;
@@ -199,7 +214,7 @@ export default {
     // 机构互助详情
     goWholeDetail() {
       console.log(this.$route.query);
-      return
+      return;
       const { href } = this.$router.resolve({
         path: "/organizationList",
         query: {
@@ -231,3 +246,8 @@ export default {
   }
 }
 </style>
+<style>
+.el-tabs__nav-wrap::after {
+  background-color: rgba(255, 255, 255, 0.5);
+}
+</style>

src/views/custom_manage/contacts/organizationList.vue

@@ -6,6 +6,9 @@
         <span class="attention">注：机构的互动详情，是截止至昨天24点的数据，非当前实时数据</span>
         <span class="organization-details" @click="goWholeDetail">全机构互动详情>></span>
       </div>
+      <div class="department-tabs">
+        <span :class="['item', activeTypeName == item.value && 'active']" v-for="item in typeList" :key="item.value" @click="typeHandleClick(item)">{{ item.label }}</span>
+      </div>
       <div class="tabs">
         <span :class="['item', activeName == item.Source && 'active']" v-for="item in list" :key="item.Source" @click="handleTabsClick(item)">{{ item.PermissionName }} ({{ item.TotalNum }})</span>
       </div>
@@ -22,7 +25,7 @@
           </el-tooltip>
         </div>
         <div class="dataReport-top">
-          <template v-if="activeName == 1 || activeName == 2">
+          <template v-if="showSelectBox">
             <date-picker
               v-model="filterObj.date"
               type="date"
@@ -50,7 +53,7 @@
       </div>
       <template v-if="activeName != 4">
         <el-table style="margin-top: 20px" :data="tableData" v-loading="tableLoading" element-loading-text="数据加载中..." border>
-          <el-table-column v-for="item in tableColums" :key="item.label" :label="item.label" :width="item.widthsty" :min-width="item.minwidthsty" align="center">
+          <el-table-column v-for="item in tableColumsList" :key="item.label" :label="item.label" :width="item.widthsty" :min-width="item.minwidthsty" align="center">
             <template slot-scope="{ row }">
               <span @click="handleRowClick(row, item.key)" :style="handleRowStyle(item.key)">{{ handleRowContent(row, item.key) }}</span>
             </template>
@@ -68,7 +71,7 @@
         <template v-if="publicHaveMoveCompany">
           <div v-for="item in chartList" :key="item.UserId">
             <template v-if="item.ListChart">
-              <ChartItem :chartData="item" />
+              <ChartItem :chartData="item" :activeTypeName="activeTypeName" />
             </template>
           </div>
         </template>
@@ -116,6 +119,7 @@ export default {
         StartDate: this.start_date,
         KeyWord: this.searchVal,
         ActivityName: this.activityName,
+        ClassType: this.activeTypeName,
       };
       for (let key in params) {
         paramStr = `${paramStr}&${key}=${params[key]}`;
@@ -131,10 +135,19 @@ export default {
     this.getSale();
   },
   methods: {
+    // 类型的点击事件
+    typeHandleClick(item) {
+      if (this.activeTypeName == item.value) return;
+      this.activeTypeName = item.value;
+      this.activeName = 1;
+      this.tableColums = organizationTableColums(this.activeName);
+      this.getCygxMutualList();
+    },
     //获取基础数据
     async getCygxMutualList() {
       const res = await equityContacts.getCompanyTableList({
         CompanyId: Number(this.$route.query.CompanyId),
+        ClassType: this.activeTypeName,
       });
       if (res.Ret === 200) {
         this.list = res.Data.List || [];
@@ -180,6 +193,7 @@ export default {
         StartDate: this.start_date,
         KeyWord: this.searchVal,
         ActivityName: this.activityName,
+        ClassType: this.activeTypeName,
       });
       if (res.Ret === 200) {
         this.total = res.Data.Paging.Totals;
@@ -195,6 +209,7 @@ export default {
         CurrentIndex: this.page_no,
         IdentityType: 2,
         KeyWord: this.searchVal,
+        ClassType: this.activeTypeName,
       });
       if (res.Ret === 200) {
         this.publicHaveMove = res.Data ? this.page_no < res.Data.Paging.Pages : false;
@@ -254,3 +269,8 @@ export default {
   }
 }
 </style>
+<style>
+.el-tabs__nav-wrap::after {
+  background-color: rgba(255, 255, 255, 0.5);
+}
+</style>

src/views/custom_manage/contacts/wholeOrganization.vue

@@ -2,6 +2,9 @@
   <div class="container-whole-organization">
     <el-card>
       <div class="introduce">注：机构的互动详情，是截止至昨天24点的数据，非当前实时数据</div>
+      <div class="department-tabs">
+        <span :class="['item', activeTypeName == item.value && 'active']" v-for="item in typeList" :key="item.value" @click="typeHandleClick(item)">{{ item.label }}</span>
+      </div>
       <div class="tabs">
         <span :class="['item', activeName == item.Source && 'active']" v-for="item in list" :key="item.Source" @click="handleTabsClick(item)">{{ item.PermissionName }} ({{ item.TotalNum }})</span>
       </div>
@@ -18,7 +21,7 @@
           </el-tooltip>
         </div>
         <div class="dataReport-top">
-          <template v-if="activeName == 1 || activeName == 2">
+          <template v-if="showSelectBox">
             <date-picker
               v-model="filterObj.date"
               type="date"
@@ -56,7 +59,7 @@
       </div>
       <template v-if="activeName != 4">
         <el-table style="margin-top: 20px" :data="tableData" v-loading="tableLoading" element-loading-text="数据加载中..." border>
-          <el-table-column v-for="item in tableColums" :key="item.label" :label="item.label" :width="item.widthsty" :min-width="item.minwidthsty" align="center">
+          <el-table-column v-for="item in tableColumsList" :key="item.label" :label="item.label" :width="item.widthsty" :min-width="item.minwidthsty" align="center">
             <template slot-scope="{ row }">
               <span @click="handleRowClick(row, item.key)" :style="handleRowStyle(item.key)">{{ handleRowContent(row, item.key) }}</span>
             </template>
@@ -74,7 +77,7 @@
         <template v-if="publicHaveMoveCompany">
           <div v-for="item in chartList" :key="item.UserId">
             <template v-if="item.ListChart">
-              <ChartItem :chartData="item" :companyName="item.CompanyName" />
+              <ChartItem :chartData="item" :companyName="item.CompanyName" :activeTypeName="activeTypeName"/>
             </template>
           </div>
           <el-col :span="24" class="toolbar">
@@ -131,7 +134,8 @@ export default {
         KeyWord: this.searchVal,
         ActivityName: this.activityName,
         AdminId: salesArr.join(","),
-      };
+        ClassType: this.activeTypeName,
+      };  
       for (let key in params) {
         paramStr = `${paramStr}&${key}=${params[key]}`;
       }
@@ -146,9 +150,17 @@ export default {
     this.getSale();
   },
   methods: {
+    // 类型的点击事件
+    typeHandleClick(item) {
+      if (this.activeTypeName == item.value) return;
+      this.activeTypeName = item.value;
+      this.activeName = 1;
+      this.tableColums = wholeOrganizationTableColums(this.activeName);
+      this.getCygxMutualList();
+    },
     //获取基础数据
     async getCygxMutualList() {
-      const res = await equityContacts.getUserTableCompanyList({});
+      const res = await equityContacts.getUserTableCompanyList({ ClassType: this.activeTypeName });
       if (res.Ret === 200) {
         this.list = res.Data.List || [];
         this.userForm = res.Data;
@@ -199,6 +211,7 @@ export default {
         KeyWord: this.searchVal,
         ActivityName: this.activityName,
         AdminId: salesArr.join(","),
+        ClassType: this.activeTypeName,
       });
       if (res.Ret === 200) {
         this.total = res.Data.Paging.Totals;
@@ -222,6 +235,7 @@ export default {
         PageSize: this.pageSize,
         CurrentIndex: this.page_no,
         AdminId: salesArr.join(","),
+        ClassType: this.activeTypeName,
       });
       if (res.Ret === 200) {
         this.chartList = res.Data.List || [];
@@ -257,3 +271,8 @@ export default {
   @import "./compontents/details.scss";
 }
 </style>
+<style>
+.el-tabs__nav-wrap::after {
+  background-color: rgba(255, 255, 255, 0.5);
+}
+</style>

src/views/ficc_manage/chapterVariety.vue

@@ -196,10 +196,12 @@ import { bannerupload, getchapterTypeList,editChapterType } from 'api/api.js';
 export default {
     components: { mDialog },
   beforeRouteEnter(to, from, next) {
-    if (to.query.reportType == 'day') {
+    if (to.query.reportType === 'day') {
       to.matched[1].name = '晨报章节设置'
-    } else {
+    } else if(to.query.reportType === 'week') {
       to.matched[1].name = '周报章节设置'
+    }else {
+      to.matched[1].name = '章节设置'
     }
     next()
   },
@@ -222,7 +224,7 @@ export default {
   },
   methods: {
     async getList() {
-      getchapterTypeList({ ReportType: this.$route.query.reportType == 'week' ? 'week' : 'day' }).then(res => {
+      getchapterTypeList({ ClassifyId:Number(this.$route.query.id) }).then(res => {
         if (res.Ret === 200) {
           this.list = res.Data.List || []
         }

src/views/ficc_manage/reportVariety.vue

@@ -30,7 +30,7 @@
           </div>
 
           <div class="opt-box">
-            <span class="editsty" v-if="['晨报','周报'].includes(data.ClassifyName)" @click="chapterSetting(data)">章节设置</span>
+            <span class="editsty" v-if="!data.Child" @click="chapterSetting(data)">章节设置</span>
             <span
               style="cursor: pointer; color: #409eff"
               @click.stop="handleShowEdit(data)"
@@ -295,7 +295,7 @@
           <el-form-item
             label="关联线上路演"
             prop="RelateVideo"
-            v-if="aeForm.parent_id!=0"
+            v-if="aeForm.isLastLevel"
           >
             <el-switch
               v-model="aeForm.RelateVideo"
@@ -544,13 +544,13 @@ export default {
   },
   methods: {
     chapterSetting(row){
-      let reportType;
+      let reportType='';
 			if(row.ClassifyName=='周报'){
 				reportType='week'
-			}else{
+			}else if(row.ClassifyName=='晨报'){
 				reportType='day'
 			}
-			this.$router.push({path:'chapterVariety',query:{reportType}})
+			this.$router.push({path:'chapterVariety',query:{id:row.Id,reportType}})
     },
     showInput(index){
 			if(index!=-1){
@@ -650,7 +650,8 @@ export default {
         ClassifyMenuId: item.ClassifyMenuId || '',
         YbRightBanner: item.YbRightBanner || '',
         relate: [item.RelateTel == 1 ? 1 : null, item.RelateVideo == 1 ? 2 : null],
-        RelateVideo:item.RelateVideo == 1?true:false
+        RelateVideo:item.RelateVideo == 1?true:false,
+        isLastLevel: item.Child ? false : true
       }
       this.ClassifyMenuList = item.ClassifyMenuList ? item.ClassifyMenuList.map(item => {
         return {

src/views/report_manage/components/setVarietyPause.vue

@@ -63,10 +63,11 @@ export default {
 		'isOpenDialog': {
 			handler(newval) {
         if(newval) {
+          console.log(this.setArr)
           this.pauseList = this.setArr.map(_=>({
             id: _.ReportChapterTypeId,
             name: _.ReportChapterTypeName,
-            date: _.PauseStartTime ? [_.PauseStartTime,_.PauseEndTime] : []
+            date: _.PauseStartTime ? [_.PauseStartTime,_.PauseEndTime] : [this.$moment().format('YYYY-MM-DD'),this.$moment().format('YYYY-MM-DD')]
           }))
         }
 			}