diff --git a/src/api/device/deviceList.js b/src/api/device/deviceList.js
index 0ab8389..6f1be6a 100644
--- a/src/api/device/deviceList.js
+++ b/src/api/device/deviceList.js
@@ -27,4 +27,13 @@ export function ReqQueryDevice(parameter) {
         method: 'get',
         params: parameter
     })
+}
+
+// 根据id解绑
+export function ReqRemoveDevice(parameter) {
+    return request({
+        url: 'api/device/delete',
+        method: 'post',
+        data: parameter
+    })
 }
\ No newline at end of file
diff --git a/src/api/device/startUpList.js b/src/api/device/startUpList.js
index bafefea..0e17d37 100644
--- a/src/api/device/startUpList.js
+++ b/src/api/device/startUpList.js
@@ -16,4 +16,13 @@ export function reqEditStartUp(parameter) {
         method: 'post',
         data: parameter
     })
+}
+
+// 情况开关机配置列表的接口
+export function reqClearStartUp(parameter) {
+    return request({
+        url: 'api/device/clearSetting',
+        method: 'post',
+        data: 'parameter'
+    })
 }
\ No newline at end of file
diff --git a/src/views/device/deviceConfig.vue b/src/views/device/deviceConfig.vue
index e011e43..2a51b9f 100644
--- a/src/views/device/deviceConfig.vue
+++ b/src/views/device/deviceConfig.vue
@@ -14,7 +14,7 @@
           </div>
         </el-col>
         <el-col class="page_add" :span="4">
-          <el-button class="table_add clear_btn" plain :disabled="clearBtnDisabled">清空</el-button>
+          <el-button class="table_add clear_btn" plain :disabled="clearBtnDisabled" @click="clearStartUp">清空</el-button>
         </el-col>
       </el-row>
     </div>
@@ -391,7 +391,7 @@ export default {
       } else {
         this.clearBtnDisabled = true
       }
-      // console.log(val)
+      console.log(val)
     }
   }
 }
@@ -466,7 +466,7 @@ export default {
   }
   .avatar-uploader-icon {
     font-size: 28px;
-    color: #8c939d;
+      color: #8c939d;
     width: 178px;
     height: 178px;
     line-height: 178px;
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index e67ba24..eee9b9e 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -91,7 +91,7 @@
                 @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">解绑</el-button>
+              <el-button type="danger" @click="removeDevice(scope.row)">解绑</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -198,7 +198,7 @@
 </template>
 
 <script>
-import { ReqDeviceEdit ,ReqDeviceList,ReqQueryDevice} from '@/api/device/deviceList.js'
+import { ReqDeviceEdit ,ReqDeviceList,ReqQueryDevice,ReqRemoveDevice} from '@/api/device/deviceList.js'
 import {parseTime} from '@/utils/index.js'
 export default {
   name: 'Device',
@@ -267,9 +267,42 @@ export default {
       this.form.name=row.device_name
       this.form.orientation=row.device_direction==1?'竖屏':'横屏'
       this.form.device_id=row.device_id     
-      console.log(this.form.orientation)
-  
+      // console.log(this.form.device_id)    
+    },
+    // 解绑
+    removeDevice(row){
+      // console.log(row.device_id)
+      this.$confirm(`你确定解绑${row.device_name}?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+        const params={
+          id:row.device_id
+        }
+        ReqRemoveDevice(params).then(res=>{   
+          if (res.code === 200) {
+            this.$message({
+              message: '解绑成功',
+              type: 'success'
+            })
+             this.getDevice()
+          }
+        })
+      })
+      // .catch(err => err) //用catch来捕获错误消息
+
+      // if ('cancel' === confirmRes) {//用户点击了取消
+      //  return this.$message.info('已经取消了删除')
+      // }
+      // if ('confirm' === confirmRes) { //用户点击了确认 
+      //   ReqRemoveDevice(row.id).then(res=>{
+      //     console.log(res)
+      //   })
+         
+      // }
       
+
     },
     recordData(index, row) {
       this.recordVisible = true