From 964dbfecff8197fbd2fb718868c97cabcb8f5747 Mon Sep 17 00:00:00 2001 From: sunfengxiang Date: Mon, 15 Nov 2021 14:28:48 +0800 Subject: [PATCH 1/6] =?UTF-8?q?URL=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- agriculturalLawEnforcement/index.html | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/agriculturalLawEnforcement/index.html b/agriculturalLawEnforcement/index.html index a849604..48e2073 100644 --- a/agriculturalLawEnforcement/index.html +++ b/agriculturalLawEnforcement/index.html @@ -4,7 +4,7 @@ - 综合执法 + 埇桥区农业综合行政执法平台 @@ -20,20 +20,24 @@
-

农业综合行政执法平台

+

埇桥区农业综合行政执法平台

PUBLICPLATFORMFORCOMPREHENSIVEAGRICULTURALLAWENFORCEMENT

-
- -

大数据

-
-
- -

登录

-
+ +
+ +

大数据

+
+ + +
+ +

登录

+
+
From 96e7a0f207d9bc4f55170d77825b8d0f73950ae9 Mon Sep 17 00:00:00 2001 From: sunfengxiang Date: Mon, 15 Nov 2021 14:41:22 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=BD=91=E7=AB=99=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- agriculturalLawEnforcement/login.html | 4 ++-- agriculturalLawEnforcement/view/basis/basisDetail.html | 2 +- agriculturalLawEnforcement/view/basis/basisList.html | 2 +- agriculturalLawEnforcement/view/complaint/complaintAdd.html | 2 +- .../view/complaint/complaintDetail.html | 2 +- agriculturalLawEnforcement/view/complaint/complaintList.html | 2 +- agriculturalLawEnforcement/view/inventory/inventoryList.html | 2 +- .../view/noticeAnnouncement/noticeDetail.html | 2 +- .../view/noticeAnnouncement/noticeList.html | 2 +- .../view/schemeDisclosure/schemeDetail.html | 2 +- .../view/schemeDisclosure/schemeList.html | 2 +- agriculturalLawEnforcement/view/workDynamics/workDetail.html | 2 +- agriculturalLawEnforcement/view/workDynamics/workList.html | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/agriculturalLawEnforcement/login.html b/agriculturalLawEnforcement/login.html index 5735d23..302f686 100644 --- a/agriculturalLawEnforcement/login.html +++ b/agriculturalLawEnforcement/login.html @@ -4,7 +4,7 @@ - 综合执法 + 埇桥区农业综合行政执法平台 @@ -19,7 +19,7 @@
diff --git a/agriculturalLawEnforcement/view/basis/basisDetail.html b/agriculturalLawEnforcement/view/basis/basisDetail.html index 8a9429c..a63b97a 100644 --- a/agriculturalLawEnforcement/view/basis/basisDetail.html +++ b/agriculturalLawEnforcement/view/basis/basisDetail.html @@ -25,7 +25,7 @@
-

农业综合行政执法平台

+

埇桥区农业综合行政执法平台

PUBLICPLATFORMFORCOMPREHENSIVEAGRICULTURALLAWENFORCEMENT

diff --git a/agriculturalLawEnforcement/view/basis/basisList.html b/agriculturalLawEnforcement/view/basis/basisList.html index 42dd636..af561f9 100644 --- a/agriculturalLawEnforcement/view/basis/basisList.html +++ b/agriculturalLawEnforcement/view/basis/basisList.html @@ -21,7 +21,7 @@
-

农业综合行政执法平台

+

埇桥区农业综合行政执法平台

PUBLICPLATFORMFORCOMPREHENSIVEAGRICULTURALLAWENFORCEMENT

diff --git a/agriculturalLawEnforcement/view/complaint/complaintAdd.html b/agriculturalLawEnforcement/view/complaint/complaintAdd.html index d64e59d..a05bf58 100644 --- a/agriculturalLawEnforcement/view/complaint/complaintAdd.html +++ b/agriculturalLawEnforcement/view/complaint/complaintAdd.html @@ -49,7 +49,7 @@
-

农业综合行政执法平台

+

埇桥区农业综合行政执法平台

PUBLICPLATFORMFORCOMPREHENSIVEAGRICULTURALLAWENFORCEMENT

diff --git a/agriculturalLawEnforcement/view/complaint/complaintDetail.html b/agriculturalLawEnforcement/view/complaint/complaintDetail.html index e5104d6..d2ab7a4 100644 --- a/agriculturalLawEnforcement/view/complaint/complaintDetail.html +++ b/agriculturalLawEnforcement/view/complaint/complaintDetail.html @@ -29,7 +29,7 @@
-

农业综合行政执法平台

+

埇桥区农业综合行政执法平台

PUBLICPLATFORMFORCOMPREHENSIVEAGRICULTURALLAWENFORCEMENT

diff --git a/agriculturalLawEnforcement/view/complaint/complaintList.html b/agriculturalLawEnforcement/view/complaint/complaintList.html index 14b413c..2e41db3 100644 --- a/agriculturalLawEnforcement/view/complaint/complaintList.html +++ b/agriculturalLawEnforcement/view/complaint/complaintList.html @@ -21,7 +21,7 @@
-

农业综合行政执法平台

+

埇桥区农业综合行政执法平台

PUBLICPLATFORMFORCOMPREHENSIVEAGRICULTURALLAWENFORCEMENT

diff --git a/agriculturalLawEnforcement/view/inventory/inventoryList.html b/agriculturalLawEnforcement/view/inventory/inventoryList.html index f577b1f..9297789 100644 --- a/agriculturalLawEnforcement/view/inventory/inventoryList.html +++ b/agriculturalLawEnforcement/view/inventory/inventoryList.html @@ -39,7 +39,7 @@
-

农业综合行政执法平台

+

埇桥区农业综合行政执法平台

PUBLICPLATFORMFORCOMPREHENSIVEAGRICULTURALLAWENFORCEMENT

diff --git a/agriculturalLawEnforcement/view/noticeAnnouncement/noticeDetail.html b/agriculturalLawEnforcement/view/noticeAnnouncement/noticeDetail.html index efaf8fb..8eb49d8 100644 --- a/agriculturalLawEnforcement/view/noticeAnnouncement/noticeDetail.html +++ b/agriculturalLawEnforcement/view/noticeAnnouncement/noticeDetail.html @@ -25,7 +25,7 @@
-

农业综合行政执法平台

+

埇桥区农业综合行政执法平台

PUBLICPLATFORMFORCOMPREHENSIVEAGRICULTURALLAWENFORCEMENT

diff --git a/agriculturalLawEnforcement/view/noticeAnnouncement/noticeList.html b/agriculturalLawEnforcement/view/noticeAnnouncement/noticeList.html index 1988a1c..adf0c22 100644 --- a/agriculturalLawEnforcement/view/noticeAnnouncement/noticeList.html +++ b/agriculturalLawEnforcement/view/noticeAnnouncement/noticeList.html @@ -21,7 +21,7 @@
-

农业综合行政执法平台

+

埇桥区农业综合行政执法平台

PUBLICPLATFORMFORCOMPREHENSIVEAGRICULTURALLAWENFORCEMENT

diff --git a/agriculturalLawEnforcement/view/schemeDisclosure/schemeDetail.html b/agriculturalLawEnforcement/view/schemeDisclosure/schemeDetail.html index 4dbfd06..9860221 100644 --- a/agriculturalLawEnforcement/view/schemeDisclosure/schemeDetail.html +++ b/agriculturalLawEnforcement/view/schemeDisclosure/schemeDetail.html @@ -56,7 +56,7 @@
-

农业综合行政执法平台

+

埇桥区农业综合行政执法平台

PUBLICPLATFORMFORCOMPREHENSIVEAGRICULTURALLAWENFORCEMENT

diff --git a/agriculturalLawEnforcement/view/schemeDisclosure/schemeList.html b/agriculturalLawEnforcement/view/schemeDisclosure/schemeList.html index da0d593..6b8d65a 100644 --- a/agriculturalLawEnforcement/view/schemeDisclosure/schemeList.html +++ b/agriculturalLawEnforcement/view/schemeDisclosure/schemeList.html @@ -21,7 +21,7 @@
-

农业综合行政执法平台

+

埇桥区农业综合行政执法平台

PUBLICPLATFORMFORCOMPREHENSIVEAGRICULTURALLAWENFORCEMENT

diff --git a/agriculturalLawEnforcement/view/workDynamics/workDetail.html b/agriculturalLawEnforcement/view/workDynamics/workDetail.html index 0e4abc7..d2fa2a6 100644 --- a/agriculturalLawEnforcement/view/workDynamics/workDetail.html +++ b/agriculturalLawEnforcement/view/workDynamics/workDetail.html @@ -25,7 +25,7 @@
-

农业综合行政执法平台

+

埇桥区农业综合行政执法平台

PUBLICPLATFORMFORCOMPREHENSIVEAGRICULTURALLAWENFORCEMENT

diff --git a/agriculturalLawEnforcement/view/workDynamics/workList.html b/agriculturalLawEnforcement/view/workDynamics/workList.html index 33716c9..9a49207 100644 --- a/agriculturalLawEnforcement/view/workDynamics/workList.html +++ b/agriculturalLawEnforcement/view/workDynamics/workList.html @@ -21,7 +21,7 @@
-

农业综合行政执法平台

+

埇桥区农业综合行政执法平台

PUBLICPLATFORMFORCOMPREHENSIVEAGRICULTURALLAWENFORCEMENT

From e7769f0caee13cdaadae8f1e41070bc4558240fd Mon Sep 17 00:00:00 2001 From: sunfengxiang Date: Mon, 15 Nov 2021 15:07:34 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=BD=91=E7=AB=99=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- agriculturalLawEnforcement/index.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/agriculturalLawEnforcement/index.html b/agriculturalLawEnforcement/index.html index 48e2073..cae76c6 100644 --- a/agriculturalLawEnforcement/index.html +++ b/agriculturalLawEnforcement/index.html @@ -26,12 +26,12 @@
- -
- -

大数据

-
- + + + + + +
From 629451fb642db622a5491fc242f0e49f6a46dcd8 Mon Sep 17 00:00:00 2001 From: sunfengxiang Date: Mon, 15 Nov 2021 16:37:11 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/project/complaint/complaintAdd.js | 34 +++++++++++-------- .../view/basis/basisDetail.html | 11 ------ .../view/basis/basisList.html | 11 ------ .../view/complaint/complaintAdd.html | 19 +++-------- .../view/complaint/complaintDetail.html | 11 ------ .../view/complaint/complaintList.html | 11 ------ .../view/inventory/inventoryList.html | 11 ------ .../view/noticeAnnouncement/noticeDetail.html | 11 ------ .../view/noticeAnnouncement/noticeList.html | 11 ------ .../view/schemeDisclosure/schemeDetail.html | 10 +----- .../view/schemeDisclosure/schemeList.html | 11 ------ .../view/workDynamics/workDetail.html | 11 ------ .../view/workDynamics/workList.html | 11 ------ 13 files changed, 25 insertions(+), 148 deletions(-) diff --git a/agriculturalLawEnforcement/static/js/project/complaint/complaintAdd.js b/agriculturalLawEnforcement/static/js/project/complaint/complaintAdd.js index d1a8e48..eda0a9d 100644 --- a/agriculturalLawEnforcement/static/js/project/complaint/complaintAdd.js +++ b/agriculturalLawEnforcement/static/js/project/complaint/complaintAdd.js @@ -25,21 +25,27 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa } goAdd = function () { - var form = { - title:$('#title').val(), - communicateType:$('input:radio:checked').val(), - content:$('#content').val(), - name:$('#name').val(), - phone:$('#phone').val(), + if($('#title').val()=="" || $('#title').val()==undefined){ + tools.initError('标题不能为空！'); + } else if($('#content').val()=="" || $('#content').val()==undefined){ + tools.initError('内容不能为空！'); + } else{ + var form = { + title:$('#title').val(), + communicateType:$('input:radio:checked').val(), + content:$('#content').val(), + name:$('#name').val(), + phone:$('#phone').val(), + } + tools.doPost(communicateAdd, { + title:$('#title').val(), + communicateType:$('input:radio:checked').val(), + content:$('#content').val(), + name:$('#name').val(), + phone:$('#phone').val(), + deptId:module.data.deptId + }, module.addEnd , true); } - tools.doPost(communicateAdd, { - title:$('#title').val(), - communicateType:$('input:radio:checked').val(), - content:$('#content').val(), - name:$('#name').val(), - phone:$('#phone').val(), - deptId:module.data.deptId - }, module.addEnd , true); } module.addEnd = function(data){ diff --git a/agriculturalLawEnforcement/view/basis/basisDetail.html b/agriculturalLawEnforcement/view/basis/basisDetail.html index a63b97a..f4fb35a 100644 --- a/agriculturalLawEnforcement/view/basis/basisDetail.html +++ b/agriculturalLawEnforcement/view/basis/basisDetail.html @@ -30,17 +30,6 @@
-
-
- -

大数据

-
-
- -

登录

-
-
-
diff --git a/agriculturalLawEnforcement/view/basis/basisList.html b/agriculturalLawEnforcement/view/basis/basisList.html index af561f9..e792ea1 100644 --- a/agriculturalLawEnforcement/view/basis/basisList.html +++ b/agriculturalLawEnforcement/view/basis/basisList.html @@ -26,17 +26,6 @@
-
-
- -

大数据

-
-
- -

登录

-
-
-
diff --git a/agriculturalLawEnforcement/view/complaint/complaintAdd.html b/agriculturalLawEnforcement/view/complaint/complaintAdd.html index a05bf58..bf22191 100644 --- a/agriculturalLawEnforcement/view/complaint/complaintAdd.html +++ b/agriculturalLawEnforcement/view/complaint/complaintAdd.html @@ -54,17 +54,6 @@
-
-
- -

大数据

-
-
- -

登录

-
-
-
@@ -93,21 +82,21 @@ - + - + - + diff --git a/agriculturalLawEnforcement/view/complaint/complaintDetail.html b/agriculturalLawEnforcement/view/complaint/complaintDetail.html index d2ab7a4..cd285ec 100644 --- a/agriculturalLawEnforcement/view/complaint/complaintDetail.html +++ b/agriculturalLawEnforcement/view/complaint/complaintDetail.html @@ -34,17 +34,6 @@
-
-
- -

大数据

-
-
- -

登录

-
-
-
diff --git a/agriculturalLawEnforcement/view/complaint/complaintList.html b/agriculturalLawEnforcement/view/complaint/complaintList.html index 2e41db3..6912c17 100644 --- a/agriculturalLawEnforcement/view/complaint/complaintList.html +++ b/agriculturalLawEnforcement/view/complaint/complaintList.html @@ -26,17 +26,6 @@
-
-
- -

大数据

-
-
- -

登录

-
-
-
diff --git a/agriculturalLawEnforcement/view/inventory/inventoryList.html b/agriculturalLawEnforcement/view/inventory/inventoryList.html index 9297789..0a6adeb 100644 --- a/agriculturalLawEnforcement/view/inventory/inventoryList.html +++ b/agriculturalLawEnforcement/view/inventory/inventoryList.html @@ -44,17 +44,6 @@
-
-
- -

大数据

-
-
- -

登录

-
-
-
diff --git a/agriculturalLawEnforcement/view/noticeAnnouncement/noticeDetail.html b/agriculturalLawEnforcement/view/noticeAnnouncement/noticeDetail.html index 8eb49d8..ef3e901 100644 --- a/agriculturalLawEnforcement/view/noticeAnnouncement/noticeDetail.html +++ b/agriculturalLawEnforcement/view/noticeAnnouncement/noticeDetail.html @@ -30,17 +30,6 @@
-
-
- -

大数据

-
-
- -

登录

-
-
-
diff --git a/agriculturalLawEnforcement/view/noticeAnnouncement/noticeList.html b/agriculturalLawEnforcement/view/noticeAnnouncement/noticeList.html index adf0c22..7112727 100644 --- a/agriculturalLawEnforcement/view/noticeAnnouncement/noticeList.html +++ b/agriculturalLawEnforcement/view/noticeAnnouncement/noticeList.html @@ -26,17 +26,6 @@
-
-
- -

大数据

-
-
- -

登录

-
-
-
diff --git a/agriculturalLawEnforcement/view/schemeDisclosure/schemeDetail.html b/agriculturalLawEnforcement/view/schemeDisclosure/schemeDetail.html index 9860221..e504311 100644 --- a/agriculturalLawEnforcement/view/schemeDisclosure/schemeDetail.html +++ b/agriculturalLawEnforcement/view/schemeDisclosure/schemeDetail.html @@ -142,7 +142,7 @@ {{each newList.historicActivityList as value i}} diff --git a/agriculturalLawEnforcement/view/schemeDisclosure/schemeList.html b/agriculturalLawEnforcement/view/schemeDisclosure/schemeList.html index 6b8d65a..cc0cda8 100644 --- a/agriculturalLawEnforcement/view/schemeDisclosure/schemeList.html +++ b/agriculturalLawEnforcement/view/schemeDisclosure/schemeList.html @@ -26,17 +26,6 @@
-
-
- -

大数据

-
-
- -

登录

-
-
-
diff --git a/agriculturalLawEnforcement/view/workDynamics/workDetail.html b/agriculturalLawEnforcement/view/workDynamics/workDetail.html index d2fa2a6..24fa156 100644 --- a/agriculturalLawEnforcement/view/workDynamics/workDetail.html +++ b/agriculturalLawEnforcement/view/workDynamics/workDetail.html @@ -30,17 +30,6 @@
-
-
- -

大数据

-
-
- -

登录

-
-
-
diff --git a/agriculturalLawEnforcement/view/workDynamics/workList.html b/agriculturalLawEnforcement/view/workDynamics/workList.html index 9a49207..34aa55d 100644 --- a/agriculturalLawEnforcement/view/workDynamics/workList.html +++ b/agriculturalLawEnforcement/view/workDynamics/workList.html @@ -26,17 +26,6 @@
-
-
- -

大数据

-
-
- -

登录

-
-
-
From 3994c0749ae8f7cc69909a488f8d8ba85a2c3922 Mon Sep 17 00:00:00 2001 From: sunfengxiang Date: Mon, 29 Nov 2021 15:23:32 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=A1=B5=E9=9D=A2td=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/schemeDisclosure/schemeDetail.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/agriculturalLawEnforcement/view/schemeDisclosure/schemeDetail.html b/agriculturalLawEnforcement/view/schemeDisclosure/schemeDetail.html index e504311..b57fa95 100644 --- a/agriculturalLawEnforcement/view/schemeDisclosure/schemeDetail.html +++ b/agriculturalLawEnforcement/view/schemeDisclosure/schemeDetail.html @@ -112,8 +112,7 @@ - - +
类型：*类型： - +
标题：*标题：
内容：*内容：
-

{{value.activityName}}：

+

{{value.activityName}}：

@@ -160,14 +160,6 @@

意见：{{value.comment}}

-
-
- - -
-

附件：暂无附件

-
-
检查事项：{{newList.checkList}}
方案描述：{{newList.checkContent}}方案描述：{{newList.checkContent}}
From c74d11540ffd910c4e0226bba14a6f4eb9815617 Mon Sep 17 00:00:00 2001 From: sunfengxiang Date: Mon, 29 Nov 2021 16:10:07 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=8A=95=E8=AF=89=E5=BB=BA=E8=AE=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/js/project/complaint/complaintAdd.js | 2 ++ agriculturalLawEnforcement/view/complaint/complaintAdd.html | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/agriculturalLawEnforcement/static/js/project/complaint/complaintAdd.js b/agriculturalLawEnforcement/static/js/project/complaint/complaintAdd.js index eda0a9d..0cbc4b8 100644 --- a/agriculturalLawEnforcement/static/js/project/complaint/complaintAdd.js +++ b/agriculturalLawEnforcement/static/js/project/complaint/complaintAdd.js @@ -29,6 +29,8 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa tools.initError('标题不能为空！'); } else if($('#content').val()=="" || $('#content').val()==undefined){ tools.initError('内容不能为空！'); + } else if($('#phone').val()=="" || $('#phone').val()==undefined){ + tools.initError('联系方式不能为空！'); } else{ var form = { title:$('#title').val(), diff --git a/agriculturalLawEnforcement/view/complaint/complaintAdd.html b/agriculturalLawEnforcement/view/complaint/complaintAdd.html index bf22191..ac88d02 100644 --- a/agriculturalLawEnforcement/view/complaint/complaintAdd.html +++ b/agriculturalLawEnforcement/view/complaint/complaintAdd.html @@ -106,7 +106,7 @@ - 联系方式： + *联系方式：