Merge branch 'master' of http://8.141.155.183:3000/bjquanjiang/pinganxiaoyuan

SafeCampus.WEB/src/views/warn/zjrq/index.vue

@@ -232,11 +232,11 @@ const columns: ColumnProps<ZJRQ.WarnInfo>[] = [
   // { prop: "cameraId", label: "所属摄像头", search: { el: "input" }, isShow: false },
   // { prop: "alarmTypeDesc", label: "预警类型", search: { el: "input" }, isShow: false },
   {
-    prop: "poiId",
+    prop: "sceneName",
     label: "场景名称",
-    render: () => {
-      return "演示学校";
-    }
+    // render: () => {
+    //   return "演示学校";
+    // }
   },
   
   {