From b1c03952401ae7acb2e33b5d028a685b186a609a Mon Sep 17 00:00:00 2001 From: liujiangyong Date: Tue, 17 Jan 2023 18:00:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E9=83=A8=E9=97=A8=E6=88=90=E5=91=98?= =?UTF-8?q?=E7=99=BD=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/organization/containers/user.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/client/src/sections/organization/containers/user.js b/web/client/src/sections/organization/containers/user.js index 9c3eeec..10f59b1 100644 --- a/web/client/src/sections/organization/containers/user.js +++ b/web/client/src/sections/organization/containers/user.js @@ -9,9 +9,10 @@ import ResetPwd from '../components/resetPwd'; import DeptModal from '../components/deptModal'; const TreeNode = Tree.TreeNode; -const user = JSON.parse(sessionStorage.getItem('user')); const UserManage = (props) => { + const user = JSON.parse(sessionStorage.getItem('user')); + const { dispatch, loading, depMessage, depUser, clientHeight } = props; // 部门 const [deptModalVisible, setDeptModalVisible] = useState(false); From 31a77173b1038e73dab446226cac1d85018d00dc Mon Sep 17 00:00:00 2001 From: liujiangyong Date: Tue, 17 Jan 2023 18:02:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/1.0.0/schema/3.create_patrol_plan.sql | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 script/1.0.0/schema/3.create_patrol_plan.sql diff --git a/script/1.0.0/schema/3.create_patrol_plan.sql b/script/1.0.0/schema/3.create_patrol_plan.sql new file mode 100644 index 0000000..044750e --- /dev/null +++ b/script/1.0.0/schema/3.create_patrol_plan.sql @@ -0,0 +1,20 @@ +DROP SEQUENCE if EXISTS "public"."patrol_plan_id_seq"; +CREATE SEQUENCE "public"."patrol_plan_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 9223372036854775807 +START 1 +CACHE 1; +DROP TABLE IF EXISTS "public"."patrol_plan"; +CREATE TABLE "public"."patrol_plan" ( + "id" int4 NOT NULL PRIMARY KEY DEFAULT nextval('patrol_plan_id_seq'::regclass), + "name" varchar(128) NOT NULL, + "way" varchar(128), + "structure_id" int4, + "start_time" timestamp(6), + "end_time" timestamp(6), + "frequency" varchar(64), + "points" jsonb, + "user_id" int4, + "patrol_count" int4 NOT NULL DEFAULT 0 +); \ No newline at end of file