清空功能横竖屏以及紧急发布列表的获取

3 years ago · 09d77810cb
4 changed files with 74 additions and 19 deletions
--- a/src/api/device/startUpList.js
+++ b/src/api/device/startUpList.js
@ -18,11 +18,11 @@ export function reqEditStartUp(parameter) {
    })
 }

-// 情况开关机配置列表的接口
+// 清空开关机配置列表的接口
 export function reqClearStartUp(parameter) {
    return request({
        url: 'api/device/clearSetting',
        method: 'post',
-        data: 'parameter'
+        data: parameter
    })
 }
--- a/src/views/device/deviceConfig.vue
+++ b/src/views/device/deviceConfig.vue
@ -5,7 +5,7 @@
      <el-row type="flex">
        <el-col :span="20" class="col_flex">
          <div class="form_item">
-            <span>设备ID：</span>
+            <span>设备ID:</span>
            <el-input v-model="queryInfo.device_id" clearable size="small" placeholder="请输入设备ID" style="width: 200px" class="filter-item" @keyup.enter.native="getStartUpList" @blur="getStartUpList" />
          </div>
          <div class="form_item">
@ -14,15 +14,14 @@
          </div>
        </el-col>
        <el-col class="page_add" :span="4">
-          <!-- @click="clearStartUp" -->
-          <el-button class="table_add clear_btn" plain :disabled="clearBtnDisabled">清空</el-button>
+          <el-button class="table_add clear_btn" plain :disabled="clearBtnDisabled" @click="removeStartUp(sels)">清空</el-button>
        </el-col>
      </el-row>
    </div>
    <!-- 配置开关机列表 -->
    <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" />
@ -34,13 +33,13 @@
          </el-table-column>
          <el-table-column prop="period" label="配置周期" align="center" width="300">
            <template slot-scope="{row}">
-              <div>{{ row.open_setting==1? '每天 - 开机 '+row.open_time :'每周'+setWeekly(row.open_weekly)+'开机'+row.open_time }}</div>
-              <div>{{ row.close_setting==1?'每天 - 关机'+row.close_time :'每周'+setWeekly(row.close_weekly)+'关机'+row.close_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" />
+              <el-image class="cover_img" :src="row.startup_screen" v-show="row.startup_screen"></el-image>
            </template>
          </el-table-column>
          <el-table-column prop="create_time" label="创建时间" align="center" width="200">
@ -211,7 +210,7 @@

 <script>
 import UploadCover from '../components/upload_cover.vue'
-import { reqStartUpList, reqEditStartUp } from '@/api/device/startUpList.js'
+import { reqStartUpList, reqEditStartUp ,reqClearStartUp} from '@/api/device/startUpList.js'
 import { parseTime } from '@/utils/index.js'
 export default {
  name: 'DeviceConfig',
@ -251,7 +250,8 @@ export default {
      selectOpenWeekly: [], // 选中的开机每周状态
      selectCloseweekly: [], // 选中的关机机每周状态
      addFromVisible: false,
-      selectedList: [],
+      // 被选中的行
+      sels: [],
      clearBtnDisabled: true,
      deviceData: [{ key: '1', name: '竖屏' }, { key: '2', name: '横屏' }],
      weeklyList: [
@ -303,7 +303,8 @@ export default {
          return str.split(',').map(i => a[i]).join('/')
        }
      }
-    }
+    },
+
  },
  watch: {},
  mounted() {
@ -360,8 +361,7 @@ export default {
    },
    // 选择设备方向处理
    selectDirection(selVal) {
-      this.key = selVal.key
-      this.name = selVal.name
+      console.log(selVal)
      this.form.device_direction = selVal.key
      this.form.device_direction_name = selVal.name
    },
@ -413,14 +413,46 @@ export default {
    //   this.form.startup_screen = res.data
    // },
    // 列表多选操作 - 清空btn状态
-    handleSelectionChange(val) {
-      this.selectedList = val
-      if (val.length > 0) {
+    // 单选单个复选框
+    handleSelectionChange(sels) {
+      this.sels = sels
+      if (sels.length > 0) {
        this.clearBtnDisabled = false
      } else {
        this.clearBtnDisabled = true
      }
-      console.log(val)
+    },
+    // 清空
+    removeStartUp(rows){
+      let 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=>{
+          console.log(res)
+          if(res.code==200){
+            this.$message({
+              message: '清空成功',
+              type: 'success'
+            })
+             this.getDevice()
+          }
+        }).catch(()=>{
+        this.$message({
+          message:'清空失败',
+          type:'info'
+        })
+      })
+      })
    }
  }
 }
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@ -97,6 +97,18 @@
        </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="getPageList"
+      @size-change="handleSizeChange"
+      layout="prev, pager, next, jumper,->,sizes,total"
+    >
+    </el-pagination> -->
    <!-- 编辑设备 -->
    <div class="layer">
      <el-dialog
@ -211,6 +223,7 @@ export default {
        page:'1',
        size:'3'
      },
+       total: 0,
      // device_id:'',
      dialogTitle: '',
      // 编辑的对话框
@ -250,10 +263,12 @@ export default {
  methods: {
    // 获取设备列表的数据
    getDevice(){
+      // this.page=pager
      const params = this.queryInfo
      ReqDeviceList(params).then(res => {
         if(res.code==200) {
            this.deviceList=res.data.content
+            this.total=res.data.totalElements
         }else{
            return this.$message.error('获取设备列表失败！')
         }
@ -286,9 +301,14 @@ export default {
              message: '解绑成功',
              type: 'success'
            })
-             this.getDevice()
+             this.getDevice(this.deviceList.length>1?this.page:this.page-1)
          }
        })
+      }).catch(()=>{
+        this.$message({
+          message:'已取消解绑',
+          type:'info'
+        })
      })
      // .catch(err => err) //用catch来捕获错误消息

@ -352,6 +372,7 @@ export default {
        }
      })
    },
+ 
  }
 }
 </script>
--- a/src/views/publishContent/publishList/index.vue
+++ b/src/views/publishContent/publishList/index.vue
@ -250,9 +250,11 @@
 </template>

 <script>
+import pagination from '@crud/Pagination'
 import {reqPublishList} from '@/api/publish/publishList'
 export default {
  name: 'PublishList',
+   components: { pagination },
  data() {
    return {
      queryInfo:{