'commit'

WebRoot/component/pear/module/admin.js

@@ -100,7 +100,7 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm
 				});
 			}
 
-			this.bodyRender = function (param) {
+			this.bodyRender = function (param) {			
 
 				body.on("click", ".refresh", function () {
 					refresh();
@@ -116,20 +116,25 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm
 						success: function (res) {
 							var indexHref = 'html/pages/welcome.html';
 							var _id = "indexPage";
-							if (res.role_id == 232) {
-								indexHref = 'html/pages/projectManagement/zbzx/index.html';
-							} else if (res.role_id == 234 || res.role_id === 243) {
-								indexHref = 'html/pages/projectManagement/xx/index.html';
-							} else if (res.role_id == 0) {
+
+							if (param.other.report) {
 								indexHref = 'view/tb/school/task_list_p.html?is_finish=0';
 								_id = "10";
+							} else {
+								if (res.role_id == 232) {
+									indexHref = 'html/pages/projectManagement/zbzx/index.html';
+								} else if (res.role_id == 234 || res.role_id === 243) {
+									indexHref = 'html/pages/projectManagement/xx/index.html';
+								}
 							}
+							
 							indexTabData = {
 								id: _id,
 								url: indexHref,
 								title: param.tab.index.title,
 								close: false
 							}
+
 						}
 					});
 

WebRoot/config/pear.config.p.yml

@@ -1,7 +1,7 @@
 ## 网站配置
 logo: 
   ## 网站名称
-  title: "长春市教育装备与信息化项目智慧管理系统"
+  title: "长春市教育装备与信息化项目智慧管理系统1"
   ## 网站图标
   image: "admin/images/logo.png"
 ## 菜单配置
@@ -36,7 +36,7 @@ tab:
   index: 
     id: "10" ## 标识 ID , 建议与菜单项中的 ID 一致
     href: "view/tb/school/task_list_p.html?is_finish=0" ## 页面地址
-    title: "待填报任务" ## 标题
+    title: "待填报任务" ## 标题  
 ## 主题配置
 theme: 
   ## 默认主题色，对应 colors 配置中的 ID 标识
@@ -74,6 +74,7 @@ other:
   autoHead: false
   ## 页脚
   footer: false
+  report: true
 ## 头部配置
 header:
   ## 站内消息，通过 false 设置关闭

WebRoot/config/pear.config.yml

@@ -78,6 +78,7 @@ other:
   autoHead: false
   ## 页脚
   footer: false
+  report: false
 ## 头部配置
 header:
   ## 站内消息，通过 false 设置关闭

WebRoot/view/hk_old/pear/component/pear/module/admin.js

@@ -114,6 +114,7 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm
 						url: "/QingLong/gtzz/getWhiceRole",
 						async: false,
 						success: function (res) {
+							console.log(indexTabData)
 							var indexHref = 'html/pages/welcome.html';
 							if (res.role_id == 232) {
 								indexHref = 'html/pages/projectManagement/zbzx/index.html';
@@ -125,7 +126,7 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm
 								url: indexHref,
 								title: param.tab.index.title,
 								close: false
-							}
+							}							
 						}
 					});
 

WebRoot/view/tb/form/ayq/modules/formDesigner.js

@@ -4148,6 +4148,7 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele
             $('#columnProperty').append(_html);
         }
 
+
         /* 给字段属性绑定事件 实现双向绑定*/
         Class.prototype.bindPropertyEvent = function (_json) {
             var that = this
@@ -4405,9 +4406,8 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele
                 }
             });
 
-            form.on('radio', function (data) {                
+            form.on('radio', function (data) {
                 var _json = options.selectItem;
-                
                 switch (_json.tag) {
                     case 'radio':
                         var _index = parseInt($("#" + _json.id + " .layui-input-block div.layui-form-radio").index(data.othis[0]));
@@ -4420,8 +4420,8 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele
                                 continue;
                             }
                             _json.options[i].checked = false;
-                        }                        
-                        that.components[_json.tag].update(_json, that);
+                        }
+                        that.components[_json.tag].update(_json,that);
                         break;
                     case 'select':
                     case 'carousel':
@@ -4434,13 +4434,15 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele
                             }
                             _json.options[i].checked = false;
                         }
-                        that.components[_json.tag].update(_json, that);
+                        that.components[_json.tag].update(_json,that);
                         break;
                     default:
                         break;
                 }
             });
 
+
+
             form.on('checkbox', function (data) {
                 var _json = options.selectItem;
                 switch (_json.tag) {
@@ -4514,8 +4516,7 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele
         Class.prototype.render = function () {
             var that = this
                 , options = that.config;
-
-
+                
             options.data.forEach(function (item, index) {
                 if (index === 0) {
                     options.selectItem = item;
@@ -5177,6 +5178,10 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele
                 //显示当前的属性
                 that.components[tag].property(options.selectItem, that);
                 that.bindPropertyEvent(options.selectItem);
+<<<<<<< HEAD
+=======
+
+>>>>>>> 45a8873c05d0736b15112606aae1da04aa320be5
                 //移除 #formDesignerForm .layui-form-item 下所有的 active
                 $('#formDesignerForm .layui-form-item').removeClass('active');
                 //给当前元素增加class

src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java

@@ -1970,8 +1970,8 @@ public class CollectController extends Controller {
         for (int i = 0; i < ja.size(); i++) {
             JSONObject j2 = ja.getJSONObject(i);
             int data_type_id = DataType.getFormDataType(j2);
+            _map.put(j2.getString("id"), data_type_id);//哪个字段是什么类型
             if (j2.getString("tag").equals("input")) {
-                _map.put(j2.getString("id"), data_type_id);//哪个字段是什么类型
                 _mapLabel.put(j2.getString("id"), j2.getString("label"));
             }
         }