From 629451fb642db622a5491fc242f0e49f6a46dcd8 Mon Sep 17 00:00:00 2001
From: sunfengxiang <sun345347172@126.com>
Date: Mon, 15 Nov 2021 16:37:11 +0800
Subject: [PATCH] =?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 @@
                     </div>
                     <div class="clear"></div>
                 </div>
-                <div class="loginBox">
-                    <div class="fl m-r-60">
-                        <img src="../../static/images/bigdata.png" class="m-b-5" alt=""/>
-                        <p>大数据</p>
-                    </div>
-                    <div class="fl">
-                        <img src="../../static/images/login.png" class="m-b-5" alt=""/>
-                        <p>登录</p>
-                    </div>
-                    <div class="clear"></div>
-                </div>
                 <div class="clear"></div>
             </div>
         </div>
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 @@
                     </div>
                     <div class="clear"></div>
                 </div>
-                <div class="loginBox">
-                    <div class="fl m-r-60">
-                        <img src="../../static/images/bigdata.png" class="m-b-5" alt=""/>
-                        <p>大数据</p>
-                    </div>
-                    <div class="fl">
-                        <img src="../../static/images/login.png" class="m-b-5" alt=""/>
-                        <p>登录</p>
-                    </div>
-                    <div class="clear"></div>
-                </div>
                 <div class="clear"></div>
             </div>
         </div>
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 @@
                     </div>
                     <div class="clear"></div>
                 </div>
-                <div class="loginBox">
-                    <div class="fl m-r-60">
-                        <img src="../../static/images/bigdata.png" class="m-b-5" alt=""/>
-                        <p>大数据</p>
-                    </div>
-                    <div class="fl">
-                        <img src="../../static/images/login.png" class="m-b-5" alt=""/>
-                        <p>登录</p>
-                    </div>
-                    <div class="clear"></div>
-                </div>
                 <div class="clear"></div>
             </div>
         </div>
@@ -93,21 +82,21 @@
 
                 <table style="width: 100%;margin-top: 25px;">
                     <tr>
-                        <td>类型：</td>
+                        <td><span style="color: red;">*</span>类型：</td>
                         <td colspan="6">
-                            <label><input name="communicateType" type="radio" value="3" />投诉</label>
+                            <label><input name="communicateType" type="radio" value="3" checked/>投诉</label>
                             <label><input name="communicateType" type="radio" value="1" />建议</label>
                             <label><input name="communicateType" type="radio" value="2" />举报</label>
                         </td>
                     </tr>
                     <tr>
-                        <td>标题：</td>
+                        <td><span style="color: red;">*</span>标题：</td>
                         <td colspan="6">
                             <input type="text" placeholder="请输入标题" id="title"/>
                         </td>
                     </tr>
                     <tr>
-                        <td>内容：</td>
+                        <td><span style="color: red;">*</span>内容：</td>
                         <td colspan="6">
                             <textarea rows="" cols="" placeholder="请输入内容" id="content"></textarea>
                         </td>
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 @@
                     </div>
                     <div class="clear"></div>
                 </div>
-                <div class="loginBox">
-                    <div class="fl m-r-60">
-                        <img src="../../static/images/bigdata.png" class="m-b-5" alt=""/>
-                        <p>大数据</p>
-                    </div>
-                    <div class="fl">
-                        <img src="../../static/images/login.png" class="m-b-5" alt=""/>
-                        <p>登录</p>
-                    </div>
-                    <div class="clear"></div>
-                </div>
                 <div class="clear"></div>
             </div>
         </div>
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 @@
                     </div>
                     <div class="clear"></div>
                 </div>
-                <div class="loginBox">
-                    <div class="fl m-r-60">
-                        <img src="../../static/images/bigdata.png" class="m-b-5" alt=""/>
-                        <p>大数据</p>
-                    </div>
-                    <div class="fl">
-                        <img src="../../static/images/login.png" class="m-b-5" alt=""/>
-                        <p>登录</p>
-                    </div>
-                    <div class="clear"></div>
-                </div>
                 <div class="clear"></div>
             </div>
         </div>
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 @@
                     </div>
                     <div class="clear"></div>
                 </div>
-                <div class="loginBox">
-                    <div class="fl m-r-60">
-                        <img src="../../static/images/bigdata.png" class="m-b-5" alt=""/>
-                        <p>大数据</p>
-                    </div>
-                    <div class="fl">
-                        <img src="../../static/images/login.png" class="m-b-5" alt=""/>
-                        <p>登录</p>
-                    </div>
-                    <div class="clear"></div>
-                </div>
                 <div class="clear"></div>
             </div>
         </div>
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 @@
                     </div>
                     <div class="clear"></div>
                 </div>
-                <div class="loginBox">
-                    <div class="fl m-r-60">
-                        <img src="../../static/images/bigdata.png" class="m-b-5" alt=""/>
-                        <p>大数据</p>
-                    </div>
-                    <div class="fl">
-                        <img src="../../static/images/login.png" class="m-b-5" alt=""/>
-                        <p>登录</p>
-                    </div>
-                    <div class="clear"></div>
-                </div>
                 <div class="clear"></div>
             </div>
         </div>
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 @@
                     </div>
                     <div class="clear"></div>
                 </div>
-                <div class="loginBox">
-                    <div class="fl m-r-60">
-                        <img src="../../static/images/bigdata.png" class="m-b-5" alt=""/>
-                        <p>大数据</p>
-                    </div>
-                    <div class="fl">
-                        <img src="../../static/images/login.png" class="m-b-5" alt=""/>
-                        <p>登录</p>
-                    </div>
-                    <div class="clear"></div>
-                </div>
                 <div class="clear"></div>
             </div>
         </div>
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}}
                     <tr>
                         <td>
-                            <p class="fl" style="width: 105px">{{value.activityName}}：</p>
+                            <p class="fl" style="width: 150px">{{value.activityName}}：</p>
                             <div class="fl" style="padding: 2px 10px">
                                 <div class="tableBox">
                                     <div class="bs_t fl">
@@ -160,14 +160,6 @@
                                     <p class="fl">意见：{{value.comment}}</p>
                                     <div class="clear"></div>
                                 </div>
-                                <div class="tableBox">
-                                    <div class="bs_t fl">
-                                        <i></i>
-                                        <span></span>
-                                    </div>
-                                    <p class="fl">附件：暂无附件</p>
-                                    <div class="clear"></div>
-                                </div>
                             </div>
                             <div class="clear"></div>
                         </td>
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 @@
                     </div>
                     <div class="clear"></div>
                 </div>
-                <div class="loginBox">
-                    <div class="fl m-r-60">
-                        <img src="../../static/images/bigdata.png" class="m-b-5" alt=""/>
-                        <p>大数据</p>
-                    </div>
-                    <div class="fl">
-                        <img src="../../static/images/login.png" class="m-b-5" alt=""/>
-                        <p>登录</p>
-                    </div>
-                    <div class="clear"></div>
-                </div>
                 <div class="clear"></div>
             </div>
         </div>
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 @@
                     </div>
                     <div class="clear"></div>
                 </div>
-                <div class="loginBox">
-                    <div class="fl m-r-60">
-                        <img src="../../static/images/bigdata.png" class="m-b-5" alt=""/>
-                        <p>大数据</p>
-                    </div>
-                    <div class="fl">
-                        <img src="../../static/images/login.png" class="m-b-5" alt=""/>
-                        <p>登录</p>
-                    </div>
-                    <div class="clear"></div>
-                </div>
                 <div class="clear"></div>
             </div>
         </div>
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 @@
                     </div>
                     <div class="clear"></div>
                 </div>
-                <div class="loginBox">
-                    <div class="fl m-r-60">
-                        <img src="../../static/images/bigdata.png" class="m-b-5" alt=""/>
-                        <p>大数据</p>
-                    </div>
-                    <div class="fl">
-                        <img src="../../static/images/login.png" class="m-b-5" alt=""/>
-                        <p>登录</p>
-                    </div>
-                    <div class="clear"></div>
-                </div>
                 <div class="clear"></div>
             </div>
         </div>