Merge branch 'master' of http://gitlib.occloud.net/biao/ZhiNanZhen

src/cn/compass/entity/definition/AccountRole.inc

@@ -96,5 +96,17 @@ class AccountRole
 		return null;
 	}
 	
-
+	/**
+	 *
+	 * @return AccountRole
+	 */
+	public static function getByTitle($title) {
+	  $list = AccountRole::getList();
+	  foreach ($list as $tmp) {
+	    if ($tmp->title == $title) {
+	      return $tmp;
+	    }
+	  }
+	  return null;
+	}
 }
\ No newline at end of file

src/cn/compass/handler/CompassHandler.inc

@@ -138,7 +138,7 @@ class CompassHandler{
 	 * 获取去重后的解梦关键词列表
 	 */
 	public static function getUniqueDreamListByCategoryId($categoty_id, $offset, $limit) {
-		$db = &DivinationsDBManager::getInstance();
+		$db = &CompassDBManager::getInstance();
 		$sql = "select distinct category_id, dream_id, title from dream_dat where delete_flg=false";
 		if(isset($categoty_id)) {
 			$sql .= " and category_id=".$categoty_id;
@@ -161,7 +161,7 @@ class CompassHandler{
 	 * 获取单个广告合计后的去重点击数
 	 */
 	public static function getSumUniqueAdClickCount($adid, $object_date) {
-		$db = &DivinationsDBManager::getInstance();
+	  $db = &CompassDBManager::getInstance();
 		$sql = "select sum(unique_click_count) as count from miniplay_ad_click_dat where delete_flg=false and channel_id<>'0' and adid='" . $adid . "' and object_date='" . $object_date . "'";
 
 		$result = $db->executeQuery($sql);
@@ -176,7 +176,7 @@ class CompassHandler{
 	*/
 	public static function insertPointLog($openid, $action_type, $point, $status) {
 		if(empty($openid) || $openid=="undefined") return;
-		$db = &DivinationsDBManager::getInstance();
+		$db = &CompassDBManager::getInstance();
 		$insert_sql = "insert into miniplay_user_point_log (openid, action_type, point, status) VALUES ('{$openid}', '{$action_type}','{$point}','{$status}')";
 		$db->executeQuery($insert_sql);
 		
@@ -199,7 +199,7 @@ class CompassHandler{
 	*/
 	public static function insertPointLogByUID($uid, $action_type, $point, $status) {
 		if(empty($uid) || $uid=="undefined") return;
-		$db = &DivinationsDBManager::getInstance();
+		$db = &CompassDBManager::getInstance();
 		$insert_sql = "insert into miniplay_user_point_log (openid, action_type, point, status) VALUES ('{$uid}', '{$action_type}','{$point}','{$status}')";
 		$db->executeQuery($insert_sql);
 		
@@ -236,7 +236,7 @@ class CompassHandler{
 	*/
 	public static function insertOctopusPointLog($openid, $action_type, $group_id, $point) {
 		if(empty($openid) || $openid=="undefined") return;
-		$db = &DivinationsDBManager::getInstance();
+		$db = &CompassDBManager::getInstance();
 		$insert_sql = "insert into octopus_user_point_log (openid, action_type, group_id, point) VALUES ('{$openid}', '{$action_type}','{$group_id}','{$point}')";
 		$db->executeQuery($insert_sql);
 		
@@ -258,7 +258,7 @@ class CompassHandler{
 	*/
 	public static function insertTrafficLog($channel_id, $openid, $adid) {
 		if(empty($openid) || $openid=="undefined") return;
-		$db = &DivinationsDBManager::getInstance();
+		$db = &CompassDBManager::getInstance();
 		$insert_sql = "insert into miniplay_traffic_click_log (channel_id, openid, adid) VALUES ('{$channel_id}', '{$openid}','{$adid}')";
 		$db->executeQuery($insert_sql);
 		return;
@@ -379,6 +379,25 @@ class CompassHandler{
 	public static function callbackCmpPriority($a, $b) {
 		return $a["idx"] < $b["idx"] ? true : false;
 	}
+	
+	/**
+	 * 新增account时使用的学校list
+	 */
+	public static function getSchoolListForAccount() {
+	  $sql = "select id,title from school_mst where delete_flg = false order by id asc";
+	  $db = &CompassDBManager::getInstance();
+	  $result = $db->executeQuery($sql);
+	  return $result;
+	}
+	/**
+	 * 新增account时使用的领过机构list
+	 */
+	public static function getGovernmentlListForAccount() {
+	  $sql = "select id,title from government_mst where delete_flg = false order by id asc";
+	  $db = &CompassDBManager::getInstance();
+	  $result = $db->executeQuery($sql);
+	  return $result;
+	}
 }
 
 ?>
\ No newline at end of file

src/manager/account_new_input.php

 <?php
-/**
+/*
  * 管理员管理
  * $Id: account_new_input.php,v 1.1 2015/10/08 11:18:46 wanggb Exp $
  * @author wanggb
@@ -16,25 +16,25 @@ require_once("check_login.inc");
 if (!checkAuthority("ADMIN")) {
 	// エラー表示
 	$layout_pages = array();
-	$layout_pages["footer"] = "footer.inc";
-	$layout_pages["top"] = "menu.inc";
-	$layout_pages["middle"] = "error.inc";
+	$layout_pages["left"] = "menu.inc";
+	$layout_pages["right"] = "error.inc";
 	$message = "权限不足，请联系系统管理员。";
-	require_once(MANAGER_TEMPLATE_DIR_PATH . "/layout/topmenutopsub_layout.inc");
+	require_once(MANAGER_TEMPLATE_DIR_PATH . "/layout/leftmenu_layout.inc");
 	exit;
 }
 
-// 初始值
-$authority_level_array = array();
-
 // 权限一览取得
-$authority_level_list = AuthorityLevel::getList();
+$modules_list = AcountModule::getList();
+$account_role_list = AccountRole::getList();
+
+$school_list = CompassHandler::getSchoolListForAccount();
+$government_list = CompassHandler::getGovernmentlListForAccount();
 
 // 页面表示
 $_SCRIPT_FILE = array("scripts/validators.js", "scripts/account_new_input.js");
 $layout_pages = array();
-$layout_pages["top"] = "menu.inc";
-$layout_pages["menu_clicked"] = "li_system";
-$layout_pages["middle"] = "account_new_input.inc";
-require_once(MANAGER_TEMPLATE_DIR_PATH . "/layout/topmenutopsub_layout.inc");
+$layout_pages["left"] = "menu.inc";
+$layout_pages["right"] = "account_new_input.inc";
+$layout_pages["menu_clicked"] = "4-1";
+require_once(MANAGER_TEMPLATE_DIR_PATH . "/layout/leftmenu_layout.inc");
 exit;
\ No newline at end of file

src/manager/account_new_result.php

 <?php
-/**
+/*
  * 管理员管理
  * $Id: account_new_result.php,v 1.1 2015/10/08 11:18:46 wanggb Exp $
  * @author wanggb
@@ -28,27 +28,44 @@ if (!checkAuthority("ADMIN")) {
 $name = ParamUtil::getRequestString("name");
 $login = ParamUtil::getRequestString("login");
 $password = ParamUtil::getRequestString("password");
-$phone = ParamUtil::getRequestString("phone");
-$authority_type_array = ParamUtil::getRequestArray("authority_type", array());
+$contact = ParamUtil::getRequestString("contact");
+$comment = ParamUtil::getRequestString("comment");
+$account_role = ParamUtil::getRequestString("account_role");
+$modules_array = ParamUtil::getRequestArray("modules", array());
+$organization = ParamUtil::getRequestString("organization");
 
+ErrorLogger::doOutput("name " . $name);
+ErrorLogger::doOutput("login " . $login);
+ErrorLogger::doOutput("password " . $password);
+ErrorLogger::doOutput("account_rol " . $account_role);
+ErrorLogger::doOutput("contact " . $contact);
+ErrorLogger::doOutput("comment " . $comment);
+ErrorLogger::doOutput(print_r($modules_array,1));
+ErrorLogger::doOutput("organization " . $organization);
+exit;
 // 登陆帐号唯一性判断
 $param = array();
 $param["delete_flg"] = false;
 $param["login"] = $login;
 $account_list = AccountMst::getList($param);
 if (count($account_list) > 0) {
-	$error_message_login = "登陆帐号已经被使用,请换一个。";
+	$error_message = "登陆帐号已经被使用,请换一个。";
 	
 	// 权限一览取得
-	$authority_type_list = AuthorityType::getList();
+	$modules_list = AcountModule::getList();
+	$account_role_list = AccountRole::getList();
+	
+	$school_list = CompassHandler::getSchoolListForAccount();
+	$government_list = CompassHandler::getGovernmentlListForAccount();
 	
 	// 页面表示
 	$_SCRIPT_FILE = array("scripts/validators.js", "scripts/account_new_input.js");
+	$_SCRIPT_FILE = array("scripts/validators.js", "scripts/account_new_input.js");
 	$layout_pages = array();
-	$layout_pages["top"] = "menu.inc";
-	$layout_pages["menu_clicked"] = "li_system";
-	$layout_pages["middle"] = "account_new_input.inc";
-	require_once(MANAGER_TEMPLATE_DIR_PATH . "/layout/topmenutopsub_layout.inc");
+	$layout_pages["left"] = "menu.inc";
+	$layout_pages["right"] = "account_new_input.inc";
+	$layout_pages["menu_clicked"] = "4-1";
+	require_once(MANAGER_TEMPLATE_DIR_PATH . "/layout/leftmenu_layout.inc");
 	exit;
 }
 
@@ -57,8 +74,19 @@ $account_mst = new AccountMst();
 $account_mst->login = $login;
 $account_mst->password = $password;
 $account_mst->name = $name;
-$account_mst->phone = $phone;
-$account_mst->authority = implode(",", $authority_type_array);
+$account_mst->contact = $contact;
+$account_mst->comment = $comment;
+if(count($modules_array) == 0){
+  $modules_array = [1,2,3,4,5,6,7,8,9,10,11,12,13];
+}
+$account_mst->modules = implode("|", $modules_array);
+$account_mst->role = $account_role;
+if($role_id <=6){
+  $account_mst->government_id = $organization;
+}else if($role_id >= 8 && $role_id <= 9){
+  $account_mst->school_id = $organization;
+}
+
 $account_mst->save();
 
 // 跳到一览页

src/manager/check_login.inc

@@ -37,18 +37,20 @@ function checkAuthority($allow_types = null) {
 		require_once(MANAGER_TEMPLATE_DIR_PATH . "/layout/topmenutopsub_layout.inc");
 		exit;
 	}
-	ErrorLogger::doOutput($allow_types . $_account->modules,0);
-	// 超级管理员 或 无限制的场合，返回true
-	if (empty($allow_types)) {
-		return false;
-	}
 	
-	$account_authority_type_list = explode("|", $_account->modules);
-	foreach ($account_authority_type_list as $account_authority_type) {
-	  if ($allow_types == $account_authority_type) {
+	ErrorLogger::doOutput($allow_types . $_account->modules,0);
 	return true;
-		}
-	}
-	return false;
+// 	// 超级管理员 或 无限制的场合，返回true
+// 	if (empty($allow_types)) {
+// 		return false;
+// 	}
+	
+// 	$account_authority_type_list = explode("|", $_account->modules);
+// 	foreach ($account_authority_type_list as $account_authority_type) {
+// 	  if ($allow_types == $account_authority_type) {
+// 			return true;
+// 		}
+// 	}
+// 	return false;
 }
 ?>
\ No newline at end of file

src/manager/templates/account_new_input.inc

 <?php
-/**
+/*
  * 管理员管理
  * $Id: account_new_input.inc,v 1.1 2015/10/08 11:18:53 wanggb Exp $
  * @author wanggb
  * @access public
  * @package manager.templates
- **/
+ */
 global $login;
 global $password;
 global $name;
 global $contact;
-global $authority_level_array;
-global $authority_level_list;
-global $error_message_login;
 global $comment;
+global $account_role_list;
+global $modules_list;
+global $error_message;
+global $account_role;
 ?>
-<b>新增账号</b><br />
-<br />
-<form name="account_new_input" action="account_new_result.php" method="post">
-<table>
-	<tr>
-		<td>登陆帐号</td>
-	</tr>
-	<tr>
-		<td class="begin_blank">
-			<input type="text" name="login" value="<?=htmlspecialchars($login) ?>" />
-			<span style="color:#FF0000"><?=$error_message_login ?></span>
-		</td>
-	</tr>
+<div id="change">
+	<p class="edit_title">新增账号</p>
+	<div class="edit_content">
+		<form id="form" method="post" action="account_new_result.php" enctype="multipart/form-data">
+			<input type="hidden" name="account_role"/>
+			<input type="hidden" name="organization"/>
+			<p>登陆帐号</p>
+			<el-input v-model="login" name="login" class="input_200"></el-input><br />
+			<p>登陆密码</p>
+			<el-input v-model="password" name="password" class="input_200"></el-input><br />
+			<p>账户名称</p>
+			<el-input v-model="name" name="name" class="input_200"></el-input><br />
+			<p>联系方式</p>
+			<el-input v-model="contact" name="contact" class="input_200"></el-input><br />
+			<p>用户角色 </p>
+			<el-select v-model="selected" size='medium' >
+        <el-option
+            v-for="item in account_role"
+            :key="item.id"
+            :label="item.title"
+            :value="item.id">
+        </el-option>
+    	</el-select>
+    	<div v-if="isShow">
+    		<p>机构选择 </p>
+    		<el-select v-model="organization" size='medium' >
+    		<div class="el-select-dropdown__item"><input  v-model="searchVal" style="border-radius: 4px;background: url(images/search_icon.png) no-repeat 150px;"type="text" autocomplete="off"></div>
+        <el-option
+            v-for="item in new_org_list"
+            :key="item.id"
+            :label="item.title"
+            :value="item.id">
+        </el-option>
+    	</el-select>
+    	</div>
     	
-	<tr>
-		<td>登陆密码</td>
-	</tr>
-	<tr>
-		<td class="begin_blank"><input type="text" name="password" value="<?=htmlspecialchars($password) ?>" /></td>
-	</tr>
+			<p>权限 <span style="color:#FF0000">※全不选即为超级管理员</span></p>
+			<template v-for="(modules, index) in modules_list">
+        <input type="checkbox" name="modules[]" :value="modules.id" v-model='checked' :id="modules.id" />
+        <label :for="modules.id">{{ modules.module }}</label>
+        <br>
+    	</template>
+    	<p>备注</p>
+			<el-input v-model="comment" name="comment"  class="input_300"></el-input><br />
+			<br/><br/>
+			<el-button type="danger" class="edit_btn"  @click="submitForm()">新增</el-button>
+			<el-button type="danger" class="edit_btn"  @Click="window.location='./account_list.php'" />返回</el-button>
+			<br/><br/>
+		</form>
+	</div>
+</div>
+<script type="text/javascript">
+$(document).ready(function () {
+  var vm = new Vue({
+    el: '#form',
+    data: {
+        login: '<?=htmlspecialchars($login) ?>',
+        password:'<?=htmlspecialchars($password) ?>',
+        contact:'<?=htmlspecialchars($contact) ?>',
+        name:'<?=htmlspecialchars($name) ?>',
+        comment:'<?=htmlspecialchars($comment) ?>',
+        modules_list:<?=json_encode($modules_list)?>,
+    		account_role:<?=json_encode($account_role_list)?>,
+    		school_list:[{id:'1',title:"aa"},{id:'2',title:"bb"}],
+    		government_list:<?=json_encode($government_list)?>,
+        selected:1,
+        checked:[],
+        isShow:true,
+        organization:'<?=$government_list[0]["id"]?>',
+        org_list:<?=json_encode($government_list)?>,
+        searchVal:''
         
-	<tr>
-		<td>账户名称</td>
-	</tr>
-	<tr>
-		<td class="begin_blank"><input type="text" name="name" value="<?=htmlspecialchars($name) ?>" /></td>
-	</tr>
-	
-	<tr>
-		<td>联系电话</td>
-	</tr>
-	<tr>
-		<td class="begin_blank"><input type="text" name="contact" value="<?=htmlspecialchars($contact) ?>" /></td>
-	</tr>
+    },
+    watch:{
+      selected(val,oldval){
+				if(val > 8){
+				  this.isShow = false;
+				}else{
+				  this.isShow = true;
+					if(val >= 7){
+						this.org_list = this.school_list;
+						this.organization = '2';
+					}else{
+					  this.org_list = this.government_list;
+					  this.organization = '<?=$government_list[0]["id"]?>';
+					}
+				}
+      }
+    },
+    methods: {
+        submitForm() {
+          if(!this.login){
+  					this.$message({
+  		            type: 'error',
+  		            message: '请输入登陆帐号。'
+  		          });
+  		          return;
+  				}
+          if (!isAlpaNum(this.login)) {
+  					this.$message({
+  		            type: 'error',
+  		            message: '登陆帐号只能使用半角英文或数字。'
+  		          });
+  		          return;
+  				}
+          if (!this.password) {
+  					this.$message({
+  		            type: 'error',
+  		            message: '请输入登陆密码。'
+  		          });
+  		          return;
+  				}
+          if (!isAlpaNum(this.password)) {
+  					this.$message({
+  		            type: 'error',
+  		            message: '登陆密码只能使用半角英文或数字。'
+  		          });
+  		          return;
+  				}
+          if (!this.name) {
+  					this.$message({
+  		            type: 'error',
+  		            message: '请输入账户名称。'
+  		          });
+  		          return;
+  				}
+  				$("input[name='account_role']").val(this.selected);
+  				$("input[name='organization']").val(this.organization);
+  				$('#form').submit();
+        }
+    },
+    computed: {
+      new_org_list() {
+       var _this = this;
+       var new_org_list = [];
+       _this.org_list.map(function(item) {
+        if (item.title.search(_this.searchVal) != -1) {
+          new_org_list.push(item);
+        }
+       });
+       if(new_org_list.length == 0){
+         new_org_list = _this.org_list;
+        }
+       return new_org_list;
+      }
+    }
+})
+  if(<?=$error_message?1:0 ?>){
+    vm.$message({
+      type: 'error',
+      message: '<?=$error_message?>'
+    });
+  }
+})
 
-	<tr>
-		<td>备注</td>
-	</tr>
-	<tr>
-		<td class="begin_blank"><input type="text" name="comment" value="<?=htmlspecialchars($comment) ?>" /></td>
-	</tr>
+</script>
 
-	<tr>
-		<td>权限 <span style="color:#FF0000">※全不选即为超级管理员</span></td>
-	</tr>
-	<tr>
-		<td class="begin_blank">
-			<?
-			foreach ($authority_level_list as $authority_level) {
-			?>
-			<label><input type="checkbox" name="authority_level[]" value="<?=$authority_level->name ?>"/><?=$authority_level->model ?></label>
-			<?
-			}
-			?>
-		</td>
-	</tr>
-	<tr>
-</table>
-<br />
-<input type="button" value="新增" class="button_width_normal" onClick="doCheck();" />
-</form>

src/manager/templates/layout/leftmenu_layout.inc

@@ -34,7 +34,7 @@ require(MANAGER_TEMPLATE_DIR_PATH. "/" . $layout_pages["header"]);
 		<? require(MANAGER_TEMPLATE_DIR_PATH . "/" . $layout_pages["left"]); ?>
 		</div>
 	</td>
-	<td class="rightWidth" style="position: relative;">
+	<td class="rightWidth" style="position: relative;overflow-y: auto;overflow-x: hidden;">
 		<div class="right_content" style="position: absolute;top: 0;left: 0;">
 		<? require(MANAGER_TEMPLATE_DIR_PATH . "/" . $layout_pages["right"]); ?>
 		</div>
@@ -43,9 +43,9 @@ require(MANAGER_TEMPLATE_DIR_PATH. "/" . $layout_pages["header"]);
 </table>
 <script>
 	$(function(){
-		var clientHeight = document.body.clientHeight;
+		var clientHeight = document.body.clientHeight - 80;
 		$('.table').css('height',clientHeight)
-		var width = document.body.clientWidth-200;
+		var width = document.body.clientWidth-220;
 		$('.rightWidth').css('width',width)
 	})
 </script>

src/settings/compass_include.inc

@@ -31,6 +31,7 @@ require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/AccountRole.inc")
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/AuthorityLevel.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/SystemFunction.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/OrganizationStatus.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/AcountModule.inc");
 
 // Action
 require_once(COMPASS_LIB_ROOT . "/cn/compass/action/TemplateAction.inc");