zhangzl
/
nsgk_web
1
0
複製 0
程式碼 問題 0 合併請求 0 版本發佈 0 Wiki 活動
瀏覽代碼

Merge branch 'master' of http://116.255.135.38:3000/zhangzl/nsgk_web 

 Conflicts:
	agriculturalLawEnforcement/view/complaint/complaintAdd.html
master
庞东旭 3 年之前
父節點
7c06787618 c74d11540f
當前提交
d55dab0c62
共有 15 個檔案被更改，包括 56 行新增 和 163 行删除
統一視圖
Diff Options
Show Stats Download Patch File Download Diff File
  1. +14
    -10
      agriculturalLawEnforcement/index.html
  2. +2
    -2
      agriculturalLawEnforcement/login.html
  3. +22
    -14
      agriculturalLawEnforcement/static/js/project/complaint/complaintAdd.js
  4. +1
    -12
      agriculturalLawEnforcement/view/basis/basisDetail.html
  5. +1
    -12
      agriculturalLawEnforcement/view/basis/basisList.html
  6. +5
    -5
      agriculturalLawEnforcement/view/complaint/complaintAdd.html
  7. +1
    -12
      agriculturalLawEnforcement/view/complaint/complaintDetail.html
  8. +1
    -12
      agriculturalLawEnforcement/view/complaint/complaintList.html
  9. +1
    -12
      agriculturalLawEnforcement/view/inventory/inventoryList.html
  10. +1
    -12
      agriculturalLawEnforcement/view/noticeAnnouncement/noticeDetail.html
  11. +1
    -12
      agriculturalLawEnforcement/view/noticeAnnouncement/noticeList.html
  12. +3
    -12
      agriculturalLawEnforcement/view/schemeDisclosure/schemeDetail.html
  13. +1
    -12
      agriculturalLawEnforcement/view/schemeDisclosure/schemeList.html
  14. +1
    -12
      agriculturalLawEnforcement/view/workDynamics/workDetail.html
  15. +1
    -12
      agriculturalLawEnforcement/view/workDynamics/workList.html

+ 14
- 10
agriculturalLawEnforcement/index.html 查看文件

@@ -4,7 +4,7 @@


<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>综合执法</title>
<title>埇桥区农业综合行政执法平台</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="keywords" content="" /> <meta name="keywords" content="" />
@@ -20,20 +20,24 @@
<div class="logoBox fl"> <div class="logoBox fl">
<img src="static/images/logo.png" class="fl" alt=""/> <img src="static/images/logo.png" class="fl" alt=""/>
<div class="fl"> <div class="fl">
<p>农业综合行政执法平台</p>
<p>埇桥区农业综合行政执法平台</p>
<p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p> <p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="loginBox"> <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>
<!--<a href="http://116.255.135.38:73/dataScreen/agriculturalLawEnforcement" target="_blank">-->
<!--<div class="fl m-r-60">-->
<!--<img src="static/images/bigdata.png" class="m-b-5" alt=""/>-->
<!--<p>大数据</p>-->
<!--</div>-->
<!--</a>-->
<a href="http://116.255.135.38:73" target="_blank">
<div class="fl">
<img src="static/images/login.png" class="m-b-5" alt=""/>
<p>登录</p>
</div>
</a>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>


+ 2
- 2
agriculturalLawEnforcement/login.html 查看文件

@@ -4,7 +4,7 @@


<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>综合执法</title>
<title>埇桥区农业综合行政执法平台</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="keywords" content="" /> <meta name="keywords" content="" />
@@ -19,7 +19,7 @@
<div class="registerBody"> <div class="registerBody">
<div class="topLogo"> <div class="topLogo">
<img src="static/images/logo.png" alt=""/> <img src="static/images/logo.png" alt=""/>
<p>农业综合行政执法平台</p>
<p>埇桥区农业综合行政执法平台</p>
</div> </div>
<div class="loginView_bg"></div> <div class="loginView_bg"></div>
<div class="loginView"> <div class="loginView">


+ 22
- 14
agriculturalLawEnforcement/static/js/project/complaint/complaintAdd.js 查看文件

@@ -25,21 +25,29 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
} }


goAdd = function () { 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 if($('#phone').val()=="" || $('#phone').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){ module.addEnd = function(data){


+ 1
- 12
agriculturalLawEnforcement/view/basis/basisDetail.html 查看文件

@@ -25,22 +25,11 @@
<div class="logoBox fl"> <div class="logoBox fl">
<img src="../../static/images/logo.png" class="fl" alt=""/> <img src="../../static/images/logo.png" class="fl" alt=""/>
<div class="fl"> <div class="fl">
<p>农业综合行政执法平台</p>
<p>埇桥区农业综合行政执法平台</p>
<p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p> <p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</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 class="clear"></div>
</div> </div>
</div> </div>


+ 1
- 12
agriculturalLawEnforcement/view/basis/basisList.html 查看文件

@@ -21,22 +21,11 @@
<div class="logoBox fl"> <div class="logoBox fl">
<img src="../../static/images/logo.png" class="fl" alt=""/> <img src="../../static/images/logo.png" class="fl" alt=""/>
<div class="fl"> <div class="fl">
<p>农业综合行政执法平台</p>
<p>埇桥区农业综合行政执法平台</p>
<p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p> <p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</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 class="clear"></div>
</div> </div>
</div> </div>


+ 5
- 5
agriculturalLawEnforcement/view/complaint/complaintAdd.html 查看文件

@@ -93,21 +93,21 @@


<table style="width: 100%;margin-top: 25px;"> <table style="width: 100%;margin-top: 25px;">
<tr> <tr>
<td>类型：</td>
<td><span style="color: red;">*</span>类型：</td>
<td colspan="6"> <td colspan="6">
<label><input name="communicateType" type="radio" value="2" />投诉</label>
<label><input name="communicateType" type="radio" value="2" checked/>投诉</label>
<label><input name="communicateType" type="radio" value="1" />建议</label> <label><input name="communicateType" type="radio" value="1" />建议</label>
<label><input name="communicateType" type="radio" value="3" />举报</label> <label><input name="communicateType" type="radio" value="3" />举报</label>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>标题：</td>
<td><span style="color: red;">*</span>标题：</td>
<td colspan="6"> <td colspan="6">
<input type="text" placeholder="请输入标题" id="title"/> <input type="text" placeholder="请输入标题" id="title"/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>内容：</td>
<td><span style="color: red;">*</span>内容：</td>
<td colspan="6"> <td colspan="6">
<textarea rows="" cols="" placeholder="请输入内容" id="content"></textarea> <textarea rows="" cols="" placeholder="请输入内容" id="content"></textarea>
</td> </td>
@@ -117,7 +117,7 @@
<td> <td>
<input type="text" placeholder="请输入姓名" id="name"/> <input type="text" placeholder="请输入姓名" id="name"/>
</td> </td>
<td>联系方式：</td>
<td><span style="color: red;">*</span>联系方式：</td>
<td> <td>
<input type="text" placeholder="请输入联系方式" id="phone"/> <input type="text" placeholder="请输入联系方式" id="phone"/>
</td> </td>


+ 1
- 12
agriculturalLawEnforcement/view/complaint/complaintDetail.html 查看文件

@@ -29,22 +29,11 @@
<div class="logoBox fl"> <div class="logoBox fl">
<img src="../../static/images/logo.png" class="fl" alt=""/> <img src="../../static/images/logo.png" class="fl" alt=""/>
<div class="fl"> <div class="fl">
<p>农业综合行政执法平台</p>
<p>埇桥区农业综合行政执法平台</p>
<p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p> <p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</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 class="clear"></div>
</div> </div>
</div> </div>


+ 1
- 12
agriculturalLawEnforcement/view/complaint/complaintList.html 查看文件

@@ -21,22 +21,11 @@
<div class="logoBox fl"> <div class="logoBox fl">
<img src="../../static/images/logo.png" class="fl" alt=""/> <img src="../../static/images/logo.png" class="fl" alt=""/>
<div class="fl"> <div class="fl">
<p>农业综合行政执法平台</p>
<p>埇桥区农业综合行政执法平台</p>
<p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p> <p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</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 class="clear"></div>
</div> </div>
</div> </div>


+ 1
- 12
agriculturalLawEnforcement/view/inventory/inventoryList.html 查看文件

@@ -39,22 +39,11 @@
<div class="logoBox fl"> <div class="logoBox fl">
<img src="../../static/images/logo.png" class="fl" alt=""/> <img src="../../static/images/logo.png" class="fl" alt=""/>
<div class="fl"> <div class="fl">
<p>农业综合行政执法平台</p>
<p>埇桥区农业综合行政执法平台</p>
<p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p> <p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</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 class="clear"></div>
</div> </div>
</div> </div>


+ 1
- 12
agriculturalLawEnforcement/view/noticeAnnouncement/noticeDetail.html 查看文件

@@ -25,22 +25,11 @@
<div class="logoBox fl"> <div class="logoBox fl">
<img src="../../static/images/logo.png" class="fl" alt=""/> <img src="../../static/images/logo.png" class="fl" alt=""/>
<div class="fl"> <div class="fl">
<p>农业综合行政执法平台</p>
<p>埇桥区农业综合行政执法平台</p>
<p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p> <p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</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 class="clear"></div>
</div> </div>
</div> </div>


+ 1
- 12
agriculturalLawEnforcement/view/noticeAnnouncement/noticeList.html 查看文件

@@ -21,22 +21,11 @@
<div class="logoBox fl"> <div class="logoBox fl">
<img src="../../static/images/logo.png" class="fl" alt=""/> <img src="../../static/images/logo.png" class="fl" alt=""/>
<div class="fl"> <div class="fl">
<p>农业综合行政执法平台</p>
<p>埇桥区农业综合行政执法平台</p>
<p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p> <p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</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 class="clear"></div>
</div> </div>
</div> </div>


+ 3
- 12
agriculturalLawEnforcement/view/schemeDisclosure/schemeDetail.html 查看文件

@@ -56,7 +56,7 @@
<div class="logoBox fl"> <div class="logoBox fl">
<img src="../../static/images/logo.png" class="fl" alt=""/> <img src="../../static/images/logo.png" class="fl" alt=""/>
<div class="fl"> <div class="fl">
<p>农业综合行政执法平台</p>
<p>埇桥区农业综合行政执法平台</p>
<p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p> <p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
@@ -112,8 +112,7 @@
<td>检查事项：{{newList.checkList}}</td> <td>检查事项：{{newList.checkList}}</td>
</tr> </tr>
<tr> <tr>
<td>方案描述：{{newList.checkContent}}</td>
<td></td>
<td colspan="2">方案描述：{{newList.checkContent}}</td>
</tr> </tr>
</table> </table>


@@ -142,7 +141,7 @@
{{each newList.historicActivityList as value i}} {{each newList.historicActivityList as value i}}
<tr> <tr>
<td> <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="fl" style="padding: 2px 10px">
<div class="tableBox"> <div class="tableBox">
<div class="bs_t fl"> <div class="bs_t fl">
@@ -160,14 +159,6 @@
<p class="fl">意见：{{value.comment}}</p> <p class="fl">意见：{{value.comment}}</p>
<div class="clear"></div> <div class="clear"></div>
</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>
<div class="clear"></div> <div class="clear"></div>
</td> </td>


+ 1
- 12
agriculturalLawEnforcement/view/schemeDisclosure/schemeList.html 查看文件

@@ -21,22 +21,11 @@
<div class="logoBox fl"> <div class="logoBox fl">
<img src="../../static/images/logo.png" class="fl" alt=""/> <img src="../../static/images/logo.png" class="fl" alt=""/>
<div class="fl"> <div class="fl">
<p>农业综合行政执法平台</p>
<p>埇桥区农业综合行政执法平台</p>
<p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p> <p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</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 class="clear"></div>
</div> </div>
</div> </div>


+ 1
- 12
agriculturalLawEnforcement/view/workDynamics/workDetail.html 查看文件

@@ -25,22 +25,11 @@
<div class="logoBox fl"> <div class="logoBox fl">
<img src="../../static/images/logo.png" class="fl" alt=""/> <img src="../../static/images/logo.png" class="fl" alt=""/>
<div class="fl"> <div class="fl">
<p>农业综合行政执法平台</p>
<p>埇桥区农业综合行政执法平台</p>
<p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p> <p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</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 class="clear"></div>
</div> </div>
</div> </div>


+ 1
- 12
agriculturalLawEnforcement/view/workDynamics/workList.html 查看文件

@@ -21,22 +21,11 @@
<div class="logoBox fl"> <div class="logoBox fl">
<img src="../../static/images/logo.png" class="fl" alt=""/> <img src="../../static/images/logo.png" class="fl" alt=""/>
<div class="fl"> <div class="fl">
<p>农业综合行政执法平台</p>
<p>埇桥区农业综合行政执法平台</p>
<p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p> <p>PUBLIC<i></i>PLATFORM<i></i>FOR<i></i>COMPREHENSIVE<i></i>AGRICULTURAL<i></i>LAW<i></i>ENFORCEMENT</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</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 class="clear"></div>
</div> </div>
</div> </div>


Write Preview
Loading…
取消
儲存