update

潘钊
1 parent 28d4ebbe
Showing 4 changed files with 13 additions and 9 deletions
src/main/resources/static/pages/permission/authorize_all/authorize.html
src/main/resources/static/pages/permission/authorize_all/main.html
src/main/resources/static/pages/permission/role/settings.html
src/main/resources/static/real_control_v2/js/data/data_basic.js
+我在iframe 里面
 \ No newline at end of file
+<iframe src="/pages/permission/authorize_all/authorize.html"></iframe>
 \ No newline at end of file
@@ -160,10 +160,13 @@ $(function(){
 	//模块下拉框
 	getModuleTreeData(function(treeData){
+
 		var options = '';
 		$.each(treeData, function(i, g){
 			var dArray = g.children;
-			
+
+            if(!dArray)
+                return true;
 			for(var i = 0,d; d = dArray[i++];){
 				options += '<optgroup label="'+d.name+'">';
 				if(!d.children)
@@ -56,16 +56,15 @@ var gb_data_basic = (function () {
         ep.emit('all_personnel', data);
     });
     function loadAllPersonnel(cb) {
-        $.get('/basic/all_personnel', function (rs) {
+        $.get('/personnel/all_py', function (rs) {
             //转换成自动补全组件需要的数据
-            var data = [], name, code;
-            for (var jobCode in rs) {
-                name = rs[jobCode];
-                code = jobCode.indexOf('-')!=-1?jobCode.split('-')[1]:jobCode;
+            var data = [], code;
+            for(var i =0, p; p = rs[i++];){
+                code = p['workId'].indexOf('-')!=-1?p['workId'].split('-')[1]:p['workId'];
                 data.push({
-                    value: code + '/' + name,
-                    fullChars: pinyin.getFullChars(name).toUpperCase(),
-                    camelChars: pinyin.getCamelChars(name)
+                    value: code + '/' + p.name,
+                    fullChars: p.fullChars,
+                    camelChars: p.camelChars
                 });
             }
             cb && cb(data);