Merge remote-tracking branch 'origin/master'

src/utils/allPageData.js

@@ -3,8 +3,8 @@ export { typeField, enableOrDisable, yesOrNo, isExam }
 /** banner管理*/
 /** 分类*/
 const typeField = [
-  { value: '1', label: '首页' },
-  { value: '0', label: '活动' }
+  { value: '0', label: '首页' },
+  { value: '1', label: '活动' }
 ]
 /** 启用、停用*/
 const enableOrDisable = [

src/views/contentManagement/activity/index.vue

@@ -24,8 +24,8 @@
               <el-option v-for="item in yesOrNo" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="状态:" prop="flag">
-            <el-select v-model="queryParams.flag" placeholder="请选择发布状态" style="width: 150px" clearable>
+          <el-form-item label="状态:" prop="publishStatus">
+            <el-select v-model="queryParams.publishStatus" placeholder="请选择发布状态" style="width: 150px" clearable>
               <el-option
                 v-for="item in releaseStatusOptions"
                 :key="item.value"
@@ -512,10 +512,10 @@ export default {
     handleChangeTime() {
       if (this.dateRange && this.dateRange !== '' && this.dateRange !== undefined && this.dateRange.length > 0) {
         this.queryParams.beginTime = this.dateRange[0] + ' 00:00:00'
-        this.queryParams.endTime = this.dateRange[1] + ' 23:59:59'
+        this.queryParams.overTime = this.dateRange[1] + ' 23:59:59'
       } else {
         this.queryParams.beginTime = ''
-        this.queryParams.endTime = ''
+        this.queryParams.overTime = ''
       }
     },
     loadData1() {

src/views/contentManagement/activity/info/index.vue

@@ -5,7 +5,8 @@
         <span class="topTitleText">{{ title }}</span>
       </div>
       <div class="twoTitle">
-        <el-tag v-if="form.flag==='1'" type="success">已发布</el-tag>
+        <el-tag v-if="form.publishStatus==='1'" type="success">已发布</el-tag>
+        <el-tag v-else-if="form.publishStatus !=='2'" type="danger">未发布</el-tag>
       </div>
       <div class="updateBoby">
         <el-form ref="deviceFormRef" :model="form" :rules="rules" label-position="right" label-width="auto">
@@ -161,7 +162,10 @@
               <el-form-item
                 label="结束时间:"
                 prop="endTime"
-                :rules="{ required: !(controls.isOperation === '3'), message: '请选择结束时间', trigger: 'blur' }"
+                :rules="[
+                  { required: !(controls.isOperation === '3'), message: '请选择结束时间', trigger: 'blur' },
+                  { validator: validateEndTime, trigger: 'blur' }
+                  ]"
               >
                 <el-date-picker
                   v-model="form.endTime"
@@ -402,6 +406,7 @@ export default {
         title: null,
         isApplication: null,
         publishDate: null,
+        publishStatus: null,
         flag: null,
         startTime: null,
         endTime: null,
@@ -448,6 +453,20 @@ export default {
     this.setFormDefaults()
   },
   methods: {
+    //时间填写验证
+    validateEndTime(rule, value, callback) {
+    if (value && this.form.startTime) {
+      const startTime = new Date(this.form.startTime);
+      const endTime = new Date(value);
+      if (endTime < startTime) {
+        callback(new Error('结束时间不能早于开始时间'));
+      } else {
+        callback();
+      }
+    } else {
+      callback();
+    }
+  },
     // 活动内容预览
     contentPreview() {
       this.open = true
@@ -608,6 +627,7 @@ export default {
               }
             })
           } else {
+            this.form.publishStatus = '0'
             addCmsActivity(this.form).then(res => {
               if (res.code === 200) {
                 this.$message({
@@ -632,6 +652,7 @@ export default {
             // 编辑
             console.log('编辑打印', this.form)
             this.form.flag = '1'
+            this.form.publishStatus = '1'
             updateCmsActivity(this.form).then(res => {
               if (res.code === 200) {
                 this.$message({

src/views/contentManagement/notice/index.vue

@@ -25,7 +25,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="状态:" prop="flag">
-            <el-select v-model="queryParams.flag" placeholder="请选择发布状态" style="width: 150px" clearable>
+            <el-select v-model="queryParams.flag" placeholder="请选择状态" style="width: 150px" clearable>
               <el-option
                 v-for="item in releaseStatusOptions"
                 :key="item.value"

src/views/contentManagement/notice/info/index.vue

@@ -6,6 +6,7 @@
       </div>
       <div class="twoTitle">
         <el-tag v-if="form.flag==='1'" type="success">已发布</el-tag>
+        <el-tag v-else-if="form.flag==='0'" type="danger">未发布</el-tag>
       </div>
       <div class="updateBoby">
         <el-form ref="deviceFormRef" :model="form" :rules="rules" label-position="right" label-width="auto">

src/views/contentManagement/topic/index.vue

@@ -4,9 +4,9 @@
     <div v-show="showSwitch.courseContent" class="courseContent">
       <div class="search">
         <el-form ref="queryForm" style="padding: 30px 0 0 10px" :model="queryParams" :inline="true">
-          <el-form-item label="话题名称 :" prop="title">
+          <el-form-item label="话题名称 :" prop="topicName">
             <el-input
-              v-model.trim="queryParams.title"
+              v-model.trim="queryParams.topicName"
               placeholder="请输入话题名称"
               clearable
               :maxlength="30"
@@ -76,14 +76,13 @@
             </template>
           </el-table-column>
           <el-table-column align="center" prop="topicName" label="话题名称" min-width="200" show-overflow-tooltip />
-          <el-table-column align="center" prop="examStatus" label="审核状态" min-width="200" show-overflow-tooltip>
+          <el-table-column align="center" prop="examStatus" label="审核状态" min-width="130" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{ scope.row.examStatus === '0' ? '待审核' : scope.row.examStatus === '1' ? '已通过' : '已驳回' }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="weight" label="权重" min-width="200" show-overflow-tooltip />
-          <el-table-column align="center" prop="articleCount" label="动态数" min-width="200" show-overflow-tooltip />
-
+          <el-table-column align="center" prop="weight" label="权重" min-width="130" show-overflow-tooltip />
+          <el-table-column align="center" prop="articleCount" label="动态数" min-width="130" show-overflow-tooltip />
           <el-table-column align="left" prop="flag" label="状态" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
               <el-switch
@@ -101,11 +100,11 @@
                     </template>
                   </el-table-column>-->
 
-          <!--          <el-table-column align="left" prop="createDate" label="提交时间" show-overflow-tooltip>
-                    <template slot-scope="scope">
-                      <span>{{ scope.row.createDate }}</span>
-                    </template>
-                  </el-table-column>-->
+          <!-- <el-table-column align="left" prop="createDate" label="发布时间" min-width="200" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ scope.row.createDate }}</span>
+            </template>
+          </el-table-column> -->
 
           <el-table-column align="center" label="操作" min-width="180">
             <template slot-scope="scope">