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

doc/DB/compass_db_schema.sql

@@ -17,6 +17,18 @@ CREATE TABLE IF NOT EXISTS account_mst(
 ) ENGINE = INNODB DEFAULT CHARSET=utf8;
 Create INDEX account_mst_name_idx ON account_mst(name);
 
+----system_const_dat
+DROP TABLE IF EXISTS system_const_dat;
+CREATE TABLE IF NOT EXISTS system_const_dat(
+	id int8 unsigned NOT NULL PRIMARY KEY auto_increment,
+	registration_date datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	name varchar(64) NOT NULL,
+	title varchar(128) NOT NULL,
+	constant_value text NOT NULL,
+	delete_flg tinyint(1) NOT NULL DEFAULT '0'
+) ENGINE = INNODB DEFAULT CHARSET=utf8;
+Create INDEX system_const_dat_name_idx ON system_const_dat(name);
+
 ----grade_mst
 DROP TABLE IF EXISTS grade_mst;
 CREATE TABLE IF NOT EXISTS grade_mst(

doc/readme.txt

@@ -8,4 +8,7 @@ http://compass.koala-online.cn/user/if
 //腾讯lbs
 https://lbs.qq.com
 key：TMJBZ-MTX3G-MPFQT-INGZP-VQVTK-WLFM3
-Secret key（ SK ）：BYLkXP9bZaQhI1ELr6HWkHRuKm1YPU
+Secret key（ SK ）：BYLkXP9bZaQhI1ELr6HWkHRuKm1YPU
\ No newline at end of file
+
+//数据库
+数据库：http://manager.koala-online.cn/phpMyAdmin
\ No newline at end of file

src/cn/compass/entity/SystemConstDat.inc

+<?php
+/**
+ * SystemConstDat Entity
+ * $Id: SystemConstDat.inc,v 1.1 2016/9/21 12:59:25 AIMS Exp $
+ * @author wanggb
+ * @package jp.fishow.entity
+ * @access public
+ */
+class SystemConstDat extends CompassDynamicData
+{
+	var $name;
+	var $title;
+	var $constant_value;
+	var $delete_flg;
+	
+
+	/**
+	 * 
+	 * 
+	 * @access public
+	 * @param mixed system_const_dat
+	 */
+	function constructor($record)
+	{
+		parent::constructor($record);
+
+		$this->name      		= $record["name"];
+		$this->title   			= $record["title"];
+		$this->constant_value   = $record["constant_value"];
+		$this->delete_flg = $record["delete_flg"];
+	}
+
+	/**
+	 * 
+	 * @access public
+	 * @static
+	 * @param array 
+	 * @return array Entity
+	 */
+	public static function getList($w_param = null, $orderkey = null, $direction = "ASC", $offset = null, $limit = null)
+	{
+		if ($w_param == null) {
+			$w_param = array();
+			$w_param["delete_flg"] = "false";
+		}
+
+		return CompassDBHandler::getList("SystemConstDat", "system_const_dat", $w_param, $orderkey, $direction, $offset, $limit);
+	}
+
+	/**
+	 * 
+	 * @access public
+	 * @static
+	 * @param array 
+	 * @return array Entity
+	 */
+	public static function getListCount($w_param = null)
+	{
+		if ($w_param == null) {
+			$w_param = array();
+			$w_param["delete_flg"] = "false";
+		}
+		$db = CompassDBManager::getInstance();
+		$result = $db->doSelect("system_const_dat", $w_param, null, null, null, null, "count(*) as count");
+
+		return $result[0]["count"];
+	}
+
+	/**
+	 * 
+	 */
+	public static function getById($id)
+	{
+		// delete_flg
+		$param = array();
+		$param["delete_flg"] = false;
+
+		return CompassDBHandler::getById("SystemConstDat", "system_const_dat", $id, $param);
+	}
+
+	
+	/**
+	 * 
+	 * DynamicData
+	 * @access public
+	 * @return int 
+	 */
+	public function save()
+	{
+		$v_param = array();
+
+		ParamUtil::copyObj2Array($v_param, $this, "name");
+		ParamUtil::copyObj2Array($v_param, $this, "title");
+		ParamUtil::copyObj2Array($v_param, $this, "constant_value");
+		ParamUtil::copyObj2Array($v_param, $this, "delete_flg");
+
+		// 保存
+		parent::_save("system_const_dat", $v_param);
+	}
+}
\ No newline at end of file

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

@@ -29,16 +29,9 @@ class SchoolType
 			$tmp = array("id"=>1, "title"=>"幼儿园");
 			array_push($data, $tmp);
 			
-			$tmp = array("id"=>2, "title"=>"小学");
+			$tmp = array("id"=>2, "title"=>"小初高");
 			array_push($data, $tmp);
 			
-			$tmp = array("id"=>3, "title"=>"初中");
-			array_push($data, $tmp);
-			
-			$tmp = array("id"=>4, "title"=>"高中");
-			array_push($data, $tmp);
-					
-			
 			$result = array();
 			foreach ($data as $row) {
 				$tmp2 = new SchoolType($row);

src/manager/templates/menu.inc

@@ -52,6 +52,7 @@ a:hover{
 	<div class="menu_title">系统设定</div>
 	<div class="menu_item" id="menu_account"><a href="government_list.php">厅县局管理</a></div>
 	<div class="menu_item" id="menu_account"><a href="account_list.php">账户管理</a></div>
+	<div class="menu_item" id="menu_account"><a href="system_const_list.php">常量设定</a></div>
 </div>-->
 <div id="leftMenu">
 	<el-menu
@@ -100,7 +101,8 @@ a:hover{
         </template>
         <el-menu-item-group>
           <el-menu-item index="4-1" v-if="checkAuthority1" @click="fn8()">账户管理</el-menu-item>
-		  		<el-menu-item index="4-2" v-if="checkAuthority2" @click="fn9()">领导机构</el-menu-item>
+		  <el-menu-item index="4-2" v-if="checkAuthority2" @click="fn9()">领导机构</el-menu-item>
+		   <el-menu-item index="4-3" v-if="checkAuthority2" @click="fn10()">常量设定</el-menu-item>
         </el-menu-item-group>
       </el-submenu>
     </el-menu>
@@ -157,6 +159,9 @@ a:hover{
 	      },
 	      fn9(){
 	      	window.location.href='government_list.php'
+	      },
+	      fn10(){
+	      	window.location.href='system_const_list.php'
 	      }
 		}
 	})

src/settings/compass_include.inc

@@ -13,6 +13,7 @@ require_once(COMPASS_LIB_ROOT . "/cn/compass/handler/CompassDBHandler.inc");
 // entity
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/EntityBase.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/CompassDynamicData.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/SystemConstDat.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/AccountMst.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/GradeMst.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/ClassMst.inc");