Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs

2022-09-14 15:32:06 +08:00 · 2022-09-14 15:32:06 +08:00 · 13bca8732e
parent 2cf1412f79 be537d884f
commit 13bca8732e
2 changed files with 4 additions and 4 deletions
--- a/src/views/am/area_form.vue
+++ b/src/views/am/area_form.vue
@ -145,8 +145,8 @@
 		number: "",
 		access_list:[],
 		belong_dept: "",
-		count_people_min: 1,
-		count_people_max: 1,
+		count_people_min: 0,
+		count_people_max: 1000,
 		count_people: 0,
 		cate: 10,
 	};
--- a/src/views/ecm/notify_setting.vue
+++ b/src/views/ecm/notify_setting.vue
@ -49,8 +49,8 @@
              </template>
            </el-table-column>
              <el-table-column
-              label="处理时间"
-              prop="handle_minute"
+              label="优先级"
+              prop="priority"
              width="80"
            ></el-table-column>
            <el-table-column label="喇叭开启" prop="speaker_on" width="80">