diff --git a/src/api/device/deviceList.js b/src/api/device/deviceList.js
index 6f1be6a..dda0743 100644
--- a/src/api/device/deviceList.js
+++ b/src/api/device/deviceList.js
@@ -10,7 +10,6 @@ export function ReqDeviceList(parameter) {
 }
 // &device_id=${device_id}
 
-
 // 编辑设备发起请求
 export function ReqDeviceEdit(parameter) {
     return request({
diff --git a/src/views/components/Editor.vue b/src/views/components/Editor.vue
index b602d70..35dc925 100644
--- a/src/views/components/Editor.vue
+++ b/src/views/components/Editor.vue
@@ -6,10 +6,10 @@
     </p>
     <el-row :gutter="10">
       <el-col :xs="24" :sm="24" :md="15" :lg="15" :xl="15">
-        <div ref="editor" class="text" />
+        <div ref="editor" class="text"></div>
       </el-col>
       <el-col :xs="24" :sm="24" :md="9" :lg="9" :xl="9">
-        <div v-html="editorContent" />
+        <div v-html="editorContent"></div>
       </el-col>
     </el-row>
   </div>
diff --git a/src/views/dashboard/LineChart.vue b/src/views/dashboard/LineChart.vue
index e654168..debc9d5 100644
--- a/src/views/dashboard/LineChart.vue
+++ b/src/views/dashboard/LineChart.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}" />
+  <div :class="className" :style="{height:height,width:width}"></div>
 </template>
 
 <script>
diff --git a/src/views/device/deviceConfig.vue b/src/views/device/deviceConfig.vue
index 55d831b..2128e3a 100644
--- a/src/views/device/deviceConfig.vue
+++ b/src/views/device/deviceConfig.vue
@@ -21,7 +21,7 @@
     <!-- 配置开关机列表 -->
     <el-row :gutter="15">
       <el-col>
-        <el-table style="width: 100%;" :data="startUpList" :header-cell-style="{ background: '#3a8aeb', color: '#fff' }" @selection-change="handleSelectionChange" >
+        <el-table style="width: 100%;" :data="startUpList" :header-cell-style="{ background: '#3a8aeb', color: '#fff' }" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" />
           <el-table-column prop="device_id" label="设备ID" align="center" />
           <el-table-column prop="device_account" label="设备账号" align="center" width="150" />
@@ -33,13 +33,13 @@
           </el-table-column>
           <el-table-column prop="period" label="配置周期" align="center" width="300">
             <template slot-scope="{row}">
-              <div v-show="row.open_setting">{{row.open_setting==1? '每天 - 开机 '+row.open_time :'每周'+setWeekly(row.open_weekly)+'开机'+row.open_time }}</div>
+              <div v-show="row.open_setting">{{ row.open_setting==1? '每天 - 开机 '+row.open_time :'每周'+setWeekly(row.open_weekly)+'开机'+row.open_time }}</div>
               <div v-show="row.open_setting">{{ row.close_setting==1?'每天 - 关机'+row.close_time :'每周'+setWeekly(row.close_weekly)+'关机'+row.close_time }}</div>
             </template>
           </el-table-column>
           <el-table-column label="启动画面" align="center">
             <template slot-scope="{row}">
-              <el-image class="cover_img" :src="row.startup_screen" v-show="row.startup_screen"></el-image>
+              <el-image v-show="row.startup_screen" class="cover_img" :src="row.startup_screen" />
             </template>
           </el-table-column>
           <el-table-column prop="update_time" label="创建时间" align="center" width="200">
@@ -49,27 +49,12 @@
           </el-table-column>
           <el-table-column fixed="right" label="操作" align="center" width="120">
             <template slot-scope="scope">
-              <el-button
-                type="primary"
-                class="edit_btn"
-                @click="editFormData(scope.row)"
-              >编辑</el-button>
+              <el-button type="primary" class="edit_btn" @click="editFormData(scope.row)">编辑</el-button>
               <el-button type="info" class="record_btn">记录</el-button>
             </template>
           </el-table-column>
         </el-table>
-       <el-pagination
-      style="margin-top: 20px; text-align: center"
-      :current-page="queryInfo.page"
-      :total="total"
-      :page-size="queryInfo.size"
-      :pager-count="7"
-      :page-sizes="[3, 5, 10]"
-      @current-change="getStartUpList"
-      @size-change="handleSizeChange"
-      layout="prev, pager, next, jumper,->,sizes,total"
-    >
-    </el-pagination>
+        <el-pagination style="margin-top: 20px; text-align: center" :current-page="queryInfo.page" :total="total" :page-size="queryInfo.size" :pager-count="7" :page-sizes="[3, 5, 10]" layout="prev, pager, next, jumper,->,sizes,total" @current-change="getStartUpList" @size-change="handleSizeChange" />
 
       </el-col>
     </el-row>
@@ -82,45 +67,28 @@
             <div class="setting_cont">
               <span>设置时间：</span>
               <div>
-                <el-form-item
-                  prop="open_setting"
-                  :rules="[
+                <el-form-item prop="open_setting" :rules="[
                     { required: true, message: '请选择开机时间', trigger: 'change' },
-                  ]"
-                  :class="{'no_margin': form.open_setting === 2}"
-                >
+                  ]" :class="{'no_margin': form.open_setting === 2}">
                   <el-radio-group v-model="form.open_setting" @change="clearCheckbox()">
                     <el-radio :label="1" value="everyday">每天</el-radio>
                     <el-radio :label="2" value="weekly">每周</el-radio>
                   </el-radio-group>
                 </el-form-item>
-                <el-form-item
-                  v-if="form.open_setting === 2"
-                  :class="{'weekly_margin': form.open_setting === 2}"
-                  prop="open_weekly"
-                  :rules="[
+                <el-form-item v-if="form.open_setting === 2" :class="{'weekly_margin': form.open_setting === 2}" prop="open_weekly" :rules="[
                     { required: true, message: '请选择每周开机时间', trigger: 'change' },
-                  ]"
-                >
+                  ]">
                   <el-checkbox-group v-model="selectOpenWeekly">
                     <el-checkbox v-for="item in weeklyList" :key="item.id" :label="item.id" :value="item.id" name="type">{{ item.name }}</el-checkbox>
                   </el-checkbox-group>
                 </el-form-item>
 
-                <el-form-item
-                  prop="open_time"
-                  :rules="[
+                <el-form-item prop="open_time" :rules="[
                     {type: 'string', required: true, message: '请选择具体开机时间', trigger: 'change' },
-                  ]"
-                >
-                  <el-time-picker
-                    v-model="form.open_time"
-                    :picker-options="{
+                  ]">
+                  <el-time-picker v-model="form.open_time" :picker-options="{
                       selectableRange: '00:00:00 - 23:59:59'
-                    }"
-                    placeholder="任意时间点"
-                    value-format="HH:mm:ss"
-                  />
+                    }" placeholder="任意时间点" value-format="HH:mm:ss" />
                 </el-form-item>
               </div>
             </div>
@@ -130,45 +98,28 @@
             <div class="setting_cont">
               <span>设置时间：</span>
               <div>
-                <el-form-item
-                  prop="close_setting"
-                  :rules="[
+                <el-form-item prop="close_setting" :rules="[
                     {required: true, message: '请选择关机时间', trigger: 'change' },
-                  ]"
-                  :class="{'no_margin': form.close_setting === 2}"
-                >
+                  ]" :class="{'no_margin': form.close_setting === 2}">
                   <el-radio-group v-model="form.close_setting" @change="clearCheckbox()">
                     <el-radio :label="1" value="everyday">每天</el-radio>
                     <el-radio :label="2" value="weekly">每周</el-radio>
                   </el-radio-group>
                 </el-form-item>
-                <el-form-item
-                  v-if="form.close_setting === 2"
-                  :class="{'weekly_margin': form.close_setting === 2}"
-                  prop="close_weekly"
-                  :rules="[
+                <el-form-item v-if="form.close_setting === 2" :class="{'weekly_margin': form.close_setting === 2}" prop="close_weekly" :rules="[
                     { required: true, message: '请选择每周关机时间', trigger: 'change' },
-                  ]"
-                >
+                  ]">
                   <el-checkbox-group v-model="selectCloseweekly">
                     <el-checkbox v-for="item in weeklyList" :key="item.id" :label="item.id" :value="item.id" name="type">{{ item.name }}</el-checkbox>
                   </el-checkbox-group>
                 </el-form-item>
 
-                <el-form-item
-                  prop="close_time"
-                  :rules="[
+                <el-form-item prop="close_time" :rules="[
                     {type: 'string', required: true, message: '请选择具体关机时间', trigger: 'change' },
-                  ]"
-                >
-                  <el-time-picker
-                    v-model="form.close_time"
-                    :picker-options="{
+                  ]">
+                  <el-time-picker v-model="form.close_time" :picker-options="{
                       selectableRange: '00:00:00 - 23:59:59'
-                    }"
-                    placeholder="任意时间点"
-                    value-format="HH:mm:ss"
-                  />
+                    }" placeholder="任意时间点" value-format="HH:mm:ss" />
                 </el-form-item>
               </div>
             </div>
@@ -177,12 +128,9 @@
             <h4>设备方向</h4>
             <div class="setting_cont">
               <span>设备方向：</span>
-              <el-form-item
-                prop="device_direction_name"
-                :rules="[
+              <el-form-item prop="device_direction_name" :rules="[
                   { required: true, message: '请选择具体设备方向', trigger: 'change' },
-                ]"
-              >
+                ]">
                 <el-select v-model="form.device_direction_name" size="small" class="filter-item" value-key="name" @change="selectDirection">
                   <el-option v-for="item in deviceData" :key="item.key" :label="item.name" :value="item" />
                 </el-select>
@@ -210,17 +158,17 @@
 
 <script>
 import UploadCover from '../components/upload_cover.vue'
-import { reqStartUpList, reqEditStartUp ,reqClearStartUp} from '@/api/device/startUpList.js'
+import { reqStartUpList, reqEditStartUp, reqClearStartUp } from '@/api/device/startUpList.js'
 import { parseTime } from '@/utils/index.js'
 export default {
   name: 'DeviceConfig',
   components: { UploadCover },
   filters: {
-    parseTime(time, cFormat) {
+    parseTime (time, cFormat) {
       return parseTime(time, cFormat)
     }
   },
-  data() {
+  data () {
     return {
       query: {
         blurry: ''
@@ -233,8 +181,8 @@ export default {
         page: 1,
         size: 3
       },
-      total:0,     
-       // 开关机列表的数据
+      total: 0,
+      // 开关机列表的数据
       startUpList: [],
       form: {
         device_direction: null,
@@ -289,7 +237,7 @@ export default {
   },
   computed: {
     // 将字符串渲染成汉字显示到页面
-    setWeekly() {
+    setWeekly () {
       const a = {
         1: '一',
         2: '二',
@@ -299,35 +247,35 @@ export default {
         6: '六',
         7: '七'
       }
-      return function(str) {
+      return function (str) {
         if (str) {
           return str.split(',').map(i => a[i]).join('/')
         }
       }
-    },
+    }
 
   },
   watch: {},
-  mounted() {
+  mounted () {
     this.getStartUpList()
   },
   methods: {
     // 获取开关机列表
-    getStartUpList(pager=1) {
-       this.queryInfo.page=pager
+    getStartUpList () {
+      // this.queryInfo.page = pager
       const params = this.queryInfo
       reqStartUpList(params).then(res => {
         if (res.code == 200) {
           this.startUpList = res.data.content
-          this.total=res.data.totalElements
-         this.queryInfo.size=res.data.size
+          this.total = res.data.totalElements
+          this.queryInfo.size = res.data.size
         } else {
           return this.$message.error('获取设备列表失败！')
         }
       })
     },
     // 编辑开关机
-    editFormData(row) {
+    editFormData (row) {
       this.addFromVisible = true
       this.form.device_id = row.device_id
       this.form.open_setting = row.open_setting
@@ -353,7 +301,7 @@ export default {
       })
     },
     // 每天/每周切换的情况下数据处理
-    clearCheckbox() {
+    clearCheckbox () {
       if (this.form.open_setting === 1) {
         this.open_weekly = []
         this.form.open_weekly = null
@@ -364,18 +312,18 @@ export default {
       }
     },
     // 选择设备方向处理
-    selectDirection(selVal) {
+    selectDirection (selVal) {
       console.log(selVal)
       this.form.device_direction = selVal.key
       this.form.device_direction_name = selVal.name
     },
     // 重置表单数据
-    resetForm(formName) {
+    resetForm (formName) {
       this.addFromVisible = false
       this.$refs[formName].resetFields()
     },
     // 提交表单数据
-    submitForm(formName) {
+    submitForm (formName) {
       this.form.startup_screen = this.$refs.childUpload.imageUrl
       if (this.form.open_setting === 2) {
         this.form.open_weekly = this.selectOpenWeekly.join(',')
@@ -415,7 +363,7 @@ export default {
     },
     // 列表多选操作 - 清空btn状态
     // 单选单个复选框
-    handleSelectionChange(sels) {
+    handleSelectionChange (sels) {
       this.sels = sels
       if (sels.length > 0) {
         this.clearBtnDisabled = false
@@ -424,72 +372,72 @@ export default {
       }
     },
     // 清空
-    removeStartUp(rows){
-      let ids=[]
-      rows.forEach(item=>{  
+    removeStartUp (rows) {
+      const ids = []
+      rows.forEach(item => {
         ids.push(item.device_id)
       })
       // console.log(ids)
-      this.$confirm('确定要清空选中的配置周期和启动画面吗?','提示', {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(()=>{
-         const params={
-           ids
-         }
-        reqClearStartUp(params).then(res=>{
+      this.$confirm('确定要清空选中的配置周期和启动画面吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const params = {
+          ids
+        }
+        reqClearStartUp(params).then(res => {
           console.log(res)
-          if(res.code==200){
+          if (res.code == 200) {
             this.$message({
               message: '清空成功',
               type: 'success'
             })
-            this.getStartUpList(this.deviceList.length>1?this.queryInfo.page:this.queryInfo.page-1)
-          }  
-        }).catch(()=>{
-        this.$message({
-          message:'清空失败',
-          type:'info'
+            this.getStartUpList(this.deviceList.length > 1 ? this.queryInfo.page : this.queryInfo.page - 1)
+          }
+        }).catch(() => {
+          this.$message({
+            message: '清空失败',
+            type: 'info'
+          })
         })
       })
-      })
     },
     // 每条显示数据改变时的事件
-     handleSizeChange(size) {
-      //整理参数
+    handleSizeChange (size) {
+      // 整理参数
       this.queryInfo.size = size
-      this.getStartUpList();
-    },
+      this.getStartUpList()
+    }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.setting_btn{
+.setting_btn {
   margin-right: 10px;
 }
 .clear_btn {
   color: #3a8aeb;
   border-color: #3a8aeb;
 }
-.cover_img{
+.cover_img {
   width: 65px;
 }
-.device_layer{
-  ::v-deep .el-dialog__body{
+.device_layer {
+  ::v-deep .el-dialog__body {
     padding: 0 20px;
   }
-  .setting_item{
+  .setting_item {
     padding-top: 24px;
     color: #333;
-    h4{
+    h4 {
       font-size: 16px;
       margin-bottom: 10px;
     }
-    .setting_cont{
+    .setting_cont {
       display: flex;
-      span{
+      span {
         display: block;
         width: 80px;
         line-height: 32px;
@@ -497,53 +445,52 @@ export default {
       .no_margin {
         margin: 0;
       }
-      .weekly_margin{
+      .weekly_margin {
         margin-bottom: 6px;
-        ::v-deep .el-form-item__error{
+        ::v-deep .el-form-item__error {
           top: 70%;
         }
       }
-      ::v-deep .el-form-item--small.el-form-item:last-child{
+      ::v-deep .el-form-item--small.el-form-item:last-child {
         margin: 0;
       }
-      ::v-deep .el-radio-group{
+      ::v-deep .el-radio-group {
         display: block;
         // line-height: 32px;
-        .el-radio{
+        .el-radio {
           line-height: 32px;
         }
       }
     }
-    .upload_img{
+    .upload_img {
       padding-left: 82px;
     }
   }
 }
-
 </style>
 
 <style>
-  .avatar-uploader .el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-  }
-  .avatar-uploader .el-upload:hover {
-    border-color: #409EFF;
-  }
-  .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 178px;
-    height: 178px;
-    line-height: 178px;
-    text-align: center;
-  }
-  .avatar {
-    width: 178px;
-    height: 178px;
-    display: block;
-  }
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
 </style>
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 30e2066..d4a0165 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -7,41 +7,16 @@
           <div class="form_item">
             <span>状态：</span>
             <el-select v-model="query.state" size="small" class="filter-item" style="width: 120px">
-              <el-option
-                v-for="item in stateData"
-                :key="item.key"
-                :label="item.name"
-                :value="item.key"
-              />
+              <el-option v-for="item in stateData" :key="item.key" :label="item.name" :value="item.key" />
             </el-select>
           </div>
           <div class="form_item">
             <span>设备ID：</span>
-            <el-input
-              v-model="queryInfo.device_id"
-              clearable
-              size="small"
-              placeholder="请输入设备ID"
-              style="width: 200px"
-              class="filter-item" 
-              @clear="getDevice"
-              @blur="queryDevice(queryInfo.device_id)"
-              @keyup.enter.native='queryDevice(queryInfo.device_id)'
-            />
+            <el-input v-model="queryInfo.device_id" clearable size="small" placeholder="请输入设备ID" style="width: 200px" class="filter-item" @clear="getDevice" @blur="queryDevice(queryInfo.device_id)" @keyup.enter.native="queryDevice(queryInfo.device_id)" />
           </div>
           <div class="form_item">
             <span>设备名称：</span>
-            <el-input
-              v-model="queryInfo.device_name"
-              clearable
-              size="small"
-              placeholder="请输入设备名称"
-              style="width: 200px"
-              class="filter-item"
-              @clear="getDevice"  
-              @blur="getDevice"
-              @keyup.enter.native="getDevice"
-            />
+            <el-input v-model="queryInfo.device_name" clearable size="small" placeholder="请输入设备名称" style="width: 200px" class="filter-item" @clear="getDevice" @blur="getDevice" @keyup.enter.native="getDevice" />
           </div>
         </el-col>
         <el-col class="page_add" :span="4">
@@ -52,22 +27,18 @@
     <!-- table :data="deviceList"-->
     <el-row :gutter="15">
       <el-col>
-        <el-table
-          style="width: 100%;"
-          :data="deviceList"
-          :header-cell-style="{ background: '#3a8aeb', color: '#fff' }"
-        >
+        <el-table style="width: 100%;" :data="deviceList" :header-cell-style="{ background: '#3a8aeb', color: '#fff' }">
           <el-table-column type="selection" width="55" />
           <el-table-column prop="device_id" label="设备ID" align="center" />
           <el-table-column prop="device_account" label="设备账号" align="center" />
           <el-table-column prop="device_name" label="设备名称" align="center" />
-          <el-table-column label="设备方向" align="center" >
-          <template slot-scope="{row}">
-              <div>{{row.device_direction==1? '竖屏' : '横屏' }}</div>
+          <el-table-column label="设备方向" align="center">
+            <template slot-scope="{row}">
+              <div>{{ row.device_direction==1? '竖屏' : '横屏' }}</div>
             </template>
-            </el-table-column>
-          <el-table-column prop="organ_name" label="所属机构" align="center"/> >
-           
+          </el-table-column>
+          <el-table-column prop="organ_name" label="所属机构" align="center" /> >
+
           <el-table-column prop="isDel" label="设备状态" align="center">
             <template slot-scope="scope">
               <div>{{ scope.row.isDel ? '在线' : '离线' }}</div>
@@ -78,18 +49,14 @@
               <el-button type="text" size="small" @click="handleClick(scope.row)">查看</el-button>
             </template>
           </el-table-column>
-          <el-table-column prop="update_time" label="创建时间" align="center" width="160" >
+          <el-table-column prop="update_time" label="创建时间" align="center" width="160">
             <template slot-scope="{row}">
-              <div>{{ row.update_time | parseTime}}</div>
+              <div>{{ row.update_time | parseTime }}</div>
             </template>
           </el-table-column>
           <el-table-column fixed="right" label="操作" align="center" width="160">
             <template slot-scope="scope">
-              <el-button
-                type="primary"
-                class="edit_btn"
-                @click="editFormData(scope.row)"
-              >编辑</el-button>
+              <el-button type="primary" class="edit_btn" @click="editFormData(scope.row)">编辑</el-button>
               <el-button type="danger" class="record_btn" @click="recordData(scope.$index, scope.row)">记录</el-button>
               <el-button type="danger" @click="removeDevice(scope.row)">解绑</el-button>
             </template>
@@ -97,27 +64,10 @@
         </el-table>
       </el-col>
     </el-row>
-      <el-pagination
-      style="margin-top: 20px; text-align: center"
-      :current-page="queryInfo.page"
-      :total="total"
-      :page-size="queryInfo.size"
-      :pager-count="7"
-      :page-sizes="[3, 5, 10]"
-      @current-change="getDevice"
-      @size-change="handleSizeChange"
-      layout="prev, pager, next, jumper,->,sizes,total"
-    >
-    </el-pagination>
+    <el-pagination style="margin-top: 20px; text-align: center" :current-page="queryInfo.page" :total="total" :page-size="queryInfo.size" :pager-count="7" :page-sizes="[3, 5, 10]" layout="prev, pager, next, jumper,->,sizes,total" @current-change="getDevice" @size-change="handleSizeChange" />
     <!-- 编辑设备 -->
     <div class="layer">
-      <el-dialog
-        :title="dialogTitle"
-        :close-on-click-modal="false"
-        :show-close="false"
-        :visible.sync="addFromVisible"
-        width="576px"
-      >
+      <el-dialog :title="dialogTitle" :close-on-click-modal="false" :show-close="false" :visible.sync="addFromVisible" width="576px">
         <el-form ref="form" :model="form" :rules="rules" label-width="100px">
           <el-form-item label="设备账号" prop="account">
             <el-input v-model="form.account" autocomplete="off" disabled />
@@ -127,12 +77,7 @@
           </el-form-item>
           <el-form-item label="设备方向" prop="orientation_name">
             <el-select v-model="form.orientation_name" size="small" class="filter-item" @change="selectDirection">
-              <el-option
-                v-for="item in deviceData"
-                :key="item.key"
-                :label="item.name"
-                :value="item"
-              />
+              <el-option v-for="item in deviceData" :key="item.key" :label="item.name" :value="item" />
             </el-select>
           </el-form-item>
         </el-form>
@@ -144,13 +89,7 @@
     </div>
 
     <div class="publish_layer">
-      <el-dialog
-        title="发布内容"
-        :close-on-click-modal="false"
-        :visible.sync="contentVisible"
-        width="970px"
-        height="590px"
-      >
+      <el-dialog title="发布内容" :close-on-click-modal="false" :visible.sync="contentVisible" width="970px" height="590px">
         <div class="content_warp">
           <h4>图片</h4>
           <ul class="item_list">
@@ -189,14 +128,7 @@
     </div>
 
     <!-- 记录 -->
-    <el-dialog
-      append-to-body
-      :close-on-click-modal="false"
-      :visible.sync="recordVisible"
-      title="记录"
-      class="record_layer"
-      width="750px"
-    >
+    <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="recordVisible" title="记录" class="record_layer" width="750px">
       <el-table :data="recordData">
         <el-table-column property="name" label="操作人" />
         <el-table-column property="permissionType" label="角色权限" />
@@ -210,20 +142,25 @@
 </template>
 
 <script>
-import { ReqDeviceEdit ,ReqDeviceList,ReqQueryDevice,ReqRemoveDevice} from '@/api/device/deviceList.js'
-import {parseTime} from '@/utils/index.js'
+import { ReqDeviceEdit, ReqDeviceList, ReqQueryDevice, ReqRemoveDevice } from '@/api/device/deviceList.js'
+import { parseTime } from '@/utils/index.js'
 export default {
   name: 'Device',
-  data() {
-    return {  
-      queryInfo:{
-        device_id:'',
-        device_name:'',
-        is_state:'',
-        page:1,
-        size:3
+  filters: {
+    parseTime (time, cFormat) {
+      return parseTime(time, cFormat)
+    }
+  },
+  data () {
+    return {
+      queryInfo: {
+        device_id: '',
+        device_name: '',
+        is_state: '',
+        page: 1,
+        size: 3
       },
-       total: 0,
+      total: 0,
       // device_id:'',
       dialogTitle: '',
       // 编辑的对话框
@@ -231,154 +168,146 @@ export default {
       contentVisible: false,
       recordVisible: false,
       // 设备列表的数据
-      deviceList:[],
+      deviceList: [],
       stateData: [{ key: '0', name: '全部' }, { key: '1', name: '在线' }, { key: '2', name: '离线' }],
       deviceData: [{ key: '1', name: '竖屏' }, { key: '2', name: '横屏' }],
-      query:{
-        state:null,
+      query: {
+        state: null
       },
       // 收集表单数据
       form: {
-       account: null,
-       name: null,
-       orientation_name:null,
-       orientation: null,
-       device_id:'',
-       orga_id:'1310000'
-     },
+        account: null,
+        name: null,
+        orientation_name: null,
+        orientation: null,
+        device_id: '',
+        orga_id: '1310000'
+      },
       rules: {
         name: [{ required: true, message: '请输入设备名称', trigger: 'blur' }, { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }],
         orientation: [{ required: true, message: '请选择设备方向', trigger: 'change' }]
       }
     }
   },
-  filters: {
-    parseTime(time, cFormat) {
-      return parseTime(time, cFormat)
-    }
-  },
   watch: {},
-  mounted(){
-     this.getDevice()
+  mounted () {
+    this.getDevice()
   },
   methods: {
     // 获取设备列表的数据
-    getDevice(pager=1){
-      this.queryInfo.page=pager
+    getDevice () {
+      // this.queryInfo.page = pager
       const params = this.queryInfo
       ReqDeviceList(params).then(res => {
         console.log(res)
-         if(res.code==200) {
-            this.deviceList=res.data.content
-            this.total=res.data.totalElements
-            this.queryInfo.size=res.data.size
-         }else{
-            return this.$message.error('获取设备列表失败！')
-         }
+        if (res.code == 200) {
+          this.deviceList = res.data.content
+          this.total = res.data.totalElements
+          this.queryInfo.size = res.data.size
+        } else {
+          return this.$message.error('获取设备列表失败！')
+        }
       })
-
     },
     // 编辑
-    editFormData(row) {
+    editFormData (row) {
       this.addFromVisible = true
       this.form.account = row.device_account
-      this.form.name=row.device_name
-      this.form.orientation_name=row.device_direction==1?'竖屏':'横屏'
-      this.form.orientation=row.device_direction
-      this.form.device_id=row.device_id     
+      this.form.name = row.device_name
+      this.form.orientation_name = row.device_direction == 1 ? '竖屏' : '横屏'
+      this.form.orientation = row.device_direction
+      this.form.device_id = row.device_id
     },
-      // 选择设备方向处理
-    selectDirection(selVal) {
+    // 选择设备方向处理
+    selectDirection (selVal) {
       console.log(selVal)
       this.form.orientation = selVal.key
       this.form.orientation_name = selVal.name
     },
     // 解绑
-    removeDevice(row){
+    removeDevice (row) {
       // console.log(row.device_id)
-      this.$confirm(`你确定解绑${row.device_name}?`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(()=>{
-        const params={
-          id:row.device_id
+      this.$confirm(`你确定解绑${row.device_name}?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const params = {
+          id: row.device_id
         }
-        ReqRemoveDevice(params).then(res=>{   
+        ReqRemoveDevice(params).then(res => {
           if (res.code === 200) {
             this.$message({
               message: '解绑成功',
               type: 'success'
             })
             // 解绑时 如果一页设备只剩下一个 则返回上一页
-             this.getDevice(this.deviceList.length>1?this.queryInfo.page:this.queryInfo.page-1)
-            
+            this.getDevice(this.deviceList.length > 1 ? this.queryInfo.page : this.queryInfo.page - 1)
           }
         })
-      }).catch(()=>{
+      }).catch(() => {
         this.$message({
-          message:'已取消解绑',
-          type:'info'
+          message: '已取消解绑',
+          type: 'info'
         })
       })
-
     },
-    recordData(index, row) {
+    recordData (index, row) {
       this.recordVisible = true
     },
     // 查看
-    handleClick(row) {
+    handleClick (row) {
       // console.log(row)
       this.contentVisible = true
     },
     // 修改设备信息并提交
-    submitForm(formName) {
+    submitForm (formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-       const params = {
-        account:this.form.account,
-        device_name:this.form.name,
-        device_direction:this.form.orientation, 
-        device_id:this.form.device_id,
-        orga_id:'13000'
-      }
-      console.log(params)
-      ReqDeviceEdit(params).then(res => {
-         if(res.code==200) {
-            this.$message({
-              type: "success",
-              message: '修改设备成功'
-            });
-         }
-         this.addFromVisible=false
-         this.getDevice(this.queryInfo.page)
-      })
-        } else { 
+          const params = {
+            account: this.form.account,
+            device_name: this.form.name,
+            device_direction: this.form.orientation,
+            device_id: this.form.device_id,
+            orga_id: '13000'
+          }
+          console.log(params)
+          ReqDeviceEdit(params).then(res => {
+            if (res.code == 200) {
+              this.$message({
+                type: 'success',
+                message: '修改设备成功'
+              })
+            }
+            this.addFromVisible = false
+            this.getDevice(this.queryInfo.page)
+          })
+        } else {
           console.log('error submit!!')
           return false
         }
       })
     },
     // 查询设备
-    queryDevice(id){
-      const params={
-        device_id:id
+    queryDevice (id) {
+      const params = {
+        device_id: id
       }
-      ReqQueryDevice(params).then(res=>{
+      ReqQueryDevice(params).then(res => {
         console.log(res)
-        if(res.code==200) {
-           this.getDevice()
+        if (res.code == 200) {
+          this.getDevice()
         }
       })
     },
     // 每条显示数据改变时的事件
-     handleSizeChange(size) {
-      //整理参数
+    handleSizeChange (size) {
+      // 整理参数
       this.queryInfo.size = size
-        this.getDevice()
-    },
- 
-  } 
+      this.getDevice()
+    }
+
+  }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/features/401.vue b/src/views/features/401.vue
index 8a3b69e..f37907a 100644
--- a/src/views/features/401.vue
+++ b/src/views/features/401.vue
@@ -20,7 +20,7 @@
         </ul>
       </el-col>
       <el-col :span="12">
-        <img :src="errGif" width="313" height="428" alt="Girl has dropped her ice cream.">
+        <img :src="errGif" width="313" height="428" alt="Girl has dropped her ice cream." />
       </el-col>
     </el-row>
   </div>
diff --git a/src/views/features/404.vue b/src/views/features/404.vue
index 237d81f..14bce85 100644
--- a/src/views/features/404.vue
+++ b/src/views/features/404.vue
@@ -2,10 +2,10 @@
   <div class="wscn-http404-container">
     <div class="wscn-http404">
       <div class="pic-404">
-        <img class="pic-404__parent" src="@/assets/404_images/404.png" alt="404">
-        <img class="pic-404__child left" src="@/assets/404_images/404_cloud.png" alt="404">
-        <img class="pic-404__child mid" src="@/assets/404_images/404_cloud.png" alt="404">
-        <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
+        <img class="pic-404__parent" src="@/assets/404_images/404.png" alt="404" />
+        <img class="pic-404__child left" src="@/assets/404_images/404_cloud.png" alt="404" />
+        <img class="pic-404__child mid" src="@/assets/404_images/404_cloud.png" alt="404" />
+        <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404" />
       </div>
       <div class="bullshit">
         <div class="bullshit__oops">OOPS!</div>
diff --git a/src/views/mnt/database/execute.vue b/src/views/mnt/database/execute.vue
index 94622fc..7e0e5c2 100644
--- a/src/views/mnt/database/execute.vue
+++ b/src/views/mnt/database/execute.vue
@@ -10,7 +10,7 @@
         class="upload-demo"
         drag
       >
-        <i class="el-icon-upload" />
+        <i class="el-icon-upload"></i>
         <div class="el-upload__text">
           将文件拖到此处，或
           <em>点击上传</em>
diff --git a/src/views/mnt/deploy/deploy.vue b/src/views/mnt/deploy/deploy.vue
index 4a411b4..6d688c1 100644
--- a/src/views/mnt/deploy/deploy.vue
+++ b/src/views/mnt/deploy/deploy.vue
@@ -10,7 +10,7 @@
         class="upload-demo"
         drag
       >
-        <i class="el-icon-upload" />
+        <i class="el-icon-upload"></i>
         <div class="el-upload__text">
           将文件拖到此处，或
           <em>点击上传</em>
diff --git a/src/views/publishContent/urgentMessage/index.vue b/src/views/publishContent/urgentMessage/index.vue
index ae8b62a..1b9ea27 100644
--- a/src/views/publishContent/urgentMessage/index.vue
+++ b/src/views/publishContent/urgentMessage/index.vue
@@ -1,575 +1,571 @@
 <template>
-	<div class="list_warp">
-		<el-row :gutter="15">
-			<el-col>
-				<!-- v-loading="crud.loading" -->
-				<el-table
-					ref="table"
-					:data="urgentMessage"
-					:header-cell-style="{ background: '#3a8aeb', color: '#fff' }"
-					@selection-change="handleSelectionChange"
-				>
-					<el-table-column type="selection" width="55" />
-					<!-- prop="name"  -->
-					<el-table-column
-						label="序号"
-						type="index"
-						align="center"
-						width="50"
-					/>
-					<el-table-column
-						label="发布内容"
-						align="center"
-						prop="context"
-						width="400"
-					>
-						<template slot-scope="{ row }">
-							<div>{{ row.context }}</div>
-						</template>
-					</el-table-column>
-					<el-table-column label="通知时间" align="center" prop="create_time">
-						<template slot-scope="{ row }">
-							<div>{{ row.create_time | parseTime }}</div>
-						</template>
-					</el-table-column>
+  <div class="list_warp">
+    <el-row :gutter="15">
+      <el-col>
+        <!-- v-loading="crud.loading" -->
+        <el-table
+          ref="table"
+          :data="urgentMessage"
+          :header-cell-style="{ background: '#3a8aeb', color: '#fff' }"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="55" />
+          <!-- prop="name"  -->
+          <el-table-column
+            label="序号"
+            type="index"
+            align="center"
+            width="50"
+          />
+          <el-table-column
+            label="发布内容"
+            align="center"
+            prop="context"
+            width="400"
+          >
+            <template slot-scope="{ row }">
+              <div>{{ row.context }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="通知时间" align="center" prop="create_time">
+            <template slot-scope="{ row }">
+              <div>{{ row.create_time | parseTime }}</div>
+            </template>
+          </el-table-column>
 
-					<el-table-column label="发布人" align="center" prop="creater_name" />
-					<el-table-column label="状态" align="center" prop="is_state">
-						<template slot-scope="{ row }">
-							<div :class="{ stop_txt: row.is_state }">
-								{{ row.is_state == 1 ? "发布中" : "停止" }}
-							</div>
-						</template>
-					</el-table-column>
-					<el-table-column
-						label="操作"
-						width="120px"
-						align="center"
-						fixed="right"
-					>
-						<template slot-scope="scope">
-							<el-button
-								type="primary"
-								class="edit_btn"
-								@click="editFormData(scope.row)"
-								>编辑</el-button
-							>
-							<el-button
-								type="primary"
-								:class="['start_btn', { stop_btn: scope.row.is_state == 1 }]"
-								@click="isStopHandle(scope.$index, scope.row)"
-								>{{ scope.row.is_state == 1 ? "停止" : "恢复" }}</el-button
-							>
-						</template>
-					</el-table-column>
-				</el-table>
-			</el-col>
-		</el-row>
-		<!-- 分页器 -->
-		<el-pagination
-			style="margin-top: 20px; text-align: center"
-			:current-page="queryInfo.page"
-			:total="total"
-			:page-size="queryInfo.size"
-			:pager-count="5"
-			:page-sizes="[3, 5, 10]"
-			@current-change="getUrgentMessage"
-			@size-change="handleSizeChange"
-			layout="prev, pager, next, jumper,->,sizes,total"
-		>
-		</el-pagination>
+          <el-table-column label="发布人" align="center" prop="creater_name" />
+          <el-table-column label="状态" align="center" prop="is_state">
+            <template slot-scope="{ row }">
+              <div :class="{ stop_txt: row.is_state }">
+                {{ row.is_state == 1 ? "发布中" : "停止" }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            width="120px"
+            align="center"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button
+                type="primary"
+                class="edit_btn"
+                @click="editFormData(scope.row)"
+              >编辑</el-button>
+              <el-button
+                type="primary"
+                :class="['start_btn', { stop_btn: scope.row.is_state == 1 }]"
+                @click="isStopHandle(scope.$index, scope.row)"
+              >{{ scope.row.is_state == 1 ? "停止" : "恢复" }}</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+    <!-- 分页器 -->
+    <el-pagination
+      style="margin-top: 20px; text-align: center"
+      :current-page="queryInfo.page"
+      :total="total"
+      :page-size="queryInfo.size"
+      :pager-count="5"
+      :page-sizes="[3, 5, 10]"
+      layout="prev, pager, next, jumper,->,sizes,total"
+      @current-change="getUrgentMessage"
+      @size-change="handleSizeChange"
+    />
 
-		<!-- 编辑紧急通知 -->
-		<div class="publish_layer">
-			<el-dialog
-				title="紧急发布"
-				: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="[
-							{ 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="[
-							{ 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="[
-							{ 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="[
-							{ 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="[
-							{ 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="[
-							{ 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
-							>
-						</el-radio-group>
-					</el-form-item>
-					<div v-if="form.notice_device === 1" class="select_all_tip">
-						所有设备都将被发送
-					</div>
-					<div
-						v-if="deviceTags.length > 0 && form.notice_device === 2"
-						class="select_other"
-					>
-						<el-row>
-							<el-col :span="10" class="other_tip"
-								>以下设备都将被发送<span
-									>总计{{ deviceTags.length }}个设备</span
-								></el-col
-							>
-							<el-col :span="4">
-								<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"
-							context_color="#cbe3ff"
-							@close="handleClose(tag)"
-						>
-							{{ tag.device_name }}
-						</el-tag>
-					</div>
-				</el-form>
-				<div slot="footer" class="dialog-footer">
-					<!-- :loading="crud.status.cu === 2"  
+    <!-- 编辑紧急通知 -->
+    <div class="publish_layer">
+      <el-dialog
+        title="紧急发布"
+        :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="[
+              { 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="[
+              { 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="[
+              { 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="[
+              { 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="[
+              { 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="[
+              { 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>
+            </el-radio-group>
+          </el-form-item>
+          <div v-if="form.notice_device === 1" class="select_all_tip">
+            所有设备都将被发送
+          </div>
+          <div
+            v-if="deviceTags.length > 0 && form.notice_device === 2"
+            class="select_other"
+          >
+            <el-row>
+              <el-col
+                :span="10"
+                class="other_tip"
+              >以下设备都将被发送<span>总计{{ deviceTags.length }}个设备</span></el-col>
+              <el-col :span="4">
+                <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"
+              context_color="#cbe3ff"
+              @close="handleClose(tag)"
+            >
+              {{ tag.device_name }}
+            </el-tag>
+          </div>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <!-- :loading="crud.status.cu === 2"
            @click="crud.submitCU"-->
-					<el-button type="primary" round @click="submit">保存</el-button>
-					<el-button round @click="closeDialog">关闭</el-button>
-				</div>
-			</el-dialog>
-		</div>
-		<!-- 添加发布的设备 -->
-		<!-- 添加发布的设备 -->
-		<div class="add_device_layer">
-			<el-dialog
-				title="请选择设备"
-				:close-on-click-modal="false"
-				:visible.sync="selectDeviceVisible"
-				width="400px"
-			>
-				<el-tag
-					v-for="tag in deviceList"
-					:key="tag.device_id"
-					:disable-transitions="true"
-					:hit="false"
-					color="#cbe3ff"
-					class="all_tags"
-					@click="tagHandle(tag)"
-				>
-					{{ tag.device_name }}
-				</el-tag>
-			</el-dialog>
-		</div>
-	</div>
+          <el-button type="primary" round @click="submit">保存</el-button>
+          <el-button round @click="closeDialog">关闭</el-button>
+        </div>
+      </el-dialog>
+    </div>
+    <!-- 添加发布的设备 -->
+    <!-- 添加发布的设备 -->
+    <div class="add_device_layer">
+      <el-dialog
+        title="请选择设备"
+        :close-on-click-modal="false"
+        :visible.sync="selectDeviceVisible"
+        width="400px"
+      >
+        <el-tag
+          v-for="tag in deviceList"
+          :key="tag.device_id"
+          :disable-transitions="true"
+          :hit="false"
+          color="#cbe3ff"
+          class="all_tags"
+          @click="tagHandle(tag)"
+        >
+          {{ tag.device_name }}
+        </el-tag>
+      </el-dialog>
+    </div>
+  </div>
 </template>
 
 <script>
-	import { parseTime } from "@/utils/index.js";
-	import { ReqDeviceList } from "@/api/device/deviceList.js";
-	import {
-		reqUrgentMessage,
-		reqQueryMessage,
-		reqEditMessage,
-    reqChangeMessage
-	} from "@/api/publish/urgentMessage";
-	export default {
-		name: "UrgentMessage",
-		filters: {
-			parseTime(time, cFormat) {
-				return parseTime(time, cFormat);
-			},
-		},
-		data() {
-			return {
-				isAddEdit: false,
-				form: {
-					context_color: "#ff0000", //文本的颜色
-					context: "", //文本的内容
-					context_position: null, //文本的位置
-					context_position_name: null,
-					context_speed_name: null,
-					context_speed: null, //文本的速度
-					context_size_name: null,
-					context_size: null, //文字的大小
-					// create_by:'', //发布人
-					notice_device: null,
-					notice_devices: [],
-					notice_id: "", //紧急通知的id
-					orga_id: "133221333123111",
-				},
-				queryInfo: {
-					notice_name: "",
-					orga_id: "133221333123111",
-					page: 1,
-					size: 3,
-				},
-				total: 0,
-				messageVisible: false,
-				selectDeviceVisible: false,
-				sizeData: [
-					{ key: 0, name: 16 },
-					{ key: 1, name: 22 },
-					{ key: 2, name: 24 },
-					{ key: 3, name: 30 },
-				],
-				positionData: [
-					{ key: 1, name: "顶部" },
-					{ key: 2, name: "中间" },
-					{ key: 3, name: "底部" },
-				],
-				speedData: [
-					{ key: 0, name: "1s" },
-					{ key: 1, name: "2s" },
-					{ key: 2, name: "3s" },
-				],
-				selectedList: [],
-				// 部分设备列表的数据
-				deviceList: [],
-				// newArr:[],
-				deviceTags: [],
-				// 紧急通知列表
-				urgentMessage: [],
-			};
-		},
-		mounted() {
-			this.getUrgentMessage();
-			this.getDevice();
-		},
-		methods: {
-			// 获取紧急通知的列表
-			getUrgentMessage(pager=1) {
-        this.queryInfo.page=pager
-				const params = this.queryInfo;
-				reqUrgentMessage(params).then((res) => {
-					if (res.code == 200) {
-						this.urgentMessage = res.data.content;
-						this.total = res.data.totalElements;
-						// console.log(this.urgentMessage);
-					}
-				});
-			},
-			// 获取设备列表的信息
-			getDevice() {
-				const params = this.queryInfo;
-				ReqDeviceList(params).then((res) => {
-					if (res.code == 200) {
-						this.deviceList = res.data.content;
-					} else {
-						return this.$message.error("获取设备列表失败！");
-					}
-				});
-			},
-      // 紧急通知的状态  is_state为1 发布中 2 停止
-      // row.is_state == 1 ? "停止" : "恢复"
-			isStopHandle(index, row) {
-        console.log(row)
-        // console.log(index)
-				if (row.is_state == 1) {
-					row.is_state = 2;       
-				} else {
-					row.is_state = 1;
-				}
-        const params={
-          id:row.notice_id,
-          state:row.is_state
+import { parseTime } from '@/utils/index.js'
+import { ReqDeviceList } from '@/api/device/deviceList.js'
+import {
+  reqUrgentMessage,
+  reqQueryMessage,
+  reqEditMessage,
+  reqChangeMessage
+} from '@/api/publish/urgentMessage'
+export default {
+  name: 'UrgentMessage',
+  filters: {
+    parseTime(time, cFormat) {
+      return parseTime(time, cFormat)
+    }
+  },
+  data() {
+    return {
+      isAddEdit: false,
+      form: {
+        context_color: '#ff0000', // 文本的颜色
+        context: '', // 文本的内容
+        context_position: null, // 文本的位置
+        context_position_name: null,
+        context_speed_name: null,
+        context_speed: null, // 文本的速度
+        context_size_name: null,
+        context_size: null, // 文字的大小
+        // create_by:'', //发布人
+        notice_device: null,
+        notice_devices: [],
+        notice_id: '', // 紧急通知的id
+        orga_id: '133221333123111'
+      },
+      queryInfo: {
+        notice_name: '',
+        orga_id: '133221333123111',
+        page: 1,
+        size: 3
+      },
+      total: 0,
+      messageVisible: false,
+      selectDeviceVisible: false,
+      sizeData: [
+        { key: 0, name: 16 },
+        { key: 1, name: 22 },
+        { key: 2, name: 24 },
+        { key: 3, name: 30 }
+      ],
+      positionData: [
+        { key: 1, name: '顶部' },
+        { key: 2, name: '中间' },
+        { key: 3, name: '底部' }
+      ],
+      speedData: [
+        { key: 0, name: '1s' },
+        { key: 1, name: '2s' },
+        { key: 2, name: '3s' }
+      ],
+      selectedList: [],
+      // 部分设备列表的数据
+      deviceList: [],
+      // newArr:[],
+      deviceTags: [],
+      // 紧急通知列表
+      urgentMessage: []
+    }
+  },
+  mounted() {
+    this.getUrgentMessage()
+    this.getDevice()
+  },
+  methods: {
+    // 获取紧急通知的列表
+    getUrgentMessage(pager = 1) {
+      this.queryInfo.page = pager
+      const params = this.queryInfo
+      reqUrgentMessage(params).then((res) => {
+        if (res.code == 200) {
+          this.urgentMessage = res.data.content
+          this.total = res.data.totalElements
+          // console.log(this.urgentMessage);
         }
-        reqChangeMessage(params).then(res=>{
-          // console.log(res)
-          if(res.code==200){
-            if(params.state==1){
-              this.$message({
-									type: "success",
-									message:'已发布成功！'						
-								});
-            }else{
+      })
+    },
+    // 获取设备列表的信息
+    getDevice() {
+      const params = this.queryInfo
+      ReqDeviceList(params).then((res) => {
+        if (res.code == 200) {
+          this.deviceList = res.data.content
+        } else {
+          return this.$message.error('获取设备列表失败！')
+        }
+      })
+    },
+    // 紧急通知的状态  is_state为1 发布中 2 停止
+    // row.is_state == 1 ? "停止" : "恢复"
+    isStopHandle(index, row) {
+      console.log(row)
+      // console.log(index)
+      if (row.is_state == 1) {
+        row.is_state = 2
+      } else {
+        row.is_state = 1
+      }
+      const params = {
+        id: row.notice_id,
+        state: row.is_state
+      }
+      reqChangeMessage(params).then(res => {
+        // console.log(res)
+        if (res.code == 200) {
+          if (params.state == 1) {
+            this.$message({
+              type: 'success',
+              message: '已发布成功！'
+            })
+          } else {
+            this.$message({
+              type: 'success',
+              message: '已停止！'
+            })
+          }
+        } else {
+          return this.$message.error('失败了~~~~')
+        }
+      })
+    },
+    // 编辑
+    editFormData(row) {
+      this.messageVisible = true
+      // 根据id查询返回的紧急通知的数据
+      const params = {
+        notice_id: row.notice_id
+      }
+      reqQueryMessage(params).then((res) => {
+        if (res.code == 200) {
+          this.form.notice_device = res.data.notice.noticeDevice
+          this.form.context_color = res.data.notice.contextColor
+          this.form.context = res.data.notice.context
+          this.form.context_position = res.data.notice.contextPosition
+          this.form.context_size = res.data.notice.contextSize
+          this.form.notice_id = row.notice_id
+          //  判断文字位置
+          if (this.form.context_position == 1) {
+            this.form.context_position_name = '顶部'
+          } else if (this.form.context_position == 2) {
+            this.form.context_position_name = '中部'
+          } else {
+            this.form.context_position_name = '底部'
+          }
+          // 判断速度
+          //   if(context_speed_name == 0){
+          //   this.form.context_speed_name='1s'
+          // }else if(this.form.context_speed==1){
+          //     this.form.context_speed_name='2s'
+          // }else{
+          //     this.form.context_speed_name='3s'
+          // }
+          // 判断文字大小
+          if (this.form.context_size == 0) {
+            this.form.context_size_name = '16'
+          } else if (this.form.context_size == 1) {
+            this.form.context_size_name = '22'
+          } else if (this.form.context_size == 2) {
+            this.form.context_size_name = '24'
+          } else {
+            this.form.context_size_name = '30'
+          }
+        }
+      })
+    },
+    // 新增
+    addFormData() {
+      this.messageVisible = true
+      this.$nextTick(() => {
+        this.form.notice_id = null
+      })
+    },
+    // 提交
+    submit() {
+      this.$refs.form.validate((valid) => {
+        // 修改
+        if (valid) {
+          const params = {
+            context: this.form.context,
+            context_color: this.form.context_color,
+            context_position: this.form.context_position,
+            context_size: this.form.context_size,
+            context_speed: this.form.context_speed,
+            notice_device: this.form.notice_device,
+            notice_devices: this.form.notice_devices,
+            notice_id: this.form.notice_id,
+            orga_id: '133221333123111'
+          }
+          reqEditMessage(params).then((res) => {
+            if (res.code == 200) {
               this.$message({
-									type: "success",
-									message:'已停止！'						
-								});
+                type: 'success',
+                message: this.form.notice_id
+                  ? '修改紧急通知成功'
+                  : '添加紧急通知成功'
+              })
+              this.messageVisible = false
+              this.getUrgentMessage(this.form.notice_id ? this.queryInfo : 1)
             }
-          }else{
-            	return this.$message.error("失败了~~~~");
-          }
+          })
+        }
+      })
+    },
+    // 所有设备和部分设备的切换数据处理
+    clearCheckbox() {
+      if (this.form.notice_device == 1) {
+        this.form.notice_devices = []
+      }
+    },
+    // 多选框
+    handleSelectionChange(val) {
+      this.selectedList = val
+      // if (val.length > 0) {
+      // 	this.clearBtnDisabled = false;
+      // } else {
+      // 	this.clearBtnDisabled = true;
+      // }
+    },
+    // 改变文字的颜色
+    headleChangeColor() {
+      this.form.context_size
+    },
+    // 改变文字的大小
+    selectSize(selVal) {
+      this.form.context_size = selVal.key
+      this.form.context_size_name = selVal.name
+    },
+    // 改变文字的位置
+    selectPosition(selVal) {
+      this.form.context_position = selVal.key
+      this.form.context_position_name = selVal.name
+    },
+    // 速度
+    selectSpeed(selVal) {
+      this.form.context_speed = selVal.key
+      this.form.context_speed_name = selVal.name
+    },
+    // 添加设备的对话框
+    addDeviceTag() {
+      this.selectDeviceVisible = true
+    },
+    // 添加设备
+    tagHandle(tag) {
+      // 收集参数 部分设备的列表
+      if (this.form.notice_devices.length == 0) {
+        this.form.notice_devices.push({ deviceId: tag.device_id })
+      } else {
+        const result = this.form.notice_devices.some((item) => {
+          return item.deviceId == tag.device_id
         })
-			},
-       
-
-			// 编辑
-			editFormData(row) {
-				this.messageVisible = true;
-				// 根据id查询返回的紧急通知的数据
-				const params = {
-					notice_id: row.notice_id,
-				};
-				reqQueryMessage(params).then((res) => {
-					if (res.code == 200) {
-						this.form.notice_device = res.data.notice.noticeDevice;
-						this.form.context_color = res.data.notice.contextColor;
-						this.form.context = res.data.notice.context;
-						this.form.context_position = res.data.notice.contextPosition;
-						this.form.context_size = res.data.notice.contextSize;
-						this.form.notice_id = row.notice_id;
-						//  判断文字位置
-						if (this.form.context_position == 1) {
-							this.form.context_position_name = "顶部";
-						} else if (this.form.context_position == 2) {
-							this.form.context_position_name = "中部";
-						} else {
-							this.form.context_position_name = "底部";
-						}
-						// 判断速度
-						//   if(context_speed_name == 0){
-						//   this.form.context_speed_name='1s'
-						// }else if(this.form.context_speed==1){
-						//     this.form.context_speed_name='2s'
-						// }else{
-						//     this.form.context_speed_name='3s'
-						// }
-						//判断文字大小
-						if (this.form.context_size == 0) {
-							this.form.context_size_name = "16";
-						} else if (this.form.context_size == 1) {
-							this.form.context_size_name = "22";
-						} else if (this.form.context_size == 2) {
-							this.form.context_size_name = "24";
-						} else {
-							this.form.context_size_name = "30";
-						}
-					}
-				});
-			},
-			// 新增
-			addFormData() {
-				this.messageVisible = true;
-				this.$nextTick(() => {
-					this.form.notice_id = null;
-				});
-			},
-			// 提交
-			submit() {
-				this.$refs.form.validate((valid) => {
-					// 修改
-					if (valid) {
-						const params = {
-							context: this.form.context,
-							context_color: this.form.context_color,
-							context_position: this.form.context_position,
-							context_size: this.form.context_size,
-							context_speed: this.form.context_speed,
-							notice_device: this.form.notice_device,
-							notice_devices: this.form.notice_devices,
-							notice_id: this.form.notice_id,
-							orga_id: "133221333123111",
-						};
-						reqEditMessage(params).then((res) => {
-							if (res.code == 200) {
-								this.$message({
-									type: "success",
-									message: this.form.notice_id
-										? "修改紧急通知成功"
-										: "添加紧急通知成功",
-								});
-								this.messageVisible = false;
-								this.getUrgentMessage(this.form.notice_id? this.queryInfo:1);
-							}
-						});
-					}
-				});
-			},
-			// 所有设备和部分设备的切换数据处理
-			clearCheckbox() {
-				if (this.form.notice_device == 1) {
-					this.form.notice_devices = [];
-				}
-			},
-      // 多选框
-			handleSelectionChange(val) {
-				this.selectedList = val;
-				// if (val.length > 0) {
-				// 	this.clearBtnDisabled = false;
-				// } else {
-				// 	this.clearBtnDisabled = true;
-				// }
-			},
-			// 改变文字的颜色
-			headleChangeColor() {
-				this.form.context_size;
-			},
-			// 改变文字的大小
-			selectSize(selVal) {
-				this.form.context_size = selVal.key;
-				this.form.context_size_name = selVal.name;
-			},
-			// 改变文字的位置
-			selectPosition(selVal) {
-				this.form.context_position = selVal.key;
-				this.form.context_position_name = selVal.name;
-			},
-			// 速度
-			selectSpeed(selVal) {
-				this.form.context_speed = selVal.key;
-				this.form.context_speed_name = selVal.name;
-			},
-			//添加设备的对话框
-			addDeviceTag() {
-				this.selectDeviceVisible = true;
-			},
-			// 添加设备
-			tagHandle(tag) {
-				// 收集参数 部分设备的列表
-				if (this.form.notice_devices.length == 0) {
-					this.form.notice_devices.push({ deviceId: tag.device_id });
-				} else {
-					const result = this.form.notice_devices.some((item) => {
-						return item.deviceId == tag.device_id;
-					});
-					if (!result) {
-						this.form.notice_devices.push({ deviceId: tag.device_id });
-					}
-				}
+        if (!result) {
+          this.form.notice_devices.push({ deviceId: tag.device_id })
+        }
+      }
 
-				// 添加设备不能重复 不重复才添加
-				if (this.deviceTags.length == 0) {
-					this.deviceTags.push(tag);
-				} else {
-					const current =
+      // 添加设备不能重复 不重复才添加
+      if (this.deviceTags.length == 0) {
+        this.deviceTags.push(tag)
+      } else {
+        const current =
 						this.deviceTags &&
-						this.deviceTags.some((item) => item.device_name == tag.device_name);
-					if (!current) {
-						this.deviceTags.push(tag);
-					} else {
-						this.$message("请勿添加重复的设备！");
-					}
-					// !this.deviceTags.some(item => item.device_name === tag.device_name)
-					//  && this.deviceTags.push(tag)
-				}
-			},
-			// 单独删除某一个设备
-			handleClose(tag) {
-				this.deviceTags.splice(this.deviceTags.indexOf(tag), 1);
-			},
-			// 清空设备
-			clearDevice() {
-				this.deviceTags = [];
-			},
-			// 关闭重置表单
-			closeDialog() {
-				this.messageVisible = false;
-				this.$refs.form.resetFields();
-			},
-      // 每条显示数据改变时的事件
-     handleSizeChange(size) {
-      //整理参数
-      this.queryInfo.size = size
-      this.getUrgentMessage();
+						this.deviceTags.some((item) => item.device_name == tag.device_name)
+        if (!current) {
+          this.deviceTags.push(tag)
+        } else {
+          this.$message('请勿添加重复的设备！')
+        }
+        // !this.deviceTags.some(item => item.device_name === tag.device_name)
+        //  && this.deviceTags.push(tag)
+      }
+    },
+    // 单独删除某一个设备
+    handleClose(tag) {
+      this.deviceTags.splice(this.deviceTags.indexOf(tag), 1)
     },
-		},
-	};
+    // 清空设备
+    clearDevice() {
+      this.deviceTags = []
+    },
+    // 关闭重置表单
+    closeDialog() {
+      this.messageVisible = false
+      this.$refs.form.resetFields()
+    },
+    // 每条显示数据改变时的事件
+    handleSizeChange(size) {
+      // 整理参数
+      this.queryInfo.size = size
+      this.getUrgentMessage()
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>