Merge branch 'dev3.3' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.3

* 'dev3.3' of http://192.168.3.207:10080/qmx/jy-data-extract:
  xg

# Conflicts:
#	dataprocess/src/front/front.go

dataprocess/src/front/front.go

@@ -36,7 +36,6 @@ type Front struct {
 	roleDel			xweb.Mapper	`xweb:"/front/role/edit/del"`	//权限编辑删除
 	roleSecondEdit  xweb.Mapper	`xweb:"/front/role/second/edit"`//二级权限编辑
 
-
 }
 
 func (f *Front) Login() {

dataprocess/src/main.go

@@ -4,9 +4,8 @@ import (
 	qu "qfw/util"
 	"time"
 
-	. "./util"
-
 	"./front"
+	. "./util"
 
 	"github.com/go-xweb/xweb"
 )

dataprocess/src/web/templates/com/header.html

@@ -88,9 +88,9 @@
 								if(role=="2"){
 									document.write("开发员")
 								}else if(role=="1"){
-									document.write("审核员")
-								}else{
 									document.write("管理员")
+								}else{
+									document.write("系统管理员")
 								}
 							</script>
 							</option>

dataprocess/src/web/templates/com/menu.html

@@ -3,7 +3,8 @@
       <ul id="menu" class="sidebar-menu" data-widget="tree">
         <li class="header">HEADER</li>
         <!-- Optionally, you can add icons to the links -->
-        <li class="treeview">
+        <!--
+		<li class="treeview">
           	<a href="#"><i class="fa fa-clock-o"></i> <span>任务管理</span>
             <span class="pull-right-container">
                 <i class="fa fa-angle-left pull-right"></i>
@@ -38,26 +39,27 @@
 				<li><a href="/admin/rule/pre"><i class="fa fa-circle-o"></i>角色管理</a></li>
 				<li><a href="/front/menu"><i class="fa fa-circle-o"></i>菜单管理</a></li>
 			</ul>
-		</li>
+		</li>-->
       </ul>
     </section>
-	<!--<span id="role" class="hidden">{{session "role"}}</span>-->
+	<span id="role" class="hidden">{{(session "user").role}}</span>
 </aside>
 <script>
-/**$(function () {
-	$.post('/admin/menu','',function (data,status) {
+$(function () {
+	$.post('/front/personalMenu','',function (data,status) {
 		for(var a=0;a<data.data.length;a++) {
             var info=data.data[a]
+			console.log(info)
 		    if (info.secondmenu){
                 var str=""
-                for(var sec=1;sec<=Object.keys(info.secondmenu).length;sec++){
+               	for(var sec=1;sec<=Object.keys(info.secondmenu).length;sec++){
                     var ro=$("#role").text()
-                    if(ro=="3" || info.secondmenu[sec.toString(10)].role[ro] ) {
-                        str = str + '<li><a href=' + info.secondmenu[sec.toString(10)].href + '><i class="' + info.secondmenu[sec.toString(10)].pic + '"></i>' + info.secondmenu[sec.toString(10)].name + '</a></li>'
+                    if(ro=="0" || info.secondmenu[sec.toString(10)].role[ro] ) {
+                        str = str + '<li><a href=' + info.secondmenu[sec.toString(10)].s_href + '><i class="' + info.secondmenu[sec.toString(10)].s_css + '"></i>' + info.secondmenu[sec.toString(10)].s_name + '</a></li>'
                     }
                 }
                 $('#menu').append('<li class="treeview">' +
-                        '          <a href="#"><i class="'+info.pic+'"></i> <span>'+info.name+'</span>' +
+                        '          <a href="#"><i class="'+info.s_css+'"></i> <span>'+info.s_name+'</span>' +
                         '            <span class="pull-right-container">' +
                         '                <i class="fa fa-angle-left pull-right"></i>' +
                         '            </span>' +
@@ -65,11 +67,11 @@
                         '          <ul class="treeview-menu">' + str+ '</ul>' +
                         '        </li>')
 			}else{
-                $('#menu').append('<li><a href='+info.href+'><i class="'+info.pic+'"></i> <span>'+info.name+'</span></a></li>')
+                $('#menu').append('<li><a href='+info.s_href+'><i class="'+info.s_css+'"></i> <span>'+info.s_name+'</span></a></li>')
 			}
         }
     })
-})*/
+})
 function menuActive(name){
     setTimeout(function(){
         $(".sidebar-menu").tree();

dataprocess/src/web/templates/com/menu_first.html

@@ -144,7 +144,7 @@
 		var name=$("#modal-info #name").val();
 		var href=$("#modal-info #href").val();
 		var css=$("#modal-info #css").val();
-		if(name==""||href==""||css==""){
+		if(name==""||css==""){
 			alert("表单填写不完整！")
 			return false;
 		}

dataprocess/src/web/templates/com/user.html

@@ -73,8 +73,8 @@
 				    <div class="col-sm-10">
 				     	<select id="role" name="role" class="form-control">
 							<option value="2">开发员</option>
-							<option value="1">审核员</option>
-					  		<option value="0">管理员</option>
+							<option value="1">管理员</option>
+					  		<option value="0">系统管理员</option>
 						</select>
 				    </div>
 				</div>	
@@ -124,12 +124,10 @@ $(function () {
 				if(val==2){
 					role="开发员"
 				}else if(val==1){
-					role="审核员"
+					role="管理员"
 				}else if(val==0){
-                    role="管理员"
-                }else{
-					role="超级管理员"
-				}
+                    role="系统管理员"
+                }
 				return role
 			}},
 			{ "data":"_id",render:function(val,a,row){