diff --git a/src/utils/index.js b/src/utils/index.js
index 5bb196a..3e1dc64 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -383,6 +383,7 @@ export function downloadFile(obj, name, suffix) {
   document.body.removeChild(link)
 }
 
+// 获取当天的日期
 export function getNowFormatDate() {
   var date = new Date()
   var seperator1 = '-'
@@ -463,3 +464,10 @@ export function setWeekly(str) {
     return str.split(',').map(i => a[i]).join('/')
   }
 }
+
+// 根据url获取文件格式
+export function getFileFormat(str) {
+  if (str) {
+    return str.substring(str.lastIndexOf('.') + 1, str.length)
+  }
+}
diff --git a/src/views/ThemeGallery/index.vue b/src/views/ThemeGallery/index.vue
index 4e3f74b..f5e213a 100644
--- a/src/views/ThemeGallery/index.vue
+++ b/src/views/ThemeGallery/index.vue
@@ -41,7 +41,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="所属机构" prop="is_all_name">
-            <el-select v-model="classifyForm.is_all_name" style="width: 360px;" @change="selectorganization" value-key="name">
+            <el-select v-model="classifyForm.is_all_name" style="width: 360px;" value-key="name" @change="selectorganization">
               <el-option v-for="item in options" :key="item.key" :label="item.name" :value="item" />
             </el-select>
           </el-form-item>
@@ -57,12 +57,12 @@
 </template>
 
 <script>
-import { reqHeaderList, reqAddOrEdit } from "@/api/theme/theme.js";
+import { reqHeaderList, reqAddOrEdit } from '@/api/theme/theme.js'
 import ThemeGalleryList from '../components/ThemeGalleryList.vue'
 export default {
   name: 'ThemeGallery',
   components: { ThemeGalleryList },
-  data () {
+  data() {
     return {
       orga_id: '133221333123111', // 机构ID
       mulitText: '多选',
@@ -83,7 +83,7 @@ export default {
         is_all_name: '',
         is_all: false,
         id: '',
-        orga_ids: ["133221333123111"],
+        orga_ids: ['133221333123111'],
         selectName: null,
         direction: null,
         selectNameList: []
@@ -117,30 +117,28 @@ export default {
 
       // 导航栏的lsit
       tabItem: [],
-      activeIndex: 0,
-
+      activeIndex: 0
 
     }
   },
-  mounted () {
+  mounted() {
     this.getHeaderList()
   },
   methods: {
-    getHeaderList () {
+    getHeaderList() {
       const { orga_id } = this
       reqHeaderList(orga_id).then(res => {
         if (res.code == 200) {
           this.tabItem = res.data
-
         }
       })
     },
-    tabHandleClick (tab, event) {
+    tabHandleClick(tab, event) {
       console.log(tab.index)
       this.activeIndex = tab.index
     },
     // 多选btn
-    multiSelectBtn () {
+    multiSelectBtn() {
       this.isMultiSelected = !this.isMultiSelected
       if (this.isMultiSelected) {
         this.mulitText = '取消'
@@ -149,10 +147,10 @@ export default {
       }
     },
     // 上传历史-停用/恢复
-    isStopHandle (index, row) {
+    isStopHandle(index, row) {
       row.enabled = !row.enabled
     },
-    addEdit (index) {
+    addEdit(index) {
       this.addDialogVisible = true
       // index ? this.layerTitle = '编辑' : this.layerTitle = '新增'
       // index ? this.isAddEdit = 1 : this.isAddEdit = 0
@@ -175,7 +173,6 @@ export default {
         } else {
           this.classifyForm.is_all_name == '武汉图书馆'
         }
-
       } else {
         this.layerTitle = '新增'
         this.isAddEdit = 0
@@ -183,15 +180,13 @@ export default {
         this.classifyForm.class_name = ''
         this.classifyForm.is_all_name = ''
       }
-
     },
     // 上传
-    upload () {
+    upload() {
       //  通知子组件发请求
       this.$refs.ThemeGalleryList.saveMaterial()
-
     },
-    selectName (vId) {
+    selectName(vId) {
       this.classifyForm.id = vId.id
       this.classifyForm.class_name = vId.class_name
       // let obj = {}
@@ -201,14 +196,14 @@ export default {
       // this.classifyForm.class_name = obj.class_name
     },
     // 新增编辑
-    submitForm (formName) {
+    submitForm(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           const params = {
             class_name: this.classifyForm.class_name,
             is_all: this.classifyForm.is_all,
             id: this.classifyForm.id,
-            orga_ids: ["133221333123111"],
+            orga_ids: ['133221333123111']
           }
           reqAddOrEdit(params).then(res => {
             if (res.code == 200) {
@@ -218,8 +213,6 @@ export default {
               })
               this.addDialogVisible = false
               this.getHeaderList()
-
-
             }
           })
         } else {
@@ -228,22 +221,22 @@ export default {
         }
       })
     },
-    resetForm (formName) {
+    resetForm(formName) {
       this.addDialogVisible = false
       this.uploadDialogVisible = false
       this.$refs[formName].resetFields()
     },
     // 所属机构
-    selectorganization (selVal) {
+    selectorganization(selVal) {
       this.classifyForm.is_all = selVal.key
       this.classifyForm.is_all_name = selVal.name
     },
     // tabClick
 
-    tabItemClick (tab, event) {
+    tabItemClick(tab, event) {
       console.log(this.themeItemActive)
       console.log(tab, event)
-    },
+    }
 
   }
 }
diff --git a/src/views/components/MaterialCompontentList.vue b/src/views/components/MaterialCompontentList.vue
index 3070711..1e93223 100644
--- a/src/views/components/MaterialCompontentList.vue
+++ b/src/views/components/MaterialCompontentList.vue
@@ -15,9 +15,9 @@
     </div>
     <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 class="item_type">{{ item.deposit_url | getFileFormat }}</span>
         <span v-if="item.material_type !== '0'" class="item_time">{{ item.duration | getSeconds }}</span>
       </div>
       <div class="file_name">{{ item.material_name }}</div>
@@ -28,13 +28,16 @@
 
 <script>
 import { getMaterialList } from '@/api/material/material'
-import { getSeconds } from '@/utils/index.js'
+import { getSeconds, getFileFormat } from '@/utils/index.js'
 export default {
   name: 'MaterialList',
   components: {},
   filters: {
     getSeconds(s) {
       return getSeconds(s)
+    },
+    getFileFormat(str) {
+      return getFileFormat(str)
     }
   },
   props: {
@@ -56,7 +59,6 @@ export default {
       materialList: [], // 素材库list
       materialType: null,
       materialTypeNot: null,
-      materialPostfix: [], // 文件后缀格式
       selectedMaterial: [], // 素材选中
       selectedListId: [], // 素材选中的material_id
       selectinFolderid: [], // 素材选中的和文件关联表id -- in_folder_id
@@ -80,6 +82,7 @@ export default {
       }
     },
     activeItemIndex(val) {
+      console.log(val)
       if (val == 0) {
         this.materialType = null
         this.materialTypeNot = 2
@@ -90,6 +93,7 @@ export default {
     }
   },
   mounted() {
+    this.materialTypeNot = 2
     this.getMaterialList()
   },
   methods: {
@@ -131,16 +135,8 @@ export default {
           }
           this.materialFolders = res.data.materialFolders
           this.materialList = res.data.pageThemeVO
-
           // 创建文件夹获取data
           this.thisFoldId = res.data.thisFoldId
-          // 素材类型格式处理
-          this.materialList.forEach((item, key) => {
-            this.materialPostfix[key] = item.deposit_url.substring(
-              item.deposit_url.lastIndexOf('.') + 1,
-              item.deposit_url.length
-            )
-          })
         } else {
           this.$message({
             message: res.msg,
diff --git a/src/views/immediateRelease/index.vue b/src/views/immediateRelease/index.vue
index 4873351..1069a97 100644
--- a/src/views/immediateRelease/index.vue
+++ b/src/views/immediateRelease/index.vue
@@ -77,7 +77,7 @@
                 <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 class="item_type">{{ (item.deposit_url || item.depositUrl) | getFileFormat }}</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 || item.name }}</div>
@@ -122,8 +122,8 @@
                 <el-button round class="delt_btn" @click="clearDevice()">清空</el-button>
               </el-col>
             </el-row>
-            <el-tag v-for="tag in deviceTags" :key="tag.device_id" closable :disable-transitions="true" :hit="false" color="#cbe3ff" @close="deltTags(tag)">
-              {{ tag.device_name }}
+            <el-tag v-for="tag in deviceTags" :key="(tag.device_id || tag.deviceId)" closable :disable-transitions="true" :hit="false" color="#cbe3ff" @close="deltTags(tag)">
+              {{ tag.device_name || tag.deviceName }}
             </el-tag>
           </div>
         </el-col>
@@ -168,18 +168,20 @@
         </div>
         <div v-for="(item, index) in selectedEditData" :key="index" class="edit_material">
           <div class="edit_img">
-            <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>
+            <!-- <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> -->
+            <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>
             <span class="">{{ index+1 }}</span>
           </div>
           <div class="edit_cont">
             <div class="edit_cont_base">
-              <p>{{ item.material_name }}</p>
-              <span>{{ materialPostfix[index] }}</span>
-              <span>{{ item.file_size | formatBytes }}</span>
+              <p>{{ item.material_name || item.name }}</p>
+              <span>{{ (item.deposit_url || item.depositUrl) | getFileFormat }}</span>
+              <span>{{ (item.file_size||item.fileSize) | formatBytes }}</span>
             </div>
             <!-- <div v-if="item.material_type == 0" class="edit_cont_set"> -->
-            <el-form v-if="item.material_type == 0" :ref="setMaterialForm" :model="setMaterialForm.form" class="edit_cont_set" size="small">
+            <el-form v-if="item.material_type == 0 || item.type == 0" :ref="setMaterialForm" :model="setMaterialForm.form" class="edit_cont_set" size="small">
               <div class="set_time">
                 <span>展示时长</span>
                 <el-form-item :prop="'form.'+index+'.showTime'" style="width: 100px">
@@ -262,7 +264,7 @@ import MaterialList from '../components/MaterialCompontentList.vue'
 import { getMaterialByType, FetchFindMaterialById } from '@/api/material/material'
 import { ReqDeviceList } from '@/api/device/deviceList.js'
 import { FetchSaveRelease, FetchGetReleaseDetailsById } from '@/api/release/release.js'
-import { getSeconds, formatBytes, parseTime } from '@/utils/index.js'
+import { getSeconds, formatBytes, parseTime, getFileFormat } from '@/utils/index.js'
 export default {
   name: 'ImmediateRelease',
   components: {
@@ -276,13 +278,15 @@ export default {
     },
     formatBytes(bytes, decimals) {
       return formatBytes(bytes, decimals)
+    },
+    getFileFormat(str) {
+      return getFileFormat(str)
     }
   },
   data() {
     return {
       orga_id: '133221333123111',
       selectedMaterial: [], // 从其他页面选择带过来的素材
-      materialPostfix: [],
       publishType: 0, // 判断是定时发布还是即时发布页面
       themeType: null,
       page: 1,
@@ -309,17 +313,6 @@ export default {
         release_deviceDTOs: [], // {"device_id": "设备id"}
         release_end: '', // “发布结束时间 yyyy-MM-dd HH:mm:ss”
         release_id: null, // 发布id 为null则为新增
-        // {
-        // "duration": 时长(s),
-        // "effect": 切换动效,
-        // "material_id": "素材id",
-        // "material_name": "素材名称",
-        // "img_path","显示图片路径",
-        // "bgm_path":"背景音乐",
-        // "file_size":"文件大小",
-        // "ranking": 排序,
-        // "rm_id": "关联id 新增则为null"
-        // }
         release_materialDTOs: [],
         release_start: null, // 发布开始时间 yyyy-MM-dd HH:mm:ss
         release_type: '' // 发布类型
@@ -397,7 +390,10 @@ export default {
         }
       ],
       activeIndex: 0,
-      activeItemIndex: 0
+      activeItemIndex: 0,
+      release_id: null,
+      releaseInfo: null,
+      isEditMaterial: []
     }
   },
   computed: {
@@ -411,15 +407,6 @@ export default {
   created() {
     this.selectedMaterial = []
     this.selectedMaterial = JSON.parse(localStorage.getItem('selectedMaterial'))
-    // 素材类型格式处理
-    if (this.selectedMaterial) {
-      this.selectedMaterial.forEach((item, key) => {
-        this.materialPostfix[key] = item.deposit_url.substring(
-          item.deposit_url.lastIndexOf('.') + 1,
-          item.deposit_url.length
-        )
-      })
-    }
   },
   mounted() {
     if (this.$route.path === '/release') {
@@ -437,22 +424,23 @@ export default {
   methods: {
     editRelease() {
       const release_id = JSON.parse(localStorage.getItem('releaseId'))
+      this.release_id = release_id
       const params = {
         release_id: release_id
       }
       FetchGetReleaseDetailsById(params).then(res => {
         if (res.code == 200) {
-          console.log(res.data)
           const releaseInfo = res.data.release
+          this.releaseInfo = releaseInfo
           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(',')
+            if (releaseInfo.releaseWeekly) {
+              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))
@@ -461,13 +449,12 @@ export default {
           } 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 = []
+          this.isEditMaterial = res.data.release_materials
           res.data.release_materials.map((item) => {
             materialIds.push(item.materialId)
           })
@@ -476,10 +463,12 @@ export default {
           }
           FetchFindMaterialById(params).then(res => {
             if (res.code == 200) {
-              console.log(res.data)
               this.selectedMaterial = res.data
             }
           })
+          // 设备list
+          this.form.release_device = releaseInfo.releaseDevice
+          this.deviceTags = res.data.release_devices
         } else {
           this.$message.error(res.msg)
         }
@@ -492,8 +481,16 @@ export default {
           this.form.orga_id = this.orga_id
           // 发布类型
           this.form.release_type = this.publishType
-          // 先判断编辑还是新增
-          this.form.actual_end = this.publishType == 0 ? null : ''
+          // 实际结束时间
+          if (this.release_id) {
+            if (this.releaseInfo.actualEnd) {
+              this.form.actual_end = this.releaseInfo.actualEnd
+            }
+            this.form.release_id = this.release_id
+          } else {
+            this.form.actual_end = null
+            this.form.release_id = null
+          }
           // 设备选择判断
           if (this.form.release_device) {
             if (this.form.release_device == 1) {
@@ -505,7 +502,7 @@ export default {
               }
               this.form.release_deviceDTOs = this.deviceTags.map(item => {
                 const json = {}
-                json.device_id = item.device_id
+                json.device_id = item.device_id || item.deviceId
                 return json
               })
             }
@@ -528,7 +525,7 @@ export default {
           if (this.selectedMaterial) {
             this.form.release_materialDTOs = this.selectedMaterial.map((item, index) => {
               const json = {}
-              if (item.material_type == 0) {
+              if (item.material_type == 0 || item.type == 0) {
                 json.duration = (item.showTime || item.showAnimationName || item.showAnimation) ? item.showTime : 15
                 json.effect = (item.showTime || item.showAnimationName || item.showAnimation) ? item.showAnimation : 0
                 json.bgm_path = (item.showAudioName || item.showAudioUrl) ? item.showAudioUrl : null
@@ -537,17 +534,21 @@ export default {
                 json.effect = 0
                 json.bgm_path = null
               }
-              json.material_id = item.material_id
-              json.material_name = item.material_name
-              json.img_path = item.img_path
-              json.file_size = item.file_size
-              json.rm_id = null
+              json.material_id = item.material_id || item.id
+              json.material_name = item.material_name || item.name
+              json.img_path = item.img_path || item.imgPath
+              json.file_size = item.file_size || item.fileSize
+              if (this.release_id) {
+                json.rm_id = this.isEditMaterial[index].id
+              } else {
+                json.rm_id = null
+              }
               json.ranking = index + 1
               return json
             })
             // 判断最外层是否有bgm
             const isBgm = this.selectedMaterial.find(item => {
-              return item.material_type == 2
+              return item.material_type == 2 || item.type == 2
             })
             if (isBgm) {
               this.form.bgm_main = isBgm.deposit_url
@@ -599,7 +600,7 @@ export default {
         this.deviceTags.push(tag)
       } else {
         const result = this.deviceTags.find((item) => {
-          return item == tag
+          return (item.device_id || item.deviceId) == tag.device_id
         })
         if (!result) {
           this.deviceTags.push(tag)
@@ -629,13 +630,6 @@ export default {
       getMaterialByType(params).then(res => {
         if (res.code == 200) {
           this.audioListData = res.data.content
-          // 素材类型格式处理
-          this.audioListData.forEach((item, key) => {
-            this.materialPostfix[key] = item.deposit_url.substring(
-              item.deposit_url.lastIndexOf('.') + 1,
-              item.deposit_url.length
-            )
-          })
         } else {
           this.$message({
             message: res.msg,
@@ -712,7 +706,7 @@ export default {
         if (!this.isMainBgm) {
           this.audioListData[index].material_type = 2
           const resultIndex = this.selectedMaterial.findIndex((item, key) => {
-            return item.material_type == 2
+            return item.material_type == 2 || item.type == 2
           })
           if (resultIndex == -1) {
             this.selectedMaterial.push(this.audioListData[index])
@@ -751,7 +745,6 @@ export default {
     // 子菜单-tab
     tabItem(index) {
       this.activeItemIndex = index
-      console.log(this.activeItemIndex)
     },
     // 多选btn
     multiSelectBtn(type) {
@@ -777,13 +770,6 @@ export default {
       this.selectContVisible = false
       this.selectedMaterial = []
       this.selectedMaterial = this.$refs.MaterialList.selectedMaterial
-      // 素材类型格式处理
-      this.selectedMaterial.forEach((item, key) => {
-        this.materialPostfix[key] = item.deposit_url.substring(
-          item.deposit_url.lastIndexOf('.') + 1,
-          item.deposit_url.length
-        )
-      })
       localStorage.setItem('selectedMaterial', JSON.stringify(this.selectedMaterial))
       this.mulitText = '多选'
     },
diff --git a/src/views/materialContent/materialList/index.vue b/src/views/materialContent/materialList/index.vue
index cae2133..a5a8d54 100644
--- a/src/views/materialContent/materialList/index.vue
+++ b/src/views/materialContent/materialList/index.vue
@@ -29,7 +29,7 @@
         <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 class="item_format">
-          <span class="item_type">{{ materialPostfix[index] }}</span>
+          <span class="item_type">{{ item.deposit_url | getFileFormat }}</span>
           <span v-if="item.material_type !== '0'" class="item_time">{{ item.duration | getSeconds }}</span>
         </div>
         <div class="file_name">{{ item.material_name }}</div>
@@ -103,13 +103,16 @@
 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'
+import { getSeconds, getFileFormat } from '@/utils/index.js'
 export default {
   name: 'Material',
   components: { Upload, UploadCover },
   filters: {
     getSeconds(s) {
       return getSeconds(s)
+    },
+    getFileFormat(s) {
+      return getFileFormat(s)
     }
   },
   props: {
@@ -140,7 +143,6 @@ export default {
       formatType: null, // 上传素材类型 0 img 1 video 2 audio
       materialId: null, // 编辑时需要参数 id
       materialImgPath: '', // 素材封面
-      materialPostfix: [], // 文件后缀格式
       materialDuration: 0, // 时长
       materialName: '', // 素材名称
       uploadFileUrl: null, // 素材保存路径
@@ -216,14 +218,6 @@ export default {
         this.materialList = res.data.pageThemeVO
         // 创建文件夹获取data
         this.thisFoldId = res.data.thisFoldId
-        // 素材类型格式处理
-        this.materialList.forEach((item, key) => {
-          this.materialPostfix[key] = item.deposit_url.substring(
-            item.deposit_url.lastIndexOf('.') + 1,
-            item.deposit_url.length
-          )
-          // item.material_name = item.material_name.split('.')[0]
-        })
       })
     },
     // 新建 / 编辑 文件夹
diff --git a/src/views/publishContent/urgentMessage/index.vue b/src/views/publishContent/urgentMessage/index.vue
index 98f7339..2839590 100644
--- a/src/views/publishContent/urgentMessage/index.vue
+++ b/src/views/publishContent/urgentMessage/index.vue
@@ -42,41 +42,65 @@
     <div class="publish_layer">
       <el-dialog :title="form.notice_id==null? '紧急发布':'编辑'" :close-on-click-modal="false" :show-close="false" :visible.sync="messageVisible" width="872px">
         <el-form ref="form" :model="form" size="small" label-width="100px">
-          <el-form-item label="文本颜色" prop="context_color" :rules="[
+          <el-form-item
+            label="文本颜色"
+            prop="context_color"
+            :rules="[
               { required: true, message: '请选择文本颜色', trigger: '' },
-            ]">
+            ]"
+          >
             <colorPicker v-model="form.context_color" class="txt_color" @change="headleChangeColor" />
             <el-input v-show="false" v-model="form.context_color" />
           </el-form-item>
-          <el-form-item label="文本内容" prop="context" :rules="[
+          <el-form-item
+            label="文本内容"
+            prop="context"
+            :rules="[
               { required: true, message: '请输入文本内容', trigger: 'blur' },
-            ]">
+            ]"
+          >
             <el-input v-model="form.context" type="textarea" rows="6" style="width: 674px" />
           </el-form-item>
-          <el-form-item label="文本大小" prop="context_size_name" :rules="[
+          <el-form-item
+            label="文本大小"
+            prop="context_size_name"
+            :rules="[
               { required: true, message: '请选择文本大小', trigger: 'change' },
-            ]">
+            ]"
+          >
             <el-select v-model="form.context_size_name" size="small" class="filter-item" @change="selectSize">
               <el-option v-for="item in sizeData" :key="item.key" :label="item.name" :value="item" />
             </el-select>
           </el-form-item>
-          <el-form-item label="文本位置" prop="context_position_name" :rules="[
+          <el-form-item
+            label="文本位置"
+            prop="context_position_name"
+            :rules="[
               { required: true, message: '请选择文本位置', trigger: 'change' },
-            ]">
+            ]"
+          >
             <el-select v-model="form.context_position_name" size="small" value-key="name" class="filter-item" @change="selectPosition">
               <el-option v-for="item in positionData" :key="item.key" :label="item.name" :value="item" />
             </el-select>
           </el-form-item>
-          <el-form-item label="滚动速度" prop="context_speed_name" :rules="[
+          <el-form-item
+            label="滚动速度"
+            prop="context_speed_name"
+            :rules="[
               { required: true, message: '请选择滚动速度', trigger: 'change' },
-            ]">
+            ]"
+          >
             <el-select v-model="form.context_speed_name" size="small" class="filter-item" @change="selectSpeed">
               <el-option v-for="item in speedData" :key="item.key" :label="item.name" :value="item" />
             </el-select>
           </el-form-item>
-          <el-form-item label="选择设备" prop="notice_device" :rules="[
+          <el-form-item
+            label="选择设备"
+            prop="notice_device"
+            :rules="[
               { required: true, message: '请选择设备', trigger: 'change' },
-            ]">
+            ]"
+          >
             <el-radio-group v-model="form.notice_device" @change="clearCheckbox()">
               <el-radio :label="1" value="all">所有设备</el-radio>
               <el-radio :label="2" value="other">部分设备<i v-if="form.notice_device === 2" class="radio_tip" @click="addDeviceTag()">添加</i></el-radio>
@@ -128,11 +152,11 @@ import {
 export default {
   name: 'UrgentMessage',
   filters: {
-    parseTime (time, cFormat) {
+    parseTime(time, cFormat) {
       return parseTime(time, cFormat)
     }
   },
-  data () {
+  data() {
     return {
       isAddEdit: false,
       form: {
@@ -184,13 +208,13 @@ export default {
       urgentMessage: []
     }
   },
-  mounted () {
+  mounted() {
     this.getUrgentMessage()
     this.getDevice()
   },
   methods: {
     // 获取紧急通知的列表
-    getUrgentMessage (pager = 1) {
+    getUrgentMessage(pager = 1) {
       this.queryInfo.page = pager
       const params = this.queryInfo
       reqUrgentMessage(params).then((res) => {
@@ -202,7 +226,7 @@ export default {
       })
     },
     // 获取设备列表的信息
-    getDevice () {
+    getDevice() {
       const params = this.queryInfo
       ReqDeviceList(params).then((res) => {
         if (res.code == 200) {
@@ -214,7 +238,7 @@ export default {
     },
     // 紧急通知的状态  is_state为1 发布中 2 停止
     // row.is_state == 1 ? "停止" : "恢复"
-    isStopHandle (index, row) {
+    isStopHandle(index, row) {
       console.log(row)
       // console.log(index)
       if (row.is_state == 1) {
@@ -246,7 +270,7 @@ export default {
       })
     },
     // 编辑
-    editFormData (row) {
+    editFormData(row) {
       this.messageVisible = true
       // 根据id查询返回的紧急通知的数据
       const params = {
@@ -290,14 +314,14 @@ export default {
       })
     },
     // 新增
-    addFormData () {
+    addFormData() {
       this.messageVisible = true
       this.$nextTick(() => {
         this.form.notice_id = null
       })
     },
     // 提交
-    submit () {
+    submit() {
       this.$refs.form.validate((valid) => {
         // 修改
         if (valid) {
@@ -328,13 +352,13 @@ export default {
       })
     },
     // 所有设备和部分设备的切换数据处理
-    clearCheckbox () {
+    clearCheckbox() {
       if (this.form.notice_device == 1) {
         this.form.notice_devices = []
       }
     },
     // 多选框
-    handleSelectionChange (val) {
+    handleSelectionChange(val) {
       this.selectedList = val
       // if (val.length > 0) {
       // 	this.clearBtnDisabled = false;
@@ -343,31 +367,31 @@ export default {
       // }
     },
     // 改变文字的颜色
-    headleChangeColor () {
+    headleChangeColor() {
       this.form.context_size
     },
     // 改变文字的大小
-    selectSize (selVal) {
+    selectSize(selVal) {
       this.form.context_size = selVal.key
       this.form.context_size_name = selVal.name
     },
     // 改变文字的位置
-    selectPosition (selVal) {
+    selectPosition(selVal) {
       console.log(selVal)
       this.form.context_position = selVal.key
       this.form.context_position_name = selVal.name
     },
     // 速度
-    selectSpeed (selVal) {
+    selectSpeed(selVal) {
       this.form.context_speed = selVal.key
       this.form.context_speed_name = selVal.name
     },
     // 添加设备的对话框
-    addDeviceTag () {
+    addDeviceTag() {
       this.selectDeviceVisible = true
     },
     // 添加设备
-    tagHandle (tag) {
+    tagHandle(tag) {
       // 收集参数 部分设备的列表
       if (this.form.notice_devices.length == 0) {
         this.form.notice_devices.push({ deviceId: tag.device_id })
@@ -397,20 +421,20 @@ export default {
       }
     },
     // 单独删除某一个设备
-    handleClose (tag) {
+    handleClose(tag) {
       this.deviceTags.splice(this.deviceTags.indexOf(tag), 1)
     },
     // 清空设备
-    clearDevice () {
+    clearDevice() {
       this.deviceTags = []
     },
     // 关闭重置表单
-    closeDialog () {
+    closeDialog() {
       this.messageVisible = false
       this.$refs.form.resetFields()
     },
     // 每条显示数据改变时的事件
-    handleSizeChange (size) {
+    handleSizeChange(size) {
       // 整理参数
       this.queryInfo.size = size
       this.getUrgentMessage()