Merge remote-tracking branch 'origin/master'

pom.xml

@@ -255,8 +255,9 @@
             <groupId>com.example</groupId>
             <artifactId>micro-sdk</artifactId>
             <version>1.0.2-SNAPSHOT</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/lib/micro-sdk-1.0.2-SNAPSHOT.jar</systemPath>
         </dependency>
-
         <!--http common-->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

src/main/java/com/bootdo/datas/controller/DataController.java

@@ -54,13 +54,13 @@ public class DataController {
 
     @GetMapping("dataInfo")
     @RequiresPermissions("datas:data:data")
-    String dataInfo(String type, String status, String provinceName, Model model) {
+    String dataInfo(String type, String status, String cityName, Model model) {
         log.info("dataLevel:" + type);
         log.info("dataStatus:" + status);
-        log.info("provinceName:" + provinceName);
+        log.info("cityName:" + cityName);
         model.addAttribute("dataLevel", type);
         model.addAttribute("dataStatus", status);
-        model.addAttribute("provinceName", provinceName);
+        model.addAttribute("cityName", cityName);
         return "datas/data/dataInfo";
     }
 

src/main/resources/static/js/appjs/datas/data/dataInfo.js

@@ -73,7 +73,7 @@ function loadProvince2() {
                 }
                 // $('#exampleTable').bootstrapTable('refresh', opt);
             });
-            // 当为全国地图跳转时 禁用省份下拉框
+            // 当为省级地图跳转时 禁用省份下拉框
             if ($('#provinceName').val() != '') {
                 $('#unitProvince').prop('disabled', true).trigger("chosen:updated");
             }
@@ -209,7 +209,7 @@ function load() {
                         dataIndustry: $('#dataIndustry').val(),
                         industryTypeOne: $('#industryTypeOne').val(),
                         unitProvince: $('#unitProvince').val() == '' ? $('#provinceName').val() : $('#unitProvince').val(),
-                        unitCity: $('#unitCity').val(), //市区
+                        unitCity: $('#unitCity').val()=='' ? $('#cityName').val() : $('#unitCity').val(), //市区
                         reporterUnit: $('#reporterUnit').val(),
                         dataLevel: $('#dataLevel').val(),
                         dataStatus: $('#dataStatus').val(),

src/main/resources/static/js/demo/echarts-demo.js

@@ -644,8 +644,8 @@ function mapChart(province) {
                     }
                     // 打开新table
                     console.log(currentCityName);
-                    if (currentCityName != '' && currentCityName != 'undefined') {
-                        page('/datas/data/dataInfo?cityName=' + currentCityName
+                    if (oldCityName !== '' && oldCityName !== 'undefined') {
+                        page('/datas/data/dataInfo?cityName=' + oldCityName
                             , oldCityName + '数据', '1', '省份数据');
                     }
                 }

src/main/resources/templates/datas/data/dataInfo.html

@@ -10,7 +10,7 @@
                 <div class="fixed-table-toolbar">
                     <input id="dataLevels" name="dataLevels" th:value="${dataLevel}" type="hidden"/>
                     <input id="dataStatus" name="dataStatus" th:value="${dataStatus}" type="hidden"/>
-                    <input id="provinceName" name="provinceName" th:value="${provinceName}" type="hidden"/>
+                    <input id="cityName" name="cityName" th:value="${cityName}" type="hidden"/>
                     <div class="columns pull-left">
                         <button shiro:hasPermission="datas:data:batchRemove" type="button" class="btn  btn-danger"
                                 onclick="batchRemove()">

src/main/resources/templates/datas/unit/dataList.html

@@ -46,14 +46,13 @@
                     <input id="creditCode" type="hidden" class="form-control" placeholder="机构编码"
                            hidden th:value="${unit.creditCode}">
                     <div class="pull-right search" style="padding-right: 5px;">
+<!--                        <select data-placeholder="&#45;&#45;审核阶段&#45;&#45;" name="auditStage" id="auditStage"-->
+<!--                                style="width: 130px;"  class="form-control chosen-select-auditStage" tabindex="2" required >-->
+<!--                            <option value="">&#45;&#45;审核阶段&#45;&#45;</option>-->
+<!--                        </select>-->
                         <input id="dataName" type="text" class="form-control" placeholder="数据名称">
                     </div>
                     <div class="columns pull-right" style="padding-right: 5px;">
-                        <select data-placeholder="--审核阶段--" name="auditStage" id="auditStage"
-                                style="width: 130px;"  class="form-control chosen-select-auditStage" tabindex="2" required >
-                            <option value="">--审核阶段--</option>
-                        </select>
-
                         <select data-placeholder="--数据级别--" name="dataLevel" id="dataLevel"
                                 class="form-control" tabindex="2" required style="font-size: 14px;color: #9b9ea3;">
                             <option value="">--数据级别--</option>