Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

packages/conv/AppDeviceConfig/components/eyeList.vue

@@ -33,7 +33,7 @@
         <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
-              <el-button type="text" @click="edit('编辑设备配置', row)">编辑</el-button>
+              <el-button type="text" @click="add('编辑设备配置', row)">编辑</el-button>
               <el-button type="text" @click="refresh(row)">刷新</el-button>
               <el-button type="text" @click="remove(row.id)">删除</el-button>
             </div>

packages/conv/AppDeviceConfig/components/videoList.vue

@@ -33,7 +33,7 @@
         <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
-              <el-button type="text" @click="edit('编辑设备配置', row)">编辑</el-button>
+              <el-button type="text" @click="add('编辑设备配置', row)">编辑</el-button>
               <el-button type="text" @click="refresh(row)">刷新</el-button>
               <el-button type="text" @click="remove(row.id)">删除</el-button>
             </div>
@@ -141,7 +141,7 @@
     },
     methods: {
       getListInit() {
-        this.search.current = 1 
+        this.search.current = 1
         this.getList()
       },
       getList () {

packages/device/monitor/components/deviceSlider.vue

@@ -111,10 +111,7 @@ export default {
           this.$message.success('更新成功')
           this.getDevices()
         }
-        this.btnLoading = false
-      }).catch(() => {
-        this.btnLoading = false
-      })
+      }).finally(() => this.btnLoading = false)
     },
     handleNodeClick(data) {
       this.$emit('select', data)
@@ -124,13 +121,13 @@ export default {
         return !this.search.bind ? true : data.deviceStatus === this.search.bind
       }
 
-      return data?.name?.indexOf(v) > -1  && (!this.search.bind ? true : data.deviceStatus === this.search.bind)
+      return data?.name?.indexOf(v) > -1 && (!this.search.bind ? true : data.deviceStatus === this.search.bind)
     },
     handleTreeFilter(v) {
       this.$refs.deviceTree?.filter(v)
     },
 
-    onChange () {
+    onChange() {
       this.$refs.deviceTree?.filter(this.search.name)
     }
   },
@@ -200,6 +197,7 @@ export default {
         height: 28px;
         background: #3E4A69;
       }
+
       ::v-deep .el-button:hover {
         border: none;
       }