metapp
/
dzadsod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

调整电梯和单元相关信息

This commit is contained in:
cloud 2020-03-03 03:30:58 +08:00
parent 76a0de12dc
commit 1a1128522a
18 changed files with 126 additions and 1795 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1554
admin/index.class.php
View File

File diff suppressed because one or more lines are too long

18
admin/info_off.class.php
View File

@ -38,16 +38,10 @@ class info_off extends appadmin {
self::village();
case 'elevator':
$e_bno = stringto_array($this->form['e_bno'],'#@met@#');
$e_uno = stringto_array($this->form['e_uno'],'#@met@#');
$e_eno = stringto_array($this->form['e_eno'],'#@met@#');
$e_aps = stringto_array($this->form['e_aps'],'#@met@#');
foreach ($e_bno as $bno) {
foreach ($e_uno as $uno) {
foreach ($e_eno as $eno) {
foreach ($e_aps as $aps) {
self::elevator($bno,$uno,$eno,$aps);
}
}
foreach ($e_aps as $aps) {
self::elevator($bno,$aps);
}
}
break;
@ -58,7 +52,7 @@ class info_off extends appadmin {
}
}
//小区
//场所
private function village() {
global $_M,$_YW;
@ -159,16 +153,14 @@ class info_off extends appadmin {
}
//广告位
private function elevator($e_bno,$e_uno,$e_eno,$e_aps) {
private function elevator($e_bno,$e_aps) {
global $_M,$_YW;
$e_number = $this->form['e_number'];
if(!$this->form['id']) parent::e_number($e_number,$e_bno.$e_uno.$e_eno.$e_aps);
if(!$this->form['id']) parent::e_number($e_number,$e_bno.$e_aps);
$field = [
'e_number' => $e_number,
'e_vid' => $this->form['e_vid'],
'e_bno' => $e_bno,
'e_uno' => $e_uno,
'e_eno' => $e_eno,
'e_aps' => $e_aps,
'e_size' => $this->form['e_size'],
'e_enable' => $this->form['e_enable'],

28
admin/info_on.class.php
View File

@ -25,11 +25,11 @@ class info_on extends appadmin
}
}
//小区
//场所
public function dovillage()
{
global $_M,$_YW;
parent::appnav(['table_on__dovillage','小区资料']);
parent::appnav(['table_on__dovillage','场所资料']);
parent::appurl(parent::tname(),['id'=>$_M['form']['id']]);
if($_M['form']['id']){
$this->input['data'] = $this->tsql->table($this->tname)
@ -41,7 +41,7 @@ class info_on extends appadmin
$this->input['data']['v_city'] = '泰安市';
$this->input['data']['v_district'] = '泰山区';
}
//小区分类
//场所分类
$para = $this->tsql->table('para')->where(['p_type' => 6])->all();
parent::para_radio($para,'v_type',$this->input['data']['v_type'],$this->input['para']['v_type_radio'])
->setparahtml(6,$this->input['para']['v_type_radio']);
@ -102,18 +102,10 @@ class info_on extends appadmin
$this->input['data']['e_number_readonly'] = 'readonly';
// 二次编辑时采用单选
//楼号
//道闸方位
$para = $this->tsql->table('para')->where(['p_type' => 3])->all();
parent::para_radio($para,'e_bno',$this->input['data']['e_bno'],$this->input['para']['e_bno_radio'])
->setparahtml(3,$this->input['para']['e_bno_radio']);
//单元号
$para = $this->tsql->table('para')->where(['p_type' => 4])->all();
parent::para_radio($para,'e_uno',$this->input['data']['e_uno'],$this->input['para']['e_uno_radio'])
->setparahtml(4,$this->input['para']['e_uno_radio']);
//电梯号
$para = $this->tsql->table('para')->where(['p_type' => 5])->all();
parent::para_radio($para,'e_eno',$this->input['data']['e_eno'],$this->input['para']['e_eno_radio'])
->setparahtml(5,$this->input['para']['e_eno_radio']);
//广告位置
$para = $this->tsql->table('para')->where(['p_type' => 0])->all();
parent::para_radio($para,'e_aps',$this->input['data']['e_aps'],$this->input['para']['e_aps_radio'])
@ -125,25 +117,17 @@ class info_on extends appadmin
$this->input['data']['e_enable'] = 1;
// 新增编辑时采用多选
//楼号
//道闸方位
$para = $this->tsql->table('para')->where(['p_type' => 3])->all();
parent::para_checkbox($para,'e_bno',$this->input['data']['e_bno'],$this->input['para']['e_bno_radio'])
->setparahtml(3,$this->input['para']['e_bno_radio']);
//单元号
$para = $this->tsql->table('para')->where(['p_type' => 4])->all();
parent::para_checkbox($para,'e_uno',$this->input['data']['e_uno'],$this->input['para']['e_uno_radio'])
->setparahtml(4,$this->input['para']['e_uno_radio']);
//电梯号
$para = $this->tsql->table('para')->where(['p_type' => 5])->all();
parent::para_checkbox($para,'e_eno',$this->input['data']['e_eno'],$this->input['para']['e_eno_radio'])
->setparahtml(5,$this->input['para']['e_eno_radio']);
//广告位置
$para = $this->tsql->table('para')->where(['p_type' => 0])->all();
parent::para_checkbox($para,'e_aps',$this->input['data']['e_aps'],$this->input['para']['e_aps_radio'])
->setparahtml(0,$this->input['para']['e_aps_radio']);
}
//小区名称URL
//场所名称URL
$this->input['remote_url'] = $_M['url']['own_name'].'c=ajax&a=doenumber&id='.$_M['form']['id'];
}

2
admin/select.class.php
View File

@ -228,7 +228,7 @@ class select extends appadmin {
}
// 查看小区名称列表
// 查看场所名称列表
public function doselect() {
global $_M,$_YW;
//判断条件

6
admin/table_on.class.php
View File

@ -36,7 +36,7 @@ class table_on extends appadmin {
$this->input['table'] = $this->table_theme->start($this->tname)->send_all(1);
}
//小区统计
//场所统计
public function dovillage()
{
global $_M,$_YW;
@ -92,7 +92,7 @@ class table_on extends appadmin {
$this->input['table'] = $this->table_theme->start($this->tname)->send_all();
}
// 小区统计
// 场所统计
public function dovillages()
{
global $_M,$_YW;
@ -112,7 +112,7 @@ class table_on extends appadmin {
$this->input['table'] = $this->table_theme->start($this->tname)->send_all(1);
}
// 小区统计
// 场所统计
public function doelevators()
{
global $_M,$_YW;

2
admin/templates/dzadsod.php
View File

@ -11,7 +11,7 @@ $met_title = $data['met_title'];
<div class="row no-space">
<div class="col-xs-1">
<strong class="profile-stat-count">{$data.num.village}</strong>
<span>小区总数</span>
<span>场所总数</span>
</div>
<div class="col-xs-1">
<strong class="profile-stat-count">{$data.num.elevator}</strong>

18
admin/templates/elevator.php
View File

@ -25,7 +25,7 @@ $met_title = $data['met_title'];
</dd>
</dl>
<dl>
<dt><label class='form-control-label'>选择小区</label></dt>
<dt><label class='form-control-label'>选择场所</label></dt>
<dd class="form-group">
<select name='e_vid' class="form-control" data-plugin="select2"
data-select2-url="{$data.url.select}"
@ -34,7 +34,7 @@ $met_title = $data['met_title'];
data-allnone="0"
data-source="add_elevator"
data-default="{$data.data.e_vid}"
data-placeholder="输入小区名"
data-placeholder="输入场所名"
required data-fv-notEmpty-message='不能为空'>
<option value=""></option>
</select>
@ -42,23 +42,11 @@ $met_title = $data['met_title'];
</dl>
<dl>
<dt><label class='form-control-label'>选择楼号</label></dt>
<dt><label class='form-control-label'>选择门口方位</label></dt>
<dd class="form-group">
{$data.para.e_bno_radio}
</dd>
</dl>
<dl>
<dt><label class='form-control-label'>选择单元号</label></dt>
<dd class="form-group">
{$data.para.e_uno_radio}
</dd>
</dl>
<dl>
<dt><label class='form-control-label'>选择电梯号</label></dt>
<dd class="form-group">
{$data.para.e_eno_radio}
</dd>
</dl>
<dl>
<dt><label class='form-control-label'>选择广告位置</label></dt>
<dd class="form-group">

8
admin/templates/village.php
View File

@ -10,7 +10,7 @@ $met_title = $data['met_title'];
<div class="metadmin-fmbx">
<h3 class='example-title'>{$data.met_title}</h3>
<dl>
<dt><label class='form-control-label'>选择小区</label></dt>
<dt><label class='form-control-label'>选择场所</label></dt>
<dd class="form-group">
<select name='v_name' class="form-control" data-plugin="select2"
data-select2-url="{$data.url.select}"
@ -19,7 +19,7 @@ $met_title = $data['met_title'];
data-allnone="3"
data-source="add_village"
data-default="{$data.data.v_name}"
data-placeholder="输入小区名"
data-placeholder="输入场所名"
required data-fv-notEmpty-message='不能为空'>
<option value=""></option>
</select>
@ -32,7 +32,7 @@ $met_title = $data['met_title'];
</dd>
</dl>
<dl>
<dt><label class='form-control-label'>小区地址</label></dt>
<dt><label class='form-control-label'>场所地址</label></dt>
<dd>
<div data-plugin="select-linkage" data-select-url="{$data.url.city}" class="city-css form-group">
<select name="v_province" class="form-control m-r-5 prov" data-checked="{$data.data.v_province}"
@ -65,7 +65,7 @@ $met_title = $data['met_title'];
</dd>
</dl>
<dl>
<dt><label class='form-control-label'>小区均价</label></dt>
<dt><label class='form-control-label'>场所均价</label></dt>
<dd class="form-group">
<input type="text" name="v_price"
value="{$data.data.v_price}"

18
include/class/appadmin.class.php
View File

@ -70,7 +70,7 @@ class appadmin extends admin{
['统计中心'],
[
'dzadsod__dodzadsod' => ['总计界面'],
'table_on__dovillages' => ['小区统计'],
'table_on__dovillages' => ['场所统计'],
'table_on__doelevators' => ['广告位统计'],
'table_on__doschedule' => ['排期查询'],
]
@ -92,7 +92,7 @@ class appadmin extends admin{
['资源管理'],
[
'table_on__doelevator' => ['广告位'],
'table_on__dovillage' => ['合作小区']
'table_on__dovillage' => ['合作场所']
]
],
@ -276,7 +276,7 @@ class appadmin extends admin{
return array_combine(array_column($para,'p_value'), array_column($para,'p_name'));
}
//小区名称
//场所名称
public function villagelist($id,$key = 'v_name') {
global $_M,$_YW;
$village = $this->tsql->table('village')->where(['id' => $id])->one();
@ -300,17 +300,13 @@ class appadmin extends admin{
//返回广告位对照地址
public function e_address($elevator) {
global $_M,$_YW;
//楼号
//道闸方位
$e_bno = self::paralist(['p_type' => 3, 'p_value' => $elevator['e_bno'] ]);
//单元号
$e_uno = self::paralist(['p_type' => 4, 'p_value' => $elevator['e_uno'] ]);
//电梯号
$e_eno = self::paralist(['p_type' => 5, 'p_value' => $elevator['e_eno'] ]);
//广告位置
$e_aps = self::paralist(['p_type' => 0, 'p_value' => $elevator['e_aps'] ]);
//小区
//场所
$e_vid = self::villagelist($elevator['e_vid']);
return "（{$elevator['e_number']}）".$e_vid.$e_bno['p_name'].$e_uno['p_name'].$e_eno['p_name'].$e_aps['p_name'];
return "（{$elevator['e_number']}）".$e_vid.$e_bno['p_name'].$e_aps['p_name'];
}
//字段颜色
@ -419,8 +415,6 @@ class appadmin extends admin{
'e_number' => $val['e_number'],
'e_vid' => $val['e_vid'],
'e_bno' => $val['e_bno'],
'e_uno' => $val['e_uno'],
'e_eno' => $val['e_eno'],
'e_aps' => $neweaps,
'e_size' => $val['e_size'],
'e_enable' => $val['e_enable'],

14
include/class/appweb.class.php
View File

@ -187,7 +187,7 @@ class appweb extends web {
return array_combine(array_column($para,'p_value'), array_column($para,'p_name'));
}
//小区名称
//场所名称
public function villagelist($id,$key = 'v_name') {
global $_M,$_YW;
$village = $this->tsql->table('village')->where(['id' => $id])->one();
@ -211,17 +211,13 @@ class appweb extends web {
//返回广告位对照地址
public function e_address($elevator) {
global $_M,$_YW;
//楼号
//道闸方位
$e_bno = self::paralist(['p_type' => 3, 'p_value' => $elevator['e_bno'] ]);
//单元号
$e_uno = self::paralist(['p_type' => 4, 'p_value' => $elevator['e_uno'] ]);
//电梯号
$e_eno = self::paralist(['p_type' => 5, 'p_value' => $elevator['e_eno'] ]);
//广告位置
$e_aps = self::paralist(['p_type' => 0, 'p_value' => $elevator['e_aps'] ]);
//小区
//场所
$e_vid = self::villagelist($elevator['e_vid']);
return "（{$elevator['e_number']}）".$e_vid.$e_bno['p_name'].$e_uno['p_name'].$e_eno['p_name'].$e_aps['p_name'];
return "（{$elevator['e_number']}）".$e_vid.$e_bno['p_name'].$e_aps['p_name'];
}
//字段颜色
@ -330,8 +326,6 @@ class appweb extends web {
'e_number' => $val['e_number'],
'e_vid' => $val['e_vid'],
'e_bno' => $val['e_bno'],
'e_uno' => $val['e_uno'],
'e_eno' => $val['e_eno'],
'e_aps' => $neweaps,
'e_size' => $val['e_size'],
'e_enable' => $val['e_enable'],

90
include/class/table_theme.class.php
View File

@ -430,18 +430,12 @@ class table_theme {
//位置
$para = $tsql->table('para')->where(['p_type' => 0])->all();
$this->search[] = self::para_select($para,['e_aps','位置']);
//电梯号
$para = $tsql->table('para')->where(['p_type' => 5])->all();
$this->search[] = self::para_select($para,['e_eno','电梯号']);
//单元号
$para = $tsql->table('para')->where(['p_type' => 4])->all();
$this->search[] = self::para_select($para,['e_uno','单元号']);
//楼号
//道闸方位
$para = $tsql->table('para')->where(['p_type' => 3])->all();
$this->search[] = self::para_select($para,['e_bno','楼号']);
$this->search[] = self::para_select($para,['e_bno','道闸方位']);
$this->select2 = [
'_fiend' => ['e_vid','选择小区',$_M['form']['e_vid']],
'placeholder' => '输入小区名称',
'_fiend' => ['e_vid','选择场所',$_M['form']['e_vid']],
'placeholder' => '输入场所名称',
'fiend' => 'id',
'tname' => 'village',
'source' => 'search',
@ -466,7 +460,7 @@ class table_theme {
}
}
// 小区统计表
// 场所统计表
protected function village() {
global $_M,$_YW;
$this->table_fiend = self::tf_village();
@ -479,7 +473,7 @@ class table_theme {
if($this->search_bool){
$this->search[] = self::input_search('v_text','输入搜索内容');
$this->search[] = self::input_search('v_address','输入地址');
$this->search[] = self::input_search('v_name','输入小区名称');
$this->search[] = self::input_search('v_name','输入场所名称');
}
//底部按钮
@ -487,11 +481,11 @@ class table_theme {
$this->btn[] = [
self::btn_del(),
self::btn_zdy('启用',2,'enableon'),
self::btn_zdy('禁用',4,'enableoff',true,'确定要禁用小区的广告位吗？一旦将无法进行排期投放!'),
self::btn_zdy('禁用',4,'enableoff',true,'确定要禁用场所的广告位吗？一旦将无法进行排期投放!'),
];
$addtourl = $this->own_name_info.__FUNCTION__;
$this->btn[] = [
'<a class="btn btn-success btn-sm" href="'.$addtourl.'" >新增小区</a>'
'<a class="btn btn-success btn-sm" href="'.$addtourl.'" >新增场所</a>'
];
}
}
@ -525,8 +519,8 @@ class table_theme {
];
$this->search[] = self::input_select_search();
$this->select2 = [
'_fiend' => ['e_vid','选择小区',$_M['form']['e_vid']],
'placeholder' => '输入小区名称',
'_fiend' => ['e_vid','选择场所',$_M['form']['e_vid']],
'placeholder' => '输入场所名称',
'fiend' => 'id',
'tname' => 'village',
'source' => 'search',
@ -658,10 +652,8 @@ class table_theme {
['广告位置',0],
['企业职位',1],
['投放进度',2],
['小区楼号',3],
['单元号',4],
['电梯编号',5],
['小区分类',6],
['场所道闸方位',3],
['场所分类',6],
['广告类型',7]
];
$this->search['left'][] = self::para_select($para,['p_type','参数分类',$_M['form']['p_type']],true);
@ -724,23 +716,17 @@ class table_theme {
$this->search['left'][] = self::para_select($para,['eaps_order','广告位排序'],true,false);
$tsql = load::own_class('tsql','new');
$this->select2 = [
'_fiend' => ['e_vid','选择小区',$_M['form']['e_vid']],
'placeholder' => '输入小区名称',
'_fiend' => ['e_vid','选择场所',$_M['form']['e_vid']],
'placeholder' => '输入场所名称',
'fiend' => 'id',
'tname' => 'village',
'source' => 'search',
'allnone' => 2
];
$this->search['left'][] = self::input_select_search();
//楼号
//道闸方位
$para = $tsql->table('para')->where(['p_type' => 3])->all();
$this->search['left'][] = self::para_select($para,['e_bno','楼号']);
//单元号
$para = $tsql->table('para')->where(['p_type' => 4])->all();
$this->search['left'][] = self::para_select($para,['e_uno','单元号']);
//电梯号
$para = $tsql->table('para')->where(['p_type' => 5])->all();
$this->search['left'][] = self::para_select($para,['e_eno','电梯号']);
$this->search['left'][] = self::para_select($para,['e_bno','道闸方位']);
//位置
$para = $tsql->table('para')->where(['p_type' => 0])->all();
$this->search['left'][] = self::para_select($para,['e_aps','位置']);
@ -787,18 +773,12 @@ class table_theme {
//位置
$para = $tsql->table('para')->where(['p_type' => 0])->all();
$this->search[] = self::para_select($para,['e_aps','位置']);
//电梯号
$para = $tsql->table('para')->where(['p_type' => 5])->all();
$this->search[] = self::para_select($para,['e_eno','电梯号']);
//单元号
$para = $tsql->table('para')->where(['p_type' => 4])->all();
$this->search[] = self::para_select($para,['e_uno','单元号']);
//楼号
//道闸方位
$para = $tsql->table('para')->where(['p_type' => 3])->all();
$this->search[] = self::para_select($para,['e_bno','楼号']);
$this->search[] = self::para_select($para,['e_bno','道闸方位']);
$this->select2 = [
'_fiend' => ['e_vid','选择小区',$_M['form']['e_vid']],
'placeholder' => '输入小区名称',
'_fiend' => ['e_vid','选择场所',$_M['form']['e_vid']],
'placeholder' => '输入场所名称',
'fiend' => 'id',
'tname' => 'village',
'source' => 'search',
@ -843,7 +823,7 @@ class table_theme {
}
}
// 小区统计展示
// 场所统计展示
protected function villages() {
global $_M,$_YW;
$this->table_fiend = self::tf_villages();
@ -853,8 +833,8 @@ class table_theme {
//key 需要在指定的位置进行整合
//整合后的新名称
//被整合的字段
'v_enum' => ['资源总计',['v_enum','v_ebnonum','v_eunonum','v_eenonum']],
'v_free' => [self::th_tooltip(['今天空闲或者时间区段内空闲的广告位，已去除禁用个数','top'],'闲置总计',false),['v_free','v_bno','v_uno','v_eno']]
'v_enum' => ['资源总计',['v_enum','v_ebnonum']],
'v_free' => [self::th_tooltip(['今天空闲或者时间区段内空闲的广告位，已去除禁用个数','top'],'闲置总计',false),['v_free','v_bno']]
]
];
//原来的列 除掉要转为第二行的 全部要设置为2，转为一行的设置为1
@ -872,11 +852,7 @@ class table_theme {
'v_endday' => self::th_tooltip(['默认7天内即将到期的广告位','top'],self::th_replace_order('v_endday'),false),
'v_prerow' => self::th_replace_order('v_prerow'),
'v_ebnonum' => self::th_replace_order('v_ebnonum'),
'v_eunonum' => self::th_replace_order('v_eunonum'),
'v_eenonum' => self::th_replace_order('v_eenonum'),
'v_bno' => self::th_tooltip(['存在一个广告空位则所属楼号就算有空','top'],self::th_replace_order('v_bno')),
'v_uno' => self::th_tooltip(['存在一个广告空位则所属单元就算有空','top'],self::th_replace_order('v_uno')),
'v_eno' => self::th_tooltip(['存在一个广告空位则所属电梯就算有空','top'],self::th_replace_order('v_eno')),
'v_bno' => self::th_tooltip(['存在一个广告空位则所属道闸方位就算有空','top'],self::th_replace_order('v_bno')),
];
$this->th_head = is_array($rselect)?array_merge($this->table_fiend,$rselect):$this->table_fiend;
@ -884,7 +860,7 @@ class table_theme {
if($this->search_bool){
$this->search[] = self::input_search('v_text','输入搜索内容');
$this->search[] = self::input_search('v_address','输入地址');
$this->search[] = self::input_search('v_name','输入小区名称');
$this->search[] = self::input_search('v_name','输入场所名称');
$this->search[] = self::date_timepicker_search(['vs_starttime','时间区段'],['vs_endtime','To']);
$this->select2 = [
@ -922,7 +898,7 @@ class table_theme {
if($this->search_bool){
$this->search[] = self::input_search('v_text','输入搜索内容');
$this->search[] = self::input_search('v_address','输入地址');
$this->search[] = self::input_search('v_name','输入小区名称');
$this->search[] = self::input_search('v_name','输入场所名称');
$this->search[] = self::date_timepicker_search(['vs_starttime','时间区段'],['vs_endtime','To']);
}
@ -949,19 +925,13 @@ class table_theme {
//位置
$para = $tsql->table('para')->where(['p_type' => 0])->all();
$this->search[] = self::para_select($para,['e_aps','位置']);
//电梯号
$para = $tsql->table('para')->where(['p_type' => 5])->all();
$this->search[] = self::para_select($para,['e_eno','电梯']);
//单元号
$para = $tsql->table('para')->where(['p_type' => 4])->all();
$this->search[] = self::para_select($para,['e_uno','单元']);
//楼号
//道闸方位
$para = $tsql->table('para')->where(['p_type' => 3])->all();
$this->search[] = self::para_select($para,['e_bno','楼号']);
$this->search[] = self::para_select($para,['e_bno','道闸方位']);
$this->select2 = [
'url' => $_M['url']['site'].'app/index.php?n=dzadsod&c=select&a=doselect',
'_fiend' => ['e_vid','小区',$_M['form']['e_vid']],
'placeholder' => '输入小区名称',
'_fiend' => ['e_vid','场所',$_M['form']['e_vid']],
'placeholder' => '输入场所名称',
'fiend' => 'id',
'tname' => 'village',
'source' => 'search',

13
include/traits/appcmp.class.php
View File

File diff suppressed because one or more lines are too long

36
include/traits/tdata.class.php
View File

@ -19,7 +19,7 @@ trait tdata {
//跳过替换为突出显示的字段
private $skip_field = [];
// 小区统计查询内的公用where
// 场所统计查询内的公用where
private $villages_where = '';
@ -105,7 +105,7 @@ trait tdata {
}
$sqlk = "{$_YW['k']['village']} AS vi LEFT JOIN {$_YW['k']['elevator']} AS el ON vi.id = el.e_vid "
. "LEFT JOIN (SELECT el.e_vid AS ae_vid,COUNT( DISTINCT el.e_number ) AS v_free,COUNT( DISTINCT el.e_vid, el.e_bno ) AS v_bno,COUNT( DISTINCT el.e_vid, el.e_bno,el.e_uno ) AS v_uno,COUNT( DISTINCT el.e_vid, el.e_bno,el.e_uno,el.e_eno ) AS v_eno {$fwhere} GROUP BY ae_vid ) AS anum ON anum.ae_vid = vi.id "
. "LEFT JOIN (SELECT el.e_vid AS ae_vid,COUNT( DISTINCT el.e_number ) AS v_free,COUNT( DISTINCT el.e_vid, el.e_bno ) AS v_bno {$fwhere} GROUP BY ae_vid ) AS anum ON anum.ae_vid = vi.id "
. "LEFT JOIN (SELECT el.e_vid AS be_vid,COUNT( DISTINCT el.e_number ) AS v_lease {$lwhere} GROUP BY be_vid ) AS bnum ON bnum.be_vid = vi.id "
. "LEFT JOIN (SELECT el.e_vid AS ce_vid,COUNT( DISTINCT el.e_number ) AS v_endday {$dwhere} GROUP BY ce_vid ) AS cnum ON cnum.ce_vid = vi.id "
. "LEFT JOIN (SELECT el.e_vid AS de_vid,COUNT( DISTINCT el.e_number ) AS v_prerow {$pwhere} GROUP BY de_vid ) AS dnum ON dnum.de_vid = vi.id ";
@ -145,10 +145,10 @@ trait tdata {
$field = 'ch.*, count(la.id) AS h_totalnum ';
break;
case 'schedule':
$field = 'el.e_enable,el.e_number,el.e_vid,el.e_bno,el.e_uno,el.e_eno,el.e_aps,la.*,ct.h_cid';
$field = 'el.e_enable,el.e_number,el.e_vid,el.e_bno,el.e_aps,la.*,ct.h_cid';
break;
case 'villages':
$field = " vi.*, COUNT( DISTINCT el.e_number) AS v_enum,COUNT(DISTINCT el.e_vid, el.e_bno) AS v_ebnonum,COUNT(DISTINCT el.e_vid, el.e_bno,el.e_uno) AS v_eunonum,COUNT(DISTINCT el.e_vid, el.e_bno,el.e_uno,el.e_eno) AS v_eenonum,COUNT( el.e_enable = 0 OR NULL ) AS noban,ANY_VALUE(anum.v_free) AS v_free,ANY_VALUE ( anum.v_bno ) AS v_bno,ANY_VALUE ( anum.v_uno ) AS v_uno,ANY_VALUE ( anum.v_eno ) AS v_eno,ANY_VALUE(bnum.v_lease) AS v_lease,ANY_VALUE(cnum.v_endday) AS v_endday,ANY_VALUE(dnum.v_prerow) AS v_prerow ";
$field = " vi.*, COUNT( DISTINCT el.e_number) AS v_enum,COUNT(DISTINCT el.e_vid, el.e_bno) AS v_ebnonum,COUNT( el.e_enable = 0 OR NULL ) AS noban,ANY_VALUE(anum.v_free) AS v_free,ANY_VALUE( anum.v_bno ) AS v_bno,ANY_VALUE(bnum.v_lease) AS v_lease,ANY_VALUE(cnum.v_endday) AS v_endday,ANY_VALUE(dnum.v_prerow) AS v_prerow ";
break;
case 'village':
$field = " vi.*, count( el.e_number ) AS total,count( el.e_enable = 0 OR NULL ) AS noban,count( el.e_enable = 1 OR NULL ) AS normal ";
@ -291,13 +291,13 @@ trait tdata {
switch ($this->tname) {
case 'applan':
$this->search_input = ['e_number'];
$this->search_other = ['e_aps','e_eno','e_uno','e_bno','e_vid','e_enable'];
$this->search_other = ['e_aps','e_bno','e_vid','e_enable'];
$where .= self::td_search();
break;
case 'elevators':
$this->search_input = ['e_number'];
$this->search_other = ['e_aps','e_eno','e_uno','e_bno','e_vid','e_enable','endid','nowid','nextid'];
$this->search_field = ['el.e_number','el.e_aps','el.e_eno','el.e_uno','el.e_bno','el.e_vid','el.e_enable','cla.endid','ala.nowid','bla.nextid'];
$this->search_other = ['e_aps','e_bno','e_vid','e_enable','endid','nowid','nextid'];
$this->search_field = ['el.e_number','el.e_aps','el.e_bno','el.e_vid','el.e_enable','cla.endid','ala.nowid','bla.nextid'];
$where .= self::td_search();
//判断是否为备份
if($this->bsign) parent::where_id($where);
@ -305,8 +305,8 @@ trait tdata {
break;
case 'patrol':
$this->search_input = ['e_number'];
$this->search_other = ['e_aps','e_eno','e_uno','e_bno','e_vid','e_enable','nowid','l_hnumber'];
$this->search_field = ['el.e_number','el.e_aps','el.e_eno','el.e_uno','el.e_bno','el.e_vid','el.e_enable','ala.nowid','la.l_hnumber'];
$this->search_other = ['e_aps','e_bno','e_vid','e_enable','nowid','l_hnumber'];
$this->search_field = ['el.e_number','el.e_aps','el.e_bno','el.e_vid','el.e_enable','ala.nowid','la.l_hnumber'];
$where .= self::td_search();
//不看空位
@ -316,7 +316,7 @@ trait tdata {
break;
case 'elevator':
$this->search_input = ['e_number','e_label','e_text'];
$this->search_other = ['e_aps','e_eno','e_uno','e_bno','e_vid','e_enable'];
$this->search_other = ['e_aps','e_bno','e_vid','e_enable'];
$where .= self::td_search();
case 'village':
$this->search_input = ['v_name','v_text'];
@ -450,10 +450,10 @@ trait tdata {
$idstr = parent::strchange($array);
if(strlen($idstr)) $order = " `e_number` IN({$idstr}) DESC, ".$order;
}
$order .= ", `e_vid` ASC, `e_bno` ASC, `e_uno` ASC, `e_eno` ASC, `e_aps` ASC ";
$order .= ", `e_vid` ASC, `e_bno` ASC, `e_aps` ASC ";
break;
case 'elevators':
$order = " `etypes` DESC, endtime DESC, el.`e_vid` ASC, el.`e_bno` ASC, el.`e_uno` ASC, el.`e_eno` ASC, el.`e_aps` ASC ";
$order = " `etypes` DESC, endtime DESC, el.`e_vid` ASC, el.`e_bno` ASC, el.`e_aps` ASC ";
if($this->form['order_e_number']) $order = " el.e_number {$this->form['order_e_number']} ";
if($this->form['order_endtime']) $order = " endtime {$this->form['order_endtime']} ";
if($this->form['order_e_totalnum']) $order = " e_totalnum {$this->form['order_e_totalnum']} ";
@ -466,11 +466,11 @@ trait tdata {
if($this->form['order_endetime']) $order = " endetime {$this->form['order_endetime']} ";
if($this->form['order_e_address']) {
$e_address = $this->form['order_e_address'];
$order = " el.e_vid {$e_address}, el.e_bno {$e_address}, el.e_uno {$e_address}, el.e_eno {$e_address}, el.e_aps {$e_address} ";
$order = " el.e_vid {$e_address}, el.e_bno {$e_address}, el.e_aps {$e_address} ";
}
break;
case 'patrol':
$order = " el.`e_vid` ASC, el.`e_bno` ASC, el.`e_uno` ASC, el.`e_eno` ASC, el.`e_aps` ASC ";
$order = " el.`e_vid` ASC, el.`e_bno` ASC, el.`e_aps` ASC ";
break;
case 'elevator':
$order = " `id` DESC ";
@ -487,9 +487,9 @@ trait tdata {
break;
case 'schedule':
$order = ' la.l_starttime DESC,la.`id` DESC';
//备份 按照小区排序
//备份 按照场所排序
if($this->bsign){
$order = " el.`e_vid` ASC, el.`e_bno` ASC, el.`e_uno` ASC, el.`e_eno` ASC, el.`e_aps` ASC ";
$order = " el.`e_vid` ASC, el.`e_bno` ASC, el.`e_aps` ASC ";
}
if($this->form['order_l_starttime']) $order = " la.l_starttime {$this->form['order_l_starttime']} ";
if($this->form['order_l_endtime']) $order = " la.l_endtime {$this->form['order_l_endtime']} ";
@ -502,11 +502,7 @@ trait tdata {
if($this->form['order_v_endday']) $order = " v_endday {$this->form['order_v_endday']} ";
if($this->form['order_v_prerow']) $order = " v_prerow {$this->form['order_v_prerow']} ";
if($this->form['order_v_ebnonum']) $order = " v_ebnonum {$this->form['order_v_ebnonum']} ";
if($this->form['order_v_eunonum']) $order = " v_eunonum {$this->form['order_v_eunonum']} ";
if($this->form['order_v_eenonum']) $order = " v_eenonum {$this->form['order_v_eenonum']} ";
if($this->form['order_v_bno']) $order = " v_bno {$this->form['order_v_bno']} ";
if($this->form['order_v_uno']) $order = " v_uno {$this->form['order_v_uno']} ";
if($this->form['order_v_eno']) $order = " v_eno {$this->form['order_v_eno']} ";
break;
case 'para':
$order = ' `id` DESC';

46
include/traits/tfield.class.php
View File

@ -9,10 +9,8 @@ trait tfield {
return [
'e_enable' => '状态',
'e_number' => '广告位编号',
'e_vid' => '小区名称',
'e_bno' => '楼号',
'e_uno' => '单元号',
'e_eno' => '电梯号',
'e_vid' => '场所名称',
'e_bno' => '道闸方位',
'e_aps' => '广告位位置',
'e_size' => '广告位规格',
'e_label' => '相关标签',
@ -20,16 +18,16 @@ trait tfield {
];
}
//小区统计
//场所统计
protected function tf_village($sign = true) {
global $_M,$_YW;
return [
'v_name' => '小区名称',
'v_type' => '小区分类',
'v_name' => '场所名称',
'v_type' => '场所分类',
'v_totalstr' => '广告状态',
'v_address' => '小区地址',
'v_address' => '场所地址',
'v_wid' => '联系人',
'v_price' => '小区均价',
'v_price' => '场所均价',
'v_psize' => '居住规模',
'v_addtime' => '录入时间',
'v_updatetime' => '修改时间',
@ -56,10 +54,8 @@ trait tfield {
$barray = [
'e_enable' => '状态',
'e_number' => '广告位编号',
'e_vid' => '小区名称',
'e_bno' => '楼号',
'e_uno' => '单元号',
'e_eno' => '电梯号',
'e_vid' => '场所名称',
'e_bno' => '道闸方位',
'e_aps' => '广告位位置',
'h_cid' => '签定的公司',
'l_hnumber' => '合同编号',
@ -197,18 +193,14 @@ trait tfield {
protected function tf_villages($sign = true) {
global $_M,$_YW;
$array = [
'v_name' => '小区名称',
'v_type' => '小区分类',
'v_name' => '场所名称',
'v_type' => '场所分类',
'v_district' => '所属区域',
'v_address' => '小区地址',
'v_address' => '场所地址',
'v_enum' => '广告位',
'v_ebnonum' => '楼号',
'v_eunonum' => '单元',
'v_eenonum' => '电梯',
'v_ebnonum' => '道闸方位',
'v_free' => '广告位',
'v_bno' => '楼号',
'v_uno' => '单元',
'v_eno' => '电梯',
'v_bno' => '道闸方位',
'v_lease' => '排期中的个数',
'v_endday' => '到期个数',
'v_prerow' => '预排的个数',
@ -216,14 +208,10 @@ trait tfield {
];
if($this->bsign){
$array['v_free'] = '闲置广告位总数';
$array['v_bno'] = '闲置楼号';
$array['v_uno'] = '闲置单元';
$array['v_eno'] = '闲置电梯';
$array['v_bno'] = '闲置道闸方位';
$array['v_enum'] = '广告位总数';
$array['v_ebnonum'] = '楼号总数';
$array['v_eunonum'] = '单元总数';
$array['v_eenonum'] = '电梯总数';
$array['v_price'] = '小区均价';
$array['v_ebnonum'] = '道闸方位总数';
$array['v_price'] = '场所均价';
$array['v_psize'] = '居住规模';
}else{
unset($array['v_district']);

46
include/traits/tlist.class.php
View File

@ -16,7 +16,7 @@ trait tlist {
protected static $customer = [];
//相关联系人缓存
protected static $workers = [];
//小区缓存
//场所缓存
protected static $village = [];
//公用删除
@ -75,29 +75,21 @@ trait tlist {
//广告位详细地址转换
protected function eaddress(&$val,$_address = 'e_address',$sign = false){
global $_M,$_YW;
//楼号
//道闸方位
if(empty(self::$para['e_bno'])) self::$para['e_bno'] = parent::translate(3);
//单元号
if(empty(self::$para['e_uno'])) self::$para['e_uno'] = parent::translate(4);
//电梯号
if(empty(self::$para['e_eno'])) self::$para['e_eno'] = parent::translate(5);
//广告位置
if(empty(self::$para['e_aps'])) self::$para['e_aps'] = parent::translate();
//小区
//场所
if(empty(self::$village[$val['e_vid']])) self::$village[$val['e_vid']] = parent::villagelist($val['e_vid']);
if($sign){
$val['e_vid'] = self::$village[$val['e_vid']];
$val['e_bno'] = self::$para['e_bno'][$val['e_bno']];
$val['e_uno'] = self::$para['e_uno'][$val['e_uno']];
$val['e_eno'] = self::$para['e_eno'][$val['e_eno']];
$val['e_aps'] = self::$para['e_aps'][$val['e_aps']];
}else{
$villages = [
self::$village[$val['e_vid']],
self::$para['e_bno'][$val['e_bno']],
self::$para['e_uno'][$val['e_uno']],
self::$para['e_eno'][$val['e_eno']],
self::$para['e_aps'][$val['e_aps']]
];
$val[$_address] = arrayto_string($villages,' ');
@ -122,15 +114,11 @@ trait tlist {
<label></label>
</span>';
//对字段处理
//楼号
//道闸方位
if(empty(self::$para['e_bno'])) self::$para['e_bno'] = parent::translate(3);
//单元号
if(empty(self::$para['e_uno'])) self::$para['e_uno'] = parent::translate(4);
//电梯号
if(empty(self::$para['e_eno'])) self::$para['e_eno'] = parent::translate(5);
//广告位置
if(empty(self::$para['e_aps'])) self::$para['e_aps'] = parent::translate();
//小区
//场所
if(empty(self::$village[$val['e_vid']])) self::$village[$val['e_vid']] = parent::villagelist($val['e_vid']);
$scheduleurl = $this->own_name_table.'elevators&e_number='.$val['e_number'];
@ -140,8 +128,6 @@ trait tlist {
$val['e_vid'] = self::$village[$val['e_vid']];
$val['e_bno'] = self::$para['e_bno'][$val['e_bno']];
$val['e_uno'] = self::$para['e_uno'][$val['e_uno']];
$val['e_eno'] = self::$para['e_eno'][$val['e_eno']];
$val['e_aps'] = self::$para['e_aps'][$val['e_aps']];
$val['e_state'] = parent::e_state();
$val['e_label'] = parent::tab_tokenfield($val['e_label'],2);
@ -156,7 +142,7 @@ trait tlist {
return self::assemble($key,$base,$val,$checked);
}
//小区统计
//场所统计
protected function village($val,$checked = '') {
global $_M,$_YW;
//获取字段
@ -174,7 +160,7 @@ trait tlist {
$workersstr[] = self::$workers[$vwid];
}
//小区分类
//场所分类
if(empty(self::$para['v_type'])) self::$para['v_type'] = parent::translate(6);
$vnameurl = $this->own_name_table.'elevator&e_vid='.$val['id'];
@ -352,12 +338,6 @@ trait tlist {
case 3:
$p_num = $this->tsql->table('elevator')->where(['e_bno' => $val['p_value']])->count();
break;
case 4:
$p_num = $this->tsql->table('elevator')->where(['e_uno' => $val['p_value']])->count();
break;
case 5:
$p_num = $this->tsql->table('elevator')->where(['e_eno' => $val['p_value']])->count();
break;
case 6:
$p_num = $this->tsql->table('village')->where(['v_type' => $val['p_value']])->count();
break;
@ -381,10 +361,8 @@ trait tlist {
<option value="0">广告位置</option>
<option value="1">企业职位</option>
<option value="2">投放进度</option>
<option value="3">小区楼号</option>
<option value="4">单元号</option>
<option value="5">电梯编号</option>
<option value="6">小区分类</option>
<option value="3">道闸方位</option>
<option value="6">场所分类</option>
<option value="7">广告类型</option>
</select>
</div>';
@ -568,7 +546,7 @@ trait tlist {
return self::assemble($key,$base,$val,$checked,false);
}
//小区统计展示
//场所统计展示
protected function villages($val,$checked = '') {
global $_M,$_YW;
//获取字段
@ -580,7 +558,7 @@ trait tlist {
<label></label>
</span>';
//小区分类
//场所分类
if(empty(self::$para['v_type'])) self::$para['v_type'] = parent::translate(6);
//对字段处理
$scheduleurl = $this->own_name_table.'schedule&e_vid='.$val['id'];
@ -609,7 +587,7 @@ trait tlist {
return self::assemble($key,$base,$val,$checked,false);
}
//小区统计展示
//场所统计展示
protected function noticeday($val,$checked = '',$base = []) {
global $_M,$_YW;
//获取字段

1
public/js/city/city.min.json Normal file
View File

File diff suppressed because one or more lines are too long

19
src/update/update.class.php
View File

@ -194,16 +194,16 @@ class update extends admin{
//数据库创建
protected function table_field() {
global $_M;
// 小区资料库
// 场所资料库
$zdytable['village'] = " `id` int(11) NOT NULL AUTO_INCREMENT,
`v_name` varchar(255) NOT NULL COMMENT '小区名称',
`v_name` varchar(255) NOT NULL COMMENT '场所名称',
`v_type` varchar(255) NOT NULL COMMENT '分类',
`v_province` varchar(255) NOT NULL COMMENT '省',
`v_city` varchar(255) NOT NULL COMMENT '市',
`v_district` varchar(255) NOT NULL COMMENT '区',
`v_address` varchar(255) NOT NULL COMMENT '详细地址',
`v_wid` varchar(255) COMMENT '相关联系人',
`v_price` decimal(10,2) DEFAULT NULL COMMENT '小区均价',
`v_price` decimal(10,2) DEFAULT NULL COMMENT '场所均价',
`v_psize` int(11) COMMENT '居住人口规模',
`v_text` text COMMENT '备注',
`v_updatetime` datetime DEFAULT NULL,
@ -239,20 +239,17 @@ class update extends admin{
`w_addtime` datetime DEFAULT NULL,
PRIMARY KEY (`id`)";
// 小区电梯
// 同一个广告位置 不可重复
$zdytable['elevator'] = " `id` int(11) NOT NULL AUTO_INCREMENT,
`e_vid` int(11) COMMENT '小区ID',
`e_vid` int(11) COMMENT '场所ID',
`e_number` varchar(100) NOT NULL COMMENT '广告位编号，用于后期各表操作',
`e_bno` int(11) NOT NULL COMMENT '楼号',
`e_uno` int(11) NOT NULL COMMENT '单元号',
`e_eno` int(11) NOT NULL COMMENT '电梯号',
`e_bno` int(11) NOT NULL COMMENT '道闸方位',
`e_aps` int(11) NOT NULL COMMENT '广告位置',
`e_size` varchar(255) NOT NULL COMMENT '广告位尺寸大小',
`e_enable` tinyint(1) NOT NULL DEFAULT '1' COMMENT '是否启用 0 不启用，1 为启用',
`e_label` text COMMENT '自主标签',
`e_text` text COMMENT '备注',
UNIQUE KEY `elidno` (`e_vid`,`e_bno`,`e_uno`,`e_eno`,`e_aps`),
UNIQUE KEY `elidno` (`e_vid`,`e_bno`,`e_aps`),
UNIQUE KEY `enumber` (`e_number`),
PRIMARY KEY (`id`)";
@ -305,7 +302,7 @@ class update extends admin{
// 参数配置
$zdytable['para'] = " `id` int(11) NOT NULL AUTO_INCREMENT,
`p_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT '参数分类 0广告位置,1职位,2合同状态,3楼号,4单元号,5电梯编号',
`p_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT '参数分类 0广告位置,1职位,2合同状态,3道闸方位',
`p_order` int(11) DEFAULT '0' COMMENT '排序',
`p_name` varchar(255) COMMENT '名称',
`p_value` int(11) COMMENT '参数值,必须为数字',
@ -447,8 +444,6 @@ class update extends admin{
e.e_vid,
e.e_number,
e.e_bno,
e.e_uno,
e.e_eno,
e.e_aps,
e.e_enable,
l.id AS l_id,

2
web/select.class.php
View File

@ -241,7 +241,7 @@ class select extends appweb {
}
// 查看小区名称列表
// 查看场所名称列表
public function doselect() {
global $_M,$_YW;
//判断条件