From 2b4480d526f931344f2ef97e7d016117a08ce2b2 Mon Sep 17 00:00:00 2001 From: seagull <24163551@qq.com> Date: Wed, 9 Oct 2019 11:13:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E4=BE=8B=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=8E=A7=E5=88=B6=E5=8F=82=E6=95=B0=E5=90=8C=E5=90=8D?= =?UTF-8?q?=E7=9A=84=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../initialization(create table)/V3.1 初始化.sql | 11 ++++++----- .../V3.0 upgrade V3.1/V3.1升级.sql | 11 ++++++----- .../mybatis/testmanagmt/ProjectCaseParamsMapper.xml | 2 +- .../templates/testmanagmt/projectCaseParams/add.html | 8 +++++++- .../templates/testmanagmt/projectCaseParams/edit.html | 8 +++++++- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/mysqldb/initialization(create table)/V3.1 初始化.sql b/mysqldb/initialization(create table)/V3.1 初始化.sql index 16baef5..cabbd48 100644 --- a/mysqldb/initialization(create table)/V3.1 初始化.sql +++ b/mysqldb/initialization(create table)/V3.1 初始化.sql @@ -889,11 +889,12 @@ insert into sys_dict_data values(69, 12, '网络异常', '12', 'qa_accident_ty insert into sys_dict_data values(70, 13, '服务器硬件异常', '13', 'qa_accident_type', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '生产事故类型'); insert into sys_dict_data values(71, 14, '外部原因异常', '14', 'qa_accident_type', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '生产事故类型'); insert into sys_dict_data values(72, 15, '未知原因异常', '15', 'qa_accident_type', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '生产事故类型'); -insert into sys_dict_data values(73, 1, '计划中', '1', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); -insert into sys_dict_data values(74, 2, '开发中', '2', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); -insert into sys_dict_data values(75, 3, '测试中', '3', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); -insert into sys_dict_data values(76, 4, '待上线', '4', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); -insert into sys_dict_data values(77, 5, '已完成', '0', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); +insert into sys_dict_data values(73, 16, '其他异常', '16', 'qa_accident_type', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '生产事故类型'); +insert into sys_dict_data values(74, 1, '计划中', '1', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); +insert into sys_dict_data values(75, 2, '开发中', '2', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); +insert into sys_dict_data values(76, 3, '测试中', '3', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); +insert into sys_dict_data values(77, 4, '待上线', '4', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); +insert into sys_dict_data values(78, 5, '已完成', '0', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); /*HTTP请求方法*/ insert into sys_dict_data values(1000, 1, 'HttpClientPost发送Post请求', 'HttpClientPost', 'testmanagmt_casestep_httpoperation', '', 'info', 'Y', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '使用HttpClient发送post请求'); diff --git a/mysqldb/upgrade(alter table)/V3.0 upgrade V3.1/V3.1升级.sql b/mysqldb/upgrade(alter table)/V3.0 upgrade V3.1/V3.1升级.sql index 3fb8b79..f6db6e8 100644 --- a/mysqldb/upgrade(alter table)/V3.0 upgrade V3.1/V3.1升级.sql +++ b/mysqldb/upgrade(alter table)/V3.0 upgrade V3.1/V3.1升级.sql @@ -97,6 +97,7 @@ insert into sys_dict_data values(69, 12, '网络异常', '12', 'qa_accident_ty insert into sys_dict_data values(70, 13, '服务器硬件异常', '13', 'qa_accident_type', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '生产事故类型'); insert into sys_dict_data values(71, 14, '外部原因异常', '14', 'qa_accident_type', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '生产事故类型'); insert into sys_dict_data values(72, 15, '未知原因异常', '15', 'qa_accident_type', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '生产事故类型'); +insert into sys_dict_data values(73, 16, '其他异常', '16', 'qa_accident_type', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '生产事故类型'); -- ---------------------------- -- 45、质量管理-版本管理 @@ -156,11 +157,11 @@ values('1104','版本管理删除', '127', '4', '#', 'F', '0', 'qualitymanagmt -- ---------------------------- -- 增加版本管理状态字典 -- ---------------------------- -insert into sys_dict_data values(73, 1, '计划中', '1', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); -insert into sys_dict_data values(74, 2, '开发中', '2', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); -insert into sys_dict_data values(75, 3, '测试中', '3', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); -insert into sys_dict_data values(76, 4, '待上线', '4', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); -insert into sys_dict_data values(77, 5, '已完成', '0', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); +insert into sys_dict_data values(74, 1, '计划中', '1', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); +insert into sys_dict_data values(75, 2, '开发中', '2', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); +insert into sys_dict_data values(76, 3, '测试中', '3', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); +insert into sys_dict_data values(77, 4, '待上线', '4', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); +insert into sys_dict_data values(78, 5, '已完成', '0', 'qa_version_status', '', 'info', 'N', '0', 'admin', '2019-02-13 10-27-32', 'luckyframe', '2019-02-13 10-27-32', '项目版本当前状态'); -- ---------------------------- -- 增加字典类型定义数据 diff --git a/src/main/resources/mybatis/testmanagmt/ProjectCaseParamsMapper.xml b/src/main/resources/mybatis/testmanagmt/ProjectCaseParamsMapper.xml index d093b4b..5f17b95 100644 --- a/src/main/resources/mybatis/testmanagmt/ProjectCaseParamsMapper.xml +++ b/src/main/resources/mybatis/testmanagmt/ProjectCaseParamsMapper.xml @@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pcp.params_name = #{paramsName} - and pcp.project_id = #{projectId} + and (pcp.project_id = #{projectId} or pcp.project_id=0) diff --git a/src/main/resources/templates/testmanagmt/projectCaseParams/add.html b/src/main/resources/templates/testmanagmt/projectCaseParams/add.html index ae8dc0c..22926cb 100644 --- a/src/main/resources/templates/testmanagmt/projectCaseParams/add.html +++ b/src/main/resources/templates/testmanagmt/projectCaseParams/add.html @@ -8,7 +8,7 @@
- @@ -85,6 +85,12 @@ } }); + /*重新初始化表单验证*/ + function resetValidateForm() { + $.validate.resetForm(); + $.validate.form(); + } + function submitHandler() { if ($.validate.form()) { $.operate.save(prefix + "/add", $('#form-projectCaseParams-add').serialize()); diff --git a/src/main/resources/templates/testmanagmt/projectCaseParams/edit.html b/src/main/resources/templates/testmanagmt/projectCaseParams/edit.html index 9884729..7dbc6e1 100644 --- a/src/main/resources/templates/testmanagmt/projectCaseParams/edit.html +++ b/src/main/resources/templates/testmanagmt/projectCaseParams/edit.html @@ -9,7 +9,7 @@
- @@ -86,6 +86,12 @@ } }); + /*重新初始化表单验证*/ + function resetValidateForm() { + $.validate.resetForm(); + $.validate.form(); + } + function submitHandler() { if ($.validate.form()) { $.operate.save(prefix + "/edit", $('#form-projectCaseParams-edit').serialize());