Merge branch 'master' of http://gitlab.91isoft.com:90/hikvision/web-project

src/views/AlarmPage/AlarmStatusPage.vue

@@ -81,7 +81,7 @@
         </el-form-item>
       </el-form>
     </div>
-    <el-row v-show="dialog_content">
+    <el-row>
       <el-col :span="6">
         <div class="left">
           <el-table :data="cnNames_before" class="scroll-table" :row-style="{ height: '16px' }"
@@ -286,6 +286,7 @@ const roleId = ref(false)
 
 function open() {
   show.value = true
+  ElMessage.info("请先选择设备后方可编辑参数")
   btnLoading.value=false
 }