样式修改

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css

@@ -70,7 +70,7 @@ body {
 
 .statit {
 	display: flex;
-	margin: 1% 0;
+	margin: 0.5% 0 1% 0;
 	width: 60%;
 }
 
@@ -192,6 +192,61 @@ body {
 	height: 90%;
 }
 
+.tab-content {
+	display: none;
+	width: 100%;
+	height: calc(100% - 60px);
+}
+
+.tab-content.active {
+	display: block;
+}
+
+.cont-box {
+	width: 100%;
+	height: calc(100% - 60px);
+	clear: both;
+	overflow-y: auto;
+}
+
+.chart-box {
+	float: left;
+	margin: 1% 5%;
+	width: 45%;
+	height: 45%;
+}
+
+.static-content {
+	float: left;
+	clear: both;
+	width: 100%;
+}
+
+.static-content li p {
+	min-width: 20px;
+}
+
+.static-content li label {
+	position: relative;
+	margin: 0 5px;
+	padding-left: 20px;
+}
+
+.static-content li label:before {
+	position: absolute;
+	top: 20%;
+	left: -5px;
+	content: "\f111";
+	padding-left: 1rem;
+	color: #136efb;
+	font-size: 0.85rem;
+	font-family: 'FontAwesome';
+}
+
+.static-content li b {
+	color: #136efb;
+	font-size: 1.5rem;
+}
 
 
 

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/excel/his/list.html

@@ -21,8 +21,8 @@
                                 文件名称：<input type="text" name="attachmentName"/>
                             </li>
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/excel/module/list.html

@@ -27,8 +27,8 @@
                             </select>
                             </li>
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/address/view.html

@@ -18,9 +18,9 @@
                             <input type="text"  name="address"/>
                         </li>
                         <li>
-                            <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i
+                            <a class="btn btn-success btn-sm" onclick="$.table.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i
+                            <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i
                                     class="fa fa-refresh"></i>&nbsp;重置</a>
                         </li>
                     </ul>
@@ -80,7 +80,7 @@
                 //     align: 'center',
                 //     formatter: function (value, row, index) {
                 //         var actions = [];
-                //         //actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.guid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                //         //actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.guid + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
                 //         return actions.join('');
                 //     }
                 // }

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/appUpload/appUpload.html

@@ -27,8 +27,8 @@
 									</select>
 								</li>
 								<li>
-									<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-								    <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+									<a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+								    <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 								</li>
 							</ul>
 						</div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/LawEnforcementWarningList.html

@@ -28,8 +28,8 @@
                                 <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endWarningTime]"/>
                             </li>
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html

@@ -29,8 +29,8 @@
                             <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endEnforcementTime]"/>
                         </li>
                         <li>
-                            <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                         </li>
                     </ul>
                 </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/StatisticsWarning/statisticsWarning.html

@@ -56,18 +56,18 @@
                             </select>
                         </li>
                         <li>
-                            <a class="btn btn-success btn-rounded btn-sm" onclick="searchW()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-reset btn-rounded btn-sm" onclick="restW()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            <a class="btn btn-download btn-rounded btn-sm" onclick="download1()"><i class="fa fa-download"></i>导出</a>
+                            <a class="btn btn-success btn-sm" onclick="searchW()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-reset btn-sm" onclick="restW()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            <a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-download"></i>导出</a>
                         </li>
                     </ul>
-                    <ul>
+                    <!--<ul>
                         <li id="fragmentW" th:fragment="fragmentW">
                             <p th:text="|${year}年|"></p>
                             <p th:text="|投诉数量  ${Number1}|"></p>
                             <p th:text="|投诉对象  ${Number2}|"></p>
                         </li>
-                    </ul>
+                    </ul>-->
                 </div>
             </form>
         </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/audit/audit.html

@@ -15,8 +15,8 @@
                                 <input type="text" name="planName"/>
                             </li>
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>
@@ -74,8 +74,8 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i> 删除</a>');
                         return actions.join('');
                     }
                 }]

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html

@@ -73,19 +73,29 @@
                                 </select>
                             </li>
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="searchComplaint1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="complaintRest(1)"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                                <a class="btn btn-download btn-rounded btn-sm" onclick="complaintDownload1()"><i class="fa fa-download"></i>导出</a>
+                                <a class="btn btn-success btn-sm" onclick="searchComplaint1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="complaintRest(1)"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-warning btn-sm" onclick="complaintDownload1()"><i class="fa fa-download"></i>导出</a>
                                 <a id="closeButton" onclick="closeC()">关闭</a>
                             </li>
-                            <ul>
+                            <!--<ul>
                                 <li id="complaintA" th:fragment="complaintA">
                                     <p th:text="|${year}年|"></p>
                                     <p th:text="|投诉数量  ${Number1}|"></p>
                                     <p th:text="|投诉对象  ${Number2}|"></p>
                                 </li>
-                            </ul>
+                            </ul>-->
                         </ul>
+                        <div class="static-content">
+                            <ul>
+                                <li id="complaintA" th:fragment="complaintA">
+                                    <p th:text="|${year}年:|"></p>
+                                    <p><label th:text="投诉数量"></label><b th:text="${Number1}"></b></p>
+                                    <p></i><label th:text="投诉对象"></label><b th:text="${Number2}"></b></p>
+                                </li>
+
+                            </ul>
+                        </div>
                     </div>
                 </form>
                 <div class="col-sm-12 select-table table-bordered">
@@ -134,24 +144,34 @@
                                 </select>
                             </li>
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="searchComplaint('form',2)"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="complaintRest(2)"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                                <a class="btn btn-download btn-rounded btn-sm" onclick="complaintDownload(2)"><i class="fa fa-download"></i>下载</a>
+                                <a class="btn btn-success btn-sm" onclick="searchComplaint('form',2)"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="complaintRest(2)"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-warning btn-sm" onclick="complaintDownload(2)"><i class="fa fa-download"></i>下载</a>
                             </li>
                         </ul>
-                        <ul>
+                        <!--<ul>
                             <li id="complaintB" th:fragment="complaintB">
                                 <p th:text="|${year}年|"></p>
                                 <p th:text="|投诉数量  ${Number3}|"></p>
                                 <p th:text="|占比总计 ${dou}|"></p>
                             </li>
-                        </ul>
+                        </ul>-->
+                        <div class="static-content" style="margin: 1% 0;">
+                            <ul>
+                                <li id="complaintB" th:fragment="complaintB">
+                                    <p th:text="|${year}年:|"></p>
+                                    <p><label th:text="投诉数量"></label><b th:text="${Number3}"></b></p>
+                                    <p></i><label th:text="占比总计"></label><b th:text="${dou}"></b></p>
+                                </li>
+
+                            </ul>
+                        </div>
                     </div>
 
                 </form>
-                <div>
-                    <table id="bootstrap-table2" style="width: 550px;"></table>
-                    <div id="container" style="width: 700px;height:550px;"></div>
+                <div class="cont-box">
+                    <table id="bootstrap-table2" style="width: 650px;"></table>
+                    <div id="container" style="width: 500px;height:500px;"></div>
                 </div>
             </div>
         </div>
@@ -371,14 +391,14 @@
                         var option3 = {
                             color:['#1874CD','#3A5FCD','#436EEE','#4876FF','#1E90FF','#63B8FF'],
                             tooltip: {},
-                            legend: {
+                            /*legend: {
                                 data: ['投诉类型统计']
-                            },
+                            },*/
                             series: [
                                 {
                                     name: '投诉类型统计',
                                     type: 'pie',
-                                    radius: ['40%', '70%'],
+                                    radius: ['35%', '50%'],
                                     data: pieData,
                                     label: {
                                         show: true,

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html

@@ -26,16 +26,26 @@
                             <input type="text" name="zfcode"/>
                         </li>
                         <li>
-                            <a class="btn btn-success btn-rounded btn-sm" onclick="deptSearch()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-reset btn-rounded btn-sm" onclick="deptRest()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            <a class="btn btn-download btn-rounded btn-sm" onclick="download1()"><i class="fa fa-download"></i>导出</a>
+                            <a class="btn btn-success btn-sm" onclick="deptSearch()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-reset btn-sm" onclick="deptRest()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            <a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-download"></i>导出</a>
                         </li>
                     </ul>
-                    <ul>
+                    <!--<ul>
                         <li id="b" th:fragment="b">
                             <p th:text="|全市:执法部门 ${deptNumber}  执法人员 ${lawNumber}|"></p>
                         </li>
-                    </ul>
+                    </ul>-->
+                    <div class="static-content">
+                        <ul>
+                            <li id="b" th:fragment="b">
+                                <p>全市:</p>
+                                <p><label th:text="执法部门"></label><b th:text="${deptNumber}"></b></p>
+                                <p></i><label th:text="执法人员"></label><b th:text="${lawNumber}"></b></p>
+                            </li>
+
+                        </ul>
+                    </div>
                 </div>
             </form>
         </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/information/information.html

@@ -30,8 +30,8 @@
                                 <input type="text" name="enterpriseAddress"/>
                             </li>
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>
@@ -137,11 +137,11 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="toQrCode(\'' + row.enterpriseNumber + '\')"><i class="fa fa-edit"></i>二维码</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="editIndustry(\'' + row.id + '\')"><i class="fa fa-edit"></i>所属行业</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="unsubscribe(\'' + row.id + '\')"><i class="fa fa-remove"></i>注销</a>');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="toQrCode(\'' + row.enterpriseNumber + '\')"><i class="fa fa-edit"></i> 二维码</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="editIndustry(\'' + row.id + '\')"><i class="fa fa-edit"></i> 所属行业</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="unsubscribe(\'' + row.id + '\')"><i class="fa fa-remove"></i> 注销</a>');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i> 删除</a>');
                         return actions.join('');
                     }
                 }]

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/item/item.html

@@ -23,8 +23,8 @@
                                 <input type="text" name="subName"/>
                             </li>
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html

@@ -4,13 +4,19 @@
     <th:block th:include="include :: header('企业端-执法部门预约记录列表')" />
     <link type="text/css" href="/css/stat1.css" rel="stylesheet"/>
     <style>
-        .tab-content {
-            display: none;
+
+        .row {
+            width: 100%;
+            height: 100%;
         }
 
-        .tab-content.active {
-            display: block;
+        .search-collapse {
+            position: relative;
+            width: 100%;
+            height: 100%;
         }
+
+
     </style>
 </head>
 <body class="gray-bg">
@@ -121,19 +127,27 @@
                                     <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
                                 </li>
                                 <li>
-                                    <a class="btn btn-success btn-rounded btn-sm" onclick="search1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                    <a class="btn btn-reset btn-rounded btn-sm" onclick="rest1()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                                    <a class="btn btn-download btn-rounded btn-sm" onclick="download1()"><i class="fa fa-download"></i>导出</a>
-                                </li>
-                            </ul>
-                            <ul>
-                                <li id="a" th:fragment="a">
-                                    <p th:text="|联合检查  ${unite}|"></p>
-                                    <p th:text="|占比  ${uniteDouble}|"></p>
-                                    <p th:text="|${check}  ${checkNumber}|"></p>
-                                    <p th:text="|占比  ${checkDouble}|"></p>
+                                    <a class="btn btn-success btn-sm" onclick="search1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                    <a class="btn btn-reset btn-sm" onclick="rest1()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                    <a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-download"></i>导出</a>
                                 </li>
                             </ul>
+                            <div class="static-content">
+                                <ul>
+                                    <!--<li id="a" th:fragment="a">
+                                        <p th:text="|联合检查  ${unite}|"></p>
+                                        <p th:text="|占比  ${uniteDouble}|"></p>
+                                        <p th:text="|${check}  ${checkNumber}|"></p>
+                                        <p th:text="|占比  ${checkDouble}|"></p>
+                                    </li>-->
+                                    <li id="a" th:fragment="a">
+                                        <p>2024年:</p>
+                                        <p><label th:text="联合检查"></label><b th:text="${unite}"></b></p>
+                                        <p></i><label th:text="${check}"></label><b th:text="${checkNumber}"></b></p>
+                                    </li>
+
+                                </ul>
+                            </div>
                         </div>
                     </form>
                     <div class="col-sm-12 select-table table-bordered">
@@ -141,57 +155,56 @@
                     </div>
                 </div>
                 <div id="one-tab2" class="tab-content">
-                    <div style="display: grid;grid-template-columns: 1fr 1fr;gap: 10px;">
-                    <div>
-                        <form id="formId2">
-                            <div class="select-list">
-                                <ul>
-                                    <li>
-                                        <p>时段：</p>
-                                        <select id="year2" name="year">
-                                            <!--<option value="2024">2024</option>-->
-                                            <option th:each="y:${yearList}" th:text="${y}" th:value="${y}"></option>
-                                        </select>
-                                        <select id="dateSearch2" name="dateSearch" onchange="timeType2()">
-                                            <option value="year">年度</option>
-                                            <option value="quarter">季度</option>
-                                            <option value="month">月度</option>
-                                        </select>
-                                        <select id="quarter2" name="quarter">
-                                            <option value="">所有</option>
-                                            <option value="1">第一季度</option>
-                                            <option value="2">第二季度</option>
-                                            <option value="3">第三季度</option>
-                                            <option value="4">第四季度</option>
-                                        </select>
-                                        <select id="month2" name="month">
-                                            <option value="">所有</option>
-                                            <option value="01">1月</option>
-                                            <option value="02">2月</option>
-                                            <option value="03">3月</option>
-                                            <option value="04">4月</option>
-                                            <option value="05">5月</option>
-                                            <option value="06">6月</option>
-                                            <option value="07">7月</option>
-                                            <option value="08">8月</option>
-                                            <option value="09">9月</option>
-                                            <option value="10">10月</option>
-                                            <option value="11">11月</option>
-                                            <option value="12">12月</option>
-                                        </select>
-                                    </li>
-                                </ul>
-                            </div>
-                            <a class="btn btn-success btn-rounded btn-sm" onclick="search2()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-reset btn-rounded btn-sm" onclick="rest2()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                        </form>
-                        <div id="container1" style="width: 500px;height:500px;margin-right:0px"></div>
-                    </div>
-                    <div id="container2" style="width: 550px;height:550px;margin-right:0px"></div>
+                    <form id="formId2">
+                        <div class="select-list">
+                        <ul>
+                            <li>
+                                <p>时段：</p>
+                                <select id="year2" name="year">
+                                    <!--<option value="2024">2024</option>-->
+                                    <option th:each="y:${yearList}" th:text="${y}" th:value="${y}"></option>
+                                </select>
+                                <select id="dateSearch2" name="dateSearch" onchange="timeType2()">
+                                    <option value="year">年度</option>
+                                    <option value="quarter">季度</option>
+                                    <option value="month">月度</option>
+                                </select>
+                                <select id="quarter2" name="quarter">
+                                    <option value="">所有</option>
+                                    <option value="1">第一季度</option>
+                                    <option value="2">第二季度</option>
+                                    <option value="3">第三季度</option>
+                                    <option value="4">第四季度</option>
+                                </select>
+                                <select id="month2" name="month">
+                                    <option value="">所有</option>
+                                    <option value="01">1月</option>
+                                    <option value="02">2月</option>
+                                    <option value="03">3月</option>
+                                    <option value="04">4月</option>
+                                    <option value="05">5月</option>
+                                    <option value="06">6月</option>
+                                    <option value="07">7月</option>
+                                    <option value="08">8月</option>
+                                    <option value="09">9月</option>
+                                    <option value="10">10月</option>
+                                    <option value="11">11月</option>
+                                    <option value="12">12月</option>
+                                </select>
+                            </li>
+                            <li>
+                                <a class="btn btn-success btn-sm" onclick="search2()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="rest2()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
                     </div>
-                    <div style="display: grid;grid-template-columns: 1fr 1fr;gap: 10px;">
-                        <div id="container3" style="width: 550px;height:550px;margin-right:0px"></div>
-                        <div id="container4" style="width: 550px;height:550px;margin-right:0px"></div>
+                    </form>
+                    <div class="cont-box">
+
+                        <div class="chart-box" id="container1" style="width: 500px; height: 500px;"></div>
+                        <div class="chart-box" id="container2" style="width: 500px; height: 500px;"></div>
+                        <div class="chart-box" id="container3" style="width: 500px; height: 500px;"></div>
+                        <div class="chart-box" id="container4" style="width: 500px; height: 500px;"></div>
                     </div>
                 </div>
             </div>
@@ -378,7 +391,12 @@
                     echart1.setOption(option1);
                     debugger;
                 }
-            })
+            });
+            // 使用刚指定的配置项和数据显示图表。
+            /*currentId.setOption(option);
+            window.addEventListener("resize",function(){
+                currentId.resize();
+            });*/
         }
         function echarts2(){
             $.ajax({

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html

@@ -117,9 +117,9 @@
                                 <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
                             </li>
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="search1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                                <a class="btn btn-download btn-rounded btn-sm" onclick="download1()"><i class="fa fa-download"></i>下载</a>
+                                <a class="btn btn-success btn-sm" onclick="search1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-download"></i>下载</a>
                             </li>
                         </ul>
                     </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/ruleItemList/ruleItemList.html

@@ -32,8 +32,8 @@
                                 </select>
                             </li>
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>
@@ -119,8 +119,8 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i> 删除</a>');
                         return actions.join('');
                     }
                 }]

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/ruleList/list.html

@@ -19,8 +19,8 @@
                                 <input type="text" name="ruleCode"/>
                             </li>
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>
@@ -101,9 +101,9 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
                         actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="detail(\'' + row.id + '\')"><i class="fa fa-list-ul"></i> 列表</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i> 删除</a>');
                         return actions.join('');
                     }
                 }]

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html

@@ -54,8 +54,8 @@
                                         <label>月度：</label>
                                         <input type="text" class="month-input" style="width: 150px" id="monthSearch" name="month">
                                     <li>
-                                        <a class="btn btn-success btn-rounded btn-sm" onclick="query()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                        <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                        <a class="btn btn-success btn-sm" onclick="query()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                        <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                                     </li>
                                 </ul>
                             </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html

@@ -38,19 +38,30 @@
                                 <option th:fragment="jd" th:each="j:${jdList}" th:text="${j.dictLabel}" th:value="${j.dictValue}"></option>
                             </select>
                         </li>
-                        <li id="fragmentE" th:fragment="fragmentE">
+                        <!--<li id="fragmentE" th:fragment="fragmentE">
                             <p th:text="全市"></p>
                             <p th:text="|企业数量 ${number}|"></p>
                             <p th:text="|续存企业数量 ${exist}|"></p>
                             <p th:text="|注销企业数量 ${logout}|"></p>
-                        </li>
+                        </li>-->
                         <li>
-                            <a class="btn btn-success btn-rounded btn-sm" onclick="searchE()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-reset btn-rounded btn-sm" onclick="restE()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            <a class="btn btn-download btn-rounded btn-sm" onclick="complaintDownload1()"><i class="fa fa-download"></i>导出</a>
+                            <a class="btn btn-success btn-sm" onclick="searchE()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-reset btn-sm" onclick="restE()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            <a class="btn btn-warning btn-sm" onclick="complaintDownload1()"><i class="fa fa-download"></i>导出</a>
                             <a id="closeButton" onclick="closeE()">返回</a>
                         </li>
                     </ul>
+                    <div class="static-content">
+                        <ul>
+                            <li id="fragmentE" th:fragment="fragmentE">
+                                <p th:text="全市"></p>
+                                <p><label th:text="企业数量"></label><b th:text="${number}"></b></p>
+                                <p></i><label th:text="续存企业数量"></label><b th:text="${exist}"></b></p>
+                                <p></i><label th:text="注销企业数量"></label><b th:text="${logout}"></b></p>
+                            </li>
+
+                        </ul>
+                    </div>
                 </div>
                 </form>
                 <div class="col-sm-12 select-table table-bordered">
@@ -97,18 +108,28 @@
                                 </select>
                             </li>
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="eSearch2()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="eRest2()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                                <a class="btn btn-download btn-rounded btn-sm" onclick="complaintDownload(2)"><i class="fa fa-download"></i>下载</a>
+                                <a class="btn btn-success btn-sm" onclick="eSearch2()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="eRest2()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-warning btn-sm" onclick="complaintDownload(2)"><i class="fa fa-download"></i>下载</a>
                             </li>
                         </ul>
-                        <ul>
+                        <!--<ul>
                             <li id="enterpriseFragment" th:fragment="enterpriseFragment">
                                 <p th:text="|${year}年|"></p>
                                 <p th:text="|企业数量  ${number2}|"></p>
                                 <p th:text="|占比总计  ${number3}|"></p>
                             </li>
-                        </ul>
+                        </ul>-->
+                        <div class="static-content">
+                            <ul>
+                                <li id="enterpriseFragment" th:fragment="enterpriseFragment">
+                                    <p th:text="|${year}年:|"></p>
+                                    <p><label th:text="企业数量"></label><b th:text="${number2}"></b></p>
+                                    <p></i><label th:text="占比总计"></label><b th:text="${number3}"></b></p>
+                                </li>
+
+                            </ul>
+                        </div>
                     </div>
 
                 </form>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/feedback/view.html

@@ -19,9 +19,9 @@
                             <input type="text" name="mobile"/>
                         </li>
                         <li>
-                            <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i
+                            <a class="btn btn-success btn-sm" onclick="$.table.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i
+                            <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i
                                     class="fa fa-refresh"></i>&nbsp;重置</a>
                         </li>
                     </ul>
@@ -78,7 +78,7 @@
                 //     align: 'center',
                 //     formatter: function (value, row, index) {
                 //         var actions = [];
-                //         //actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.guid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                //         //actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.guid + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
                 //         return actions.join('');
                 //     }
                 // }

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/view.html

@@ -15,9 +15,9 @@
                             <input type="text" name="name"/>
                         </li>
                         <li>
-                            <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i
+                            <a class="btn btn-success btn-sm" onclick="$.table.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-reset btn-rounded btn-sm" onclick="reset()"><i
+                            <a class="btn btn-reset btn-sm" onclick="reset()"><i
                                     class="fa fa-refresh"></i>&nbsp;重置</a>
                         </li>
                     </ul>
@@ -78,9 +78,9 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.guid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.guid + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="sort(\'' + row.guid + '\')"><i class="fa fa-eject"></i>上移</a>');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.guid + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.guid + '\')"><i class="fa fa-remove"></i> 删除</a>');
+                        actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="sort(\'' + row.guid + '\')"><i class="fa fa-eject"></i> 上移</a>');
                         return actions.join('');
                     }
                 }]

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/jt808/vehicle/selectEquipment.html

@@ -11,7 +11,7 @@
     <div class="box box-main">
         <div class="box-header">
             <div class="box-title">
-                <i class="fa icon-grid"></i>设备目录
+                <i class="fa icon-grid"></i> 设备目录
             </div>
             <div class="box-tools pull-right">
                 <button type="button" class="btn btn-box-tool" id="btnExpand" title="展开" style="display:none;"><i

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/jt808/vehicle/vehicle.html

@@ -27,8 +27,8 @@
 
 
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/jt808/vehicle/vehicleFence.html

@@ -25,8 +25,8 @@
 
 
                               <li>
-                                  <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                  <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                  <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                  <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                               </li>
                           </ul>
                       </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/view.html

@@ -15,9 +15,9 @@
                             <input type="text" name="name"/>
                         </li>
                         <li>
-                            <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i
+                            <a class="btn btn-success btn-sm" onclick="$.table.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-reset btn-rounded btn-sm" onclick="reset()"><i
+                            <a class="btn btn-reset btn-sm" onclick="reset()"><i
                                     class="fa fa-refresh"></i>&nbsp;重置</a>
                         </li>
                     </ul>
@@ -78,9 +78,9 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.guid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-primary btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.guid + '\')"><i class="fa fa-eye"></i>查看</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.guid + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.guid + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
+                        actions.push('<a class="btn btn-primary btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.guid + '\')"><i class="fa fa-eye"></i> 查看</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.guid + '\')"><i class="fa fa-remove"></i> 删除</a>');
                         //actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="sort(\'' + row.guid + '\')"><i class="fa fa-eject"></i>上移</a>');
                         return actions.join('');
                     }

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/mes/view.html

@@ -15,9 +15,9 @@
                             <input type="text" name="title"/>
                         </li>
                         <li>
-                            <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i
+                            <a class="btn btn-success btn-sm" onclick="$.table.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i
+                            <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i
                                     class="fa fa-refresh"></i>&nbsp;重置</a>
                         </li>
                     </ul>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/message/action/action.html

@@ -23,8 +23,8 @@
                                 <input type="text" name="action"/>
                             </li>
 
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/message/info/info.html

@@ -23,8 +23,8 @@
                                 <input type="text" name="sysid"/>
                             </li>-->
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/message/info/selectinfo.html

@@ -23,8 +23,8 @@
                                 <input type="text" name="sysid"/>
                             </li>-->
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/view.html

@@ -21,9 +21,9 @@
                                    name="createTime" data-format="yyyy-MM-dd HH:mm:ss" style="width: 200px;"/>
                         </li>
                         <li>
-                            <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i
+                            <a class="btn btn-success btn-sm" onclick="$.table.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-reset btn-rounded btn-sm" onclick="reset()"><i
+                            <a class="btn btn-reset btn-sm" onclick="reset()"><i
                                     class="fa fa-refresh"></i>&nbsp;重置</a>
                         </li>
                     </ul>
@@ -99,9 +99,9 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.guid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.guid + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        actions.push('<a class="btn btn-primary btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.guid + '\',800,450)"><i class="fa fa-eye"></i>查看</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.guid + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.guid + '\')"><i class="fa fa-remove"></i> 删除</a>');
+                        actions.push('<a class="btn btn-primary btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.guid + '\',800,450)"><i class="fa fa-eye"></i> 查看</a> ');
                         //actions.push('<a class="btn btn-danger btn-xs ' + bindFlag + '" href="javascript:void(0)" onclick="bindNew(\'' + row.guid + '\',900,500)"><i class="fa fa-eject"></i>绑定</a>');
                         return actions.join('');
                     }

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/role/view.html

@@ -24,9 +24,9 @@
                             </select>
                         </li>
                         <li>
-                            <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i
+                            <a class="btn btn-success btn-sm" onclick="$.table.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-reset btn-rounded btn-sm" onclick="reset()"><i
+                            <a class="btn btn-reset btn-sm" onclick="reset()"><i
                                     class="fa fa-refresh"></i>&nbsp;重置</a>
                         </li>
                     </ul>
@@ -96,12 +96,12 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit(\'' + row.guid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.guid + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        actions.push('<a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="question(\'' + row.guid + '\')"><i class="fa fa-eye"></i>绑定</a> ');
-                        //actions.push('<a class="btn btn-primary btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.guid + '\',800,450)"><i class="fa fa-eye"></i>查看</a> ');
-                        // actions.push('<a class="btn btn-danger btn-xs ' + bindFlag + '" href="javascript:void(0)" onclick="bind(\'' + row.guid + '\',800,450)"><i class="fa fa-eject"></i>绑定</a>');
-                        //actions.push('<a class="btn btn-danger btn-xs ' + bindFlag + '" href="javascript:void(0)" onclick="bindNew(\'' + row.guid + '\',900,500)"><i class="fa fa-eject"></i>绑定</a>');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit(\'' + row.guid + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.guid + '\')"><i class="fa fa-remove"></i> 删除</a>');
+                        actions.push('<a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="question(\'' + row.guid + '\')"><i class="fa fa-eye"></i> 绑定</a> ');
+                        //actions.push('<a class="btn btn-primary btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.guid + '\',800,450)"><i class="fa fa-eye"></i> 查看</a> ');
+                        // actions.push('<a class="btn btn-danger btn-xs ' + bindFlag + '" href="javascript:void(0)" onclick="bind(\'' + row.guid + '\',800,450)"><i class="fa fa-eject"></i> 绑定</a>');
+                        //actions.push('<a class="btn btn-danger btn-xs ' + bindFlag + '" href="javascript:void(0)" onclick="bindNew(\'' + row.guid + '\',900,500)"><i class="fa fa-eject"></i> 绑定</a>');
                         return actions.join('');
                     }
                 }]

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/tab/view.html

@@ -15,9 +15,9 @@
                             <input type="text" name="title"/>
                         </li>
                         <li>
-                            <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i
+                            <a class="btn btn-success btn-sm" onclick="$.table.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-reset btn-rounded btn-sm" onclick="reset()"><i
+                            <a class="btn btn-reset btn-sm" onclick="reset()"><i
                                     class="fa fa-refresh"></i>&nbsp;重置</a>
                         </li>
                     </ul>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/view.html

@@ -15,9 +15,9 @@
                             <input type="text" name="type"/>
                         </li>
                         <li>
-                            <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i
+                            <a class="btn btn-success btn-sm" onclick="$.table.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i
+                            <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i
                                     class="fa fa-refresh"></i>&nbsp;重置</a>
                         </li>
                     </ul>
@@ -91,7 +91,7 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.guid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.guid + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.guid + '\')"><i class="fa fa-remove"></i> 删除</a>');
                         return actions.join('');
                     }

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/user/view.html

@@ -19,9 +19,9 @@
                             <input type="text" name="mobile"/>
                         </li>
                         <li>
-                            <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i
+                            <a class="btn btn-success btn-sm" onclick="$.table.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i
+                            <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i
                                     class="fa fa-refresh"></i>&nbsp;重置</a>
                         </li>
                     </ul>
@@ -89,8 +89,8 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.guid + '\')"><i class="fa fa-edit"></i>勋章</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="address(\'' + row.guid + '\')"><i class="fa fa-edit"></i>地址</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.guid + '\')"><i class="fa fa-edit"></i> 勋章</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="address(\'' + row.guid + '\')"><i class="fa fa-edit"></i> 地址</a> ');
                         return actions.join('');
                     }
                 }

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/application/application.html

@@ -14,9 +14,9 @@
                             系统名称：<input type="text" name="appName"/>
                         </li>
                         <li>
-                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                            <a class="btn btn-primary btn-sm" onclick="$.table.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                            <a class="btn btn-warning btn-sm" onclick="$.form.reset()"><i
                                     class="fa fa-refresh"></i>&nbsp;重置</a>
                         </li>
                     </ul>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/blockData/community/community.html

@@ -43,8 +43,8 @@
                                 <input type="text" name="sourceTypeCode"/>
                             </li>
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/blockData/road/road.html

@@ -71,8 +71,8 @@
                                 <input type="text" name="technologyLevel"/>
                             </li>
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/blockData/street/street.html

@@ -39,8 +39,8 @@
                                 <input type="text" name="resouce"/>
                             </li>
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/blockData/thining/thining.html

@@ -54,8 +54,8 @@
                                 <input type="text" name="explan4"/>
                             </li>
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/model/conf/conf.html

@@ -23,8 +23,8 @@
                                 <input type="text" name="modelName"/>
                             </li>
                             <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/tenant/tenant.html

@@ -17,9 +17,9 @@
                             联系人：<input type="text" name="contactMan"/>
                         </li>
                         <li>
-                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                            <a class="btn btn-primary btn-sm" onclick="$.table.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                            <a class="btn btn-warning btn-sm" onclick="$.form.reset()"><i
                                     class="fa fa-refresh"></i>&nbsp;重置</a>
                         </li>
                     </ul>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/tool/gen/edit.html

@@ -262,10 +262,10 @@
                 <div class="box-footer">
                     <div class="col-sm-offset-5 col-sm-6">
                         <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i
-                                class="fa fa-check"></i>保 存
+                                class="fa fa-check"></i> 保存
                         </button>&nbsp;
                         <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i
-                                class="fa fa-reply-all"></i>关 闭
+                                class="fa fa-reply-all"></i> 关闭
                         </button>
                     </div>
                 </div>