温红权 8 лет назад
Родитель
Сommit
681e1d42aa

+ 2 - 1
VisualInspection/fwq/js/appeal_management/appeal_list.js

@@ -12,7 +12,9 @@ function initQueryParams() {
     $.jeDate("#start_time", {
         isinitVal: true,
         format: 'YYYY/MM' // 分隔符可以任意定义,该例子表示只显示年月
+
     });
+    $("#start_time").val(getCurrentTimeFormat());
     //去上次查询保留的参数
     var store_params = $.zui.store.get('store_param_' + current_url);
     var checked_dept = null;
@@ -56,7 +58,6 @@ function initAppealList() {
 function queryAppeal() {
     var t = getTimeByMonth($("#start_time").val());
 
-    alert(getMomentTimeFormat(t.starttime))
     var data = {
         "start_time": getMomentTimeFormat(t.starttime),
         "end_time": getMomentTimeFormat(t.endtime),

+ 1 - 0
VisualInspection/fwq/js/task/add.js

@@ -7,6 +7,7 @@ $(document).ready(function() {
         isinitVal: true,
         format: 'YYYY/MM' // 分隔符可以任意定义,该例子表示只显示年月
     });
+    $("#month_date").val(getCurrentTimeFormat());
     var checked_dept = null;
     if (roleContains("SERVICEAREA")) {
         checked_dept = getCurrentUser().organid;

+ 1 - 0
VisualInspection/fwq/js/task/apply_task.js

@@ -4,6 +4,7 @@ function initApplyPage() {
         isinitVal: true,
         format: 'YYYY/MM' // 分隔符可以任意定义,该例子表示只显示年月
     });
+    $("#start_time").val(getCurrentTimeFormat());
 
     setSASelect("#fsList");
 

+ 1 - 0
VisualInspection/fwq/js/task/task_list.js

@@ -14,6 +14,7 @@ function initQueryParams() {
         format: 'YYYY/MM' // 分隔符可以任意定义,该例子表示只显示年月
     });
 
+    $("#start_time").val(getCurrentTimeFormat());
     var page_params = $.zui.store.get("page_params");
     if (page_params && page_params.status) {
         cur_status = page_params.status;

+ 1 - 0
VisualInspection/fwq/view/appeal_management/appeal_checked.html

@@ -48,6 +48,7 @@
             isinitVal: true,
             format: 'YYYY/MM' // 分隔符可以任意定义,该例子表示只显示年月
         });
+        $("#start_time").val(getCurrentTimeFormat());
         //去上次查询保留的参数
         var store_params = $.zui.store.get('store_param_' + current_url);
         var checked_dept = null;

+ 1 - 0
VisualInspection/fwq/view/appeal_management/appeal_submited.html

@@ -39,6 +39,7 @@
             isinitVal: true,
             format: 'YYYY/MM' // 分隔符可以任意定义,该例子表示只显示年月
         });
+        $("#start_time").val(getCurrentTimeFormat());
         //去上次查询保留的参数
         var store_params = $.zui.store.get('store_param_' + current_url);
         var checked_dept = null;

+ 1 - 0
VisualInspection/fwq/view/task/checked.html

@@ -49,6 +49,7 @@
             isinitVal: true,
             format: 'YYYY/MM' // 分隔符可以任意定义,该例子表示只显示年月
         });
+        $("#start_time").val(getCurrentTimeFormat());
         //去上次查询保留的参数
         var store_params = $.zui.store.get('store_param_' + current_url);
         var checked_dept = null;

+ 11 - 0
VisualInspection/js/util/util.js

@@ -835,4 +835,15 @@ function getTimeByMonth(time) {
 
 function getMomentTimeFormat(t) {
     return t.format("YYYY-MM-DD HH:mm:ss");
+}
+
+function getCurrentTimeFormat() {
+    var m = moment().get("D") > 25 ? (moment().get("M") + 1) : (moment().get("M"));
+    var p = moment();
+    p = p.month(m);
+    return p.format("YYYY/MM");
+}
+
+function GV(selector) {
+    return $(selector).val();
 }

+ 2 - 2
VisualInspection_server/src/main/resources/application.properties

@@ -57,8 +57,8 @@ spring.datasource.useGlobalDataSourceStat=true
 spring.redis.database=0  
 # Redis\u670D\u52A1\u5668\u5730\u5740
 #spring.redis.host=10.112.0.199
-#spring.redis.host=192.168.45.158
-spring.redis.host=127.0.0.1
+spring.redis.host=192.168.45.158
+#spring.redis.host=127.0.0.1
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
 #spring.redis.port=6379
 

+ 2 - 2
Visuallnspection_fjq/visuallnspectioninteface/pom.xml

@@ -40,12 +40,12 @@
         <repository>
             <id>xt-releases</id>
             <name>Releases</name>
-            <url>http://git.topm.win:9506/nexus/content/repositories/releases</url>
+            <url>http://xt.wenhq.top:8084/nexus/content/repositories/releases</url>
         </repository>
         <snapshotRepository>
             <id>xt-snapshots</id>
             <name>Snapshot</name>
-            <url>http://git.topm.win:9506/nexus/content/repositories/snapshots</url>
+            <url>http://xt.wenhq.top:8084/nexus/content/repositories/snapshots</url>
         </snapshotRepository>
     </distributionManagement>