Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/templates/admin/common/header.html

@@ -291,7 +291,7 @@
                         var obj = result.obj;
                         if (obj.isLogin) {
                             if (e == 'azw') {
-                                window.open("http://202.102.20.60:8008/xq/#/login?username=" + obj.userName)
+                                window.open("http://202.102.20.60:8008/zf/#/login?username=" + obj.userName)
                             } else if (e == 'dljk') {
                                 window.open("http://202.102.20.60:8008/ly/#/login?username=" + obj.userName)
                             } else if (e == 'lyjj') {

src/main/resources/templates/admin/government/industrial_land_supply/feedback_append.html

@@ -248,8 +248,50 @@
     // }
 
     function removeLine(obj) {
+        if ($(obj).parent().parent().siblings().length < 1) {
+            $(obj).parent().parent().parent().parent().parent().siblings('.cl').children('.formControls').children('input')[0].checked = false
+        } else {
+            let canChecked = false
+            $(obj).parent().parent().siblings().each(function(index,item){
+                if($(this).children('.td_material').children('.consultation')[0].attr(value!='')) {
+                    canChecked = true
+                }
+            })
+            $(obj).parent().parent().parent().parent().parent().siblings('.cl').children('.formControls').children('input')[0].checked = canChecked
+        }
         $(obj).parent().parent().remove();
     }
+    $(document).ready(function(){
+        $('input[name^="consultationList"]').blur(function(){
+            console.log('blur事件触发')
+            $('input[name^="consultationList"]').each(function(index,item){
+                if (item.value) {
+                    console.log('输入框内有值')
+                    $(this).parent().parent().parent().parent().parent().siblings('.cl').children('.formControls').children('input')[0].checked = true
+                    // let defaultIndex = 'defaultList[' + item.name.split('.')[0].split('')[item.name.split('.')[0].split('').length-2] + ']'
+                    // $('input[name^="defaultList"]').each(function(vindex,vitem){
+                    //     if (vitem.name == defaultIndex) {
+                    //         vitem.checked = true
+                    //     }
+                    // })
+                } else {
+                    if ($(this).parent().parent().siblings().length < 1) {
+                        console.log('同级元素少于一个')
+                        $(this).parent().parent().parent().parent().parent().siblings('.cl').children('.formControls').children('input')[0].checked = false
+                    } else {
+                        console.log('同级元素大于一个要判断是否为空')
+                        let canChecked = false
+                        $(this).parent().parent().siblings().each(function(index,item){
+                            if($(this).children('.td_material').children('.consultation')[0].attr(value!='')) {
+                                canChecked = true
+                            }
+                        })
+                        $(this).parent().parent().parent().parent().parent().siblings('.cl').children('.formControls').children('input')[0].checked = canChecked
+                    }
+                }
+            })
+        })
+    })
 </script>
 </body>
 </html>

src/main/resources/templates/home/common/common.html

@@ -138,7 +138,7 @@
                         var obj = result.obj;
                         if (obj.isLogin) {
                             if (e == 'azw') {
-                                window.open("http://202.102.20.60:8008/xq/#/login?username=" + obj.userName)
+                                window.open("http://202.102.20.60:8008/zf/#/login?username=" + obj.userName)
                             } else if (e == 'dljk') {
                                 window.open("http://202.102.20.60:8008/ly/#/login?username=" + obj.userName)
                             } else if (e == 'lyjj') {
@@ -168,8 +168,8 @@
                         } else {
                             //errorMessage("请登陆！");
                             location.href = pagePath + "/home/login";
-                            // localStorage.setItem("activityUrl", 'http://202.102.20.60:8008/xq/#/login');
-                            // localStorage.setItem("returnUrl", 'http://202.102.20.60:8008/xq/#/login');
+                            // localStorage.setItem("activityUrl", 'http://202.102.20.60:8008/zf/#/login');
+                            // localStorage.setItem("returnUrl", 'http://202.102.20.60:8008/zf/#/login');
                             // localStorage.setItem("requiredUserType", "0");
                             if (e == 'azw') {
                                 localStorage.setItem("safetySupervision", "1");

src/main/resources/templates/home/html/login.html

@@ -167,7 +167,7 @@
 
                     //进入安监系统
                     if (safetySupervision) {
-                        window.location.href = "http://202.102.20.60:8008/xq/#/login?username=" + result.obj.userName;
+                        window.location.href = "http://202.102.20.60:8008/zf/#/login?username=" + result.obj.userName;
                         return;
                     }
                     //进入电炉监控系统