Skip to content

C
Compass
Commit 0ad2ad27 by lixq
Options

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

# Conflicts:
#	src/settings/compass_include.inc
parents 9935ab32 8e03e4aa
Showing with 95 additions and 54 deletions
doc/DB/compass_db_schema.sql
......@@ -363,11 +363,11 @@ CREATE TABLE IF NOT EXISTS certificate_mst(
registration_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
title varchar(128) NOT NULL,
front_image text NOT NULL,
point text,
status varchar(64) NOT NULL DEFAULT '0',
display_order int8 NOT NULL DEFAULT '1',
delete_flg tinyint(1) NOT NULL DEFAULT '0'
) ENGINE = INNODB DEFAULT CHARSET=utf8mb4;
Create INDEX certificate_mst_id_idx ON certificate_mst(id);
##----user_point_log create
......@@ -419,12 +419,29 @@ CREATE TABLE IF NOT EXISTS media_tag_dat(
Create INDEX media_tag_dat_tag_idx ON media_tag_dat(tag);
##----course_category_dat create
DROP TABLE IF EXISTS course_category_dat;
CREATE TABLE IF NOT EXISTS course_category_dat(
id bigint unsigned NOT NULL PRIMARY KEY auto_increment,
registration_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
parent_id int4 NOT NULL,
title varchar(128) NOT NULL,
delete_flg tinyint(1) NOT NULL DEFAULT '0'
) ENGINE = INNODB DEFAULT CHARSET=utf8mb4;
Create INDEX course_category_dat_id_idx ON course_category_dat(id);
Create INDEX course_category_dat_parent_id_idx ON course_category_dat(parent_id);
##----course_mst create
DROP TABLE IF EXISTS course_mst;
CREATE TABLE IF NOT EXISTS course_mst(
id bigint unsigned NOT NULL PRIMARY KEY auto_increment,
registration_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
parent_category_id int8 NOT NULL,
sub_category_id int8 NOT NULL,
title varchar(128) NOT NULL,
front_image text NOT NULL,
teacher_profile text,
......
src/cn/compass/entity/AccountMst.inc
<?php
/**
* AccountMst Entity
* $Id: AccountMst.inc,v 1.1 2020/1/16 11:09:00 Exp $
* $Id: AccountMst.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......
src/cn/compass/entity/CertificateMst.inc
<?php
/**
* CertificateMst Entity
* $Id: CertificateMst.inc,v 1.1 2020/1/16 11:09:00 Exp $
* $Id: CertificateMst.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......@@ -10,8 +10,7 @@ class CertificateMst extends CompassDynamicData
{
var $title;
var $front_image;
var $point;
var $status;
var $display_order;
var $delete_flg;
/**
......@@ -26,8 +25,7 @@ class CertificateMst extends CompassDynamicData
$this->title = $record["title"];
$this->front_image = $record["front_image"];
$this->point = $record["point"];
$this->status = $record["status"];
$this->display_order = $record["display_order"];
$this->delete_flg = $record["delete_flg"];
}
......@@ -94,8 +92,7 @@ class CertificateMst extends CompassDynamicData
ParamUtil::copyObj2Array($v_param, $this, "title");
ParamUtil::copyObj2Array($v_param, $this, "front_image");
ParamUtil::copyObj2ArrayNullField($v_param, $this, "point");
ParamUtil::copyObj2Array($v_param, $this, "status");
ParamUtil::copyObj2Array($v_param, $this, "display_order");
ParamUtil::copyObj2Array($v_param, $this, "delete_flg");
// 保存
......
src/cn/compass/entity/CircleDat.inc
<?php
/**
* CircleDat Entity
* $Id: CircleDat.inc,v 1.1 2020/1/16 11:09:00 Exp $
* $Id: CircleDat.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......@@ -14,6 +14,7 @@ class CircleDat extends CompassDynamicData
var $comment;
var $longitude;
var $latitude;
var $address;
var $owner_id;
var $delete_flg;
......@@ -33,6 +34,7 @@ class CircleDat extends CompassDynamicData
$this->comment = $record["comment"];
$this->longitude = $record["longitude"];
$this->latitude = $record["latitude"];
$this->address = $record["address"];
$this->owner_id = $record["owner_id"];
$this->delete_flg = $record["delete_flg"];
}
......@@ -104,6 +106,7 @@ class CircleDat extends CompassDynamicData
ParamUtil::copyObj2Array($v_param, $this, "comment");
ParamUtil::copyObj2Array($v_param, $this, "longitude");
ParamUtil::copyObj2Array($v_param, $this, "latitude");
ParamUtil::copyObj2Array($v_param, $this, "address");
ParamUtil::copyObj2Array($v_param, $this, "owner_id");
ParamUtil::copyObj2Array($v_param, $this, "delete_flg");
......
src/cn/compass/entity/CircleMemberDat.inc
<?php
/**
* CircleMemberDat Entity
* $Id: CircleMemberDat.inc,v 1.1 2020/1/16 11:09:00 Exp $
* $Id: CircleMemberDat.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......
src/cn/compass/entity/ClassMst.inc
<?php
/**
* ClassMst Entity
* $Id: ClassMst.inc,v 1.1 2020/1/16 11:09:00 Exp $
* $Id: ClassMst.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......
src/cn/compass/entity/CourseMediaDat.inc
<?php
/**
* CourseMediaDat Entity
* $Id: CourseMediaDat.inc,v 1.1 2020/1/17 14:38:28 Exp $
* $Id: CourseMediaDat.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......
src/cn/compass/entity/CourseMst.inc
<?php
/**
* CourseMst Entity
* $Id: CourseMst.inc,v 1.1 2020/1/17 14:38:28 Exp $
* $Id: CourseMst.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
*/
class CourseMst extends CompassDynamicData
{
var $parent_category_id;
var $sub_category_id;
var $title;
var $front_image;
var $teacher_profile;
......@@ -23,6 +25,8 @@ class CourseMst extends CompassDynamicData
{
parent::constructor($record);
$this->parent_category_id = $record["parent_category_id"];
$this->sub_category_id = $record["sub_category_id"];
$this->title = $record["title"];
$this->front_image = $record["front_image"];
$this->teacher_profile = $record["teacher_profile"];
......@@ -90,6 +94,8 @@ class CourseMst extends CompassDynamicData
{
$v_param = array();
ParamUtil::copyObj2Array($v_param, $this, "parent_category_id");
ParamUtil::copyObj2Array($v_param, $this, "sub_category_id");
ParamUtil::copyObj2Array($v_param, $this, "title");
ParamUtil::copyObj2Array($v_param, $this, "front_image");
ParamUtil::copyObj2ArrayNullField($v_param, $this, "teacher_profile");
......
src/cn/compass/entity/FamilyEventDat.inc
<?php
/**
* FamilyEventDat Entity
* $Id: FamilyEventDat.inc,v 1.1 2020/1/16 11:09:00 Exp $
* $Id: FamilyEventDat.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......@@ -10,10 +10,12 @@ class FamilyEventDat extends CompassDynamicData
{
var $school_no;
var $class_no;
var $event_id;
var $original_source;
var $title;
var $author;
var $publish_time;
var $images;
var $content;
var $scope;
var $delete_flg;
......@@ -30,10 +32,12 @@ class FamilyEventDat extends CompassDynamicData
$this->school_no = $record["school_no"];
$this->class_no = $record["class_no"];
$this->event_id = $record["event_id"];
$this->original_source = $record["original_source"];
$this->title = $record["title"];
$this->author = $record["author"];
$this->publish_time = $record["publish_time"];
$this->images = $record["images"];
$this->content = $record["content"];
$this->scope = $record["scope"];
$this->delete_flg = $record["delete_flg"];
......@@ -102,10 +106,12 @@ class FamilyEventDat extends CompassDynamicData
ParamUtil::copyObj2Array($v_param, $this, "school_no");
ParamUtil::copyObj2Array($v_param, $this, "class_no");
ParamUtil::copyObj2Array($v_param, $this, "event_id");
ParamUtil::copyObj2Array($v_param, $this, "original_source");
ParamUtil::copyObj2Array($v_param, $this, "title");
ParamUtil::copyObj2Array($v_param, $this, "author");
ParamUtil::copyObj2Array($v_param, $this, "publish_time");
ParamUtil::copyObj2ArrayNullField($v_param, $this, "images");
ParamUtil::copyObj2Array($v_param, $this, "content");
ParamUtil::copyObj2Array($v_param, $this, "scope");
ParamUtil::copyObj2Array($v_param, $this, "delete_flg");
......
src/cn/compass/entity/FamilyEventMemberDat.inc
<?php
/**
* FamilyEventMemberDat Entity
* $Id: FamilyEventMemberDat.inc,v 1.1 2020/1/16 11:09:00 Exp $
* $Id: FamilyEventMemberDat.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......
src/cn/compass/entity/GovernmentMst.inc
<?php
/**
* GovernmentMst Entity
* $Id: GovernmentMst.inc,v 1.1 2020/1/16 11:09:00 Exp $
* $Id: GovernmentMst.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......
src/cn/compass/entity/GovernmentQrDat.inc
<?php
/**
* GovernmentQrDat Entity
* $Id: GovernmentQrDat.inc,v 1.1 2020/1/17 14:38:28 Exp $
* $Id: GovernmentQrDat.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......
src/cn/compass/entity/GradeMst.inc
<?php
/**
* GradeMst Entity
* $Id: GradeMst.inc,v 1.1 2020/1/16 11:09:00 Exp $
* $Id: GradeMst.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......
src/cn/compass/entity/MediaTagDat.inc
<?php
/**
* MediaTagDat Entity
* $Id: MediaTagDat.inc,v 1.1 2020/1/17 14:38:28 Exp $
* $Id: MediaTagDat.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......
src/cn/compass/entity/SchoolMst.inc
<?php
/**
* SchoolMst Entity
* $Id: SchoolMst.inc,v 1.1 2020/1/20 15:52:15 Exp $
* $Id: SchoolMst.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......
src/cn/compass/entity/SocialEventDat.inc
<?php
/**
* SocialEventDat Entity
* $Id: SocialEventDat.inc,v 1.1 2020/1/16 11:09:00 Exp $
* $Id: SocialEventDat.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......@@ -10,6 +10,7 @@ class SocialEventDat extends CompassDynamicData
{
var $school_no;
var $class_no;
var $event_id;
var $original_source;
var $title;
var $author;
......@@ -30,6 +31,7 @@ class SocialEventDat extends CompassDynamicData
$this->school_no = $record["school_no"];
$this->class_no = $record["class_no"];
$this->event_id = $record["event_id"];
$this->original_source = $record["original_source"];
$this->title = $record["title"];
$this->author = $record["author"];
......@@ -102,6 +104,7 @@ class SocialEventDat extends CompassDynamicData
ParamUtil::copyObj2Array($v_param, $this, "school_no");
ParamUtil::copyObj2Array($v_param, $this, "class_no");
ParamUtil::copyObj2Array($v_param, $this, "event_id");
ParamUtil::copyObj2Array($v_param, $this, "original_source");
ParamUtil::copyObj2Array($v_param, $this, "title");
ParamUtil::copyObj2Array($v_param, $this, "author");
......
src/cn/compass/entity/SocialEventMemberDat.inc
<?php
/**
* SocialEventMemberDat Entity
* $Id: SocialEventMemberDat.inc,v 1.1 2020/1/16 11:09:00 Exp $
* $Id: SocialEventMemberDat.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......
src/cn/compass/entity/SystemConstantDat.inc
<?php
/**
* SystemConstantDat Entity
* $Id: SystemConstantDat.inc,v 1.1 2020/1/16 11:09:00 Exp $
* $Id: SystemConstantDat.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......
src/cn/compass/entity/UserCertificateDat.inc
<?php
/**
* UserCertificateDat Entity
* $Id: UserCertificateDat.inc,v 1.1 2020/1/17 14:38:28 Exp $
* $Id: UserCertificateDat.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......
src/cn/compass/entity/UserMediaDat.inc
<?php
/**
* UserMediaDat Entity
* $Id: UserMediaDat.inc,v 1.1 2020/1/17 14:38:28 Exp $
* $Id: UserMediaDat.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......
src/cn/compass/entity/UserMst.inc
<?php
/**
* UserMst Entity
* $Id: UserMst.inc,v 1.1 2020/1/16 11:09:00 Exp $
* $Id: UserMst.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
*/
class UserMst extends CompassDynamicData
{
var $school_id;
var $class_id;
var $name;
var $tel_no;
var $school_no;
var $class_no;
var $original_source;
var $openid;
var $unionid;
var $status;
var $name;
var $mobile;
var $account_id;
var $child_age;
var $role;
var $point;
var $longitude;
var $latitude;
var $organization_submit_date;
......@@ -44,16 +44,16 @@ class UserMst extends CompassDynamicData
{
parent::constructor($record);
$this->school_id = $record["school_id"];
$this->class_id = $record["class_id"];
$this->name = $record["name"];
$this->tel_no = $record["tel_no"];
$this->school_no = $record["school_no"];
$this->class_no = $record["class_no"];
$this->original_source = $record["original_source"];
$this->openid = $record["openid"];
$this->unionid = $record["unionid"];
$this->status = $record["status"];
$this->name = $record["name"];
$this->mobile = $record["mobile"];
$this->account_id = $record["account_id"];
$this->child_age = $record["child_age"];
$this->role = $record["role"];
$this->point = $record["point"];
$this->longitude = $record["longitude"];
$this->latitude = $record["latitude"];
$this->organization_submit_date = $record["organization_submit_date"];
......@@ -132,16 +132,16 @@ class UserMst extends CompassDynamicData
{
$v_param = array();
ParamUtil::copyObj2Array($v_param, $this, "school_id");
ParamUtil::copyObj2Array($v_param, $this, "class_id");
ParamUtil::copyObj2Array($v_param, $this, "name");
ParamUtil::copyObj2Array($v_param, $this, "tel_no");
ParamUtil::copyObj2Array($v_param, $this, "school_no");
ParamUtil::copyObj2Array($v_param, $this, "class_no");
ParamUtil::copyObj2Array($v_param, $this, "original_source");
ParamUtil::copyObj2Array($v_param, $this, "openid");
ParamUtil::copyObj2Array($v_param, $this, "unionid");
ParamUtil::copyObj2Array($v_param, $this, "status");
ParamUtil::copyObj2ArrayNullField($v_param, $this, "name");
ParamUtil::copyObj2ArrayNullField($v_param, $this, "mobile");
ParamUtil::copyObj2Array($v_param, $this, "account_id");
ParamUtil::copyObj2ArrayNullField($v_param, $this, "child_age");
ParamUtil::copyObj2Array($v_param, $this, "child_age");
ParamUtil::copyObj2Array($v_param, $this, "role");
ParamUtil::copyObj2Array($v_param, $this, "point");
ParamUtil::copyObj2Array($v_param, $this, "longitude");
ParamUtil::copyObj2Array($v_param, $this, "latitude");
ParamUtil::copyObj2ArrayNullField($v_param, $this, "organization_submit_date");
......
src/cn/compass/entity/UserPointLog.inc
<?php
/**
* UserPointLog Entity
* $Id: UserPointLog.inc,v 1.1 2020/1/16 11:09:00 Exp $
* $Id: UserPointLog.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......
src/cn/compass/entity/VolunteerEventDat.inc
<?php
/**
* VolunteerEventDat Entity
* $Id: VolunteerEventDat.inc,v 1.1 2020/1/16 11:09:00 Exp $
* $Id: VolunteerEventDat.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......
src/cn/compass/entity/VolunteerEventMemberDat.inc
<?php
/**
* VolunteerEventMemberDat Entity
* $Id: VolunteerEventMemberDat.inc,v 1.1 2020/1/16 11:09:00 Exp $
* $Id: VolunteerEventMemberDat.inc,v 1.1 2020/2/13 11:17:48 Exp $
* @author lixq
* @package jp.compass.entity
* @access public
......
src/manager/templates/menu.inc
......@@ -115,6 +115,8 @@ a:hover{
<el-menu-item index="5-1" v-if="checkAuthority1" @click="fn51()">账户管理</el-menu-item>
<el-menu-item index="5-2" v-if="checkAuthority2" @click="fn52()">领导机构</el-menu-item>
<el-menu-item index="5-3" v-if="checkAuthority2" @click="fn53()">常量设定</el-menu-item>
<el-menu-item index="5-4" v-if="checkAuthority2" @click="fn54()">证书管理</el-menu-item>
<el-menu-item index="5-5" v-if="checkAuthority2" @click="fn55()">证书申请</el-menu-item>
</el-menu-item-group>
</el-submenu>
......@@ -187,6 +189,12 @@ a:hover{
},
fn53(){
window.location.href='system_const_list.php'
},
fn54(){
window.location.href='certificate_list.php'
},
fn55(){
window.location.href='certificate_apply_list.php'
}
}
})
......
src/settings/compass_include.inc
......@@ -24,8 +24,6 @@ require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/ClassMst.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/EventDat.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/GovernmentMst.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/GradeMst.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/MiniplayTrafficClickDat.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/MiniplayTrafficClickLog.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/OrganizationMst.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/SchoolMst.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/SystemConstantDat.inc");
......@@ -37,10 +35,12 @@ require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserMst.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserPointLog.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserSignDat.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserStaffRelationDat.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/CourseMst.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/CourseMediaDat.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/MediaTagDat.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserMediaDat.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/SystemConstDat.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/CourseCategoryDat.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/CourseMst.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/CourseMediaDat.inc");
// definition
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/ImageType.inc");
......@@ -56,6 +56,7 @@ require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/SystemFunction.in
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/OrganizationStatus.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/AcountModule.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/OrderStatus.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/CourseParentCategory.inc");
// Action
require_once(COMPASS_LIB_ROOT . "/cn/compass/action/TemplateAction.inc");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment