Skip to content

J
Jz-Php
提交 69655f72 authored 作者: chengye's avatar chengye
浏览文件
操作

同步test分之

上级 09d1ad08 9ea5a97e
显示空白字符变更
内嵌 并排
正在显示 包含 38 行增加 和 35 行删除
.gitignore
浏览文件 @ 69655f72
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
/config/cache.php /config/cache.php
/config/session.php /config/session.php
/config/cookie.php /config/cookie.php
/config/jz.php
/public/dist /public/dist
/public/dist2 /public/dist2
/public/static/uploads /public/static/uploads
......
application/admin/controller/Basestation.php
浏览文件 @ 69655f72
...@@ -484,13 +484,13 @@ class Basestation extends Base ...@@ -484,13 +484,13 @@ class Basestation extends Base
public function basestation_map(Request $request){ public function basestation_map(Request $request){
$id= $request->get('station_name'); $id= $request->get('station_name');
$db = Db::connect([ $db = Db::connect([
'type' => 'mysql', 'type' => config('jz.jztype'),
'hostname' => '127.0.0.1', 'hostname' => config('jz.jzhostname'),
'database' => 'jzdb', 'database' => config('jz.jzdatabase'),
'username' => 'root', 'username' => config('jz.jzusername'),
'password' => 'pvv5718J0CwhNfn4B^8^H3igPj#oiQkX', 'password' => config('jz.jzpassword'),
'hostport' => '10036', 'hostport' =>config('jz.jzhostport'),
'charset' => 'utf8', 'charset' => config('jz.jzcharset'),
]); ]);
$data=$db->table('jz_message')->field('business_id')->where(['jz_name'=>$id])->find(); $data=$db->table('jz_message')->field('business_id')->where(['jz_name'=>$id])->find();
$this->assign('data',$data['business_id']); $this->assign('data',$data['business_id']);
...@@ -499,13 +499,13 @@ class Basestation extends Base ...@@ -499,13 +499,13 @@ class Basestation extends Base
public function basestation_region(Request $request){ public function basestation_region(Request $request){
$db = Db::connect([ $db = Db::connect([
'type' => 'mysql', 'type' => config('jz.jztype'),
'hostname' => '127.0.0.1', 'hostname' => config('jz.jzhostname'),
'database' => 'jzdb', 'database' => config('jz.jzdatabase'),
'username' => 'root', 'username' => config('jz.jzusername'),
'password' => 'pvv5718J0CwhNfn4B^8^H3igPj#oiQkX', 'password' => config('jz.jzpassword'),
'hostport' => '10036', 'hostport' =>config('jz.jzhostport'),
'charset' => 'utf8', 'charset' => config('jz.jzcharset'),
]); ]);
$data['business_id']= $request->get('station_id'); $data['business_id']= $request->get('station_id');
if(empty($data['business_id'])){ if(empty($data['business_id'])){
......
application/admin/view/basestation/base_region.html
浏览文件 @ 69655f72
...@@ -17,12 +17,10 @@ ...@@ -17,12 +17,10 @@
<form class="layui-form" > <form class="layui-form" >
<div class="layui-input-inline layui-show-xs-block" style="width:130px;"> <div class="layui-input-inline layui-show-xs-block" style="width:130px;">
<select name="search_type" id="search_type"> <select name="search_type" id="search_type">
<option value="1" {if $search_type eq 1 } selected {/if}>站名</option> <option value="1" {if $search_type eq 1 } selected {/if}>123213站名</option>
<option value="2" {if $search_type eq 2 } selected {/if}>站号</option> <option value="2" {if $search_type eq 2 } selected {/if}>站号</option>
<option value="3" {if $search_type eq 3 } selected {/if}>项目编号</option> <option value="3" {if $search_type eq 3 } selected {/if}>项目编号</option>
<option value="4" {if $search_type eq 4 } selected {/if}>机房二维码</option> <option value="4" {if $search_type eq 4 } selected {/if}>机房二维码</option>
</select> </select>
</div> </div>
<div class="layui-input-inline layui-show-xs-block"> <div class="layui-input-inline layui-show-xs-block">
...@@ -44,11 +42,9 @@ ...@@ -44,11 +42,9 @@
{if $region.level == 0} {if $region.level == 0}
<option disabled='disabled' class='layui-disabled' >{$region.region_name}</option> <option disabled='disabled' class='layui-disabled' >{$region.region_name}</option>
{else /} {else /}
<option value="{$region.id}" {if $area_id eq $region.id } selected {/if} >&nbsp;&nbsp;&nbsp;&nbsp;{$region.region_name}</option> <option value="{$region.id}" {if $area_id eq $region.id } selected {/if} >{$region.region_name}</option>
{/if} {/if}
{/volist} {/volist}
</select> </select>
</div> </div>
...@@ -162,7 +158,7 @@ ...@@ -162,7 +158,7 @@
if (time <= 3) { if (time <= 3) {
var point = new BMap.Point(res[0].longitude, res[0].latitude); var point = new BMap.Point(res[0].longitude, res[0].latitude);
var content = var content =
"<p style= 'width: 200px;overflow: hidden;display: inline-block;text-overflow: ellipsis;white-space: nowrap;'>基站名称：" + res[0].station_name + "<br/>项目编号：" + res[0].proj_number + "<br/><a onclick=xadmin.add_tab('地图显示','/base_detai?id="+res[0].station_id+"',true,true)>查看详情</a></p>"; "<p style= 'width: 200px;overflow: hidden;display: inline-block;text-overflow: ellipsis;white-space: nowrap;'>基站名称12：" + res[0].station_name + "<br/>项目编号：" + res[0].proj_number + "<br/><a onclick=xadmin.add_tab('地图显示','/base_detai?id="+res[0].station_id+"',true,true)>查看详情</a></p>";
bm.addControl(new BMap.MapTypeControl({ bm.addControl(new BMap.MapTypeControl({
mapTypes: [ mapTypes: [
...@@ -242,7 +238,7 @@ ...@@ -242,7 +238,7 @@
for (var i in res) { for (var i in res) {
var point = new BMap.Point(res[i].longitude, res[i].latitude) var point = new BMap.Point(res[i].longitude, res[i].latitude)
var content = var content =
"<p style= 'width: 200px;overflow: hidden;display: inline-block;text-overflow: ellipsis;white-space: nowrap;'>基站名称：" + res[i].station_name + "<br/>项目编号：" + res[i].proj_number + "<br/><a onclick=xadmin.add_tab('地图显示','/base_detai?id="+res[i].station_id+"',true,true)>查看详情</a></p>"; "<p style= 'width: 200px;overflow: hidden;display: inline-block;text-overflow: ellipsis;white-space: nowrap;'>基站名称34：" + res[i].station_name + "<br/>项目编号：" + res[i].proj_number + "<br/><a onclick=xadmin.add_tab('地图显示','/base_detai?id="+res[i].station_id+"',true,true)>查看详情</a></p>";
addMarker(point, content); addMarker(point, content);
} }
...@@ -303,18 +299,6 @@ ...@@ -303,18 +299,6 @@
} }
} }
}, },
error : function (XMLHttpRequest, textStatus, errorThrow ) { error : function (XMLHttpRequest, textStatus, errorThrow ) {
console.log('AJAX 执行失败...'); console.log('AJAX 执行失败...');
......
application/admin/view/staff/role.html
浏览文件 @ 69655f72
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<script src="dist/js/md5.js"></script> <script src="dist/js/md5.js"></script>
<script src="dist/js/sha1.js"></script> <script src="dist/js/sha1.js"></script>
<script src="dist/js/util.js"></script> <script src="dist/js/util.js"></script>
<!--<script src="dist/js/getUserToken.js"></script>--> <!-- <script src="dist/js/getUserToken.js"></script> -->
<script> <script>
layui.use(['laydate','form','upload'], function(){ layui.use(['laydate','form','upload'], function(){
upload = layui.upload; upload = layui.upload;
......
config/admin.php 0 → 100644
浏览文件 @ 69655f72
<?php
//配置文件
return [
//加密串
'passwd_salt' => 'gonn',
'passwd_init' => 'gonn',
'encrypt_key' => 'INJq4HXEGI',
'login_pattern' => '/^\w{2,}@\w+/', //开放模式
//'login_pattern' => '/^\w{2,}@gonn\.com\.cn$', 严格模式
'upload_dir' => './static/uploads',
'images_dir' => './static/uploads/images',
'files_dir' => './static/uploads/files',
'search_area' => '1', //1按部门搜索,2全局
'order_per' =>'ZD',
'redis_host' => '192.168.1.71',
'redis_port' => 6379,
];
route/admin.php
浏览文件 @ 69655f72
...@@ -147,6 +147,7 @@ Route::get('useage/:useage_id','em/useage/detail'); ...@@ -147,6 +147,7 @@ Route::get('useage/:useage_id','em/useage/detail');
Route::get('useage_add/:id','em/useage/create'); Route::get('useage_add/:id','em/useage/create');
Route::post('useage_add','em/useage/store'); Route::post('useage_add','em/useage/store');
Route::post('useage_del','em/useage/del'); Route::post('useage_del','em/useage/del');
Route::get('useage_update/:useage_id','em/useage/update'); Route::get('useage_update/:useage_id','em/useage/update');
Route::post('upFile','em/UploadFile/upFile'); Route::post('upFile','em/UploadFile/upFile');
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论