发布列表-编辑发布

src/api/material/material.js

@@ -62,3 +62,12 @@ export function getMaterialByType(parameter) {
     params: parameter
   })
 }
+
+// 根据素材id获取素材 - 素材库
+export function FetchFindMaterialById(parameter) {
+  return request({
+    url: 'api/material/findMaterialById',
+    method: 'post',
+    data: parameter
+  })
+}

src/api/release/release.js

@@ -1,28 +1,55 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 // 编辑 - 发布信息
 export function FetchSaveRelease(parameter) {
   return request({
-    url: "api/release/saveRelease",
-    method: "post",
-    data: parameter,
-  });
+    url: 'api/release/saveRelease',
+    method: 'post',
+    data: parameter
+  })
 }
 
 // list - 发布
 export function FetchGetReleaseList(parameter) {
   return request({
-    url: "api/release/getReleaseList",
-    method: "get",
-    params: parameter,
-  });
+    url: 'api/release/getReleaseList',
+    method: 'get',
+    params: parameter
+  })
 }
 
 // 根据id查询发布详细信息
 export function FetchGetReleaseDetailsById(parameter) {
   return request({
-    url: "api/release/getReleaseDetailsById",
-    method: "get",
-    params: parameter,
-  });
+    url: 'api/release/getReleaseDetailsById',
+    method: 'get',
+    params: parameter
+  })
+}
+
+// 改变发布状态
+export function FetchUpdateReleaseState(parameter) {
+  return request({
+    url: 'api/release/updateReleaseState',
+    method: 'post',
+    data: parameter
+  })
+}
+
+// 删除发布信息
+export function FetchDeleteRelease(parameter) {
+  return request({
+    url: 'api/release/deleteRelease',
+    method: 'post',
+    data: parameter
+  })
+}
+
+// 发布是否置顶
+export function FetchToppingRelease(parameter) {
+  return request({
+    url: 'api/release/toppingRelease',
+    method: 'post',
+    data: parameter
+  })
 }

src/utils/index.js

@@ -383,6 +383,22 @@ export function downloadFile(obj, name, suffix) {
   document.body.removeChild(link)
 }
 
+export function getNowFormatDate() {
+  var date = new Date()
+  var seperator1 = '-'
+  var year = date.getFullYear()
+  var month = date.getMonth() + 1
+  var strDate = date.getDate()
+  if (month >= 1 && month <= 9) {
+    month = '0' + month
+  }
+  if (strDate >= 0 && strDate <= 9) {
+    strDate = '0' + strDate
+  }
+  var currentdate = year + seperator1 + month + seperator1 + strDate
+  return currentdate
+}
+
 // 秒数转时分秒格式 h:m:s
 export function getSeconds(s) {
   if (s != null) {
@@ -431,3 +447,19 @@ export function formatBytes(bytes, decimals) {
   var i = Math.floor(Math.log(bytes) / Math.log(k))
   return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i]
 }
+
+// 将数字转成一，二
+export function setWeekly(str) {
+  const a = {
+    1: '一',
+    2: '二',
+    3: '三',
+    4: '四',
+    5: '五',
+    6: '六',
+    7: '七'
+  }
+  if (str) {
+    return str.split(',').map(i => a[i]).join('/')
+  }
+}

src/views/components/MaterialCompontentList.vue

@@ -33,7 +33,7 @@ export default {
   name: 'MaterialList',
   components: {},
   filters: {
-    getSeconds (s) {
+    getSeconds(s) {
       return getSeconds(s)
     }
   },
@@ -47,7 +47,7 @@ export default {
       required: true
     }
   },
-  data () {
+  data() {
     return {
       orga_id: '133221333123111', // 机构ID
       rootFolderId: null, // 根目录文件夹ID
@@ -66,20 +66,20 @@ export default {
     }
   },
   computed: {
-    changePlaceholder () {
+    changePlaceholder() {
       return this.publishType === 0 ? '即时发布 2022-01-01' : '定时发布 2022-01-01'
     },
-    defaultImg () {
+    defaultImg() {
       return 'this.src="' + require('@/assets/images/menu_bg_02.png') + '"'
     }
   },
   watch: {
-    isMultiSelected (newName, oldName) {
+    isMultiSelected(newName, oldName) {
       if (newName === false) {
         this.selectedListId = []
       }
     },
-    activeItemIndex (val) {
+    activeItemIndex(val) {
       if (val == 0) {
         this.materialType = null
         this.materialTypeNot = 2
@@ -89,12 +89,12 @@ export default {
       this.getMaterialList()
     }
   },
-  mounted () {
+  mounted() {
     this.getMaterialList()
   },
   methods: {
     // 获取素材库list
-    getMaterialList () {
+    getMaterialList() {
       this.materialFolders = []
       this.materialList = []
       let params
@@ -149,14 +149,14 @@ export default {
         }
       })
     },
-    returnFolder () {
+    returnFolder() {
       this.isReturn = false
       this.isToFolder = false
       this.rootFolderId = localStorage.getItem('rootFolderId')
       this.getMaterialList()
     },
     // 文件夹双击操作
-    floderDbClick (item, index) {
+    floderDbClick(item, index) {
       this.isToFolder = true
       this.currentFolderId = item.id
       localStorage.setItem('currentFolderId', this.currentFolderId)
@@ -164,8 +164,8 @@ export default {
       this.selectedListId = []
     },
     // 素材 - 多选
-    checkedItem (item) {
-      let id = item.material_id
+    checkedItem(item) {
+      const id = item.material_id
       const inFolderId = item.in_folder_id
       const type = item.material_type
       const arr = this.selectedListId

src/views/immediateRelease/index.vue

@@ -21,15 +21,27 @@
       <el-row class="in_release_item">
         <el-col class="step_1">第一步：设置时间</el-col>
         <el-col class="step_form">
-          <el-form-item label="发布时间" prop="release_start" :rules="[
+          <el-form-item
+            label="发布时间"
+            prop="release_start"
+            :rules="[
               { required: true, message: '请选择发布时间', trigger: 'change' }
-            ]" label-width="100px">
+            ]"
+            label-width="100px"
+          >
             <el-date-picker v-if="publishType == 0" v-model="form.release_start" value-format="yyyy-MM-dd HH:mm:ss" type="date" placeholder="选择日期" />
             <el-date-picker v-else v-model="form.release_start" value-format="yyyy-MM-dd HH:mm:ss" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
           </el-form-item>
-          <el-form-item v-if="publishType == 1" label="设置周期" prop="release_cycle" :rules="[
+          <el-form-item
+            v-if="publishType == 1"
+            label="设置周期"
+            prop="release_cycle"
+            :rules="[
               { required: true, message: '请设置周期', trigger: 'change' },
-            ]" :class="['set_weekly',{'no_margin': form.release_cycle == 2}]" label-width="100px">
+            ]"
+            :class="['set_weekly',{'no_margin': form.release_cycle == 2}]"
+            label-width="100px"
+          >
             <el-radio-group v-model="form.release_cycle" @change="clearCheckbox()">
               <el-radio :label="1">每天</el-radio>
               <el-radio :label="2">每周</el-radio>
@@ -61,16 +73,16 @@
           <div class="step_select_list">
             <div class="step_upload" @click="selectContVisible = true"></div>
             <draggable v-model="selectedMaterial" class="drag_list" @end="dragEnd">
-              <div v-for="(item, index) in selectedMaterial" :key="'list-'+index" :class="['material_item', 'item_cont']" @click="clickMaterialItem(item.material_id,item)">
-                <img v-if="item.img_path || item.material_type == 1" :src="item.img_path" :onerror="defaultImg" alt />
-                <div v-if="!item.img_path && item.material_type == 2" class="radio_img"></div>
+              <div v-for="(item, index) in selectedMaterial" :key="'list-'+index" :class="['material_item', 'item_cont']" @click="clickMaterialItem((item.material_id||item.id),item)">
+                <img v-if="(item.img_path|| item.imgPath) || (item.material_type == 1 || item.type == 1)" :src="(item.img_path||item.imgPath)" :onerror="defaultImg" alt />
+                <div v-if="(!item.img_path|| !item.imgPath) && (item.material_type == 2|| item.type == 2)" class="radio_img"></div>
                 <div class="item_format">
                   <span class="item_type">{{ materialPostfix[index] }}</span>
-                  <span v-if="item.material_type != '0'" class="item_time">{{ item.duration | getSeconds }}</span>
+                  <span v-if="item.material_type != '0' || item.type != '0'" class="item_time">{{ item.duration | getSeconds }}</span>
                 </div>
-                <div class="file_name">{{ item.material_name }}</div>
-                <div v-if="contentIds.includes(item.material_id)" class="select_handle">
-                  <div class="select_delt" @click.stop="selectDelt(item.material_id,index)">
+                <div class="file_name">{{ item.material_name || item.name }}</div>
+                <div v-if="contentIds.includes((item.material_id||item.id))" class="select_handle">
+                  <div class="select_delt" @click.stop="selectDelt((item.material_id||item.id),index)">
                     <svg class="font-icon icon1" aria-hidden="true">
                       <use xlink:href="#icon-guanbi2" />
                     </svg>
@@ -90,12 +102,16 @@
       <el-row class="in_release_item">
         <el-col class="step_1">第三步：选择设备</el-col>
         <el-col class="step_form">
-          <el-form-item label="" prop="release_device" :rules="[
+          <el-form-item
+            label=""
+            prop="release_device"
+            :rules="[
               { required: true, message: '请选择设备', trigger: 'change' },
-            ]">
+            ]"
+          >
             <el-radio-group v-model="form.release_device" @change="clearDevice()">
-              <el-radio label="1">所有设备</el-radio>
-              <el-radio label="2">部分设备<i v-if="form.release_device == 2" class="radio_tip" @click="addDeviceTag()">添加</i></el-radio>
+              <el-radio :label="1">所有设备</el-radio>
+              <el-radio :label="2">部分设备<i v-if="form.release_device == 2" class="radio_tip" @click="addDeviceTag()">添加</i></el-radio>
             </el-radio-group>
           </el-form-item>
           <div v-if="form.release_device == 1" class="select_all_tip">所有设备都将被发送</div>
@@ -127,7 +143,7 @@
             </li>
           </ul>
           <div class="material_list" style="min-height: 260px">
-            <MaterialList ref="MaterialList" :is-multi-selected="isMultiSelected" :mulit-text="mulitText" :activeItemIndex="activeItemIndex" />
+            <MaterialList ref="MaterialList" :is-multi-selected="isMultiSelected" :mulit-text="mulitText" :active-item-index="activeItemIndex" />
           </div>
         </div>
         <!-- 主题库 -->
@@ -243,10 +259,10 @@
 import draggable from 'vuedraggable'
 import ThemeGalleryList from '../components/ThemeGalleryList.vue'
 import MaterialList from '../components/MaterialCompontentList.vue'
-import { getMaterialByType } from '@/api/material/material'
+import { getMaterialByType, FetchFindMaterialById } from '@/api/material/material'
 import { ReqDeviceList } from '@/api/device/deviceList.js'
-import { FetchSaveRelease } from '@/api/release/release.js'
-import { getSeconds, formatBytes } from '@/utils/index.js'
+import { FetchSaveRelease, FetchGetReleaseDetailsById } from '@/api/release/release.js'
+import { getSeconds, formatBytes, parseTime } from '@/utils/index.js'
 export default {
   name: 'ImmediateRelease',
   components: {
@@ -255,14 +271,14 @@ export default {
     MaterialList
   },
   filters: {
-    getSeconds (s) {
+    getSeconds(s) {
       return getSeconds(s)
     },
-    formatBytes (bytes, decimals) {
+    formatBytes(bytes, decimals) {
       return formatBytes(bytes, decimals)
     }
   },
-  data () {
+  data() {
     return {
       orga_id: '133221333123111',
       selectedMaterial: [], // 从其他页面选择带过来的素材
@@ -272,7 +288,7 @@ export default {
       page: 1,
       pageSize: 10,
       audioListData: [], // 音频list
-      isMainBgm: null, //是最外层的bgm还是里面的
+      isMainBgm: null, // 是最外层的bgm还是里面的
       selectDeviceVisible: false, // 设备list - layer
       deviceAllTags: [], // 设备list
       deviceTags: [], // 已选择设备list
@@ -305,7 +321,7 @@ export default {
         // "rm_id": "关联id 新增则为null"
         // }
         release_materialDTOs: [],
-        release_start: '', // 发布开始时间 yyyy-MM-dd HH:mm:ss
+        release_start: null, // 发布开始时间 yyyy-MM-dd HH:mm:ss
         release_type: '' // 发布类型
       },
       contentIds: [],
@@ -381,18 +397,18 @@ export default {
         }
       ],
       activeIndex: 0,
-      activeItemIndex: 0,
+      activeItemIndex: 0
     }
   },
   computed: {
-    changePlaceholder () {
+    changePlaceholder() {
       return this.publishType == 0 ? '即时发布 2022-01-01' : '定时发布 2022-01-01'
     },
-    defaultImg () {
+    defaultImg() {
       return 'this.src="' + require('@/assets/images/menu_bg_02.png') + '"'
     }
   },
-  created () {
+  created() {
     this.selectedMaterial = []
     this.selectedMaterial = JSON.parse(localStorage.getItem('selectedMaterial'))
     // 素材类型格式处理
@@ -405,7 +421,7 @@ export default {
       })
     }
   },
-  mounted () {
+  mounted() {
     if (this.$route.path === '/release') {
       this.materialTabItem.pop()
     }
@@ -414,15 +430,71 @@ export default {
     }
     // 设备list
     this.ReqDeviceList()
+    if (localStorage.getItem('releaseId')) {
+      this.editRelease()
+    }
   },
   methods: {
+    editRelease() {
+      const release_id = JSON.parse(localStorage.getItem('releaseId'))
+      const params = {
+        release_id: release_id
+      }
+      FetchGetReleaseDetailsById(params).then(res => {
+        if (res.code == 200) {
+          console.log(res.data)
+          const releaseInfo = res.data.release
+          this.form.orga_id = releaseInfo.orgaId
+          this.form.relaase_name = releaseInfo.relaaseName
+          this.form.release_cycle = releaseInfo.releaseCycle
+          if (this.form.release_cycle == 2) {
+            this.selectWeekly = releaseInfo.releaseWeekly.split(',')
+          }
+
+          this.form.is_topping = releaseInfo.isTopping
+          this.form.release_device = releaseInfo.releaseDevice
+          if (releaseInfo.releaseType == 1) {
+            const arr = []
+            arr.push(parseTime(releaseInfo.releaseStart))
+            arr.push(parseTime(releaseInfo.releaseEnd))
+            this.form.release_start = arr
+          } else {
+            this.form.release_start = parseTime(releaseInfo.releaseStart)
+          }
+          if (releaseInfo.actualEnd) {
+            this.form.actual_end = releaseInfo.actualEnd
+          }
+          this.form.bgm_main = releaseInfo.bgmMain
+          this.form.release_deviceDTOs = res.data.release_devices
+          // 获取素材list
+          const materialIds = []
+          res.data.release_materials.map((item) => {
+            materialIds.push(item.materialId)
+          })
+          const params = {
+            ids: materialIds
+          }
+          FetchFindMaterialById(params).then(res => {
+            if (res.code == 200) {
+              console.log(res.data)
+              this.selectedMaterial = res.data
+            }
+          })
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    },
     // 发布提交
-    releaseSubmit (formName) {
+    releaseSubmit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           this.form.orga_id = this.orga_id
+          // 发布类型
+          this.form.release_type = this.publishType
           // 先判断编辑还是新增
           this.form.actual_end = this.publishType == 0 ? null : ''
+          // 设备选择判断
           if (this.form.release_device) {
             if (this.form.release_device == 1) {
               this.form.release_deviceDTOs = []
@@ -438,8 +510,7 @@ export default {
               })
             }
           }
-          this.form.release_type = this.publishType
-
+          // 根据发布类型 - 周期-时间
           if (this.publishType == 0) {
             this.form.release_cycle = 0
             this.form.release_weekly = null
@@ -453,6 +524,7 @@ export default {
             this.form.release_start = arrDate[0]
             this.form.release_end = arrDate[1]
           }
+          // 判断是否有localstorage有相应的list数据
           if (this.selectedMaterial) {
             this.form.release_materialDTOs = this.selectedMaterial.map((item, index) => {
               const json = {}
@@ -482,6 +554,7 @@ export default {
             } else {
               this.form.bgm_main = null
             }
+            // 保存提交
             FetchSaveRelease(this.form).then(res => {
               if (res.code == 200) {
                 this.$message.success('发布成功！')
@@ -494,13 +567,13 @@ export default {
             this.$message.error('请选择发布内容！')
           }
         } else {
-          console.log('error submit!!');
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
+      })
     },
     // 获取设备列表
-    ReqDeviceList () {
+    ReqDeviceList() {
       const params = {
         device_id: '',
         device_name: '',
@@ -517,11 +590,11 @@ export default {
       })
     },
     // 设备list - show
-    addDeviceTag () {
+    addDeviceTag() {
       this.selectDeviceVisible = true
     },
     // 设备选中list
-    tagHandle (tag) {
+    tagHandle(tag) {
       if (this.deviceTags.length == 0) {
         this.deviceTags.push(tag)
       } else {
@@ -536,15 +609,15 @@ export default {
       }
     },
     // 删除已选择的设备
-    deltTags (tag) {
+    deltTags(tag) {
       this.deviceTags.splice(this.deviceTags.indexOf(tag), 1)
     },
     // 清空已选择的设备
-    clearDevice () {
+    clearDevice() {
       this.deviceTags = []
     },
     // 根据素材类型获取素材
-    getMaterialByType () {
+    getMaterialByType() {
       const params = {
         'theme_name': '',
         'theme_type': this.themeType,
@@ -572,7 +645,7 @@ export default {
       })
     },
     // 删除选择的素材
-    selectDelt (id, i) {
+    selectDelt(id, i) {
       const index = this.contentIds.indexOf(id)
       this.contentIds.splice(index, 1)
       this.selectedEditData.splice(index, 1)
@@ -580,7 +653,7 @@ export default {
       localStorage.setItem('selectedMaterial', JSON.stringify(this.selectedMaterial))
     },
     // 选中可编辑的
-    clickMaterialItem (id, item) {
+    clickMaterialItem(id, item) {
       const arr = this.contentIds
       if (arr.includes(id)) {
         const index = arr.indexOf(id)
@@ -594,9 +667,9 @@ export default {
       }
     },
     // 编辑-已选择的
-    selectEdit () {
+    selectEdit() {
       this.listEditVisible = true
-      let form = {
+      const form = {
         showTime: '15',
         showAnimation: '',
         showAnimationName: ''
@@ -607,12 +680,12 @@ export default {
         }
       })
     },
-    dragEnd () {
+    dragEnd() {
       // console.log(this.selectedEditData)
       // console.log(this.selectedMaterial)
     },
     // 选择音频
-    selectAudioCont (type, index) {
+    selectAudioCont(type, index) {
       this.audioChecked = -1
       this.thisEditIndex = index
       this.isMultiSelected = false
@@ -624,7 +697,7 @@ export default {
       this.isMainBgm = type == 0 ? 0 : 1
     },
     // 音频选中-单选
-    audioCheckedHandle (index) {
+    audioCheckedHandle(index) {
       if (index != this.audioChecked) {
         this.audioChecked = index
       } else {
@@ -632,7 +705,7 @@ export default {
       }
     },
     // 音频选中 - 提交
-    audioCheckedSubmit () {
+    audioCheckedSubmit() {
       this.selectAudioVisible = false
       if (this.audioChecked != -1) {
         const index = this.audioChecked
@@ -657,37 +730,37 @@ export default {
       }
     },
     // 时间设置-切换到每天时
-    clearCheckbox () {
+    clearCheckbox() {
       if (this.form.release_cycle == 2) {
         this.selectWeekly = []
         this.form.release_weekly = []
       }
     },
     // 动画切换
-    selectAnimation (event, item) {
+    selectAnimation(event, item) {
       item.showAnimationName = event.name
       item.showAnimation = event.key
     },
     // 选择内容-素材库/主题库 tab
-    tabAll (index) {
+    tabAll(index) {
       this.activeIndex = index
       this.activeItemIndex = 0
       this.isMultiSelected = false
       this.mulitText = '多选'
     },
     // 子菜单-tab
-    tabItem (index) {
+    tabItem(index) {
       this.activeItemIndex = index
       console.log(this.activeItemIndex)
     },
     // 多选btn
-    multiSelectBtn (type) {
+    multiSelectBtn(type) {
       this.isMultiSelected = !this.isMultiSelected
       if (this.isMultiSelected) {
         this.mulitText = '取消'
         // 已选择的内容中-list是否包含，包含即选中状态
         this.selectedMaterial.forEach(item => {
-          this.$refs.MaterialList.selectedListId.push(item.material_id)
+          this.$refs.MaterialList.selectedListId.push(item.material_id || item.id)
           this.$refs.MaterialList.selectedMaterial.push(item)
         })
       } else {
@@ -700,7 +773,7 @@ export default {
       }
     },
     // 素材选择 - 确认按钮
-    uploadSelected () {
+    uploadSelected() {
       this.selectContVisible = false
       this.selectedMaterial = []
       this.selectedMaterial = this.$refs.MaterialList.selectedMaterial
@@ -715,7 +788,7 @@ export default {
       this.mulitText = '多选'
     },
     // 素材选择 - 取消按钮
-    cancelContSelect (type) {
+    cancelContSelect(type) {
       this.isMultiSelected = false
       if (type == 'audio') {
         this.selectAudioVisible = false

src/views/materialContent/index.vue

@@ -39,7 +39,7 @@ import MaterialList from './materialList/index'
 export default {
   name: 'MaterialContent',
   components: { MaterialList },
-  data () {
+  data() {
     return {
       activeIndex: 0,
       isMultiSelected: false,
@@ -47,18 +47,18 @@ export default {
     }
   },
   methods: {
-    handleClick (tab) {
+    handleClick(tab) {
       console.log(tab.index)
     },
-    handleUpload () {
+    handleUpload() {
       this.$refs.MaterialList.UploadList()
     },
-    multiSelectBtn () {
+    multiSelectBtn() {
       this.isMultiSelected = !this.isMultiSelected
       this.mulitText = this.isMultiSelected ? '取消' : '多选'
     },
     // 有选择中的文件夹时，同时存在素材多选操作时，素材多选操作取消
-    changedMultiSelected () {
+    changedMultiSelected() {
       if (this.isMultiSelected) {
         this.isMultiSelected = false
         this.mulitText = '多选'

src/views/materialContent/materialList/index.vue

@@ -28,7 +28,7 @@
       <!-- 素材库list -->
       <div v-for="(item, index) in materialList" :key="'list-'+index" :class="['material_item', 'item_cont', { 'item_multi': selectedListId.includes(item.material_id) }]">
         <img v-if="item.img_path || item.material_type == 1" :src="item.img_path" :onerror="defaultImg" alt />
-        <div v-if="item.material_type == 2" class="radio_img"></div>
+        <div v-if="!item.img_path && item.material_type == 2" class="radio_img"></div>
         <div class="item_format">
           <span class="item_type">{{ materialPostfix[index] }}</span>
           <span v-if="item.material_type !== '0'" class="item_time">{{ item.duration | getSeconds }}</span>
@@ -42,9 +42,13 @@
     <div class="publish_layer">
       <el-dialog :title="layerTitle" :close-on-click-modal="false" :show-close="false" :visible.sync="mkdirVisible" width="616px">
         <el-form ref="folderForm" :inline="true" :model="folderForm" size="small" label-width="100px">
-          <el-form-item :label="labelTxt" prop="name" :rules="[
+          <el-form-item
+            :label="labelTxt"
+            prop="name"
+            :rules="[
               { required: true, message: '请输入名称', trigger: 'blur' }
-            ]">
+            ]"
+          >
             <el-input v-model="folderForm.name" style="width: 336px" />
           </el-form-item>
           <el-form-item v-if="formatType != 0" label="封面">
@@ -97,7 +101,7 @@
 </template>
 
 <script>
-import { getMaterialList, saveMaterialFolder, deleteMaterialFolder, saveMaterial, deleteMyMaterial, moveMyMaterial, getMaterialByType } from '@/api/material/material'
+import { getMaterialList, saveMaterialFolder, deleteMaterialFolder, saveMaterial, deleteMyMaterial, moveMyMaterial } from '@/api/material/material'
 import Upload from '../../components/upload'
 import UploadCover from '../../components/upload_cover'
 import { getSeconds } from '@/utils/index.js'
@@ -105,7 +109,7 @@ export default {
   name: 'Material',
   components: { Upload, UploadCover },
   filters: {
-    getSeconds (s) {
+    getSeconds(s) {
       return getSeconds(s)
     }
   },
@@ -115,7 +119,7 @@ export default {
       required: true
     }
   },
-  data () {
+  data() {
     return {
       orga_id: '133221333123111', // 机构ID
       rootFolderId: null, // 根目录文件夹ID
@@ -157,34 +161,29 @@ export default {
     }
   },
   computed: {
-    defaultImg () {
+    defaultImg() {
       return 'this.src="' + require('@/assets/images/menu_bg_02.png') + '"'
     }
   },
   watch: {
-    isMultiSelected (newName, oldName) {
+    isMultiSelected(newName, oldName) {
       console.log('newName', newName)
       if (newName === false) {
         this.selectedListId = []
       }
     },
-    '$route.query.folderTag' (Val) {
+    '$route.query.folderTag'(Val) {
       console.log(Val)
-      // if (Val) {
-      //   this.isToFolder = true
-      // } else {
-      //   this.isToFolder = false
-      // }
     }
   },
-  mounted: function () {
+  mounted: function() {
     console.log(this.$route.query.folderTag)
     this.getMaterialList()
     document.addEventListener('click', this.hiddenFolderActiveClick)
   },
   methods: {
     // 获取素材库list
-    getMaterialList () {
+    getMaterialList() {
       let params
       if (this.$route.query.folderTag) {
         console.log('文件夹内')
@@ -229,7 +228,7 @@ export default {
       })
     },
     // 新建 / 编辑 文件夹
-    handleMkdir (mkdirType) {
+    handleMkdir(mkdirType) {
       this.mkdirVisible = true
       this.folderForm.fid = this.thisFoldId
       this.folderForm.orga_id = this.orga_id
@@ -247,7 +246,7 @@ export default {
       }
     },
     // 文件夹双击操作
-    floderDbClick (item, index) {
+    floderDbClick(item, index) {
       this.isEditMaterial = false
       this.$router.replace(
         {
@@ -264,12 +263,12 @@ export default {
       this.isEditFolder = false
     },
     // 点击其他区域选中的文件夹 去掉选中样式
-    hiddenFolderActiveClick () {
+    hiddenFolderActiveClick() {
       this.folderChecked = -1
       this.isEditFolder = false
     },
     // 选择 编辑 文件夹
-    editFolder (item, index) {
+    editFolder(item, index) {
       this.isEditMaterial = false
       this.selectedListId = []
       // 有选择中的文件夹时，同时存在素材多选操作时
@@ -290,7 +289,7 @@ export default {
       }
     },
     // 删除 文件夹
-    deleteMaterialFolder () {
+    deleteMaterialFolder() {
       this.$confirm('此操作将永久删除该文件夹, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -318,7 +317,7 @@ export default {
       })
     },
     // 提交表单 - 新建/编辑
-    submitForm (formName) {
+    submitForm(formName) {
       this.folderForm.img_path = this.$refs.childUpload.imageUrl
       this.$refs[formName].validate((valid) => {
         if (valid) {
@@ -346,13 +345,13 @@ export default {
       })
     },
     // 重置表单
-    resetForm () {
+    resetForm() {
       // 强制重置folderForm表单
       // Object.assign(this.$data.folderForm, this.$options.data.call(this).folderForm)
       this.mkdirVisible = false
     },
     // 选择素材 - to 即时发布/定时发布
-    publishHandle (index) {
+    publishHandle(index) {
       this.$router.push(
         {
           path: '/release', query: { tag: index }
@@ -362,7 +361,7 @@ export default {
       localStorage.setItem('selectedMaterial', JSON.stringify(this.selectedMaterial))
     },
     // 素材 - 编辑
-    editContent () {
+    editContent() {
       this.mkdirVisible = true
       this.labelTxt = '文件名称'
       this.isEditMaterial = true
@@ -383,7 +382,7 @@ export default {
       this.materialImgPath = checkedMaterial[0].img_path
     },
     // 上传素材
-    saveMaterial () {
+    saveMaterial() {
       if (!this.isEditMaterial) {
         console.log('新增')
         console.log(this.$refs.uploadMaterial.fileSize)
@@ -450,7 +449,7 @@ export default {
       }, 200)
     },
     // 素材 - 多选
-    selectedItem (item) {
+    selectedItem(item) {
       const id = item.material_id
       const inFolderId = item.in_folder_id
       const type = item.material_type
@@ -470,7 +469,7 @@ export default {
       }
     },
     // 素材 - 删除
-    deleteMyMaterial () {
+    deleteMyMaterial() {
       this.$confirm('此操作将永久删除该素材, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -496,11 +495,11 @@ export default {
         })
       })
     },
-    UploadList () {
+    UploadList() {
       this.uploadListVisible = true
     },
     // 点击-移动btn
-    moveingTo (index) {
+    moveingTo(index) {
       this.folderList = []
       if (this.materialFolders.length > 0) {
         this.folderList = this.materialFolders.slice(0, this.materialFolders.length)
@@ -514,12 +513,12 @@ export default {
       this.movingVisible = true
     },
     // 文件夹list - 选中操作
-    wjjSelected (item, index) {
+    wjjSelected(item, index) {
       this.folderListChecked = index
       this.thisFoldId = item.id
     },
     // 点击确定 - 移动素材
-    moveFile () {
+    moveFile() {
       if (this.materialFolders.length > 0) {
         if (this.thisFoldId == this.rootFolderId) {
           this.$message({
@@ -548,10 +547,10 @@ export default {
         }
       })
     },
-    format (percentage) {
+    format(percentage) {
       return percentage === 100 ? '100%' : `${percentage}%`
     },
-    start () {
+    start() {
       const that = this
       that.$nextTick(() => {
         that.progressLoading = true
@@ -564,7 +563,7 @@ export default {
       })
     },
     // 进度条结束
-    end () {
+    end() {
       this.loading_txt = '继续'
       // const that = this
       // that.percentage = 100

src/views/publishContent/index.vue

@@ -1,35 +1,24 @@
 <template>
   <div class="app-container">
     <div class="content_warp">
-      <el-tabs v-model="activeName"
-               @tab-click="handleClick">
-        <el-tab-pane label="发布列表"
-                     name="first">
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane label="发布列表" name="first">
           <PublistList />
         </el-tab-pane>
-        <el-tab-pane label="发布历史"
-                     name="second">
+        <el-tab-pane label="发布历史" name="second">
           <HistoryList />
         </el-tab-pane>
-        <el-tab-pane label="紧急通知"
-                     name="third">
+        <el-tab-pane label="紧急通知" name="third">
           <UrgentMessage ref="message" />
         </el-tab-pane>
       </el-tabs>
     </div>
-    <div v-if="activeName !== 'third'"
-         class="home_publish_btn">
-      <el-button round
-                 @click="publishHandle(0)">即时发布</el-button>
-      <el-button round
-                 type="primary"
-                 @click="publishHandle(1)">定时发布</el-button>
+    <div v-if="activeName !== 'third'" class="home_publish_btn">
+      <el-button round class="el_button_red" @click="publishHandle(0)">即时发布</el-button>
+      <el-button round type="primary" @click="publishHandle(1)">定时发布</el-button>
     </div>
-    <div v-else
-         class="home_publish_btn">
-      <el-button type="primary"
-                 round
-                 @click="addMessage">紧急发布</el-button>
+    <div v-else class="home_publish_btn">
+      <el-button type="primary" round @click="addMessage">紧急发布</el-button>
     </div>
   </div>
 </template>
@@ -41,17 +30,17 @@ import UrgentMessage from './urgentMessage/index'
 export default {
   name: 'PublishContent',
   components: { PublistList, HistoryList, UrgentMessage },
-  data () {
+  data() {
     return {
       activeName: 'first',
       mulitText: '多选'
     }
   },
   methods: {
-    handleClick (tab, event) {
+    handleClick(tab, event) {
       console.log(tab, event)
     },
-    publishHandle (index) {
+    publishHandle(index) {
       this.$router.push(
         {
           path: '/release', query: { tag: index }
@@ -59,7 +48,7 @@ export default {
       )
     },
     // 紧急发布 通知子组件发请求
-    addMessage () {
+    addMessage() {
       this.$refs.message.addFormData()
     }
   }

src/views/publishContent/publishList/index.vue

@@ -2,7 +2,7 @@
   <div class="list_warp">
     <el-row :gutter="15">
       <el-col>
-        <el-table ref="table" :data="publishList" :header-cell-style="{ background: '#3a8aeb', color: '#fff' }" class="publish_table" @selection-change="handleSelectionChange">
+        <el-table ref="table" :data="publishList" :header-cell-style="{ background: '#3a8aeb', color: '#fff' }" class="publish_table">
           <el-table-column type="selection" width="55" />
           <el-table-column label="文件名称" align="center" prop="relaase_name" />
           <el-table-column label="发布内容" align="center" prop="content">
@@ -15,7 +15,8 @@
           <el-table-column label="发布时间" align="center" prop="date" width="200px">
             <template slot-scope="scope">
               <div v-if="scope.row.release_type==0">{{ scope.row.release_start }}</div>
-              <div v-else>{{scope.row.release_start+" 至 "+scope.row.release_end}}</div>
+              <div v-else-if="scope.row.release_cycle==2">{{ scope.row.release_start+" 至 "+scope.row.release_end +'每周'+ scope.row.release_weekly }}</div>
+              <div v-else>{{ scope.row.release_start+" 至 "+scope.row.release_end +'每天' }}</div>
             </template>
           </el-table-column>
           <el-table-column label="发布类型" align="center" prop="type">
@@ -24,10 +25,10 @@
             </template>
           </el-table-column>
           <el-table-column label="发布人" align="center" prop="nick_name" />
-          <el-table-column label="状态" align="center" prop="enabled">
+          <el-table-column label="状态" align="center" prop="is_state">
             <template slot-scope="scope">
-              <div :class="{ stop_txt: scope.row.is_state }">
-                {{ scope.row.is_state==1 ? "发布中" : "停止" }}
+              <div :class="{ stop_txt: scope.row.is_state == 2 }">
+                {{ scope.row.is_state == 2 ? '停止' : (scope.row.stateTxt ? '发布中' : '未发布') }}
               </div>
             </template>
           </el-table-column>
@@ -43,44 +44,42 @@
           </el-table-column>
           <el-table-column label="操作" width="220px" align="center" fixed="right">
             <template slot-scope="scope">
-              <el-button type="primary" :class="['top_btn', { top_btn_active: scope.row.is_topping }]" @click="isTophandle(scope.$index, scope.row)">{{ scope.row.is_topping ? "取消" : "置顶" }}</el-button>
-              <el-button type="primary" class="edit_btn" @click="editForm(scope.$index, scope.row)">编辑</el-button>
-              <el-button type="primary" :class="['start_btn', { stop_btn: scope.row.is_state }]" @click="isStopHandle(scope.$index, scope.row)">{{ scope.row.is_state ? "停止" : "恢复" }}</el-button>
-              <el-button type="info" class="delt_btn">删除</el-button>
+              <el-button type="primary" :class="['top_btn', { top_btn_active: scope.row.is_topping }]" @click="isTophandle(scope.row)">{{ scope.row.is_topping ? "取消" : "置顶" }}</el-button>
+              <el-button type="primary" class="edit_btn" @click="editRelease(scope.row)">编辑</el-button>
+              <el-button type="primary" :class="['start_btn', { stop_btn: scope.row.is_state==1 }]" @click="isStopHandle(scope.row)">{{ scope.row.is_state==1 ? "停止" : "恢复" }}</el-button>
+              <el-button type="info" class="delt_btn" @click="deltHandle(scope.row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
       </el-col>
     </el-row>
+    <!-- 分页器 -->
+    <el-pagination style="margin-top: 20px;" background :current-page="page" :total="total" :page-size="size" :pager-count="5" :page-sizes="[3, 5, 10]" layout="prev, pager, next, jumper,->,sizes,total" @current-change="getPublishList" @size-change="handleSizeChange" />
   </div>
 </template>
 
 <script>
-import { parseTime } from '@/utils/index.js'
-import { FetchGetReleaseList, FetchGetReleaseDetailsById } from '@/api/release/release'
+import { parseTime, setWeekly, getNowFormatDate } from '@/utils/index.js'
+import { FetchGetReleaseList, FetchUpdateReleaseState, FetchDeleteRelease, FetchToppingRelease } from '@/api/release/release'
 export default {
   name: 'PublishList',
-  data () {
+  data() {
     return {
       orga_id: '133221333123111',
       page: 1,
       size: 10,
-      selectedList: [],
-      publishVisible: false,
-      messageVisible: false,
-      selectDeviceVisible: false,
-      isTypeDate: 0,
-      publishList: [],
-      deviceAllTags: ['GCXR1', 'GCXR2', 'GCXR3', 'GCXR4', 'GCXR5'],
-      deviceTags: []
+      total: 0,
+      stateTxt: null,
+      publishList: [] // 发布list
     }
   },
-  mounted () {
+  mounted() {
     this.getPublishList()
   },
   methods: {
     // 获取发布列表的数据
-    getPublishList () {
+    getPublishList(pager = 1) {
+      this.page = pager
       const params = {
         release_name: '',
         orga_id: this.orga_id,
@@ -90,53 +89,112 @@ export default {
       FetchGetReleaseList(params).then(res => {
         if (res.code == 200) {
           this.publishList = res.data.content
+          this.total = res.data.totalElements
           this.publishList.forEach(item => {
-            item.release_start = parseTime(item.release_start).split("00:00:00")[0]
-            item.release_end = parseTime(item.release_end).split("00:00:00")[0]
+            item.release_start = parseTime(item.release_start).split('00:00:00')[0]
+            item.release_end = parseTime(item.release_end).split('00:00:00')[0]
             if (item.binding_device) {
-              item.binding_device = item.binding_device.split(",")
+              item.binding_device = item.binding_device.split(',')
             }
+            if (item.release_weekly) {
+              item.release_weekly = setWeekly(item.release_weekly)
+            } else {
+              item.release_weekly = ''
+            }
+            // 发布开始时间与当天时间比较
+            const todayDate = getNowFormatDate()
+            item.stateTxt = this.dateCompare(item.release_start, todayDate)
           })
         } else {
           this.$message.error(res.msg)
         }
       })
     },
-    // 是否置顶
-    isTophandle (index, row) {
-      row.is_topping = !row.is_topping
+    // 每条显示数据改变时的事件
+    handleSizeChange(size) {
+      // 整理参数
+      this.size = size
+      this.getPublishList()
     },
-    // 是否停止发布
-    isStopHandle (index, row) {
-      row.is_state = !row.is_state
-    },
-    // 编辑
-    editForm (index, row) {
-      console.log(row)
+    // 是否置顶
+    isTophandle(row) {
       const params = {
-        release_id: row.release_id
+        id: row.release_id,
+        is_topping: !row.is_topping
       }
+      FetchToppingRelease(params).then(res => {
+        if (res.code == 200) {
+          this.$message.success(res.msg)
+          this.getPublishList()
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    },
+    // 编辑
+    editRelease(row) {
+      localStorage.setItem('releaseId', JSON.stringify(row.release_id))
       this.$router.push(
         {
-          path: '/release', query: { tag: 1 }
+          path: '/release', query: { tag: row.release_type }
         }
       )
-      FetchGetReleaseDetailsById(params).then(res => {
+    },
+    // 是否停止发布
+    isStopHandle(row) {
+      row.is_state = row.is_state == 1 ? 2 : 1
+      const params = {
+        id: row.release_id,
+        state: row.is_state
+      }
+      FetchUpdateReleaseState(params).then(res => {
         if (res.code == 200) {
-          console.log(res.data)
+          this.$message.success(res.msg)
+          this.getPublishList()
         } else {
           this.$message.error(res.msg)
         }
       })
     },
-    handleSelectionChange (val) {
-      this.selectedList = val
-      if (val.length > 0) {
-        this.clearBtnDisabled = false
+    // 删除发布信息
+    deltHandle(row) {
+      this.$confirm('此操作将永久删除该列表, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const params = {
+          id: row.release_id,
+          is_del: true
+        }
+        FetchDeleteRelease(params).then(res => {
+          if (res.code == 200) {
+            this.$message.success(res.msg)
+            this.getPublishList()
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          message: '已取消删除',
+          type: 'info'
+        })
+      })
+    },
+    // 时间比较 - 未发布状态
+    dateCompare(str1, str2) {
+      const arr = str1.split('-')
+      const startDate = new Date(arr[0], arr[1], arr[2])
+      const startTimes = startDate.getTime()
+      const arr2 = str2.split('-')
+      const currentDate = new Date(arr2[0], arr2[1], arr2[2])
+      const currentTimes = currentDate.getTime()
+      if (startTimes > currentTimes) {
+        return false
       } else {
-        this.clearBtnDisabled = true
+        return true
       }
-      console.log(val)
     }
   }
 }