diff --git a/application/admin/controller/Admin_bak.php b/application/admin/controller/Admin_bak.php
index 9633d5c..abc0e90 100644
--- a/application/admin/controller/Admin_bak.php
+++ b/application/admin/controller/Admin_bak.php
@@ -1,3 +1,85 @@
-
-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
\ No newline at end of file
+getadmin();
+foreach ($adminres as $k =>$v) {
+$_groupTitle=$auth->getGroups($v['id']);
+$groupTitle=$_groupTitle[0]['title'];
+$v['groupTitle']=$groupTitle;
+}
+$this->assign('adminres',$adminres);
+return view();
+}
+public function add()
+{
+if(request()->isPost()){
+$data=input('post.');
+$validate = \think\Loader::validate('Admin');
+if(!$validate->scene('add')->check($data)){
+$this->error($validate->getError());
+}
+$admin=new AdminModel();
+if($admin->addadmin($data)){
+$this->success('添加管理员成功!',url('lst'));
+}else{
+$this->error('添加管理员失败!');
+}
+return;
+}
+$authGroupRes=db('auth_group')->select();
+$this->assign('authGroupRes',$authGroupRes);
+return view();
+}
+public function edit($id)
+{
+$admins=db('admin')->find($id);
+if(request()->isPost()){
+$data=input('post.');
+$validate = \think\Loader::validate('Admin');
+if(!$validate->scene('edit')->check($data)){
+$this->error($validate->getError());
+}
+$admin=new AdminModel();
+$savenum=$admin->saveadmin($data,$admins);
+if($savenum == '2'){
+$this->error('管理员用户名不得为空!');
+}
+if($savenum !== false){
+$this->success('修改成功!',url('lst'));
+}else{
+$this->error('修改失败!');
+}
+return;
+}
+if(!$admins){
+$this->error('该管理员不存在');
+}
+$authGroupAccess=db('auth_group_access')->where(array('uid'=>$id))->find();
+$authGroupRes=db('auth_group')->select();
+$this->assign('authGroupRes',$authGroupRes);
+$this->assign('admin',$admins);
+$this->assign('groupId',$authGroupAccess['group_id']);
+return view();
+}
+public function del($id){
+$admin=new AdminModel();
+$delnum=$admin->deladmin($id);
+if($delnum == '1'){
+$this->success('删除管理员成功!',url('lst'));
+}else{
+$this->error('删除管理员失败!');
+}
+}
+public function logout(){
+session(null);
+$this->success('退出系统成功!',url('/index/login/index'));
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Article.php b/application/admin/controller/Article.php
index 41817d5..7d29201 100644
--- a/application/admin/controller/Article.php
+++ b/application/admin/controller/Article.php
@@ -1,3 +1,68 @@
-
-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
\ No newline at end of file
+field('a.*,b.catename')->alias('a')->join('cate b','a.cateid=b.id')->order('a.id desc')->paginate(2);
+$this->assign('artres',$artres);
+return view();
+}
+public function add(){
+if(request()->isPost()){
+$data=input('post.');
+$data['time']=time();
+$validate = \think\Loader::validate('Article');
+if(!$validate->scene('add')->check($data)){
+$this->error($validate->getError());
+}
+$article=new ArticleModel;
+if($article->save($data)){
+$this->success('添加文章成功',url('lst'));
+}else{
+$this->error('添加文章失败!');
+}
+return;
+}
+$cate=new CateModel();
+$cateres=$cate->catetree();
+$this->assign('cateres',$cateres);
+return view();
+}
+public function edit(){
+if(request()->isPost()){
+$data=input('post.');
+$validate = \think\Loader::validate('Article');
+if(!$validate->scene('edit')->check($data)){
+$this->error($validate->getError());
+}
+$article=new ArticleModel;
+$save=$article->update($data);
+if($save){
+$this->success('修改文章成功!',url('lst'));
+}else{
+$this->error('修改文章失败!');
+}
+return;
+}
+$cate=new CateModel();
+$cateres=$cate->catetree();
+$arts=db('article')->where(array('id'=>input('id')))->find();
+$this->assign(array(
+'cateres'=>$cateres,
+'arts'=>$arts,
+));
+return view();
+}
+public function del(){
+if(ArticleModel::destroy(input('id'))){
+$this->success('删除文章成功!',url('lst'));
+}else{
+$this->error('删除文章失败!');
+}
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Auth.php b/application/admin/controller/Auth.php
index 5d94535..583dd5c 100644
--- a/application/admin/controller/Auth.php
+++ b/application/admin/controller/Auth.php
@@ -1,3 +1,115 @@
-
-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dBAmhU0+F2aScBY0htL7tJOifbOPTolzftE9wysfKXpMd3klCBYPwtILFmaScbHICbHIkuk1doApwuShDBCIhtyldbn0GUILFmaScaSmC29Vcol0DB9Vk10phUn7tJO0DolzRT5mcbOaF2aZUB5MdZILfBlLhTShkoYvdB1idMWINUnXFMamb3klFoxiC2APkZ9FGZiFfZP/hax9RZFSkZO1F2aZB1XmbyXxbtffkZXLFmaScaSmC29Vcol0DB9Vk10pKXpEhoa2CBXPkZOjd25LDbOpd249htFVkoYvdB1idMWIRJFpKZFphTShkoYvdMOpfolvdJEMkJOifbOPTolzfysfwe0IF3OZfo9Sd3flFJILFmaScaSmdMyscUffhTShgBaSF2AIGXPLCba0DrxpF3OdbUE9wuY0FmOvdo93cbwPkuk1doadk25idBAmbUL7tm0hgWPLb2y1foiHDbY0BZO1DBWIRJO0bUE9wtOifbOPTolzfeShDBCIhtO0DolzRT5jd25MDBfdk2y1foigfulXcUffwe09wewpwuShky9TOaYTUA9KBZfgCba0Dy9SDbY0bZFVkuapctEVkuOfwe0Ikoy1foiHDbY0KXp9tmklfuaZdJniFmkiGa91dMlxfBAPkoy1foiHDbY0hTShgWpXFM90cBY0cBWIcmaVC3Opd24Ic2a0abYlFLlVcM8PkuapctLIGXpzfoy0DBHIkuazcbkpdMcvwe0IB107tMlMwtIiDbYzcbWPkuazcbkpdMcvBZO1DBOfhULIGXPLfbYlFMlVcM9dkuapcy0INUnrCjP6dMyscUILfoipFZ0+C29VcMlmBZfifbOPb3azcbwmbULsNmfPcbklhySmfBlLkz0+kuapcy0pRT5MDB5LhtL7tm0hFMa0fbkVwtO1F2aZDB5Md1SLfBlLbTShgWp9
\ No newline at end of file
+true,
+'auth_type'=>2,
+'auth_group'=>'auth_group',
+'auth_group_access'=>'auth_group_access',
+'auth_rule'=>'auth_rule',
+'auth_user'=>'auth_member'
+);
+public function __construct() {
+if (Config::get('auth_config')) {
+$this->config = array_merge($this->config,Config::get('auth_config'));
+}
+}
+public function check($name,$uid,$type = 1,$mode = 'url',$relation = 'or') {
+if (!$this->config['auth_on']) {
+return true;
+}
+$authList = $this->getAuthList($uid,$type);
+if (is_string($name)) {
+$name = strtolower($name);
+$name = strpos($name,',') !== false ?explode(',',$name) : [$name];
+}
+$list = [];
+if ($mode == 'url') {
+$REQUEST = unserialize(strtolower(serialize($_REQUEST)));
+}
+foreach ($authList as $auth) {
+$query = preg_replace('/^.+\?/U','',$auth);
+if ($mode == 'url'&&$query != $auth) {
+parse_str($query,$param);
+$intersect = array_intersect_assoc($REQUEST,$param);
+$auth = preg_replace('/\?.*$/U','',$auth);
+if (in_array($auth,$name) &&$intersect == $param) {
+$list[] = $auth;
+}
+}else if (in_array($auth,$name)) {
+$list[] = $auth;
+}
+}
+if ($relation == 'or'and !empty($list)) {
+return true;
+}
+$diff = array_diff($name,$list);
+if ($relation == 'and'and empty($diff)) {
+return true;
+}
+return false;
+}
+public function getGroups($uid) {
+static $groups = [];
+if (isset($groups[$uid])) {
+return $groups[$uid];
+}
+$user_groups = Db::view($this->config['auth_group_access'],'uid,group_id')->view($this->config['auth_group'],'title,rules',"{$this->config['auth_group_access']}.group_id={$this->config['auth_group']}.id")
+->where(['uid'=>$uid,'status'=>1])->select();
+$groups[$uid] = $user_groups ?$user_groups : [];
+return $groups[$uid];
+}
+protected function getAuthList($uid,$type) {
+static $_authList = [];
+$t = implode(',',(array) $type);
+if (isset($_authList[$uid .$t])) {
+return $_authList[$uid .$t];
+}
+if ($this->config['auth_type'] == 2 &&Session::has('_auth_list_'.$uid .$t)) {
+return Session::get('_auth_list_'.$uid .$t);
+}
+$groups = $this->getGroups($uid);
+$ids = [];
+foreach ($groups as $g) {
+$ids = array_merge($ids,explode(',',trim($g['rules'],',')));
+}
+$ids = array_unique($ids);
+if (empty($ids)) {
+$_authList[$uid .$t] = [];
+return [];
+}
+$map = [
+'id'=>['in',$ids],
+'type'=>$type,
+'status'=>1,
+];
+$rules = Db::name($this->config['auth_rule'])->where($map)->field('condition,name')->select();
+$authList = [];
+foreach ($rules as $rule) {
+if (!empty($rule['condition'])) {
+$this->getUserInfo($uid);
+$command = preg_replace('/\{(\w*?)\}/','$user[\'\\1\']',$rule['condition']);
+@(eval('$condition=('.$command .');'));
+$condition &&$authList[] = strtolower($rule['name']);
+}else {
+$authList[] = strtolower($rule['name']);
+}
+}
+$_authList[$uid .$t] = $authList;
+if ($this->config['auth_type'] == 2) {
+$_SESSION['_auth_list_'.$uid .$t] = $authList;
+}
+return array_unique($authList);
+}
+protected function getUserInfo($uid) {
+static $userinfo = [];
+if (!isset($userinfo[$uid])) {
+$userinfo[$uid] = Db::name($this->config['auth_user'])->where(['uid'=>$uid])->find();
+}
+return $userinfo[$uid];
+}
+}?>
\ No newline at end of file
diff --git a/application/admin/controller/AuthGroup.php b/application/admin/controller/AuthGroup.php
index cd62a73..7d9bc4b 100644
--- a/application/admin/controller/AuthGroup.php
+++ b/application/admin/controller/AuthGroup.php
@@ -1,3 +1,69 @@
-
-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
\ No newline at end of file
+assign('authGroupRes',$authGroupRes);
+return view();
+}
+public function add(){
+if(request()->isPost()){
+$data=input('post.');
+if($data['rules']){
+$data['rules']=implode(',',$data['rules']);
+}
+$add=db('auth_group')->insert($data);
+if($add){
+$this->success('添加用户组成功!',url('lst'));
+}else{
+$this->error('添加用户组失败!');
+}
+return;
+}
+$authRule=new \app\admin\model\AuthRule();
+$authRuleRes=$authRule->authRuleTree();
+$this->assign('authRuleRes',$authRuleRes);
+return view();
+}
+public function edit(){
+if(request()->isPost()){
+$data=input('post.');
+if($data['rules']){
+$data['rules']=implode(',',$data['rules']);
+}
+$_data=array();
+foreach ($data as $k =>$v) {
+$_data[]=$k;
+}
+if(!in_array('status',$_data)){
+$data['status']=0;
+}
+$save=db('auth_group')->update($data);
+if($save!==false){
+$this->success('修改用户组成功!',url('lst'));
+}else{
+$this->error('修改用户组失败!');
+}
+return;
+}
+$authgroups=db('auth_group')->find(input('id'));
+$this->assign('authgroups',$authgroups);
+$authRule=new \app\admin\model\AuthRule();
+$authRuleRes=$authRule->authRuleTree();
+$this->assign('authRuleRes',$authRuleRes);
+return view();
+}
+public function del(){
+$del=db('auth_group')->delete(input('id'));
+if($del){
+$this->success('删除用户组成功!',url('lst'));
+}else{
+$this->error('删除用户组失败!');
+}
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/AuthRule.php b/application/admin/controller/AuthRule.php
index f706656..feb8527 100644
--- a/application/admin/controller/AuthRule.php
+++ b/application/admin/controller/AuthRule.php
@@ -1,3 +1,83 @@
-
-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
\ No newline at end of file
+isPost()){
+$sorts=input('post.');
+foreach ($sorts as $k =>$v) {
+$authRule->update(['id'=>$k,'sort'=>$v]);
+}
+$this->success('更新排序成功!',url('lst'));
+return;
+}
+$authRuleRes=$authRule->authRuleTree();
+$this->assign('authRuleRes',$authRuleRes);
+return view();
+}
+public function add(){
+if(request()->isPost()){
+$data=input('post.');
+$plevel=db('auth_rule')->where('id',$data['pid'])->field('level')->find();
+if($plevel){
+$data['level']=$plevel['level']+1;
+}else{
+$data['level']=0;
+}
+$add=db('auth_rule')->insert($data);
+if($add){
+$this->success('添加权限成功!',url('lst'));
+}else{
+$this->error('添加权限失败!');
+}
+return;
+}
+$authRule=new AuthRuleModel();
+$authRuleRes=$authRule->authRuleTree();
+$this->assign('authRuleRes',$authRuleRes);
+return view();
+}
+public function edit(){
+if(request()->isPost()){
+$data=input('post.');
+$plevel=db('auth_rule')->where('id',$data['pid'])->field('level')->find();
+if($plevel){
+$data['level']=$plevel['level']+1;
+}else{
+$data['level']=0;
+}
+$save=db('auth_rule')->update($data);
+if($save!==false){
+$this->success('修改权限成功!',url('lst'));
+}else{
+$this->error('修改权限失败!');
+}
+return;
+}
+$authRule=new AuthRuleModel();
+$authRuleRes=$authRule->authRuleTree();
+$authRules=$authRule->find(input('id'));
+$this->assign(array(
+'authRuleRes'=>$authRuleRes,
+'authRules'=>$authRules,
+));
+return view();
+}
+public function del(){
+$authRule=new AuthRuleModel();
+$authRule->getparentid(input('id'));
+$authRuleIds=$authRule->getchilrenid(input('id'));
+$authRuleIds[]=input('id');
+$del= AuthRuleModel::destroy($authRuleIds);
+if($del){
+$this->success('删除权限成功!',url('lst'));
+}else{
+$this->error('删除权限失败!');
+}
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Bdz.php b/application/admin/controller/Bdz.php
index 2a902c9..a7e7920 100644
--- a/application/admin/controller/Bdz.php
+++ b/application/admin/controller/Bdz.php
@@ -1,3 +1,67 @@
-
-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
+assign('list',$list);
+return $this->fetch();
+}
+public function add()
+{
+if (request()->isPost()){
+$data = input('post.');
+if(db('bdz')->insert($data)){
+return $this->success('ok','lst','',1);
+}
+else {
+return $this->error('false',null,'',1);
+}
+return ;
+}
+return $this->fetch();
+}
+public function edit(){
+$id=input('id');
+$bdzs=db('bdz')->find($id);
+if(request()->ispost()){
+$data=[
+'id'=>input('id'),
+'mc'=>input('mc'),
+'ztjcid'=>input('ztjcid'),
+'hascac'=>input('hascac'),
+'coordinate'=>input('coordinate'),
+'voltagegrade'=>input('voltagegrade'),
+'scale'=>input('scale'),
+'note'=>input('note'),
+'svgurl'=>input('svgurl'),
+];
+$save=db('bdz')->update($data);
+if($save !== false){
+$this->success('修改电站成功!','lst','',1);
+}else{
+$this->error('修改电站失败!',null,'',1);
+}
+return;
+}
+$this->assign('bdzs',$bdzs);
+return $this->fetch();
+}
+public function del(){
+$id=input('id');
+if(db('bdz')->delete(input('id'))){
+$this->success('删除电站成功!','lst','',1);
+}else{
+$this->error('删除电站失败!',null,'',1);
+}
+}
+public function logout(){
+session(null);
+$this->success('退出成功!','Login/index','',1);
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Cac.php b/application/admin/controller/Cac.php
index 1596b24..6fdc881 100644
--- a/application/admin/controller/Cac.php
+++ b/application/admin/controller/Cac.php
@@ -1,3 +1,79 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7eWpVCB1lF3niC2AICbnXboyLdBlVboYvdmOZd2xScbw7eWp1F2AIfoipdMsFW29VfukvdoxlFjSYtmazcUn0DolVD1xrCjSYtMYSCbYzwtneCBHIcbi0cB5LFZned21sd24YtmSYtmn1CMxpCZnMfB5jfolvdJnSF3WPhW0hGX0hkoxpF3W9Oow6Kmy1cbk5htkzcBxlC3WIhJnMFM9swuc3b2YiCZEJhTSYtJO0DolzRT5iF3Ypc24Pk2xpF3WmRtOSDbY0hTSYtmklfuaZdJELfoipFZ0+cMa0C2IPhTSYtm0Ytmn1CMxpCZnMfB5jfolvdJnicoWPhW0hGX0hkokLGmH9Oow6Kmy1cbk5htkzcBxlC3WIDBWSdBHIcmkvdUnJcuPIwJL7eWPLC2ymFz1rCjP6FbalFmLPwmYldoajftnpctxVCB1lwocZd20IC2ymwtwpKX0hDBCIhuklFbalF3WPhU0+DbYWd3Y0htLpGX0hkoOiforINUnpdmn1ftImFo9zft4mhTSYtMlMhoOJhtfjCBHmhU0+DB5zcbk0htOLCbOihUl7eWpZcbO1FM4IkuOPDbHsNmY1C2YlF3HPk29qkZXmduY0kZL7eWp9eWplduYlwuSYtmklfuaZdJELfoipFZ0+cbkZd3wPk2ciduYlkZL7eWp9eWpZcbO1FM4IKX0hgW0hkuOPDbHsNMyzF2lmdJImCMO6FZFSkokLGmHpKX0hkuOPDbHsNMyzF2lmdJImC2ymFZFSkoYic3HpKX0hFMa0fbkVwtO0DolzRT5McbOjDtIpKX0hgW0hFuaJdoljwoc1dMY0DB9VwoaLDbWPhbSYtJOpce1pdmn1ftImDBWmhTSYtJOjCBYzNBOJhtfjCBHmhU0+cMlVctILDBWpKX0hkokLGmH9Oow6Kmy1cbk5htkzcBxlC3WIDBWSdBHIcmkvdUnJcuPIwJL7eWPLC2ymFz1rCjP6FbalFmLPwmYldoajftnpctxVCB1lwocZd20IC2ymwtwpKX0hDBCPFMaxfBazftIpRT5pF3nvF3WPhUl7eWPLcoy0CT1deWPmDBWmNT5pdmn1ftImDBWmhUXYtJfVCB1lkz0+DB5XfbWPk25idBAmhUXYtJfjCBfpctF9NMlVFua0htfjCBfpctFpRE0hk2kLGMlLkz0+DB5XfbWPk2kLGMlLkZLSeWPmdByVfBciC3O1FMAmNT5pdmn1ftImdByVfBciC3O1FMAmhUXYtJfMCBY0d3k5DB50kz0+DB5XfbWPk2ciC3OvFmlpdmWmhUXYtJfsCB51cMyjfuaZcBOifoAmNT5pdmn1ftImdByVfBciC3O1FMaLCbOlkZLSeWPmFmaVcoy0cUF9NMlVFua0htfZfB5LCbOlkZLSeWPmdo9jCbOpd24mNT5pdmn1ftImdo9jCbOpd24mhUXYtJfVd3Olkz0+DB5XfbWPk25vfoAmhUXYtJfLDbYqcmklcUF9NMlVFua0htfLDbYqcmklcUFpRE0hk2Ovf25pFtF9NMlVFua0htfLd3fVDbEmhUXYtJf1FolXkz0+DB5XfbWPk3aXDbEmhUXYtl07eWPLF2y2cT1LCJImC2yjkZLsNmaXcoy0cUILcoy0CUL7eWppcJILF2y2cUEiNT0IcMySF2ApGX0hkuOPDbHsNmY1C2YlF3HPk+U/qVDAVGBLp+DaSKDYqVDKQKMEIGB5S+BNSKDwLKBhm++8IUFSk2xzftFpKX0hgBaSF2a7eWPLfoipFZ0+cbkZd3wPk+U/qVDAVGBLp+DaSKDYqVDKQKMEIGB5S+BNSKBLSGJ0pG+8IUFpKX0hgW0hFMa0fbkVKX0hgW0hkuOPDbHsNMyzF2lmdJImC2yjFZFSkoYiC3HpKX0hkuOPDbHsNMyzF2lmdJImCMO6FZFSkokLGmHpKX0hkuOPDbHsNMyzF2lmdJImC2ymFZFSkoYic3HpKX0hFMa0fbkVwtO0DolzRT5McbOjDtIpKX0hgW0hFuaJdoljwoc1dMY0DB9VwoOldtIpGX0hkolLNBlVFua0htfpctFpKX0hDBCPcowPk2YiCZFpRT5LcBxlfoAPDB5XfbWPk2lLkZLphbSYtJO0DolzRT5zfBYjcbYzhtglJhepMDTlphgMldeMjD7MjQjpIwulVdNlj7eMJkelJp/vvwrmRtfSF3WmhTSYtm1lduYlGX0hkuOPDbHsNMaZFM9ZhtglJhepMDTlphgMldeMjD7MjQjpIwulVdNlj7elpRuPshbvvwrmhTSYtm0Ytm0Ytmn1CMxpCZnMfB5jfolvdJnSd2fvfbWPhbSYtmYlF3Ypd24PdmaSdtL7eWPLfoipFZ0+F3ajC2azFZIm6CtE5CG65PJW5CQg77ZnkZXmTo9mDB4vDB5LcbImhTSYtm0Ytm0YtI==
\ No newline at end of file
+assign('list',$list);
+return $this->fetch();
+}
+public function add()
+{
+$bdzs=Db::query("select id,mc from bdz ");
+$cags=Db::query("select id,name from cag ");
+if (request()->isPost()){
+$data = input('post.');
+if(db('cac')->insert($data)){
+return $this->success('ok','lst');
+}
+else {
+return $this->error('false');
+}
+return ;
+}
+$this->assign('bdzs',$bdzs);
+$this->assign('cags',$cags);
+return $this->fetch();
+}
+public function edit(){
+$id=input('id');
+$cacs=db('cac')->find($id);
+$bdzs=Db::query("select id,mc from bdz ");
+$cags=Db::query("select id,name from cag ");
+if(request()->ispost()){
+$data=[
+'id'=>input('id'),
+'name'=>input('name'),
+'cagid'=>input('cagid'),
+'bdzid'=>input('bdzid'),
+'manufacture'=>input('manufacture'),
+'factoryint'=>input('factoryint'),
+'manufacturedate'=>input('manufacturedate'),
+'rundate'=>input('rundate'),
+'location'=>input('location'),
+'note'=>input('note'),
+'diskfree'=>input('diskfree'),
+'downip'=>input('downip'),
+'upip'=>input('upip'),
+];
+$save=db('cac')->update($data);
+if($save !== false){
+$this->success('修改大数据推送平台成功!','lst');
+}else{
+$this->error('修改大数据推送平台失败!');
+}
+return;
+}
+$this->assign('cacs',$cacs);
+$this->assign('bdzs',$bdzs);
+$this->assign('cags',$cags);
+return $this->fetch();
+}
+public function del(){
+$id=input('id');
+if(db('cac')->delete(input('id'))){
+$this->success('删除大数据推送平台成功!','lst');
+}else{
+$this->error('删除大数据推送平台失败!');
+}
+}
+public function logout(){
+session(null);
+$this->success('退出成功!','Login/index');
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Cag.php b/application/admin/controller/Cag.php
index 48027f4..32dc864 100644
--- a/application/admin/controller/Cag.php
+++ b/application/admin/controller/Cag.php
@@ -1,3 +1,69 @@
-
-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
\ No newline at end of file
+assign('list',$list);
+return $this->fetch();
+}
+public function add()
+{
+if (request()->isPost()){
+$data = input('post.');
+if(db('cag')->insert($data)){
+return $this->success('ok','lst');
+}
+else {
+return $this->error('false');
+}
+return ;
+}
+return $this->fetch();
+}
+public function edit(){
+$id=input('id');
+$cags=db('cag')->find($id);
+if(request()->ispost()){
+$data=[
+'id'=>input('id'),
+'name'=>input('name'),
+'manufacture'=>input('manufacture'),
+'factoryint'=>input('factoryint'),
+'manufacturedate'=>input('manufacturedate'),
+'rundate'=>input('rundate'),
+'location'=>input('location'),
+'note'=>input('note'),
+'diskfree'=>input('diskfree'),
+'downip'=>input('downip'),
+'upip'=>input('upip'),
+];
+$save=db('cag')->update($data);
+if($save !== false){
+$this->success('修改主站平台信息成功!','lst');
+}else{
+$this->error('修改主站平台信息失败!');
+}
+return;
+}
+$this->assign('cags',$cags);
+return $this->fetch();
+}
+public function del(){
+$id=input('id');
+if(db('cag')->delete(input('id'))){
+$this->success('删除主站平台信息成功!','lst');
+}else{
+$this->error('删除主站平台信息失败!');
+}
+}
+public function logout(){
+session(null);
+$this->success('退出成功!','Login/index');
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Cate.php b/application/admin/controller/Cate.php
index 716c2f7..7338b18 100644
--- a/application/admin/controller/Cate.php
+++ b/application/admin/controller/Cate.php
@@ -1,3 +1,65 @@
-
-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
\ No newline at end of file
+catetree();
+$this->assign('cateres',$cateres);
+return $this->fetch();
+}
+public function add()
+{
+$cate = new Sys_menumodel();
+if (request()->isPost()) {
+if($_POST['pid']){
+$ppid=Db::table('sys_menu')->where('id',$_POST['pid'])->find();
+$ppid=$ppid['pid'];
+}else{
+$ppid = '-1';
+}
+$data=input('post.');
+$data['ppid']=$ppid;
+$add=$cate->save($data);
+if($add){
+$this->success('添加菜单成功!');
+}else{
+$this->error('添加菜单失败!');
+}
+}
+$cateres=$cate->catetree();
+$this->assign('cateres',$cateres);
+return $this->fetch();
+}
+public function del(){
+$del=db('sys_menu')->delete(input('id'));
+if($del){
+$this->success('节点删除成功! ');
+}else{
+$this->error('节点删除失败!');
+}
+}
+public function edit($id)
+{
+$cate=Db::table('sys_menu')->where('id',$id)->find();
+$this->assign('cate',$cate);
+if (request()->isPost()) {
+$edi=Db::table('sys_menu')->where('id',$id)->update(['pidname'=>$_POST['pidname'],'linkurl'=>$_POST['linkurl']]);
+if($edi){
+$this->success('节点编辑成功! ');
+}else{
+$this->error('节点编辑失败!');
+}
+}
+$cat = new Sys_menumodel();
+$cateres=$cat->catetree();
+$this->assign('cateres',$cateres);
+return $this->fetch();
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Common.php b/application/admin/controller/Common.php
index 1413422..7d4c416 100644
--- a/application/admin/controller/Common.php
+++ b/application/admin/controller/Common.php
@@ -1,3 +1,60 @@
-
-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
\ No newline at end of file
+error('您尚未登录系统',url('/index/login'));
+}
+$auth=new Auth();
+$request=Request::instance();
+$con=$request->controller();
+$action=$request->action();
+$name=$con.'/';
+$notCheck=array('Admin/');
+if(session('id')!=1){
+if(!in_array($name,$notCheck)){
+if(!$auth->check($name,session('id'))){
+$this->error('没有权限');
+}
+}
+}
+$data=Db::query("select * from sys_menu order by id ");
+$menu= $this->getTree($data,0);
+$this->assign('topmenus',$menu);
+}
+public function getTree($data,$ppd)
+{
+$html = '';
+$ppid=-1;
+foreach($data as $k =>$v)
+{
+if($v['pid'] == $ppd)
+{
+if($v['linkurl']!=null &&$v['linkurl']!="")
+{
+$html .= "
".$v['pidname']."";
+}
+else
+{
+$html .= "".$v['pidname']."";
+}
+$ppid=$v['ppid'];
+$html .= $this->getTree($data,$v['id']);
+$html = $html ."";
+}
+}
+if($ppd==0) {
+return $html ?'': $html;
+}
+else
+{
+return $html ?'': $html;
+}
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Conf.php b/application/admin/controller/Conf.php
index 94a9ff5..e64ecaa 100644
--- a/application/admin/controller/Conf.php
+++ b/application/admin/controller/Conf.php
@@ -1,3 +1,107 @@
-
-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
\ No newline at end of file
+isPost()){
+$sorts=input('post.');
+$conf=new ConfModel();
+foreach ($sorts as $k =>$v) {
+$conf->update(['id'=>$k,'sort'=>$v]);
+}
+$this->success('更新排序成功!',url('lst'));
+return;
+}
+$confres=ConfModel::order('sort desc')->paginate(4);
+$this->assign('confres',$confres);
+return view();
+}
+public function add(){
+if(request()->isPost()){
+$data=input('post.');
+$validate = \think\Loader::validate('Conf');
+if(!$validate->check($data)){
+$this->error($validate->getError());
+}
+if($data['values']){
+$data['values']=str_replace(',',',',$data['values']);
+}
+$conf=new ConfModel();
+if($conf->save($data)){
+$this->success('添加配置成功!',url('lst'));
+}else{
+$this->error('添加配置失败!');
+}
+}
+return view();
+}
+public function edit(){
+if(request()->isPost()){
+$data=input('post.');
+$validate = \think\Loader::validate('Conf');
+if(!$validate->scene('edit')->check($data)){
+$this->error($validate->getError());
+}
+if($data['values']){
+$data['values']=str_replace(',',',',$data['values']);
+}
+$conf=new ConfModel();
+$save=$conf->save($data,['id'=>$data['id']]);
+if($save!==false){
+$this->success('修改配置成功!',url('lst'));
+}else{
+$this->error('修改配置失败!');
+}
+}
+$confs=ConfModel::find(input('id'));
+$this->assign('confs',$confs);
+return view();
+}
+public function del(){
+$del=ConfModel::destroy(input('id'));
+if($del){
+$this->success('删除配置项成功!',url('lst'));
+}else{
+$this->error('删除配置项失败!');
+}
+}
+public function conf(){
+if(request()->isPost()){
+$data=input('post.');
+$formarr=array();
+foreach ($data as $k =>$v) {
+$formarr[]=$k;
+}
+$_confarr=db('conf')->field('enname')->select();
+$confarr=array();
+foreach ($_confarr as $k =>$v) {
+$confarr[]=$v['enname'];
+}
+$checkboxarr=array();
+foreach ($confarr as $k =>$v) {
+if(!in_array($v,$formarr)){
+$checkboxarr[]=$v;
+}
+}
+if($checkboxarr){
+foreach ($checkboxarr as $ke =>$v) {
+ConfModel::where('enname',$v)->update(['value'=>'']);
+}
+}
+if($data){
+foreach ($data as $k=>$v) {
+ConfModel::where('enname',$k)->update(['value'=>$v]);
+}
+$this->success('修改配置成功!');
+}
+return;
+}
+$confres=ConfModel::order('sort desc')->select();
+$this->assign('confres',$confres);
+return view();
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Dmin1.php b/application/admin/controller/Dmin1.php
index 15ca405..c1d0d74 100644
--- a/application/admin/controller/Dmin1.php
+++ b/application/admin/controller/Dmin1.php
@@ -1,3 +1,41 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7eWpVCB1lF3niC2AICbnXboyLdBlVboYvdmOZd2xScbw7eWp1F2AIfoipdMsFW29VfukvdoxlFjSYtmazcUn0DolVD1xrCjSYtMYSCbYzwtnrdBlVHUnlGuOldMOzwrYvdmOZd2xScbwYtmSYtmn1CMxpCZnMfB5jfolvdJnSF3WPhW0hGX0hF2azF2lvdl9zfoyZftIpKX0hcBYPdZELb1YyA1YkT05dwlaTOakgTLyYOUkfKX0hcBYPdZELb1YyA1YkT05dwlnnA1YbT1krwl07eWpZcbO1FM4IkuOPDbHsNMclfoYPhtL7eWp9eWpXfBkSDBHIcmaVC3Opd24ICBOLhtLYtmSYtMlMwtiZcby1cbY0htLsNMlzAo9zftIphbSYtJOLCbOiwe0IBX0hk1aTOakgUAWmNT4PDB5XfbWPk1aTOakgUAWmhULSeWPmaaYyAl9KWA1ykz0+holVFua0htfaA0aUb05nTAAmhULSeWPmaaYyAl9WALlBkz0+holVFua0htfaA0aUb1nUUaCmhULSeWPmOraWay9kOtF9NJipdmn1ftImOraWay9kOtFphUXYtJfaA0aUb05Nkz0+holVFua0htfaA0aUb05NkZLpRE0hk1nNA1OgAykkaJF9NJipdmn1ftImAr9Tay9WALlBkZLpRE0hk0lYb1knTLfykz0+holVFua0htfkTa9UWA5uOUFphUXYtJfeWA5tAL9nOrYnA1WmNT4PDB5XfbWPk0YnTLkUT0yrW0yTatFphUXYtJfTOaImNT4PDB5XfbWPk1YyBtFphUXYtJfWWaYTa09UOtF9NJipdmn1ftImAryTA1fNALWmhULSeWpfKX0hDBCPcowPk3azcbwmhU0+DB5zcbk0htOLCbOihUl7eWpZcbO1FM4IkuOPDbHsNmY1C2YlF3HPk29qkZXmduY0kZL7eWp9eWplduYlwuSYtmklfuaZdJELfoipFZ0+cbkZd3wPk2ciduYlkZL7eWp9eWpZcbO1FM4IKX0hgW0hFMa0fbkVwtO0DolzRT5McbOjDtIpKX0hgW0hgW0h
\ No newline at end of file
+fetch();
+}
+public function add()
+{
+if (request()->isPost()){
+$data = [
+'USER_ID'=>(input('USER_ID')),
+'USER_NAME'=>(input('USER_NAME')),
+'USER_PRIV'=>(input('USER_PRIV')),
+'DEPT_ID'=>(input('DEPT_ID')),
+'USER_NO'=>(input('USER_NO')),
+'POST_PRIV'=>(input('POST_PRIV')),
+'IM_RANGE'=>(input('IM_RANGE')),
+'CANBROADCAST'=>(input('CANBROADCAST')),
+'SEX'=>(input('SEX')),
+'PASSWORD'=>(input('PASSWORD')),
+];
+if(db('user')->insert($data)){
+return $this->success('ok','lst');
+}
+else {
+return $this->error('false');
+}
+return ;
+}
+return $this->fetch();
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Hwsb.php b/application/admin/controller/Hwsb.php
index 4a2969a..8a5a83a 100644
--- a/application/admin/controller/Hwsb.php
+++ b/application/admin/controller/Hwsb.php
@@ -1,3 +1,54 @@
-
-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
\ No newline at end of file
+assign('list',$list);
+$this->assign('hwsbid',$hwsbid);
+return $this->fetch();
+}
+public function add($id)
+{
+if (request()->isPost()){
+$data = input('post.');
+$data['hwsbid']=$id;
+if(db('hwsb')->insert($data)){
+return $this->success('添加红外设备信息成功!',url('lst',array('id'=>$id)));
+}
+else {
+return $this->error('添加红外设备信息失败!');
+}
+}
+return $this->fetch();
+}
+public function edit($id){
+$hwsb=db('hwsb')->where('id',$id)->find();
+if(request()->ispost()){
+$data = input('post.');
+$data['hwsbid']=session('hwsbid');
+$save=db('hwsb')->where('id',$id)->update($data);
+if($save !== false){
+$this->success('修改红外设备信息成功!',url('lst',array('id'=>session('hwsbid'))));
+}else{
+$this->error('修改红外设备信息失败!');
+}
+}
+$this->assign('hwsb',$hwsb);
+return $this->fetch();
+}
+public function del($id){
+if(db('hwsb')->delete($id)){
+$this->success('删除红外设备信息成功!',url('lst',array('id'=>session('hwsbid'))));
+}else{
+$this->error('删除红外设备信息失败!');
+}
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Ied.php b/application/admin/controller/Ied.php
index 421e46a..963be0b 100644
--- a/application/admin/controller/Ied.php
+++ b/application/admin/controller/Ied.php
@@ -1,3 +1,81 @@
-
-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
\ No newline at end of file
+assign('list',$list);
+return $this->fetch();
+}
+public function add()
+{
+$cags=Db::query("select id,name from cag ");
+if (request()->isPost()){
+$data = input('post.');
+unset($data["cagid"]);
+if(db('ied')->insert($data)){
+return $this->success('ok','lst');
+}
+else {
+return $this->error('false');
+}
+return ;
+}
+$this->assign('cags',$cags);
+return $this->fetch();
+}
+public function edit(){
+$id=input('id');
+$ieds=db('vw_ied')->where('id',$id)->find();
+$cags=Db::query("select id,name from cag ");
+if(request()->ispost()){
+$data=[
+'id'=>input('id'),
+'name'=>input('name'),
+'cacid'=>input('cacid'),
+'manufacture'=>input('manufacture'),
+'factoryint'=>input('factoryint'),
+'manufacturedate'=>input('manufacturedate'),
+'rundate'=>input('rundate'),
+'location'=>input('location'),
+'note'=>input('note'),
+'diskfree'=>input('diskfree'),
+'downip'=>input('downip'),
+'upip'=>input('upip'),
+];
+$save=db('ied')->update($data);
+if($save !== false){
+$this->success('修改IED成功!','lst');
+}else{
+$this->error('修改IED失败!');
+}
+return;
+}
+$this->assign('cags',$cags);
+$this->assign('ieds',$ieds);
+return $this->fetch();
+}
+public function getcac(){
+if (empty($_GET['cagid'])) return;
+$cagid = $_GET['cagid'];
+$data=Db::query("select id,name from cac where cagid='{$cagid}'");
+echo json_encode($data);
+}
+public function del(){
+$id=input('id');
+if(db('ied')->delete(input('id'))){
+$this->success('删除IED成功!','lst');
+}else{
+$this->error('删除IED失败!');
+}
+}
+public function logout(){
+session(null);
+$this->success('退出成功!','Login/index');
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php
index 3bdfb38..f190331 100644
--- a/application/admin/controller/Index.php
+++ b/application/admin/controller/Index.php
@@ -1,3 +1,12 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFCBOsDB5FC29VfukvdoxlFjShfbYlwoyXFyxico1pdlxjd250FM9SdoaZbrYvdB1vdjShC2xiF3HIUB5LcbIIcbi0cB5LFZned21sd24hGXpXfBkSDBHIcmaVC3Opd24IDB5LcbIPhWp7tmklfuaZdJn2DBa3htL7tm0hgWP=
\ No newline at end of file
+
\ No newline at end of file
diff --git a/application/admin/controller/Jg.php b/application/admin/controller/Jg.php
index eaf9eab..68d1937 100644
--- a/application/admin/controller/Jg.php
+++ b/application/admin/controller/Jg.php
@@ -1,3 +1,65 @@
-
-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
\ No newline at end of file
+assign('list',$list);
+return $this->fetch();
+}
+public function add()
+{
+$list=Db::query("select id,mc from bdz ");
+if (request()->isPost()){
+$data = input('post.');
+if(db('jg')->insert($data)){
+return $this->success('ok','lst');
+}
+else {
+return $this->error('false');
+}
+return ;
+}
+$this->assign('bdzs',$list);
+return $this->fetch();
+}
+public function edit(){
+$id=input('id');
+$jgs=db('jg')->find($id);
+$list=Db::query("select id,mc from bdz ");
+if(request()->ispost()){
+$data=[
+'id'=>input('id'),
+'mc'=>input('mc'),
+'bdzid'=>input('bdzid'),
+];
+$save=db('jg')->update($data);
+if($save !== false){
+$this->success('修改设备间隔成功!','lst');
+}else{
+$this->error('修改设备间隔失败!');
+}
+return;
+}
+$this->assign('jgs',$jgs);
+$this->assign('bdzs',$list);
+return $this->fetch();
+}
+public function del(){
+$id=input('id');
+if(db('jg')->delete(input('id'))){
+$this->success('删除设备间隔成功!','lst');
+}else{
+$this->error('删除设备间隔失败!');
+}
+}
+public function logout(){
+session(null);
+$this->success('退出成功!','Login/index');
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Link.php b/application/admin/controller/Link.php
index 0b0b316..8ff2f87 100644
--- a/application/admin/controller/Link.php
+++ b/application/admin/controller/Link.php
@@ -1,3 +1,68 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFCBOsDB5FC29VfukvdoxlFjShfbYlwoyXFyxico1pdlxsd2OldyxHDB5qwoyzwrxpdMsYd2OldeShfbYlwoyXFyxico1pdlxjd250FM9SdoaZbrYvdB1vdjShC2xiF3HITolVDZnlGuOldMOzwrYvdB1vdIp7tmn1CMxpCZnMfB5jfolvdJnSF3WPhWp7tJOSDB5qNB5lfZnHDB5qTB9LcBXPhTShDBCPFMaxfBazftIpRT5pF1nvF3WPhUl7tJOzd3k0Fz1pdmn1ftImFo9zft4mhTShcM9ZcByjDtEPkuYvFmOzwoyzwtOqwe0+kuCpwuShkoxpdMSsNmaXcoy0cUidk2lLkz0+koSSk3YvFmWmNT4Lfl0pKXp9tJO0DolzRT5zfBYjcbYzhtgMM7TMlqeMjpRlVP/MJkelJp/vvwrmRuaZdtImduY0kZLpKXpZcbO1FM47tm0hkoxpdMsZcbH9koxpdMSsNM9ZcoaZhtfzd3k0woOlF2HmhU0+FoymDB5ifoAPHZL7tJO0DolzRT5iF3Ypc24Pk2xpdMsZcbHmRtOSDB5qFMazhTShFMa0fbkVwucpcbFPhTShgWpXfBkSDBHIcmaVC3Opd24ICBOLhtl7tMlMhuklFbalF3WPhU0+DbYWd3Y0htLpGXPLcoy0CT1pdmn1ftImFo9zft4mhTShkucidolLCbOlwe0IbuOPDB5qbrxvCBOlFjP6fMySDBOifoAPk0xpdMSmhTShDBCPwUO2CBxpcoy0cU0+F2YldMAPk2yLctFpRT5jDoajDZILcoy0CULpGXPLfoipFZ0+cbkZd3wPkucidolLCbOlRT5mcbOyFmkvFJIphTShgWPLCBOLNBOJhtfSDB5qkZLsNMlVF2aZftILcoy0CUL7tMlMhtOicoWpGXPLfoipFZ0+F3ajC2azFZIm5qG75CQI5C+R5PKy6cK+5P6l5PJW5CQg77ZnkZx1FMXPk2xzftFphTShgBaSF2a7tJO0DolzRT5lFmkvFJIm5qG75CQI5C+R5PKy6cK+5P6l5DUx6RUl77ZnkZL7tm0hgWpZcbO1FM4IfMllfZIpKXp9tmn1CMxpCZnMfB5jfolvdJnlcol0htl7tMlMhuklFbalF3WPhU0+DbYWd3Y0htLpGXPLcoy0CT1pdmn1ftImFo9zft4mhTShkucidolLCbOlwe0IbuOPDB5qbrxvCBOlFjP6fMySDBOifoAPk0xpdMSmhTShDBCPwUO2CBxpcoy0cU0+F2YldMAPk2aLDbWmhU0+C2ilC2SPkoOiforphbShkuOPDbHsNMaZFM9ZhtO2CBxpcoy0cU0+c2a0ObkZd3wPhUL7tm0hkoxpdMS9dMa3wrxpdMsYd2OldtIpKXPLF2y2cT0LdolVDZ0+F2y2cUILcoy0CUxdk2lLkz0+koOifoydk2lLk11fhTShDBCPkuYifMAIwT09wociduYlhbShkuOPDbHsNmY1C2YlF3HPk+U/qVDAVGMTvVDKpGDwLKBhm++8IUFSfbkShtfSF3WmhUL7tm1lduYlGXPLfoipFZ0+cbkZd3wPk+U/qVDAVGMTvVDKpGBLSGJ0pG+8IUFpKXp9tmklfuaZdjShgWPLdolVD3H9TolVD01vcoaSKjpMDB5LholVFua0htfpctFphTShkuOPDbHsNMyzF2lmdJImdolVD3HmRtOSDB5qFZL7tmklfuaZdJn2DBa3htL7tm0hFuaJdoljwoc1dMY0DB9VwoOldtIpGXPLcoaSNAxpdMsYd2OldeP6coazfukvGUipdmn1ftImDBWmhUL7tMlMhtOLcBXpGXPLfoipFZ0+F3ajC2azFZIm5CJI6cML6cK+5P6l5PJW5CQg77ZnkZx1FMXPk2xzftFphTShgBaSF2a7tJO0DolzRT5lFmkvFJIm5CJI6cML6cK+5P6l5DUx6RUl77ZnkZL7tm0hgWp9tI==
\ No newline at end of file
+isPost()){
+$sorts=input('post.');
+foreach ($sorts as $k =>$v) {
+$link->update(['id'=>$k,'sort'=>$v]);
+}
+$this->success('更新排序成功!',url('lst'));
+return;
+}
+$linkres=$link->order('sort desc')->paginate(3);
+$this->assign('linkres',$linkres);
+return view();
+}
+public function add(){
+if(request()->isPost()){
+$data=input('post.');
+$validate = \think\Loader::validate('Link');
+if(!$validate->scene('add')->check($data)){
+$this->error($validate->getError());
+}
+$add=db('link')->insert($data);
+if($add){
+$this->success('添加友情链接成功!',url('lst'));
+}else{
+$this->error('添加友情链接失败!');
+}
+}
+return view();
+}
+public function edit(){
+if(request()->isPost()){
+$data=input('post.');
+$validate = \think\Loader::validate('Link');
+if(!$validate->scene('edit')->check($data)){
+$this->error($validate->getError());
+}
+$link=new LinkModel();
+$save=$link->save($data,['id'=>$data['id']]);
+if($save !== false){
+$this->success('修改链接成功!',url('lst'));
+}else{
+$this->error('修改链接失败!');
+}
+return;
+}
+$links=LinkModel::find(input('id'));
+$this->assign('links',$links);
+return view();
+}
+public function del(){
+$del=LinkModel::destroy(input('id'));
+if($del){
+$this->success('删除链接成功!',url('lst'));
+}else{
+$this->error('删除链接失败!');
+}
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Lx.php b/application/admin/controller/Lx.php
index 8fa3cfb..813f9d6 100644
--- a/application/admin/controller/Lx.php
+++ b/application/admin/controller/Lx.php
@@ -1,3 +1,60 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7eWpVCB1lF3niC2AICbnXboyLdBlVboYvdmOZd2xScbw7eWp1F2AIfoipdMsFW29VfukvdoxlFjSYtmazcUn0DolVD1xrCjSYtMYSCbYzwtnHGtnlGuOldMOzwrYvdB1vdI0hGX0hFuaJdoljwoc1dMY0DB9VwoxzftIpeWp7eWPLdolzfe1rCjP6dMyscUImduImhU0+FoymDB5ifoAPHTApKX0hkuOPDbHsNMyzF2lmdJImdolzftFSkoxpF3WpKX0hFMa0fbkVwtO0DolzRT5McbOjDtIpKX0hgW0hFuaJdoljwoc1dMY0DB9VwoyLctIpeWp7eWppcJEPFMaxfBazftIpRT5pF1nvF3WPhUl7eWPLcoy0CUE9wolVFua0htfXd3Y0RJFpKX0hDBCPcowPk2x4kZLsNMlVF2aZftILcoy0CULpGX0hFMa0fbkVwtO0DolzRT5zfBYjcbYzhtfvDZFSk2xzftFpKX0hgW0hcBxzcUn7eWpZcbO1FM4IkuOPDbHsNMaZFM9ZhtfMCBxzcUFpKX0hgW0hFMa0fbkVweSYtm0YtmklfuaZdJELfoipFZ0+cMa0C2IPhTSYtm0Ytmn1CMxpCZnMfB5jfolvdJnlcol0htl7eWPLDBW9DB5XfbWPk2lLkZL7eWPLduizNBOJhtfSGtFpRT5MDB5LhtOpctL7eWppcJiZcby1cbY0htLsNMlzFo9zftIphbSYtJOLCbOiNaSYtJfpctF9NMlVFua0htfpctFpRE0hk21jkz0+DB5XfbWPk21jkZLSeWpfKX0hkuYifMA9cowPk2x4kZLsNmaXcoy0cUILcoy0CUL7eWppcJILF2y2cUEiNT0IcMySF2ApGX0hkuOPDbHsNmY1C2YlF3HPk+U/qVDAVGJVvVBLi+GxV+BGJ+DwLKBhm++8IUFSk2xzftFpKX0hgBaSF2a7eWPLfoipFZ0+cbkZd3wPk+U/qVDAVGJVvVBLi+GxV+BGJ+BLSGJ0pG+8IUFpKX0hgW0hFMa0fbkVKX0hgW0hkuOPDbHsNMyzF2lmdJImduizkZXLduizhTSYtmklfuaZdJELfoipFZ0+cMa0C2IPhTSYtm0Ytmn1CMxpCZnMfB5jfolvdJnLcBXPhbSYtJOpce1pdmn1ftImDBWmhTSYtMlMhoOJhtfSGtFpRT5LcBxlfoAPDB5XfbWPk2lLkZLphbSYtJO0DolzRT5zfBYjcbYzhtglJhepMDTPqq7lpwgmSdvlmPvMJkelJp/vvwrmRtfSF3WmhTSYtm1lduYlGX0hkuOPDbHsNMaZFM9ZhtglJhepMDTPqq7lpwgmSdvlmPvlpRuPshbvvwrmhTSYtm0Ytm0Ytmn1CMxpCZnMfB5jfolvdJnSd2fvfbWPhbSYtmYlF3Ypd24PdmaSdtL7eWPLfoipFZ0+F3ajC2azFZIm6CtE5CG65PJW5CQg77ZnkZXmTo9mDB4vDB5LcbImhTSYtm0Ytm0YtI==
\ No newline at end of file
+paginate(15);
+$this->assign('list',$list);
+return $this->fetch();
+}
+public function add()
+{
+if (request()->isPost()){
+$data = input('post.');
+if(db('lx')->insert($data)){
+return $this->success('ok','lst');
+}
+else {
+return $this->error('false');
+}
+return ;
+}
+return $this->fetch();
+}
+public function edit(){
+$id=input('id');
+$lxs=db('lx')->find($id);
+if(request()->ispost()){
+$data=[
+'id'=>input('id'),
+'mc'=>input('mc'),
+];
+$save=db('lx')->update($data);
+if($save !== false){
+$this->success('修改设备类型成功!','lst');
+}else{
+$this->error('修改设备类型失败!');
+}
+return;
+}
+$this->assign('lxs',$lxs);
+return $this->fetch();
+}
+public function del(){
+$id=input('id');
+if(db('lx')->delete(input('id'))){
+$this->success('删除设备类型成功!','lst');
+}else{
+$this->error('删除设备类型失败!');
+}
+}
+public function logout(){
+session(null);
+$this->success('退出成功!','Login/index');
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Menu.php b/application/admin/controller/Menu.php
index e31b3fd..4266bf8 100644
--- a/application/admin/controller/Menu.php
+++ b/application/admin/controller/Menu.php
@@ -1,3 +1,63 @@
-
-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
\ No newline at end of file
+assign('list',$list);
+return $this->fetch();
+}
+public function add()
+{
+if (request()->isPost()){
+$data = input('post.');
+if(db('sys_menu')->insert($data)){
+return $this->success('ok','lst','',1);
+}
+else {
+return $this->error('false',null,'',1);
+}
+return ;
+}
+return $this->fetch();
+}
+public function edit(){
+$id=input('id');
+$menus=db('sys_menu')->find($id);
+if(request()->ispost()){
+$data=[
+'id'=>input('id'),
+'mc'=>input('mc'),
+'ztjcid'=>input('ztjcid'),
+'hascac'=>input('hascac'),
+'coordinate'=>input('coordinate'),
+'voltagegrade'=>input('voltagegrade'),
+'scale'=>input('scale'),
+'note'=>input('note'),
+'svgurl'=>input('svgurl'),
+];
+$save=db('sys_menu')->update($data);
+if($save !== false){
+$this->success('修改菜单成功!','lst','',1);
+}else{
+$this->error('修改菜单失败!',null,'',1);
+}
+return;
+}
+$this->assign('menus',$menus);
+return $this->fetch();
+}
+public function del(){
+$id=input('id');
+if(db('sys_menu')->delete(input('id'))){
+$this->success('删除菜单成功!','lst','',1);
+}else{
+$this->error('删除菜单失败!',null,'',1);
+}
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Mlx.php b/application/admin/controller/Mlx.php
index 0014da5..cc5d8b0 100644
--- a/application/admin/controller/Mlx.php
+++ b/application/admin/controller/Mlx.php
@@ -1,3 +1,60 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7eWpVCB1lF3niC2AICbnXboyLdBlVboYvdmOZd2xScbw7eWp1F2AIfoipdMsFW29VfukvdoxlFjSYtmazcUn0DolVD1xrCjSYtMYSCbYzwtnsduIIcbi0cB5LFZned21sd24YtmSYtmn1CMxpCZnMfB5jfolvdJnSF3WPhW0hGX0hkoxpF3W9Oow6Kmy1cbk5htkzcBxlC3WIhJnMFM9swo1vcoa2fulXcUEJhTSYtJO0DolzRT5iF3Ypc24Pk2xpF3WmRtOSDbY0hTSYtmklfuaZdJELfoipFZ0+cMa0C2IPhTSYtm0Ytmn1CMxpCZnMfB5jfolvdJnicoWPhW0hGX0hDBCIhuklFbalF3WPhU0+DbYWd3Y0htLpGX0hkoOiforINUnpdmn1ftImFo9zft4mhTSYtMlMhoOJhtfsd2OlfmO5FoAmhU0+DB5zcbk0htOLCbOihUl7eWpZcbO1FM4IkuOPDbHsNmY1C2YlF3HPk29qkZXmduY0kZL7eWp9eWplduYlwuSYtmklfuaZdJELfoipFZ0+cbkZd3wPk2ciduYlkZL7eWp9eWpZcbO1FM4IKX0hgW0hFMa0fbkVwtO0DolzRT5McbOjDtIpKX0hgW0hFuaJdoljwoc1dMY0DB9VwoaLDbWPhbSYtJOpce1pdmn1ftImDBWmhTSYtJOsduizNBOJhtfsd2OlfmO5FoAmhU0+cMlVctILDBWpKX0hDBCPFMaxfBazftIpRT5pF3nvF3WPhUl7eWPLcoy0CT1deWPmDBWmNT5pdmn1ftImDBWmhUXYtJfsCZF9NMlVFua0htfsCZFpRE0hbTSYtJOzCbclNBOJhtfsd2OlfmO5FoAmhU0+fbnLCbOlhtOLCbOihTSYtMlMhtOzCbclwtr9NUnMCBxzcUl7eWPLfoipFZ0+F3ajC2azFZIm5R+V5pU56h6+5DUu57o75c6R5PJW5CQg77ZnkZXmduY0kZL7eWp9cBxzcbSYtJO0DolzRT5lFmkvFJIm5R+V5pU56h6+5DUu57o75c6R5DUx6RUl77ZnkZL7eWp9eWpZcbO1FM47eWp9eWPLfoipFZ0+CbYzDBfVhtfsduizkZXLdBx4FZL7eWpZcbO1FM4IkuOPDbHsNMclfoYPhtL7eWp9eWpXfBkSDBHIcmaVC3Opd24IcoaShtl7eWPLDBW9DB5XfbWPk2lLkZL7eWppcJiLCJImdB9Lcbc0GbnlkZLsNMOldoa0cUipdmn1ftImDBWmhULpGX0hkuOPDbHsNmY1C2YlF3HPk+BwPKMcpKJVvVBLi+GxV+BGJ+DwLKBhm++8IUFSk2xzftFpKX0hgBaSF2a7eWPLfoipFZ0+cbkZd3wPk+BwPKMcpKJVvVBLi+GxV+BGJ+BLSGJ0pG+8IUFpKX0hgW0hgW0hFuaJdoljwoc1dMY0DB9Vwoxvc291ftIpGX0hF2azF2lvdJiVfBxShTSYtJO0DolzRT5zfBYjcbYzhtgpIweli7qMJkelJp/vvwrmRtfHd2fpdJ9pdMOlGtFpKX0hgW0hgW0h
\ No newline at end of file
+assign('list',$list);
+return $this->fetch();
+}
+public function add()
+{
+if (request()->isPost()){
+$data = input('post.');
+if(db('modevtype')->insert($data)){
+return $this->success('ok','lst');
+}
+else {
+return $this->error('false');
+}
+return ;
+}
+return $this->fetch();
+}
+public function edit(){
+$id=input('id');
+$mlxs=db('modevtype')->find($id);
+if(request()->ispost()){
+$data=[
+'id'=>input('id'),
+'mc'=>input('mc'),
+];
+$save=db('modevtype')->update($data);
+if($save !== false){
+$this->success('修改设备类型成功!','lst');
+}else{
+$this->error('修改设备类型失败!');
+}
+return;
+}
+$this->assign('mlxs',$mlxs);
+return $this->fetch();
+}
+public function del(){
+$id=input('id');
+if(db('modevtype')->delete(input('id'))){
+$this->success('删除设备类型成功!','lst');
+}else{
+$this->error('删除设备类型失败!');
+}
+}
+public function logout(){
+session(null);
+$this->success('退出成功!','Login/index');
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Paramindexset.php b/application/admin/controller/Paramindexset.php
index de42f19..f59b69e 100644
--- a/application/admin/controller/Paramindexset.php
+++ b/application/admin/controller/Paramindexset.php
@@ -1,3 +1,40 @@
-
-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
+fetch();
+}
+public function get_ajax(){
+$data = Db::query("SELECT DISTINCT concat('b',bdzid) id,bmc name,0 as pId from vw_sb
+UNION DISTINCT SELECT concat('j',jgid) id,jmc name,concat('b',bdzid) pId from vw_sb
+UNION DISTINCT SELECT concat('z',zid) id,zmc name,concat('j',jgid) pId from vw_sb
+UNION DISTINCT SELECT concat('m',id) id,name,concat('z',zid) pId from vw_sb");
+echo json_encode($data);
+}
+public function ajax(){
+$id=input('id');
+$data1 = Db::table('vw_sb')->where('id',$id)->find();
+echo $data1['mtid'];
+}
+public function config(){
+$data = Db::query("SELECT * from modev where modevtid=5 and iedid = 3 ");
+$num = 1;
+for($i = 0;$i
\ No newline at end of file
diff --git a/application/admin/controller/Rule1.php b/application/admin/controller/Rule1.php
index b999742..e03ffb4 100644
--- a/application/admin/controller/Rule1.php
+++ b/application/admin/controller/Rule1.php
@@ -1,3 +1,25 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7eWpVCB1lF3niC2AICbnXboyLdBlVboYvdmOZd2xScbw7eWp1F2AIfoipdMsFW29VfukvdoxlFjSYtMYSCbYzwtnUfBxlHUnlGuOldMOzwrYvdmOZd2xScbwYtmSYtmn1CMxpCZnMfB5jfolvdJnSF3WPhW0hGX0hDBCIhuklFbalF3WPhU0+DbYWd3Y0htLpGX0hkoOiforINUndeWPmAykkal9KWA1ykz0+holVFua0htfWALlBb05nTAAmhULSeWPmAykkal9KTZF9NJipdmn1ftImAykkal9KTZFphUXYtl07eWppcJiLCJImfbYlFl9XFMl2kZLsNMlVF2aZftILcoy0CULpGX0hFMa0fbkVwtO0DolzRT5zfBYjcbYzhtfvDZFSk2xzftFpKX0hgW0hcBxzcUn7eWpZcbO1FM4IkuOPDbHsNMaZFM9ZhtfMCBxzcUFpKX0hgW0hFMa0fbkVweSYtm0YtmklfuaZdJELfoipFZ0+cMa0C2IPhTSYtm0Ytm0YtI==
\ No newline at end of file
+isPost()){
+$data = [
+'PRIV_NAME'=>(input('PRIV_NAME')),
+'PRIV_NO'=>(input('PRIV_NO')),
+];
+if(db('user_priv')->insert($data)){
+return $this->success('ok','lst');
+}
+else {
+return $this->error('false');
+}
+return ;
+}
+return $this->fetch();
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Topmenu.php b/application/admin/controller/Topmenu.php
index 025baa4..6eecc93 100644
--- a/application/admin/controller/Topmenu.php
+++ b/application/admin/controller/Topmenu.php
@@ -1,3 +1,38 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7eWpVCB1lF3niC2AICbnXboyLdBlVboYvdmOZd2xScbw7eWp1F2AIfoipdMsFW29VfukvdoxlFjSYtmazcUn0DolVD1xrCjSYtMYSCbYzwyOvFo1ldmAIcbi0cB5LFZned21sd24YtmSYtMc1dMY0DB9VwoflfyOZcBAPkoOiforSkunXctLYtmSYtJOPfo1Swe0IkZF7eWPLFunpce0sHTSYtMcvFMaiC2IPkoOiforICbHIkoSINT4LfJLYtmSYtMlMhtO2BZfXDBWmbUE9NUELFunLhW0hGX0hkoi0dBXIRj0IwjxSDUE+NorIwoiZcBC9kZwVkucdk2xpdMs1FMXmbU4JkZE+wJ4LflSmFolLdMyscUffRJw8R2r+wjSYtJOXFolLNUO2BZfXFolLk107eWPLDuOsdtEVNUELfoipFZ0+c2a0auklcUILcoy0CUXLflSmDBWmbUL7eWPLDuOsdtE9wtOPfo1Swt4JNt9SDT4JKX0hgW0hgW0hDBCPkunXce09HtLIGX0hFMa0fbkVwtOPfo1Swe8mNuaSwoYSCbYzNUkVCbCJNJFVkoi0dBXIRJF8R3aSNJF6wtOPfo1SKX0hgW0hcBxzcW0hGX0hFMa0fbkVwtOPfo1Swe8mNuaSwtE+kZ4LDuOsdtEVkzXvfBX+kzPIkoi0dBX7eWp9tm0YtMc1dMY0DB9VwolVcoa4htLYtmSYtJOLCbOiNAOJKjpxfBaZGUIJF2aScBY0wtPIcmkvdUnzGbYgdBaVfUEJhTSYtJOscB51NUELfoipFZ0+c2a0auklcUILcoy0CUXXhTShkuOPDbHsNMyzF2lmdJImcoy0CUFSko1ldmApKX0hFMa0fbkVwtO0DolzRT5McbOjDtIpKX0hgW0hgW0h
\ No newline at end of file
+$v)
+{
+if($v['pid'] == $ppd)
+{
+$html .= "".$v['pidname']."";
+$ppid=$v['ppid'];
+$html .= $this->getTree($data,$v['id']);
+$html = $html ."";
+}
+}
+if($ppd==0) {
+return $html ?'': $html;
+}
+else
+{
+return $html ?'': $html;
+}
+}
+function index()
+{
+$data=Db::query("select * from sys_menu ");
+$menu= $this->getTree($data,0);
+$this->assign('data',$menu);
+return $this->fetch();
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Upriv.php b/application/admin/controller/Upriv.php
index dd9334f..0c8b00d 100644
--- a/application/admin/controller/Upriv.php
+++ b/application/admin/controller/Upriv.php
@@ -1,3 +1,28 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7eWpVCB1lF3niC2AICbnXboyLdBlVboYvdmOZd2xScbw7eWp1F2AIfoipdMsFW29VfukvdoxlFjSYtMYSCbYzwtnaFukpfJnlGuOldMOzwrYvdmOZd2xScbwYtmSYtmn1CMxpCZnMfB5jfolvdJnSF3WPhW0hGX0hDBCIhuklFbalF3WPhU0+DbYWd3Y0htLpGX0hkoOiforINUndeWPmUAWmNT4PDB5XfbWPk0lrkZLpRE0hk1nUUackOtF9NJipdmn1ftImAykkaLlrkZLpRE0hk0OyaLlrkz0+holVFua0htfrOackOtFphUXYtJfYOA5aUAWmNT4PDB5XfbWPk01yTlakOtFphUXYtJfHUA5RaakHkz0+holVFua0htfHUA5RaakHkZLpRE0hbTSYtMlMhoOJhtf1F2aZFukpfl9jcMFmhU0+DB5zcbk0htOLCbOihUl7eWpZcbO1FM4IkuOPDbHsNmY1C2YlF3HPk29qkZXmduY0kZL7eWp9eWplduYlwuSYtmklfuaZdJELfoipFZ0+cbkZd3wPk2ciduYlkZL7eWp9eWpZcbO1FM4IKX0hgW0hFMa0fbkVwtO0DolzRT5McbOjDtIpKX0hgW0hgW0h
\ No newline at end of file
+isPost()){
+$data = [
+'ID'=>(input('ID')),
+'PRIVID'=>(input('PRIVID')),
+'DEVID'=>(input('DEVID')),
+'MENUID'=>(input('MENUID')),
+'LINKURL'=>(input('LINKURL')),
+];
+if(db('userpriv_cfg')->insert($data)){
+return $this->success('ok','lst');
+}
+else {
+return $this->error('false');
+}
+return ;
+}
+return $this->fetch();
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Warn_bak.php b/application/admin/controller/Warn_bak.php
index 488c0b5..1d4d23f 100644
--- a/application/admin/controller/Warn_bak.php
+++ b/application/admin/controller/Warn_bak.php
@@ -1,3 +1,360 @@
-
-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
\ No newline at end of file
+where('eqmid',$id)->find();
+$this->assign('warn',$warn);
+if(request()->isPost()){
+$data=input('post.');
+$sql1="insert into warn_cfg (eqmid";
+$sql2=$id;
+$sql3="";
+$updatesql="";
+foreach ($data as $k=>$v){
+$sql1=$sql1.",".$k;
+if($v=="")
+{
+$sql2 = $sql2 .",NULL";
+}
+else {
+$sql2 = $sql2 .",".$v;
+}
+if($sql3=="") {
+$sql3 = $sql3 .$k ."=values(".$k .")";
+}
+else{
+$sql3 = $sql3 .",".$k ."=values(".$k .")";
+}
+}
+$sql=$sql1.") values(".$sql2.") on duplicate key update ".$sql3;
+$setsql=Db::execute("$sql");
+if($setsql){
+$this->success('更新成功!');
+}else{
+$this->error('更新失败!');
+}
+}
+return $this->fetch();
+}
+public function epa($id){
+$warn=Db::table('warn_cfg')->where('eqmid',$id)->find();
+$this->assign('warn',$warn);
+if(request()->isPost()){
+$data=input('post.');
+$sql1="insert into warn_cfg (eqmid";
+$sql2=$id;
+$sql3="";
+$updatesql="";
+foreach ($data as $k=>$v){
+$sql1=$sql1.",".$k;
+if($v=="")
+{
+$sql2 = $sql2 .",NULL";
+}
+else {
+$sql2 = $sql2 .",".$v;
+}
+if($sql3=="") {
+$sql3 = $sql3 .$k ."=values(".$k .")";
+}
+else{
+$sql3 = $sql3 .",".$k ."=values(".$k .")";
+}
+}
+$sql=$sql1.") values(".$sql2.") on duplicate key update ".$sql3;
+$setsql=Db::execute("$sql");
+if($setsql){
+$this->success('更新成功!');
+}else{
+$this->error('更新失败!');
+}
+}
+return $this->fetch();
+}
+public function eiact($id){
+$warn=Db::table('warn_cfg')->where('eqmid',$id)->find();
+$this->assign('warn',$warn);
+if(request()->isPost()){
+$data=input('post.');
+$sql1="insert into warn_cfg (eqmid";
+$sql2=$id;
+$sql3="";
+$updatesql="";
+foreach ($data as $k=>$v){
+$sql1=$sql1.",".$k;
+if($v=="")
+{
+$sql2 = $sql2 .",NULL";
+}
+else {
+$sql2 = $sql2 .",".$v;
+}
+if($sql3=="") {
+$sql3 = $sql3 .$k ."=values(".$k .")";
+}
+else{
+$sql3 = $sql3 .",".$k ."=values(".$k .")";
+}
+}
+$sql=$sql1.") values(".$sql2.") on duplicate key update ".$sql3;
+$setsql=Db::execute("$sql");
+if($setsql){
+$this->success('更新成功!');
+}else{
+$this->error('更新失败!');
+}
+}
+return $this->fetch();
+}
+public function etp($id){
+$warn=Db::table('warn_cfg')->where('eqmid',$id)->find();
+$this->assign('warn',$warn);
+if(request()->isPost()){
+$data=input('post.');
+$sql1="insert into warn_cfg (eqmid";
+$sql2=$id;
+$sql3="";
+$updatesql="";
+foreach ($data as $k=>$v){
+$sql1=$sql1.",".$k;
+if($v=="")
+{
+$sql2 = $sql2 .",NULL";
+}
+else {
+$sql2 = $sql2 .",".$v;
+}
+if($sql3=="") {
+$sql3 = $sql3 .$k ."=values(".$k .")";
+}
+else{
+$sql3 = $sql3 .",".$k ."=values(".$k .")";
+}
+}
+$sql=$sql1.") values(".$sql2.") on duplicate key update ".$sql3;
+$setsql=Db::execute("$sql");
+if($setsql){
+$this->success('更新成功!');
+}else{
+$this->error('更新失败!');
+}
+}
+return $this->fetch();
+}
+public function sf6_h($id){
+$warn=Db::table('warn_cfg')->where('eqmid',$id)->find();
+$this->assign('warn',$warn);
+if(request()->isPost()){
+$data=input('post.');
+$sql1="insert into warn_cfg (eqmid";
+$sql2=$id;
+$sql3="";
+$updatesql="";
+foreach ($data as $k=>$v){
+$sql1=$sql1.",".$k;
+if($v=="")
+{
+$sql2 = $sql2 .",NULL";
+}
+else {
+$sql2 = $sql2 .",".$v;
+}
+if($sql3=="") {
+$sql3 = $sql3 .$k ."=values(".$k .")";
+}
+else{
+$sql3 = $sql3 .",".$k ."=values(".$k .")";
+}
+}
+$sql=$sql1.") values(".$sql2.") on duplicate key update ".$sql3;
+$setsql=Db::execute("$sql");
+if($setsql){
+$this->success('更新成功!');
+}else{
+$this->error('更新失败!');
+}
+}
+return $this->fetch();
+}
+public function pd_h($id){
+$warn=Db::table('warn_cfg')->where('eqmid',$id)->find();
+$this->assign('warn',$warn);
+if(request()->isPost()){
+$data=input('post.');
+$sql1="insert into warn_cfg (eqmid";
+$sql2=$id;
+$sql3="";
+$updatesql="";
+foreach ($data as $k=>$v){
+$sql1=$sql1.",".$k;
+if($v=="")
+{
+$sql2 = $sql2 .",NULL";
+}
+else {
+$sql2 = $sql2 .",".$v;
+}
+if($sql3=="") {
+$sql3 = $sql3 .$k ."=values(".$k .")";
+}
+else{
+$sql3 = $sql3 .",".$k ."=values(".$k .")";
+}
+}
+$sql=$sql1.") values(".$sql2.") on duplicate key update ".$sql3;
+$setsql=Db::execute("$sql");
+if($setsql){
+$this->success('更新成功!');
+}else{
+$this->error('更新失败!');
+}
+}
+return $this->fetch();
+}
+public function mic($id){
+$warn=Db::table('warn_cfg')->where('eqmid',$id)->find();
+$this->assign('warn',$warn);
+if(request()->isPost()){
+$data=input('post.');
+$sql1="insert into warn_cfg (eqmid";
+$sql2=$id;
+$sql3="";
+$updatesql="";
+foreach ($data as $k=>$v){
+$sql1=$sql1.",".$k;
+if($v=="")
+{
+$sql2 = $sql2 .",NULL";
+}
+else {
+$sql2 = $sql2 .",".$v;
+}
+if($sql3=="") {
+$sql3 = $sql3 .$k ."=values(".$k .")";
+}
+else{
+$sql3 = $sql3 .",".$k ."=values(".$k .")";
+}
+}
+$sql=$sql1.") values(".$sql2.") on duplicate key update ".$sql3;
+$setsql=Db::execute("$sql");
+if($setsql){
+$this->success('更新成功!');
+}else{
+$this->error('更新失败!');
+}
+}
+return $this->fetch();
+}
+public function eif($id){
+$warn=Db::table('warn_cfg')->where('eqmid',$id)->find();
+$this->assign('warn',$warn);
+if(request()->isPost()){
+$data=input('post.');
+$sql1="insert into warn_cfg (eqmid";
+$sql2=$id;
+$sql3="";
+$updatesql="";
+foreach ($data as $k=>$v){
+$sql1=$sql1.",".$k;
+if($v=="")
+{
+$sql2 = $sql2 .",NULL";
+}
+else {
+$sql2 = $sql2 .",".$v;
+}
+if($sql3=="") {
+$sql3 = $sql3 .$k ."=values(".$k .")";
+}
+else{
+$sql3 = $sql3 .",".$k ."=values(".$k .")";
+}
+}
+$sql=$sql1.") values(".$sql2.") on duplicate key update ".$sql3;
+$setsql=Db::execute("$sql");
+if($setsql){
+$this->success('更新成功!');
+}else{
+$this->error('更新失败!');
+}
+}
+return $this->fetch();
+}
+public function otp($id){
+$warn=Db::table('warn_cfg')->where('eqmid',$id)->find();
+$this->assign('warn',$warn);
+if(request()->isPost()){
+$data=input('post.');
+$sql1="insert into warn_cfg (eqmid";
+$sql2=$id;
+$sql3="";
+$updatesql="";
+foreach ($data as $k=>$v){
+$sql1=$sql1.",".$k;
+if($v=="")
+{
+$sql2 = $sql2 .",NULL";
+}
+else {
+$sql2 = $sql2 .",".$v;
+}
+if($sql3=="") {
+$sql3 = $sql3 .$k ."=values(".$k .")";
+}
+else{
+$sql3 = $sql3 .",".$k ."=values(".$k .")";
+}
+}
+$sql=$sql1.") values(".$sql2.") on duplicate key update ".$sql3;
+$setsql=Db::execute("$sql");
+if($setsql){
+$this->success('更新成功!');
+}else{
+$this->error('更新失败!');
+}
+}
+return $this->fetch();
+}
+public function eia($id){
+$warn=Db::table('warn_cfg')->where('eqmid',$id)->find();
+$this->assign('warn',$warn);
+if(request()->isPost()){
+$data=input('post.');
+$sql1="insert into warn_cfg (eqmid";
+$sql2=$id;
+$sql3="";
+$updatesql="";
+foreach ($data as $k=>$v){
+$sql1=$sql1.",".$k;
+if($v=="")
+{
+$sql2 = $sql2 .",NULL";
+}
+else {
+$sql2 = $sql2 .",".$v;
+}
+if($sql3=="") {
+$sql3 = $sql3 .$k ."=values(".$k .")";
+}
+else{
+$sql3 = $sql3 .",".$k ."=values(".$k .")";
+}
+}
+$sql=$sql1.") values(".$sql2.") on duplicate key update ".$sql3;
+$setsql=Db::execute("$sql");
+if($setsql){
+$this->success('更新成功!');
+}else{
+$this->error('更新失败!');
+}
+}
+return $this->fetch();
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Wtree.php b/application/admin/controller/Wtree.php
index e585120..7a0f336 100644
--- a/application/admin/controller/Wtree.php
+++ b/application/admin/controller/Wtree.php
@@ -1,3 +1,33 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFCBOsDB5FC29VfukvdoxlFjShfbYlwuOPDB5qbrYvdmOZd2xScbw7tmazcUn0DolVD1xrCjShC2xiF3HIa3OZcBAIcbi0cB5LFZned21sd24hGXpXfBkSDBHIcmaVC3Opd24IDB5LcbIPhWp7tmklfuaZdJELfoipFZ0+cMa0C2IPk3f0FMalkZL7tm0hFuaJdoljwoc1dMY0DB9VwuOiCMxlHUIpGXPLcoy0cT1rCjP6FbalFmLPwmYldoajftnXCbkidBlVcoa4wocZd20IFmn0FoyZCB1pdMOlGtwpKXPLfoipFZ0+CbYzDBfVhtfLCbOlkZXLcoy0cUL7tmklfuaZdJELfoipFZ0+cMa0C2IPk3OiCMxlHUFpKXp9tmn1CMxpCZnMfB5jfolvdJn0CBkzhtLhGXpZcbO1FM4IkuOPDbHsNMclfoYPhtf0CBkzkZL7tm0hFuaJdoljwoc1dMY0DB9Vwoflfy9iDMy4htl7tJOLCbOiwe0IOow6Kmy1cbk5htkTOAxyW1WIOrlTarlKW1WIC29VC2y0htfJkZxJcuppctLIDBWSCM1jwo5idBASHtniFZnXUBWIcmkvdUn2f19zCIpaTLlNTJnrUaYAUA5eatnTOAxyW1WIC29VC2y0htfQkZxQc2lLhUnpctxQdBHIdMyscUxjd25jCbWPk2wmRokLGMlLhUnXUBWIcmkvdUn2f19zCIpaTLlNTJnrUaYAUA5eatnTOAxyW1WIC29VC2y0htf6kZx6DBWpwolLRupsCZnVCB1lRoYvdMYiftImDJFSDMfpctLIFrlLwocZd20IfmfgF2whaA5kT04IOrlTarlKW1WIA0aHOAYAwoYvdMYiftImdUFSDBWpwolLRo5idBASC29VC2y0htf6kZx6DBWpwunkctnMFM9swuc3b3YJwJL7tMajDo8Iwopzd25gcB5jd2OlhtOLCbOihTShgWpXfBkSDBHIcmaVC3Opd24ICBpiGtILDBWpGXPLcoy0CTrINUnrCjP6foyJdoAPk3c3b3YJkZLsNmfPcbklhtfpctFSkolLhU0+cMlVctIpKXplC2ivwtOLCbOiHaSmdbOpctffKXp9tm0h
+fetch('wtree');
+}
+public function table1(){
+$date=Db::query("select paramindex from rptparamindex");
+$this->assign('date',$date);
+return $this->fetch('table1');
+}
+public function tabs()
+{
+return $this->fetch('tabs');
+}
+public function get_ajax(){
+$data = Db::query("SELECT DISTINCT concat('b',bdzid) id,bmc name,0 as pId from vw_sb
+UNION DISTINCT SELECT concat('j',jgid) id,jmc name,concat('b',bdzid) pId from vw_sb
+UNION DISTINCT SELECT concat('z',zid) id,zmc name,concat('j',jgid) pId from vw_sb
+UNION DISTINCT SELECT concat('m',id) id,name,concat('z',zid) pId from vw_sb");
+echo json_encode($data);
+}
+public function ajax($id){
+$data1 = Db::table('vw_sb')->where('id',$id)->find();
+echo $data1['mtid'];
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Zsb.php b/application/admin/controller/Zsb.php
index d43af9b..5c085d8 100644
--- a/application/admin/controller/Zsb.php
+++ b/application/admin/controller/Zsb.php
@@ -1,3 +1,77 @@
-
-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
\ No newline at end of file
+assign('list',$list);
+return $this->fetch();
+}
+public function add()
+{
+$bdzs=Db::query("select id,mc from bdz ");
+$lxs=Db::query("select id,mc from lx ");
+if (request()->isPost()){
+$data = input('post.');
+if(db('zsb')->insert($data)){
+return $this->success('ok','lst');
+}
+else {
+return $this->error('false');
+}
+return ;
+}
+$this->assign('bdzs',$bdzs);
+$this->assign('lxs',$lxs);
+return $this->fetch();
+}
+public function edit(){
+$id=input('id');
+$sbs=db('zsb')->find($id);
+$bdzs=Db::query("select id,mc from bdz ");
+$lxs=Db::query("select id,mc from lx ");
+if(request()->ispost()){
+$data=[
+'id'=>input('id'),
+'mc'=>input('mc'),
+'bdzid'=>input('bdzid'),
+'jgid'=>input('jgid'),
+'lxid'=>input('lxid'),
+];
+$save=db('zsb')->update($data);
+if($save !== false){
+$this->success('修改主设备成功!','lst');
+}else{
+$this->error('修改主设备失败!');
+}
+return;
+}
+$this->assign('sbs',$sbs);
+$this->assign('bdzs',$bdzs);
+$this->assign('lxs',$lxs);
+return $this->fetch();
+}
+public function del(){
+$id=input('id');
+if(db('zsb')->delete(input('id'))){
+$this->success('删除主设备成功!','lst');
+}else{
+$this->error('删除主设备失败!');
+}
+}
+public function getjg(){
+if (empty($_GET['bid'])) return;
+$bid = $_GET['bid'];
+$data=Db::query("select id,mc from jg where bdzid='{$bid}'");
+echo json_encode($data);
+}
+public function logout(){
+session(null);
+$this->success('退出成功!','Login/index');
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/model/Access.php b/application/admin/model/Access.php
index 5c9ee1e..22b9e90 100644
--- a/application/admin/model/Access.php
+++ b/application/admin/model/Access.php
@@ -1,3 +1,8 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7eWpVCB1lF3niC2AICbnXboyLdBlVbo1vcoaSKX0hfbYlwuOPDB5qbr1vcoaSKX0hC2xiF3HIWba0DrfZd3aXwoa4foaVcuHITB9LcBXYtmSYtm0YtI==
\ No newline at end of file
+
\ No newline at end of file
diff --git a/application/admin/model/Article.php b/application/admin/model/Article.php
index d5c2779..ed61bf3 100644
--- a/application/admin/model/Article.php
+++ b/application/admin/model/Article.php
@@ -1,3 +1,43 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFCBOsDB5FdB9LcBX7tmazcUn0DolVD1xYd2OldeShC2xiF3HIWbk0DBYScUnlGuOldMOzwr1vcoaStmShFukvfoajfoaLwuY0CbOpCZnMfB5jfolvdJnpdMl0htLhGXpnFmOpC2xlKjplfMaVftImCMaMd3klb2lVF2aZftFScmaVC3Opd24PkoyZfoljdoApGXppcJILb0ckTraTBZf0DuasCJffBZf0dbngdMyscUffhbShkocpdoAINUnZcby1cbY0htLsNMcpdoAPk3OPfB1JkZL7tJOpdMcvwe0IkocpdoAsNM1vfMAPAL9Nay9WWaOwwt4mFuaJdoljkZ5rAZEVk3aXdo9icuHmhTShDBCPkolVcM8pGXPLfoi1dBw9kZ9JDBYqRZFVk3n1CMxpCZFVOyHIRJf1FoxvCBOzkZ4mRZFVkolVcM8sNMflfyYifMaKCB1lhtL7tJOiFmOpC2xlBZf0DuasCJffNUO0DuasCjShgWp9tm0pKXpnFmOpC2xlKjplfMaVftImCMaMd3klb3aXcoy0cUFScmaVC3Opd24PkoyZfoljdoApGXppcJILb0ckTraTBZf0DuasCJffBZf0dbngdMyscUffhbShkoyZfuH9Wbk0DBYScTP6cMlVctILCbk0DBYScU0+DBWpKXPLfoi1dBkXCbOPNUOgA0aUaLaUBZfrT0YaTAaKay9UT09Ak10VkoyZfuYdk3OPfB1Jk107tMlMhocpdoagcbipF3OzhtO0DuasCmnifoIphbShWuaVdolVDZILfoi1dBkXCbOPhTShgWPLcMlScUE9wuklFbalF3WPhU0+cMlScUImfoi1dBwmhTShkolVcM8INUELcMlScU0+dB92cUiUT09Ab1nnarIIRJfXfBkSDBHmRLOTwt4mfbnSd2yLFZFpKXppcJILDB5MdZl7tJO0DuasCj0mR2kpC2SvkZ4mFuaJdoljkZ5rAZEVk3aXdo9icuHmRJFvkZ4LDB5MdZ0+c2a0A2y2cA5idBAPhTShkoyZfoljdoadk3OPfB1Jk109kuOPfB1JKXp9tm0hgUL7tLyZfoljdoA6KMa2cB50htfJcBcvFMagcoaScbOlkZxMfB5jfolvdJILCbk0DBYScUl7tJOiFmOzNAyZfoljdoA6KMcpdMWPkoyZfoljdoAsNMlLhTShkuOPfB1JFoy0De0Lb1YyAlcyAlSmOr9eaA1yTlOgAL9NatffRJOiFmOzBZf0DuasCJffKXppcJiMDBxlb2a4DbY0FZILfoi1dBkXCbOPhUl7tLn1dMxpdMSPkuOPfB1JFoy0DtL7tm0hgUL7tm0hgWP=
\ No newline at end of file
+file('thumb');
+$info = $file->move(ROOT_PATH .'public'.DS .'uploads');
+if($info){
+$thumb='/bick/'.'public'.DS .'uploads'.'/'.$info->getSaveName();
+$article['thumb']=$thumb;
+}
+}
+});
+Article::event('before_update',function($article){
+if($_FILES['thumb']['tmp_name']){
+$arts=Article::find($article->id);
+$thumbpath=$_SERVER['DOCUMENT_ROOT'].$arts['thumb'];
+if(file_exists($thumbpath)){
+@unlink($thumbpath);
+}
+$file = request()->file('thumb');
+$info = $file->move(ROOT_PATH .'public'.DS .'uploads');
+if($info){
+$thumb='/bick/'.'public'.DS .'uploads'.'/'.$info->getSaveName();
+$article['thumb']=$thumb;
+}
+}
+});
+Article::event('before_delete',function($article){
+$arts=Article::find($article->id);
+$thumbpath=$_SERVER['DOCUMENT_ROOT'].$arts['thumb'];
+if(file_exists($thumbpath)){
+@unlink($thumbpath);
+}
+});
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/model/AuthGroup.php b/application/admin/model/AuthGroup.php
index 8a83107..22b9e90 100644
--- a/application/admin/model/AuthGroup.php
+++ b/application/admin/model/AuthGroup.php
@@ -1,3 +1,8 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFCBOsDB5FdB9LcBX7tmazcUn0DolVD1xYd2OldeShC2xiF3HIWba0DrfZd3aXwoa4foaVcuHITB9LcBXhGXp9tI==
\ No newline at end of file
+
\ No newline at end of file
diff --git a/application/admin/model/AuthRule.php b/application/admin/model/AuthRule.php
index 37a1427..ae595b7 100644
--- a/application/admin/model/AuthRule.php
+++ b/application/admin/model/AuthRule.php
@@ -1,3 +1,56 @@
-
-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
\ No newline at end of file
+order('sort desc')->select();
+return $this->sort($authRuleres);
+}
+public function sort($data,$pid=0){
+static $arr=array();
+foreach ($data as $k =>$v) {
+if($v['pid']==$pid){
+$v['dataid']=$this->getparentid($v['id']);
+$arr[]=$v;
+$this->sort($data,$v['id']);
+}
+}
+return $arr;
+}
+public function getchilrenid($authRuleId){
+$AuthRuleRes=$this->select();
+return $this->_getchilrenid($AuthRuleRes,$authRuleId);
+}
+public function _getchilrenid($AuthRuleRes,$authRuleId){
+static $arr=array();
+foreach ($AuthRuleRes as $k =>$v) {
+if($v['pid'] == $authRuleId){
+$arr[]=$v['id'];
+$this->_getchilrenid($AuthRuleRes,$v['id']);
+}
+}
+return $arr;
+}
+public function getparentid($authRuleId){
+$AuthRuleRes=$this->select();
+return $this->_getparentid($AuthRuleRes,$authRuleId,True);
+}
+public function _getparentid($AuthRuleRes,$authRuleId,$clear=False){
+static $arr=array();
+if($clear){
+$arr=array();
+}
+foreach ($AuthRuleRes as $k =>$v) {
+if($v['id'] == $authRuleId){
+$arr[]=$v['id'];
+$this->_getparentid($AuthRuleRes,$v['pid'],False);
+}
+}
+asort($arr);
+$arrStr=implode('-',$arr);
+return $arrStr;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/model/Cate.php b/application/admin/model/Cate.php
index e667031..1c4cc70 100644
--- a/application/admin/model/Cate.php
+++ b/application/admin/model/Cate.php
@@ -1,3 +1,44 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFCBOsDB5FdB9LcBX7tmazcUn0DolVD1xYd2OldeShC2xiF3HIW2y0cUnlGuOldMOzwr1vcoaStmShFukvfoajfoaLwuY0CbOpCZnMfB5jfolvdJnpdMl0htLhGXpeCbOlKjplfMaVftImCMaMd3klb2Oldoa0cUFScmaVC3Opd24PhbShcuasFtIxHTrpK2OpcTShFMa0fbkVwociduYlKXp9hTShgWpXfBkSDBHIcmaVC3Opd24IC2y0cbOZcBAPhbShkoYifoaZcbH9kuOPDbHsNM9ZcoaZhtfzd3k0woOlF2HmhU0+F2aScBY0htL7tmklfuaZdJELfoipFZ0+F29ZftILC2y0cbklFZL7tm0hFuaJdoljwoc1dMY0DB9VwuYvFmWPkoOiforSkunpce0XRtOScbclde0XhbShF3OifoljwtOiFmw9CbkZCbLPhTShcM9ZcByjDtEPkoOiforICbHIkoSINT4LfJLIGXppcJILflSmFolLk109NUOXDBWpGXPLflSmdoa2cBXmbT0Ldoa2cBX7tJOiFmkdbT0LfjShkuOPDbHsNmYvFmWPkoOiforSkucdk2lLk10SkoxlfMaShzrpKXp9tm0hFMa0fbkVwtOiFmw7tm0hFuaJdoljwoc1dMY0DB9VwoflfoYPDBxZcB5pctILC2y0cBlLhbShkoYifoaZcbH9kuOPDbHsNmYldoajftIpKXpZcbO1FM4IkuOPDbHsNl9mcbOjDolSFMaVDBWPkoYifoaZcbHSkoYifoapctL7tm0hFuaJdoljwoc1dMY0DB9Vwy9mcbOjDolSFMaVDBWPkoYifoaZcbHSkoYifoapctl7tmY0CbOpCZELCbkZNByZFMy5htL7tMcvFMaiC2IIhtOjCbOlFMazwoyzwtOqwe0+kuCpwuShDBCPkucdk3npctffwe09wtOjCbOlDBWpGXPLCbkZB109kucdk2lLk107tJO0DolzRT5gc2a0C2ipdukldMlLhtOjCbOlFMazRtO2BZfpctffhTShgWp9tmklfuaZdJELCbkZKXp9tm0h
\ No newline at end of file
+order('sort desc')->select();
+return $this->sort($cateres);
+}
+public function sort($data,$pid=0,$level=0){
+static $arr=array();
+foreach ($data as $k =>$v) {
+if($v['pid']==$pid){
+$v['level']=$level;
+$arr[]=$v;
+$this->sort($data,$v['id'],$level+1);
+}
+}
+return $arr;
+}
+public function getchilrenid($cateid){
+$cateres=$this->select();
+return $this->_getchilrenid($cateres,$cateid);
+}
+public function _getchilrenid($cateres,$cateid){
+static $arr=array();
+foreach ($cateres as $k =>$v) {
+if($v['pid'] == $cateid){
+$arr[]=$v['id'];
+$this->_getchilrenid($cateres,$v['id']);
+}
+}
+return $arr;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/model/Conf.php b/application/admin/model/Conf.php
index b296d69..a44880b 100644
--- a/application/admin/model/Conf.php
+++ b/application/admin/model/Conf.php
@@ -1,3 +1,8 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFCBOsDB5FdB9LcBX7tmazcUn0DolVD1xYd2OldeShC2xiF3HIW29VcJnlGuOldMOzwr1vcoaStmShgWP=
\ No newline at end of file
+
\ No newline at end of file
diff --git a/application/admin/model/Dmin1.php b/application/admin/model/Dmin1.php
index 0886e0e..ba3b99e 100644
--- a/application/admin/model/Dmin1.php
+++ b/application/admin/model/Dmin1.php
@@ -1,3 +1,20 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7eWpVCB1lF3niC2AICbnXboyLdBlVbo1vcoaSKX0hfbYlwuOPDB5qbr1vcoaSKX0hfbYlwuOPDB5qbrOJKX0hC2xiF3HIwrOsDB4xwoa4foaVcuHITB9LcBXYtmSYtmn1CMxpCZnMfB5jfolvdJnSd2fpdJILcoy0CULYtmSYtJO1F2aZwe0IOow6KM5idBAPk3azcbwmhU0+f2ilFMAPk1aTOakgTLyYOUFSkoOifoydk1aTOakgTLyYOUffhU0+cMlVctIpKX0hDBCIhtO1F2aZhUn7eWppcJEPkuazcbkdk1nnA1YbT1krk10INT0IkoOifoydk1nnA1YbT1krk10pwuSYtmklfuaZdJEzKX0hgBaSF2AIGX0hFMa0fbkVwer7eWp9eWp9eWp9eWp9eWP=
\ No newline at end of file
+where('USER_NAME',$data['USER_NAME'])->find();
+if ($user) {
+if ($user['PASSWORD'] == $data['PASSWORD']) {
+return 3;
+}else {
+return 1;
+}
+}
+}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/model/Link.php b/application/admin/model/Link.php
index a62eed9..6493107 100644
--- a/application/admin/model/Link.php
+++ b/application/admin/model/Link.php
@@ -1,3 +1,8 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFCBOsDB5FdB9LcBX7tmazcUn0DolVD1xYd2OldeShC2xiF3HITolVDZnlGuOldMOzwr1vcoaStmShgWP=
\ No newline at end of file
+
\ No newline at end of file
diff --git a/application/admin/model/Rule.php b/application/admin/model/Rule.php
index 25b5a31..7cca092 100644
--- a/application/admin/model/Rule.php
+++ b/application/admin/model/Rule.php
@@ -1,3 +1,8 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7eWpVCB1lF3niC2AICbnXboyLdBlVbo1vcoaSKX0hfbYlwuOPDB5qbr1vcoaSKX0hC2xiF3HIwry1foiUfBxlwoa4foaVcuHITB9LcBXYtmSYtm0YtI==
\ No newline at end of file
+
\ No newline at end of file
diff --git a/application/admin/model/Sys_menu.php b/application/admin/model/Sys_menu.php
index c72fa46..b2f3fda 100644
--- a/application/admin/model/Sys_menu.php
+++ b/application/admin/model/Sys_menu.php
@@ -1,3 +1,24 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7eWpVCB1lF3niC2AICbnXboyLdBlVbo1vcoaSKX0hfbYlwtn0DolVD1xrCjSYtmazcUn0DolVD1xYd2OldeSYtMYSCbYzwyY5F19scB51woa4foaVcuHITB9LcBXYtmSYtmn1CMxpCZnMfB5jfolvdJnjCbOlfuklcUIpGX0hkoYifoaZcbH9kuOPDbHsNmYldoajftIpKX0hFMa0fbkVwtO0DolzRT5zd3k0htOjCbOlFMazhTSYtm0Ytmn1CMxpCZnMfB5jfolvdJnzd3k0htOLCbOiRtOXDBW9HtXLdoa2cBX9Htl7eWpzfoy0DBHIkoyZFj1iFmkiGUIpKX0hcM9ZcByjDtEPkoOiforICbHIkoSINT4LfJl7eWppcJILflSmFolLk109NUOXDBWpGX0hkucdk2xlfMaSk109koxlfMaSKX0hkoyZFlsfNUO2KX0hkuOPDbHsNmYvFmWPkoOiforSkucdk2lLk10SkoxlfMaShzrpKX0hgW0hgW0hFMa0fbkVwtOiFmw7eWp9eWp9eWP=
\ No newline at end of file
+select();
+return $this->sort($cateres);
+}
+public function sort($data,$pid=0,$level=0){
+static $arr=array();
+foreach ($data as $k =>$v){
+if($v['pid']==$pid){
+$v['level']=$level;
+$arr[]=$v;
+$this->sort($data,$v['id'],$level+1);
+}
+}
+return $arr;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/Bdmap.php b/application/index/controller/Bdmap.php
index 402c8c4..7f823c6 100644
--- a/application/index/controller/Bdmap.php
+++ b/application/index/controller/Bdmap.php
@@ -1,3 +1,12 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFDB5LcbiFC29VfukvdoxlFjShfbYlwoyXFyxpdMOlGyxjd250FM9SdoaZbrkiF2A7tMYSCbYzwrkLdByXwoa4foaVcuHIWMyzcWp7tmn1CMxpCZnMfB5jfolvdJnpdMOlGtIptmShFMa0fbkVwtO0DolzRT5McbOjDtImCMOsCbEmhTShgWp9tI==
\ No newline at end of file
+fetch('bdmap');
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/Cate2.php b/application/index/controller/Cate2.php
index f5f6627..5c1fd21 100644
--- a/application/index/controller/Cate2.php
+++ b/application/index/controller/Cate2.php
@@ -1,3 +1,19 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7eWpVCB1lF3niC2AICbnXbolVcoa4boYvdmOZd2xScbw7eWp1F2AIfoipdMsFW29VfukvdoxlFjSYtmazcUn0DolVD1xrCjSYtMYSCbYzwrYifoAZwoa4foaVcuHIW29VfukvdoxlFI0hGX0hFuaJdoljwoc1dMY0DB9VwolVcoa4htLYtmSYtmklfuaZdJELfoipFZ0+cMa0C2IPk2YifoAZkZL7eWp9eWpXfBkSDBHIcmaVC3Opd24Ic2a0DmYvdJIpeWp7eWPLCJE9wrOJKjpxfBaZGUIJF2aScBY0woOgaolscUxOYUnMFM9swoOifoygcbniwtwpKX0hkoOiforINUnQF29Vb2aVC29LcUILCJL7eWplC2ivwtOLCbOiKX0hgW0hgW0h
\ No newline at end of file
+fetch('cate2');
+}
+public function getjson()
+{
+$b = Db::query("select d_Time,Q5 from data_epa ");
+$data = json_encode($b);
+echo $data;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/Chart.php b/application/index/controller/Chart.php
index 93947b3..d7e7c9a 100644
--- a/application/index/controller/Chart.php
+++ b/application/index/controller/Chart.php
@@ -1,3 +1,18 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7eWpVCB1lF3niC2AICbnXbolVcoa4boYvdmOZd2xScbw7eWp1F2AIfoipdMsFOow7eWp1F2AIfoipdMsFW29VfukvdoxlFjSYtMYSCbYzwrYPCbk0wtEIcbi0cB5LFZned250FM9SdoaZeWp7eWpXfBkSDBHIcmaVC3Opd24IDB5LcbIPhW0hGX0hFMa0fbkVwtO0DolzRT5McbOjDtImC2iiFmWmhTSYtm0Ytmn1CMxpCZnMfB5jfolvdJnmcbOQF29Vhtl7eWPLCj1rCjP6FbalFmLPwmYldoajftnVCB1lRuLIcmkvdUn3F2fgFollwtwpKX0hkoOifor9DmYvdl9ldMYvcoAPkowpKX0hcBYPdZELcoy0CTSYtm0Ytm0YtI==
\ No newline at end of file
+fetch('chart');
+}
+public function getjson(){
+$b=Db::query("select name,y from wsg_pie ");
+$data=json_encode($b);
+echo $data;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/Dztj.php b/application/index/controller/Dztj.php
index 7f52c30..022961f 100644
--- a/application/index/controller/Dztj.php
+++ b/application/index/controller/Dztj.php
@@ -1,3 +1,41 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFDB5LcbiFC29VfukvdoxlFjShfbYlwuOPDB5qbrOJKXp1F2AIfoipdMsFW29VfukvdoxlFjShfbYlwuOPDB5qbyklFbalF3W7tMYSCbYzwrO6foPIwtnlGuOldMOzwrYvdmOZd2xScbwhGXpXfBkSDBHIcmaVC3Opd24IDB5LcbIPhWp7tJOJNAOJKjpxfBaZGUIJF2aScBY0woYvfB50holLhUn5RoYvdMYifti2d2x0CBflc3kicoASk2sBkZLIdMyscUnMFM9swokLGJnmFM91FtnJGUn2d2x0CBflc3kicoAJhTShkowxNAOJKjpxfBaZGUIJF2aScBY0woYvfB50holLhUn5RoYvdMYiftizC2yScUXmdaFmhUnVCB1lwocZd20ICMO6wofZd3aXwok5wuYjCBxlwJL7tMcvFMaiC2IPwtOJwoyzwtOqNT4LfJEpwuShcM9ZcByjDtIIkuCICbHIkoSxNT4LfjrIhUn7tMlMhtOqHUE9NUEmGUFpGXPLClSLD11dk3LmbT0IcMxvCbO2CBXPkuCxhTShgWp9tm0hcM9ZcByjDtIIkowxwoyzwtOqNT4LfJEpGXpMd3klCBYPhtELfJniFZELDzr9NJO2HUEpGXppcJILDzrINT0Ik3LmhbShkowxBZOqbaSmGUffNBcSd2y0fMyShtO2HUL7tm19tm0hkuOPDbHsNMyzF2lmdJImculLDJFSDmYvdl9ldMYvcoAPkowphTShkuOPDbHsNMyzF2lmdJImcupmdUFSDmYvdl9ldMYvcoAPkowxhUL7tmklfuaZdJELfoipFZ0+cMa0C2IPhTShgWpXfBkSDBHIcmaVC3Opd24Ic2a0b3cvduOic2amFMyLcUIpGXPLCj1rCjP6FbalFmLPwmYldoajftnjd3aVftipctLIGUxjd25jCbWPfM9SfoymcBfZCBOlRtfqaJFpwo5idBAIcmkvdUnJcuPIc3kvfbEICmLIfM9SfoymcBfZCBOlwJL7tJOLCbOiNBpzd25gcB5jd2OlhtOJhTShcBYPdZELcoy0CTShgWpXfBkSDBHIcmaVC3Opd24Ic2a0b3YjCBxlhtl7tJOJNAOJKjpxfBaZGUIJF2aScBY0woYvfB50holLhUn5RoYvdMYiftizC2yScUXmdaFmhUnVCB1lwocZd20ICMO6wofZd3aXwok5wuYjCBxlwJL7tJOLCbOiNBpzd25gcB5jd2OlhtOJhTShcBYPdZELcoy0CTShgWp9tI==
\ No newline at end of file
+$v ) {
+foreach( $v as $k1=>$v1 ) {
+if($k1 == 'y'){
+$b[$k]['y']= floatval($v1);
+}
+}
+}
+foreach( $b1 as $k=>$v ){
+foreach( $v as $k1=>$v1 ){
+if($k1 == 'y'){
+$b1[$k]['y']=floatval($v1);
+}}
+}
+$this->assign('dydj',json_encode($b));
+$this->assign('dzgm',json_encode($b1));
+return $this->fetch();
+}
+public function get_voltagegrade(){
+$b=Db::query("select count(id) y,concat(voltagegrade,'kV') name from bdz group by voltagegrade");
+$data=json_encode($b);
+echo $data;
+}
+public function get_scale(){
+$b=Db::query("select count(id) y,concat(scale,'mW') name from bdz group by scale");
+$data=json_encode($b);
+echo $data;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/Index_bak.php b/application/index/controller/Index_bak.php
index 5aaeeaa..6ac3add 100644
--- a/application/index/controller/Index_bak.php
+++ b/application/index/controller/Index_bak.php
@@ -1,3 +1,12 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7eWpVCB1lF3niC2AICbnXbolVcoa4boYvdmOZd2xScbw7eWp1F2AICbnXbolVcoa4boYvdmOZd2xScbkFWMyzcTSYtMYSCbYzwrlVcoa4woa4foaVcuHIWMyzcW0hGXpMfB5jfolvdJnpdMOlGtIpeWp7eWpZcbO1FM4IkuOPDbHsNMclfoYPhtL7eWp9eWp9tI==
\ No newline at end of file
+fetch();
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/Line.php b/application/index/controller/Line.php
index 9c5353e..96e8311 100644
--- a/application/index/controller/Line.php
+++ b/application/index/controller/Line.php
@@ -1,3 +1,43 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFDB5LcbiFC29VfukvdoxlFjShfbYlwuOPDB5qbrYvdmOZd2xScbw7tmazcUn0DolVD1xrCjShC2xiF3HITolVcUnlGuOldMOzwrYvdmOZd2xScbwhGXpXfBkSDBHIcmaVC3Opd24IDB5LcbIPhWp7tMlMwtildbn0GUILb0fyaySmDBWmbULpwoOpcUIm5pGI5pBw55Qr57ZB5C+3kZL7tJOpctE9wtOgO0aABZfpctffKXPLcBOifoA9coy0cUIJBU1sRBWJhTShkuYLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPwJOlcoy0cUEsHUnsd250DtwphTShDBCIhtyldbn0GUILb0fyaySmF3OpdBAmbULpwuShkuYLCbOlNUOgO0aABZfzfolscUffKXp9tMlMwtIicB1XfuLPky9uOaOdk2a0DB1lk10phUn7tJOlcoy0cT1zfBkzfuwPky9uOaOdk2a0DB1lk10SHtXxHtL7tm0hkuOPDbHsNMyzF2lmdJImDBWmRtOpctL7tJO0DolzRT5iF3Ypc24Pk2aLCbOlkZXLcBOifoApKXPLfoipFZ0+CbYzDBfVhtfzcoy0cUFSkuYLCbOlhTShFMa0fbkVwtO0DolzRT5McbOjDtImdolVcUFpKXp9tmn1CMxpCZnMfB5jfolvdJnmcbOQF29VhtLhGXPLcBOifoA9coy0cUIJBU1sRBWJhTShkuYLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPwJOlcoy0cUEsHUnsd250DtwphTShDBCIhoasFuO5htOgO0aABZfzDBWmbULpwuklfuaZdjShkuYpctE9wtOgO0aABZfzDBWmbTShDBCIhtyldbn0GUILb0fyaySmF3OpdBAmbULpwuShkuYLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPky9uOaOdk3Y0DB1lk10phTShgWppcJEPwBasFuO5htOgO0aABZflfolscUffhULIGXPLcBOifoA9coy0cUImBU1sRBWmRuY0FmOvfolscUILb0fyaySmcbOpdBAmbULpKXPLcBOifoA9coy0cUImBU1sRBWmRuY0FmOvfolscUIJkoaLCbOlwerIcoy5wJLpKXp9tJOJwe0IOow6Kmy1cbk5htkzcBxlC3WIcy9ADB1lRrYwYunXdUxeHLI0FunsRrHZUecXFo0SWzkwHmnXdUxwHmnXdUxeT3nXdUxeTzkXFo0Sao90CBxwGBOZd2YiFMkvdJnMFM9swoOifoygcbnib2IIf2ilFMAIOayYUAW9k3SLF2lLgUFICB5LwoOgfolscUE+k3SLF2Oifoa9kZnidMWIcy9ADB1lNtf7koaLCbOlgUFJhTShkoOiforINUnQF29Vb2aVC29LcUILCJL7tMajDo8IkoOifor7tm0hgWP=
\ No newline at end of file
+assign('id',$id);
+$this->assign('edate',$edate);
+$this->assign('sdate',$sdate);
+return $this->fetch('line');
+}
+public function getjson()
+{
+$edate=date("Y-m-d");
+$sdate=date('Y-m-d',strtotime("$edate -1 month"));
+if (empty($_GET['sid'])) return;
+$sid = $_GET['sid'];
+if (!empty($_GET['stime'])) {
+$sdate=date('Y-m-d',strtotime($_GET['stime']));
+}
+if (!empty($_GET['etime'])) {
+$edate=date('Y-m-d',strtotime($_GET['etime']));
+$edate=date('Y-m-d',strtotime("$edate 1 day"));
+}
+$b = Db::query("select d_Time,CH4ppm,C2H4ppm,C2H6ppm,C2H2ppm,H2ppm,COppm,CO2ppm,TotalHydrocarbon from data_epa_h where EQMID='{$sid}' and d_time >'{$sdate}' and d_Time<'{$edate}'");
+$data = json_encode($b);
+echo $data;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/LineEiact.php b/application/index/controller/LineEiact.php
index df3f98a..4314823 100644
--- a/application/index/controller/LineEiact.php
+++ b/application/index/controller/LineEiact.php
@@ -1,3 +1,50 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFDB5LcbiFC29VfukvdoxlFjShfbYlwuOPDB5qbrYvdmOZd2xScbw7tmazcUn0DolVD1xrCjShC2xiF3HITolVcAapCBY0woa4foaVcuHIW29VfukvdoxlFIp7tmn1CMxpCZnMfB5jfolvdJnpdMOlGtIptmShDBCIhoasFuO5htOgO0aABZfpctffhULIcollhtgMl6eMlCjmMPTmvkdlj7FmhTShkolLwe0Iky9uOaOdk2lLk107tJOlcoy0cT1LCbOlhtkcRB0sctwpKXPLF2OifoA9coy0cUImBU1sRBWmRuY0FmOvfolscUIJkoaLCbOlwt0xwo1vdmOPwJLpKXppcJEPwBasFuO5htOgO0aABZfzfolscUffhULIGXPLF2OifoA9ky9uOaOdk3Y0DB1lk107tm0hDBCIhtyldbn0GUILb0fyaySmcbOpdBAmbULpwuShkoaLCbOlNbY1CmY0FJILb0fyaySmcbOpdBAmbUXXRerXhTShgWPLfoipFZ0+CbYzDBfVhtfpctFSkolLhTShkuOPDbHsNMyzF2lmdJImcBOifoAmRtOlcoy0cUL7tJO0DolzRT5iF3Ypc24Pk3YLCbOlkZXLF2OifoApKXpZcbO1FM4IkuOPDbHsNMclfoYPhtflDByjftFpKXp9tmn1CMxpCZnMfB5jfolvdJnmcbOQF29VhtLhGXPLcBOifoA9coy0cUIJBU1sRBWJhTShkuYLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPwJOlcoy0cUEsHUnsd250DtwphTShDBCIhoasFuO5htOgO0aABZfzDBWmbULpwuklfuaZdjShkuYpctE9wtOgO0aABZfzDBWmbTShDBCIhtyldbn0GUILb0fyaySmF3OpdBAmbULpwuShkuYLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPky9uOaOdk3Y0DB1lk10phTShgWppcJEPwBasFuO5htOgO0aABZflfolscUffhULIGXPLcBOifoA9coy0cUImBU1sRBWmRuY0FmOvfolscUILb0fyaySmcbOpdBAmbULpKXPLcBOifoA9coy0cUImBU1sRBWmRuY0FmOvfolscUIJkoaLCbOlwerIcoy5wJLpKXp9tJOJwe0IOow6Kmy1cbk5htkzcBxlC3WIcy90DB1lRoOgC3OgHUnMFM9swoOifoygcBlib2IIf2ilFMAIOayYUAW9k3SLF2lLgUFICB5LwoOgfolscUE+k3SLF2Oifoa9kZnidMWIcy90DB1lNtf7koaLCbOlgUFJhTShcM9ZcByjDtILCJniFZELDz0+kuCpGXpMd3klCBYPhtO2woyzwtOqHT0+kuCxwtl7tMlMhtOqHUEiNUEmcy90DB1lkZl7tJOJBZOqbaSLDzyfwe0IcMxvCbO2CBXPkuCxhTShgWp9tm0hkoOiforINUnQF29Vb2aVC29LcUILCJL7tMajDo8IkoOifor7tm0hgWP=
\ No newline at end of file
+assign('id',$id);
+$this->assign('edate',$edate);
+$this->assign('sdate',$sdate);
+return $this->fetch('eiact');
+}
+public function getjson()
+{
+$edate=date("Y-m-d");
+$sdate=date('Y-m-d',strtotime("$edate -1 month"));
+if (empty($_GET['sid'])) return;
+$sid = $_GET['sid'];
+if (!empty($_GET['stime'])) {
+$sdate=date('Y-m-d',strtotime($_GET['stime']));
+}
+if (!empty($_GET['etime'])) {
+$edate=date('Y-m-d',strtotime($_GET['etime']));
+$edate=date('Y-m-d',strtotime("$edate 1 day"));
+}
+$b = Db::query("select d_time,d_ct_1 from data_eia_h where EQMID='{$sid}' and d_time >'{$sdate}' and d_time<'{$edate}'");
+foreach($b as $k=>$v){
+foreach($v as $k1=>$v1 ){
+if($k1 != 'd_time'){
+$b[$k][$k1] = floatval($v1);
+}
+}
+}
+$data = json_encode($b);
+echo $data;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/LineEpa.php b/application/index/controller/LineEpa.php
index ffef9ba..a6ddf8a 100644
--- a/application/index/controller/LineEpa.php
+++ b/application/index/controller/LineEpa.php
@@ -1,3 +1,50 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFDB5LcbiFC29VfukvdoxlFjShfbYlwuOPDB5qbrYvdmOZd2xScbw7tmazcUn0DolVD1xrCjShC2xiF3HITolVcAaXCUnlGuOldMOzwrYvdmOZd2xScbwhGXpXfBkSDBHIcmaVC3Opd24IDB5LcbIPhWp7tMlMwtildbn0GUILb0fyaySmDBWmbULpwoOpcUIm5pGI5pBw55Qr57ZB5C+3kZL7tJOpctE9wtOgO0aABZfpctffKXPLcBOifoA9coy0cUIJBU1sRBWJhTShkuYLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPwJOlcoy0cUEsHUnsd250DtwphTShDBCIhtyldbn0GUILb0fyaySmF3OpdBAmbULpwuShkuYLCbOlNUOgO0aABZfzfolscUffKXp9tMlMwtIicB1XfuLPky9uOaOdk2a0DB1lk10phUn7tJOlcoy0cT1zfBkzfuwPky9uOaOdk2a0DB1lk10SHtXxHtL7tm0hkuOPDbHsNMyzF2lmdJImDBWmRtOpctL7tJO0DolzRT5iF3Ypc24Pk2aLCbOlkZXLcBOifoApKXPLfoipFZ0+CbYzDBfVhtfzcoy0cUFSkuYLCbOlhTShFMa0fbkVwtO0DolzRT5McbOjDtImdolVca9lFormhTShgWpXfBkSDBHIcmaVC3Opd24Ic2a0DmYvdJIptmShkoaLCbOlNBOifoAPwlLsdU1LwJL7tJOzcoy0cT1LCbOlhtfcRB0sctFSF3OZfo90DB1lhtwLcBOifoAIRTrIdB9VfoIJhUL7tMlMwtildbn0GUILb0fyaySmF2lLk10phUnZcbO1FM47tJOzDBWINUELb0fyaySmF2lLk107tMlMwtIicB1XfuLPky9uOaOdk3Y0DB1lk10phUn7tJOzcoy0cT1LCbOlhtfcRB0sctFSF3OZfo90DB1lhtOgO0aABZfzfolscUffhUL7tm0hDBCIhtyldbn0GUILb0fyaySmcbOpdBAmbULpwuShkoaLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPky9uOaOdk2a0DB1lk10phTShkoaLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPwJOlcoy0cUExwoOiGUwphTShgWPLCJE9wrOJKjpxfBaZGUIJF2aScBY0woOgfolscUxeUeOXFo0SWzkwYunXdUxeHLI2FunsRrHZUekXFo0SUekXFo0SW09XFo0SW08ZFunsRyOvfoySUulLFM9jCbkJd24IcmkvdUnLCbOib2aXCa9PwufPcbklwraOTAlrNUf7kuYpcu0mwoyVctnLb3OpdBAINJf7kuYLCbOlgUFICB5LwoOgfolscTXmGZOlcoy0cb0mwJL7tMcvFMaiC2IPkowICbHIkoS9NJO2hbShcM9ZcByjDtILfJniFZELDzr9NJO2HUEpGXppcJILDzrIwT0Ik2OgfolscUFpGXPLClSLD11dkoSxbUE9wocSd2y0fMyShtO2HUL7tm0hgWp9tJOLCbOiwe0IDmYvdl9ldMYvcoAPkowpKXplC2ivwtOLCbOiKXp9tm0h
\ No newline at end of file
+assign('id',$id);
+$this->assign('edate',$edate);
+$this->assign('sdate',$sdate);
+return $this->fetch('line_epa');
+}
+public function getjson()
+{
+$edate=date("Y-m-d");
+$sdate=date('Y-m-d',strtotime("$edate -1 month"));
+if (empty($_GET['sid'])) return;
+$sid = $_GET['sid'];
+if (!empty($_GET['stime'])) {
+$sdate=date('Y-m-d',strtotime($_GET['stime']));
+}
+if (!empty($_GET['etime'])) {
+$edate=date('Y-m-d',strtotime($_GET['etime']));
+$edate=date('Y-m-d',strtotime("$edate 1 day"));
+}
+$b = Db::query("select d_time,CH4ppm,C2H4ppm,C2H6ppm,C2H2ppm,H2ppm,COppm,CO2ppm,TotalHydrocarbon from data_epa_h where EQMID='{$sid}' and d_time >'{$sdate}' and d_time<'{$edate}'");
+foreach($b as $k=>$v){
+foreach($v as $k1=>$v1 ){
+if($k1 != 'd_time'){
+$b[$k][$k1] = floatval($v1);
+}
+}
+}
+$data = json_encode($b);
+echo $data;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/LineEtp.php b/application/index/controller/LineEtp.php
index 4d934bc..44fb3c8 100644
--- a/application/index/controller/LineEtp.php
+++ b/application/index/controller/LineEtp.php
@@ -1,3 +1,50 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFDB5LcbiFC29VfukvdoxlFjShfbYlwuOPDB5qbrYvdmOZd2xScbw7tmazcUn0DolVD1xrCjShC2xiF3HITolVcAa0FtnlGuOldMOzwrYvdmOZd2xScbwhGXpXfBkSDBHIcmaVC3Opd24IDB5LcbIPhWp7tMlMwtildbn0GUILb0fyaySmDBWmbULpwoOpcUIm5pGI5pBw55Qr57ZB5C+3kZL7tJOpctE9wtOgO0aABZfpctffKXPLcBOifoA9coy0cUIJBU1sRBWJhTShkuYLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPwJOlcoy0cUEsHUnsd250DtwphTShDBCIhtyldbn0GUILb0fyaySmF3OpdBAmbULpwuShkuYLCbOlNUOgO0aABZfzfolscUffKXp9tMlMwtIicB1XfuLPky9uOaOdk2a0DB1lk10phUn7tJOlcoy0cT1zfBkzfuwPky9uOaOdk2a0DB1lk10SHtXxHtL7tm0hkuOPDbHsNMyzF2lmdJImDBWmRtOpctL7tJO0DolzRT5iF3Ypc24Pk2aLCbOlkZXLcBOifoApKXPLfoipFZ0+CbYzDBfVhtfzcoy0cUFSkuYLCbOlhTShFMa0fbkVwtO0DolzRT5McbOjDtImdolVca9lfuEmhTShgWpXfBkSDBHIcmaVC3Opd24Ic2a0DmYvdJIptmShkoaLCbOlNBOifoAPwlLsdU1LwJL7tJOzcoy0cT1LCbOlhtfcRB0sctFSF3OZfo90DB1lhtwLcBOifoAIRTrIdB9VfoIJhUL7tMlMwtildbn0GUILb0fyaySmF2lLk10phUnZcbO1FM47tJOzDBWINUELb0fyaySmF2lLk107tMlMwtIicB1XfuLPky9uOaOdk3Y0DB1lk10phUn7tJOzcoy0cT1LCbOlhtfcRB0sctFSF3OZfo90DB1lhtOgO0aABZfzfolscUffhUL7tm0hDBCIhtyldbn0GUILb0fyaySmcbOpdBAmbULpwuShkoaLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPky9uOaOdk2a0DB1lk10phTShkoaLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPwJOlcoy0cUExwoOiGUwphTShgWPLCJE9wrOJKjpxfBaZGUIJF2aScBY0woOgfolscUx0HUx0HJx0HZx0Ytx0YUx0YJx0YZx0Ktx0KUx0HTESferxRuWxHJnMFM9swoOifoygcbOXb2IIf2ilFMAIOayYUAW9k3SLF2lLgUFICB5LwoOgfolscUE+k3SLF2Oifoa9kZnidMWIcy90DB1lNtf7koaLCbOlgUFJhTShcM9ZcByjDtILCJniFZELDz0+kuCpGXpMd3klCBYPhtO2woyzwtOqHT0+kuCxwtl7tMlMhtOqHUEiNUEmcy90DB1lkZl7tJOJBZOqbaSLDzyfwe0IcMxvCbO2CBXPkuCxhTShgWp9tm0hkoOiforINUnQF29Vb2aVC29LcUILCJL7tMajDo8IkoOifor7tm0hgWP=
\ No newline at end of file
+assign('id',$id);
+$this->assign('edate',$edate);
+$this->assign('sdate',$sdate);
+return $this->fetch('line_etp');
+}
+public function getjson()
+{
+$edate=date("Y-m-d");
+$sdate=date('Y-m-d',strtotime("$edate -1 month"));
+if (empty($_GET['sid'])) return;
+$sid = $_GET['sid'];
+if (!empty($_GET['stime'])) {
+$sdate=date('Y-m-d',strtotime($_GET['stime']));
+}
+if (!empty($_GET['etime'])) {
+$edate=date('Y-m-d',strtotime($_GET['etime']));
+$edate=date('Y-m-d',strtotime("$edate 1 day"));
+}
+$b = Db::query("select d_time,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12 from data_etp_h where EQMID='{$sid}' and d_time >'{$sdate}' and d_time<'{$edate}'");
+foreach($b as $k=>$v){
+foreach($v as $k1=>$v1 ){
+if($k1 != 'd_time'){
+$b[$k][$k1] = floatval($v1);
+}
+}
+}
+$data = json_encode($b);
+echo $data;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/LineMic.php b/application/index/controller/LineMic.php
index e735561..98af5f3 100644
--- a/application/index/controller/LineMic.php
+++ b/application/index/controller/LineMic.php
@@ -1,3 +1,50 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFDB5LcbiFC29VfukvdoxlFjShfbYlwuOPDB5qbrYvdmOZd2xScbw7tmazcUn0DolVD1xrCjShC2xiF3HITolVcA1pCZnlGuOldMOzwrYvdmOZd2xScbwhGXpXfBkSDBHIcmaVC3Opd24IDB5LcbIPhWp7tMlMwtildbn0GUILb0fyaySmDBWmbULpwoOpcUIm5pGI5pBw55Qr57ZB5C+3kZL7tJOpctE9wtOgO0aABZfpctffKXPLcBOifoA9coy0cUIJBU1sRBWJhTShkuYLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPwJOlcoy0cUEsHUnsd250DtwphTShDBCIhtyldbn0GUILb0fyaySmF3OpdBAmbULpwuShkuYLCbOlNUOgO0aABZfzfolscUffKXp9tMlMwtIicB1XfuLPky9uOaOdk2a0DB1lk10phUn7tJOlcoy0cT1zfBkzfuwPky9uOaOdk2a0DB1lk10SHtXxHtL7tm0hkuOPDbHsNMyzF2lmdJImDBWmRtOpctL7tJO0DolzRT5iF3Ypc24Pk2aLCbOlkZXLcBOifoApKXPLfoipFZ0+CbYzDBfVhtfzcoy0cUFSkuYLCbOlhTShFMa0fbkVwtO0DolzRT5McbOjDtImdolVca9sDBHmhTShgWpXfBkSDBHIcmaVC3Opd24Ic2a0DmYvdJIptmShkoaLCbOlNBOifoAPwlLsdU1LwJL7tJOzcoy0cT1LCbOlhtfcRB0sctFSF3OZfo90DB1lhtwLcBOifoAIRTrIdB9VfoIJhUL7tMlMwtildbn0GUILb0fyaySmF2lLk10phUnZcbO1FM47tJOzDBWINUELb0fyaySmF2lLk107tMlMwtIicB1XfuLPky9uOaOdk3Y0DB1lk10phUn7tJOzcoy0cT1LCbOlhtfcRB0sctFSF3OZfo90DB1lhtOgO0aABZfzfolscUffhUL7tm0hDBCIhtyldbn0GUILb0fyaySmcbOpdBAmbULpwuShkoaLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPky9uOaOdk2a0DB1lk10phTShkoaLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPwJOlcoy0cUExwoOiGUwphTShgWPLCJE9wrOJKjpxfBaZGUIJF2aScBY0woOgfolscUxldmc0dbEScB52DuasRufLc3azfuYXctxldmcXFMazRufLcolZRukVcMxSwocZd20Icoy0Ca9sDBYZd2YSDB1ifoagDtn3DoaZcUnyAA1kOe0mGZOzDBO9kZnidMWIcy90DB1lwe4mGZOzcoy0cb0mwoyVctnLb3OpdBA8k3SLcBOifoa9kZwpKXpMd3klCBYPhtOJwoyzwtOqNT4LfJl7tMcvFMaiC2IPkuCICbHIkoSxNT4LfjrIhbShDBCPkoSxwtr9wtfLb3OpdBAmhbShkokdkosfBZOqHa0INUnMdo9ifucidtILfjrpKXp9tm0hgWPLcoy0CUE9wopzd25gcB5jd2OlhtOJhTShcBYPdZELcoy0CTShgWp9tI==
\ No newline at end of file
+assign('id',$id);
+$this->assign('edate',$edate);
+$this->assign('sdate',$sdate);
+return $this->fetch('line_mic');
+}
+public function getjson()
+{
+$edate=date("Y-m-d");
+$sdate=date('Y-m-d',strtotime("$edate -1 month"));
+if (empty($_GET['sid'])) return;
+$sid = $_GET['sid'];
+if (!empty($_GET['stime'])) {
+$sdate=date('Y-m-d',strtotime($_GET['stime']));
+}
+if (!empty($_GET['etime'])) {
+$edate=date('Y-m-d',strtotime($_GET['etime']));
+$edate=date('Y-m-d',strtotime("$edate 1 day"));
+}
+$b = Db::query("select d_time,envtmp,envhum,wdgustspd,envpres,wddir,rnfll from data_microclimate_h where EQMID='{$sid}' and d_time >'{$sdate}' and d_time<'{$edate}'");
+foreach($b as $k=>$v){
+foreach($v as $k1=>$v1 ){
+if($k1 != 'd_time'){
+$b[$k][$k1] = floatval($v1);
+}
+}
+}
+$data = json_encode($b);
+echo $data;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/LineMoa.php b/application/index/controller/LineMoa.php
index 00b677e..cde5470 100644
--- a/application/index/controller/LineMoa.php
+++ b/application/index/controller/LineMoa.php
@@ -1,3 +1,50 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFDB5LcbiFC29VfukvdoxlFjShfbYlwuOPDB5qbrYvdmOZd2xScbw7tmazcUn0DolVD1xrCjShC2xiF3HITolVcA1vCUnlGuOldMOzwrYvdmOZd2xScbwhGXpXfBkSDBHIcmaVC3Opd24IDB5LcbIPhWp7tMlMwtildbn0GUILb0fyaySmDBWmbULpwoOpcUIm5pGI5pBw55Qr57ZB5C+3kZL7tJOpctE9wtOgO0aABZfpctffKXPLcBOifoA9coy0cUIJBU1sRBWJhTShkuYLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPwJOlcoy0cUEsHUnsd250DtwphTShDBCIhtyldbn0GUILb0fyaySmF3OpdBAmbULpwuShkuYLCbOlNUOgO0aABZfzfolscUffKXp9tMlMwtIicB1XfuLPky9uOaOdk2a0DB1lk10phUn7tJOlcoy0cT1zfBkzfuwPky9uOaOdk2a0DB1lk10SHtXxHtL7tm0hkuOPDbHsNMyzF2lmdJImDBWmRtOpctL7tJO0DolzRT5iF3Ypc24Pk2aLCbOlkZXLcBOifoApKXPLfoipFZ0+CbYzDBfVhtfzcoy0cUFSkuYLCbOlhTShFMa0fbkVwtO0DolzRT5McbOjDtImdolVca9sd2rmhTShgWpXfBkSDBHIcmaVC3Opd24Ic2a0DmYvdJIptmShkoaLCbOlNBOifoAPwlLsdU1LwJL7tJOzcoy0cT1LCbOlhtfcRB0sctFSF3OZfo90DB1lhtwLcBOifoAIRTrIdB9VfoIJhUL7tMlMwtildbn0GUILb0fyaySmF2lLk10phUnZcbO1FM47tJOzDBWINUELb0fyaySmF2lLk107tMlMwtIicB1XfuLPky9uOaOdk3Y0DB1lk10phUn7tJOzcoy0cT1LCbOlhtfcRB0sctFSF3OZfo90DB1lhtOgO0aABZfzfolscUffhUL7tm0hDBCIhtyldbn0GUILb0fyaySmcbOpdBAmbULpwuShkoaLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPky9uOaOdk2a0DB1lk10phTShkoaLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPwJOlcoy0cUExwoOiGUwphTShgWPLCJE9wrOJKjpxfBaZGUIJF2aScBY0woOgfolscUxXferSdoHxRukjHUxXfewSdoHZRukjHJxXfeHSdoHzRukjHZnMFM9swoOifoygdB9ib2IIf2ilFMAIOayYUAW9k3SLF2lLgUFICB5LwoOgfolscUE+k3SLF2Oifoa9kZnidMWIcy90DB1lNtf7koaLCbOlgUFJhTShcM9ZcByjDtILCJniFZELDz0+kuCpGXpMd3klCBYPhtO2woyzwtOqHT0+kuCxwtl7tMlMhtOqHUEiNUEmcy90DB1lkZl7tJOJBZOqbaSLDzyfwe0IcMxvCbO2CBXPkuCxhTShgWp9tm0hkoOiforINUnQF29Vb2aVC29LcUILCJL7tMajDo8IkoOifor7tm0hgWP=
\ No newline at end of file
+assign('id',$id);
+$this->assign('edate',$edate);
+$this->assign('sdate',$sdate);
+return $this->fetch('line_moa');
+}
+public function getjson()
+{
+$edate=date("Y-m-d");
+$sdate=date('Y-m-d',strtotime("$edate -1 month"));
+if (empty($_GET['sid'])) return;
+$sid = $_GET['sid'];
+if (!empty($_GET['stime'])) {
+$sdate=date('Y-m-d',strtotime($_GET['stime']));
+}
+if (!empty($_GET['etime'])) {
+$edate=date('Y-m-d',strtotime($_GET['etime']));
+$edate=date('Y-m-d',strtotime("$edate 1 day"));
+}
+$b = Db::query("select d_time,pt1,lc1,rc1,pt2,lc2,rc2,pt3,lc3,rc3 from data_moa_h where EQMID='{$sid}' and d_time >'{$sdate}' and d_time<'{$edate}'");
+foreach($b as $k=>$v){
+foreach($v as $k1=>$v1 ){
+if($k1 != 'd_time'){
+$b[$k][$k1] = floatval($v1);
+}
+}
+}
+$data = json_encode($b);
+echo $data;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/LineOtp.php b/application/index/controller/LineOtp.php
index 64911ed..bf6bf8f 100644
--- a/application/index/controller/LineOtp.php
+++ b/application/index/controller/LineOtp.php
@@ -1,3 +1,50 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFDB5LcbiFC29VfukvdoxlFjShfbYlwuOPDB5qbrYvdmOZd2xScbw7tmazcUn0DolVD1xrCjShC2xiF3HITolVcA90FtnlGuOldMOzwrYvdmOZd2xScbwhGXpXfBkSDBHIcmaVC3Opd24IDB5LcbIPhWp7tMlMwtildbn0GUILb0fyaySmDBWmbULpwoOpcUIm5pGI5pBw55Qr57ZB5C+3kZL7tJOpctE9wtOgO0aABZfpctffKXPLcBOifoA9coy0cUIJBU1sRBWJhTShkuYLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPwJOlcoy0cUEsHUnsd250DtwphTShDBCIhtyldbn0GUILb0fyaySmF3OpdBAmbULpwuShkuYLCbOlNUOgO0aABZfzfolscUffKXp9tMlMwtIicB1XfuLPky9uOaOdk2a0DB1lk10phUn7tJOlcoy0cT1zfBkzfuwPky9uOaOdk2a0DB1lk10SHtXxHtL7tm0hkuOPDbHsNMyzF2lmdJImDBWmRtOpctL7tJO0DolzRT5iF3Ypc24Pk2aLCbOlkZXLcBOifoApKXPLfoipFZ0+CbYzDBfVhtfzcoy0cUFSkuYLCbOlhTShFMa0fbkVwtO0DolzRT5McbOjDtImdolVca9vfuEmhTShgWpXfBkSDBHIcmaVC3Opd24Ic2a0DmYvdJIptmShkoaLCbOlNBOifoAPwlLsdU1LwJL7tJOzcoy0cT1LCbOlhtfcRB0sctFSF3OZfo90DB1lhtwLcBOifoAIRTrIdB9VfoIJhUL7tMlMwtildbn0GUILb0fyaySmF2lLk10phUnZcbO1FM47tJOzDBWINUELb0fyaySmF2lLk107tMlMwtIicB1XfuLPky9uOaOdk3Y0DB1lk10phUn7tJOzcoy0cT1LCbOlhtfcRB0sctFSF3OZfo90DB1lhtOgO0aABZfzfolscUffhUL7tm0hDBCIhtyldbn0GUILb0fyaySmcbOpdBAmbULpwuShkoaLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPky9uOaOdk2a0DB1lk10phTShkoaLCbOlNBOifoAPk1LsdU1LkZxzfuk0d3OpdBAPwJOlcoy0cUExwoOiGUwphTShgWPLCJE9wrOJKjpxfBaZGUIJF2aScBY0woOgfolscUxvDBx0cB1XcbkifuaZcUxvDBxXFMazFZnMFM9swoOifoygd3OXb2IIf2ilFMAIOayYUAW9k3SLF2lLgUFICB5LwoOgfolscUE+k3SLF2Oifoa9kZnidMWIcy90DB1lNtf7koaLCbOlgUFJhTShcM9ZcByjDtILCJniFZELDz0+kuCpGXpMd3klCBYPhtO2woyzwtOqHT0+kuCxwtl7tMlMhtOqHUEiNUEmcy90DB1lkZl7tJOJBZOqbaSLDzyfwe0IcMxvCbO2CBXPkuCxhTShgWp9tm0hkoOiforINUnQF29Vb2aVC29LcUILCJL7tMajDo8IkoOifor7tm0hgWP=
\ No newline at end of file
+assign('id',$id);
+$this->assign('edate',$edate);
+$this->assign('sdate',$sdate);
+return $this->fetch('line_otp');
+}
+public function getjson()
+{
+$edate=date("Y-m-d");
+$sdate=date('Y-m-d',strtotime("$edate -1 month"));
+if (empty($_GET['sid'])) return;
+$sid = $_GET['sid'];
+if (!empty($_GET['stime'])) {
+$sdate=date('Y-m-d',strtotime($_GET['stime']));
+}
+if (!empty($_GET['etime'])) {
+$edate=date('Y-m-d',strtotime($_GET['etime']));
+$edate=date('Y-m-d',strtotime("$edate 1 day"));
+}
+$b = Db::query("select d_time,oiltemperature,oilpress from data_otp_h where EQMID='{$sid}' and d_time >'{$sdate}' and d_time<'{$edate}'");
+foreach($b as $k=>$v){
+foreach($v as $k1=>$v1 ){
+if($k1 != 'd_time'){
+$b[$k][$k1] = floatval($v1);
+}
+}
+}
+$data = json_encode($b);
+echo $data;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/LinePd-bak.php b/application/index/controller/LinePd-bak.php
index 8069d4c..20e7f26 100644
--- a/application/index/controller/LinePd-bak.php
+++ b/application/index/controller/LinePd-bak.php
@@ -1,3 +1,50 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFDB5LcbiFC29VfukvdoxlFjShfbYlwuOPDB5qbrYvdmOZd2xScbw7tmazcUn0DolVD1xrCjShC2xiF3HITolVcanLwoa4foaVcuHIW29VfukvdoxlFIp7tmn1CMxpCZnMfB5jfolvdJnpdMOlGtIptmShDBCIhoasFuO5htOgO0aABZfpctffhULIcollhtgMl6eMlCjmMPTmvkdlj7FmhTShkolLwe0Iky9uOaOdk2lLk107tJOlcoy0cT1LCbOlhtkcRB0sctwpKXPLF2OifoA9coy0cUImBU1sRBWmRuY0FmOvfolscUIJkoaLCbOlwt0xwo1vdmOPwJLpKXppcJEPwBasFuO5htOgO0aABZfzfolscUffhULIGXPLF2OifoA9ky9uOaOdk3Y0DB1lk107tm0hDBCIhtyldbn0GUILb0fyaySmcbOpdBAmbULpwuShkoaLCbOlNbY1CmY0FJILb0fyaySmcbOpdBAmbUXXRerXhTShgWPLfoipFZ0+CbYzDBfVhtfpctFSkolLhTShkuOPDbHsNMyzF2lmdJImcBOifoAmRtOlcoy0cUL7tJO0DolzRT5iF3Ypc24Pk3YLCbOlkZXLF2OifoApKXpZcbO1FM4IkuOPDbHsNMclfoYPhtfSDB5lb3nLkZL7tm0hFuaJdoljwoc1dMY0DB9Vwoflfopzd24PhWp7tJOlcoy0cT1LCbOlhtkcRB0sctwpKXPLF2OifoA9coy0cUImBU1sRBWmRuY0FmOvfolscUIJkoaLCbOlwt0xwo1vdmOPwJLpKXppcJEPcB1XfuLPky9uOaOdk3YpctffhULIFMa0fbkVKXPLF2lLwe0Iky9uOaOdk3YpctffKXppcJEPwBasFuO5htOgO0aABZfzfolscUffhULIGXPLF2OifoA9coy0cUImBU1sRBWmRuY0FmOvfolscUILb0fyaySmF3OpdBAmbULpKXp9tMlMwtIicB1XfuLPky9uOaOdk2a0DB1lk10phUn7tJOlcoy0cT1LCbOlhtfcRB0sctFSF3OZfo90DB1lhtOgO0aABZflfolscUffhUL7tJOlcoy0cT1LCbOlhtfcRB0sctFSF3OZfo90DB1lhtwLcBOifoAIHUnLCbLJhUL7tm0hkowINUnrCjP6FbalFmLPwmYldoajftnLb3OpdBASCBY1FoyLF2YPRoyXFunicuYjDtxVFbHSfBiMFoyLF2YPRunPCbYlwocZd20Icoy0Ca9Xcy9PwufPcbklwraOTAlrNUf7kuYpcu0mwoyVctnLb3OpdBAINJf7kuYLCbOlgUFICB5LwoOgfolscTXmGZOlcoy0cb0mwJL7tMcvFMaiC2IPkowICbHIkoS9NJO2hbShcM9ZcByjDtILfJniFZELDzr9NJO2HUEpGXppcJILDzrIwT0Ik2OgfolscUFpGXPLClSLD11dkoSxbUE9wocSd2y0fMyShtO2HUL7tm0hgWp9tJOLCbOiwe0IDmYvdl9ldMYvcoAPkowpKXplC2ivwtOLCbOiKXp9tm0h
\ No newline at end of file
+assign('id',$id);
+$this->assign('edate',$edate);
+$this->assign('sdate',$sdate);
+return $this->fetch('line_pd');
+}
+public function getjson()
+{
+$edate=date("Y-m-d");
+$sdate=date('Y-m-d',strtotime("$edate -1 month"));
+if (empty($_GET['sid'])) return;
+$sid = $_GET['sid'];
+if (!empty($_GET['stime'])) {
+$sdate=date('Y-m-d',strtotime($_GET['stime']));
+}
+if (!empty($_GET['etime'])) {
+$edate=date('Y-m-d',strtotime($_GET['etime']));
+$edate=date('Y-m-d',strtotime("$edate 1 day"));
+}
+$b = Db::query("select d_time,acupadsch,apppadsch,nqs,uhfpadsch,phase from data_pd_h where EQMID='{$sid}' and d_time >'{$sdate}' and d_time<'{$edate}'");
+foreach($b as $k=>$v){
+foreach($v as $k1=>$v1 ){
+if($k1 != 'd_time'){
+$b[$k][$k1] = floatval($v1);
+}
+}
+}
+$data = json_encode($b);
+echo $data;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/LineSf6.php b/application/index/controller/LineSf6.php
index 13b18b5..edb1414 100644
--- a/application/index/controller/LineSf6.php
+++ b/application/index/controller/LineSf6.php
@@ -1,3 +1,50 @@
-
-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
\ No newline at end of file
+assign('id',$id);
+$this->assign('edate',$edate);
+$this->assign('sdate',$sdate);
+return $this->fetch('line_sf6');
+}
+public function getjson()
+{
+$edate=date("Y-m-d");
+$sdate=date('Y-m-d',strtotime("$edate -1 month"));
+if (empty($_GET['sid'])) return;
+$sid = $_GET['sid'];
+if (!empty($_GET['stime'])) {
+$sdate=date('Y-m-d',strtotime($_GET['stime']));
+}
+if (!empty($_GET['etime'])) {
+$edate=date('Y-m-d',strtotime($_GET['etime']));
+$edate=date('Y-m-d',strtotime("$edate 1 day"));
+}
+$b = Db::query("select d_time,temp1,pressure1,md1,pm1,ddt1,temp2,pressure2,md2,pm2,ddt2,temp3,pressure3,md3,pm3,ddt3 from data_sf6_h where EQMID='{$sid}' and d_time >'{$sdate}' and d_time<'{$edate}'");
+foreach($b as $k=>$v){
+foreach($v as $k1=>$v1 ){
+if($k1 != 'd_time'){
+$b[$k][$k1] = floatval($v1);
+}
+}
+}
+$data = json_encode($b);
+echo $data;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/Ltest.php b/application/index/controller/Ltest.php
index f4648b6..b07e3a5 100644
--- a/application/index/controller/Ltest.php
+++ b/application/index/controller/Ltest.php
@@ -1,3 +1,26 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFDB5LcbiFC29VfukvdoxlFjShfbYlwuOPDB5qbrYvdmOZd2xScbw7tmazcUn0DolVD1xrCjShC2xiF3HITuOlF3WIcbi0cB5LFZned250FM9SdoaZtmShFuaJdoljwoc1dMY0DB9VwolVcoa4htLhGXpZcbO1FM4IkuOPDbHsNMclfoYPhtfSfoazftFpKXp9tmn1CMxpCZnMfB5jfolvdJnmcbOQF29VhtLhGXPLCJE9wrOJKjpxfBaZGUIJF2aScBY0woOgfolscUxXferSdoHxRukjHUxXfewSdoHZRukjHJxXfeHSdoHzRukjHZnMFM9swoOifoygdB9ib2IJhTShcM9ZcByjDtILCJniFZELDz0+kuCpGXpMd3klCBYPhtO2woyzwtOqHT0+kuCxwtl7tMlMhtOqHUEiNUEmcy90DB1lkZl7tJOJBZOqbaSLDzyfwe0IcMxvCbO2CBXPkuCxhTShgWp9tm0hkoOiforINUnQF29Vb2aVC29LcUILCJL7tMajDo8IkoOifor7tm0hgWP=
\ No newline at end of file
+fetch('ltest');
+}
+public function getjson()
+{
+$b = Db::query("select d_time,pt1,lc1,rc1,pt2,lc2,rc2,pt3,lc3,rc3 from data_moa_h");
+foreach($b as $k=>$v){
+foreach($v as $k1=>$v1 ){
+if($k1 != 'd_time'){
+$b[$k][$k1] = floatval($v1);
+}
+}
+}
+$data = json_encode($b);
+echo $data;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/Pie1.php b/application/index/controller/Pie1.php
index fbec7f7..6f1af1f 100644
--- a/application/index/controller/Pie1.php
+++ b/application/index/controller/Pie1.php
@@ -1,3 +1,18 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7eWpVCB1lF3niC2AICbnXbolVcoa4boYvdmOZd2xScbw7eWp1F2AIfoipdMsFOow7eWp1F2AIfoipdMsFW29VfukvdoxlFjSYtMYSCbYzwynpcTrIwtnlGuOldMOzwrYvdmOZd2xScbwYtmSYtmn1CMxpCZnMfB5jfolvdJnpdMOlGtIpeWp7eWpZcbO1FM4IkuOPDbHsNMclfoYPhtfXDBAxkZL7eWp9eWpXfBkSDBHIcmaVC3Opd24Ic2a0DmYvdJIpGX0hkow9Oow6Kmy1cbk5htkzcBxlC3WIdMyscUx5wocZd20If3Ymb3npcUEJhTSYtJOLCbOiNBpzd25gcB5jd2OlhtOJhTSYtMajDo8IkoOifor7eWp9eWp9eWP=
\ No newline at end of file
+fetch('pie1');
+}
+public function getjson(){
+$b=Db::query("select name,y from wsg_pie ");
+$data=json_encode($b);
+echo $data;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/Sbtj.php b/application/index/controller/Sbtj.php
index 3793812..85652ac 100644
--- a/application/index/controller/Sbtj.php
+++ b/application/index/controller/Sbtj.php
@@ -1,3 +1,41 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFDB5LcbiFC29VfukvdoxlFjShfbYlwuOPDB5qbrOJKXp1F2AIfoipdMsFW29VfukvdoxlFjShfbYlwuOPDB5qbyklFbalF3W7tMYSCbYzwyYJfoPIwtnlGuOldMOzwrYvdmOZd2xScbwhGXpXfBkSDBHIcmaVC3Opd24IDB5LcbIPhWp7tJOJNAOJKjpxfBaZGUIJF2aScBY0woYvfB50holLhUn5RoYvdMYifti2d2x0CBflc3kicoASk2sBkZLIdMyscUnMFM9swokLGJnmFM91FtnJGUn2d2x0CBflc3kicoAJhTShkowxNAOJKjpxfBaZGUIJF2aScBY0woYvfB50holLhUn5RoYvdMYiftizC2yScUXmdaFmhUnVCB1lwocZd20ICMO6wofZd3aXwok5wuYjCBxlwJL7tMcvFMaiC2IPwtOJwoyzwtOqNT4LfJEpwuShcM9ZcByjDtIIkuCICbHIkoSxNT4LfjrIhUn7tMlMhtOqHUE9NUEmGUFpGXPLClSLD11dk3LmbT0IcMxvCbO2CBXPkuCxhTShgWp9tm0hcM9ZcByjDtIIkowxwoyzwtOqNT4LfJEpGXpMd3klCBYPhtELfJniFZELDzr9NJO2HUEpGXppcJILDzrINT0Ik3LmhbShkowxBZOqbaSmGUffNBcSd2y0fMyShtO2HUL7tm19tm0hkuOPDbHsNMyzF2lmdJImcoy0CUFSDmYvdl9ldMYvcoAPkowphTShkuOPDbHsNMyzF2lmdJImcoy0CTwmRopzd25gcB5jd2OlhtOJHULpKXpZcbO1FM4IkuOPDbHsNMclfoYPhtL7tm0hFuaJdoljwoc1dMY0DB9Vwoflfy92d2x0CBflc3kicoAPhbShkow9Oow6Kmy1cbk5htkzcBxlC3WIC291dmWPDBWpwuLSC29VC2y0hucvduOic2amFMyLcUXmD1CmhUnVCB1lwocZd20ICMO6wofZd3aXwok5wucvduOic2amFMyLcUwpKXPLcoy0CT1QF29Vb2aVC29LcUILCJL7tMajDo8IkoOifor7tm0hFuaJdoljwoc1dMY0DB9Vwoflfy9zC2yScUIpGXPLCj1rCjP6FbalFmLPwmYldoajftnjd3aVftipctLIGUxjd25jCbWPF2YidoASk21bkZLIdMyscUnMFM9swokLGJnmFM91FtnJGUnzC2yScUwpKXPLcoy0CT1QF29Vb2aVC29LcUILCJL7tMajDo8IkoOifor7tm0hgWP=
\ No newline at end of file
+$v ) {
+foreach( $v as $k1=>$v1 ) {
+if($k1 == 'y'){
+$b[$k]['y']= floatval($v1);
+}
+}
+}
+foreach( $b1 as $k=>$v ){
+foreach( $v as $k1=>$v1 ){
+if($k1 == 'y'){
+$b1[$k]['y']=floatval($v1);
+}}
+}
+$this->assign('data',json_encode($b));
+$this->assign('data2',json_encode($b1));
+return $this->fetch();
+}
+public function get_voltagegrade(){
+$b=Db::query("select count(id) y,concat(voltagegrade,'kV') name from bdz group by voltagegrade");
+$data=json_encode($b);
+echo $data;
+}
+public function get_scale(){
+$b=Db::query("select count(id) y,concat(scale,'mW') name from bdz group by scale");
+$data=json_encode($b);
+echo $data;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/Sline.php b/application/index/controller/Sline.php
index 04a338a..6875e15 100644
--- a/application/index/controller/Sline.php
+++ b/application/index/controller/Sline.php
@@ -1,3 +1,24 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7eWpVCB1lF3niC2AICbnXbolVcoa4boYvdmOZd2xScbw7eWp1F2AIfoipdMsFW29VfukvdoxlFjSYtmazcUn0DolVD1xrCjSYtMYSCbYzwyYSDB5lwoa4foaVcuHIW29VfukvdoxlFI0hGX0hFuaJdoljwoc1dMY0DB9VwolVcoa4htLYtmSYtMlMwtildbn0GUILb0fyaySmDBWmbULpwoOpcUIm5pGI5pBw55Qr57ZB5C+3kZL7eWPLDBWINUELb0fyaySmDBWmbTSYtJO0DolzRT5iF3Ypc24Pk2lLkZXLDBWpKX0hFMa0fbkVwtO0DolzRT5McbOjDtImF2xpdMAmhTSYtm0Ytmn1CMxpCZnMfB5jfolvdJnmcbOQF29VhtLYtmSYtMlMwtildbn0GUILb0fyaySmF2lLk10phUnZcbO1FM47eWPLF2lLwe0Iky9uOaOdk3YpctffKX0hkowINUnrCjP6FbalFmLPwmYldoajftnLb1OpdBASW0I0FunsRrHZUeOXFo0SWzkwYmnXdUxeHLIZFunsRrIZFunsRrYNFunsRrYNHmnXdUxAd3Oidri5cukvC2yZCM9VwocZd20Icoy0Ca9lFoygDtn3DoaZcUnyAA1kOe0mGZOzDBO9kZwpKX0hkoOiforINUnQF29Vb2aVC29LcUILCJL7eWplC2ivwtOLCbOiKX0hgW0hgW0h
\ No newline at end of file
+assign('id',$id);
+return $this->fetch('sline');
+}
+public function getjson()
+{
+if (empty($_GET['sid'])) return;
+$sid = $_GET['sid'];
+$b = Db::query("select d_Time,CH4ppm,C2H4ppm,C2H6ppm,C2H2ppm,H2ppm,COppm,CO2ppm,TotalHydrocarbon from data_epa_h where EQMID='{$sid}'");
+$data = json_encode($b);
+echo $data;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/TbEiact.php b/application/index/controller/TbEiact.php
index 2c8cf39..beb5d08 100644
--- a/application/index/controller/TbEiact.php
+++ b/application/index/controller/TbEiact.php
@@ -1,3 +1,80 @@
-
-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Ooy0CaSLDa1dk2OgC3OgHUffNmYlF3Ypd24Pk3fiFM4Vf2yZdM1iGeAmhUl7tJOvCMpWUynyGoYldt0+c2a0WBY0DbclA2ilcbWPHtLsNMflfyY0GBxlhtftkZ4PkoLqHZLpRT5mcbOod250htLsNMflfrYvdo9ZhtLsNmYlfryUO0wPk0coOLCXHeEXkZL7tm0hko9JDlnwAra4C2aSRT5mcbOnC3OpfMaTDoalftIXhU0+F2a0W2aSdycidualhtOjcBxSTMyscaSLDl0VhtOphzHpRtOlGunACBkScAOifoydkolfBZOlGunecBxSTMyscaSLDl1dHy1fhTShgWp9tMilCBOlFJImW29VfoaVft1AGbnlKJniFunSDBYifolvdJ92dMWVdbHscbijcBXmhTShDoaicoaZhtfed250cB50RAOpF3nvF2l0DB9VKJnifuOiC2iscB50K2cpdoaVCB1lNUwmRJO4duYADbOScU4mRmiSFZwmhTShDoaicoaZhtfeCBYPcU1ed250FM9SKJnsCbIsCBflNTEmhTShko9JDlfZDbOlFJ0+F2y2cUImFoiXKJ8vd3a0Fua0kZL7tMa4DbW7tm0hgWP=
\ No newline at end of file
+where('eqmid',$id)->find();
+session('warn',$warn);
+$this->assign('warn',$warn);
+$data = Db::table('data_eia_h')->field('d_time,d_ct_1')->where('eqmid',$id)->where('d_time','between time',[$sdate,$edate])->order('d_time desc')->paginate(10,false,['query'=>request()->param(),]);
+$data1 = Db::table('data_eia_h')->field('d_time,d_ct_1')->where('eqmid',$id)->where('d_time','between time',[$sdate,$edate])->select();
+session('data',$data);
+session('data1',$data1);
+$this->assign('data',$data);
+return $this->fetch('tb_eiact');
+}
+public function ExcelOne()
+{
+$list = session('data');
+$xlsCell = array(
+array('d_time','时间'),
+array('d_ct_1','泄露电流')
+);
+$this->exportExcel("当前数据导出",$xlsCell,$list);
+}
+public function ExcelAll()
+{
+$list = session('data1');
+$xlsCell = array(
+array('d_time','时间'),
+array('d_ct_1','泄露电流')
+);
+$this->exportExcel("全部数据导出",$xlsCell,$list);
+}
+public function exportExcel($expTitle,$expCellName,$expTableData)
+{
+$xlsTitle = iconv('utf-8','gb2312',$expTitle);
+$fileName = $expTitle.date('_YmdHis');
+$cellNum = count($expCellName);
+$dataNum = count($expTableData);
+import('PhpExcel',EXTEND_PATH);
+$objPHPExcel = new \PhpExcel();
+$objWriter = new \PHPExcel_Writer_Excel5($objPHPExcel);
+$cellName = array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','AA','AB','AC','AD','AE','AF','AG','AH','AI','AJ','AK','AL','AM','AN','AO','AP','AQ','AR','AS','AT','AU','AV','AW','AX','AY','AZ');
+$objPHPExcel->getActiveSheet(0)->mergeCells('A1:'.$cellName[$cellNum-1].'1');
+for($i=0;$i<$cellNum;$i++){
+$objPHPExcel->getActiveSheet(0)->getColumnDimension($cellName[$i])->setWidth(18);
+$objPHPExcel->setActiveSheetIndex(0)->setCellValue($cellName[$i].'2',$expCellName[$i][1]);
+}
+for($i=0;$i<$dataNum;$i++){
+for($j=0;$j<$cellNum;$j++){
+if($expTableData[$i]['d_ct_1']session('warn.warnmax5')){
+$objPHPExcel->getActiveSheet(0)->getStyle('B'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+$objPHPExcel->getActiveSheet(0)->setCellValue($cellName[$j].($i+3),$expTableData[$i][$expCellName[$j][0]]);
+}
+}
+header('Content-Type: application/vnd.ms-excel');
+header('Content-Disposition: attachment;filename="'.$xlsTitle.'.xls"');
+header('Cache-Control: max-age=0');
+$objWriter->save('php://output');
+exit;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/TbEpa.php b/application/index/controller/TbEpa.php
index 566a773..2fd5e1f 100644
--- a/application/index/controller/TbEpa.php
+++ b/application/index/controller/TbEpa.php
@@ -1,3 +1,115 @@
-
-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
\ No newline at end of file
+where('eqmid',$id)->find();
+session('warn',$warn);
+$this->assign('warn',$warn);
+$data = Db::table('data_epa_h')->field('d_Time,CH4ppm,C2H4ppm,C2H6ppm,C2H2ppm,H2ppm,COppm,CO2ppm,TotalHydrocarbon')->where('eqmid',$id)->where('d_Time','between time',[$sdate,$edate])->order('d_Time desc')->paginate(10,false,['query'=>request()->param(),]);
+$data1 = Db::table('data_epa_h')->field('d_Time,CH4ppm,C2H4ppm,C2H6ppm,C2H2ppm,H2ppm,COppm,CO2ppm,TotalHydrocarbon')->where('eqmid',$id)->where('d_Time','between time',[$sdate,$edate])->select();
+session('data',$data);
+session('data1',$data1);
+$this->assign('data',$data);
+return $this->fetch('tb_epa');
+}
+public function ExcelOne()
+{
+$list = session('data');
+$xlsCell = array(
+array('d_Time','时间'),
+array('CH4ppm','甲烷含量'),
+array('C2H4ppm','乙烯含量'),
+array('C2H6ppm','乙烷含量'),
+array('C2H2ppm','乙炔含量'),
+array('H2ppm','氢气含量'),
+array('COppm','一氧化碳含量'),
+array('CO2ppm','二氧化碳含量'),
+array('TotalHydrocarbon','总烃')
+);
+$this->exportExcel("当前数据导出",$xlsCell,$list);
+}
+public function ExcelAll()
+{
+$list = session('data1');
+$xlsCell = array(
+array('d_Time','时间'),
+array('CH4ppm','甲烷含量'),
+array('C2H4ppm','乙烯含量'),
+array('C2H6ppm','乙烷含量'),
+array('C2H2ppm','乙炔含量'),
+array('H2ppm','氢气含量'),
+array('COppm','一氧化碳含量'),
+array('CO2ppm','二氧化碳含量'),
+array('TotalHydrocarbon','总烃')
+);
+$this->exportExcel("全部数据导出",$xlsCell,$list);
+}
+public function exportExcel($expTitle,$expCellName,$expTableData)
+{
+$xlsTitle = iconv('utf-8','gb2312',$expTitle);
+$fileName = $expTitle.date('_YmdHis');
+$cellNum = count($expCellName);
+$dataNum = count($expTableData);
+import('PhpExcel',EXTEND_PATH);
+$objPHPExcel = new \PhpExcel();
+$objWriter = new \PHPExcel_Writer_Excel5($objPHPExcel);
+$cellName = array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','AA','AB','AC','AD','AE','AF','AG','AH','AI','AJ','AK','AL','AM','AN','AO','AP','AQ','AR','AS','AT','AU','AV','AW','AX','AY','AZ');
+$objPHPExcel->getActiveSheet(0)->mergeCells('A1:'.$cellName[$cellNum-1].'1');
+for($i=0;$i<$cellNum;$i++){
+$objPHPExcel->getActiveSheet(0)->getColumnDimension($cellName[$i])->setWidth(18);
+$objPHPExcel->setActiveSheetIndex(0)->setCellValue($cellName[$i].'2',$expCellName[$i][1]);
+}
+for($i=0;$i<$dataNum;$i++){
+for($j=0;$j<$cellNum;$j++){
+if($expTableData[$i]['CH4ppm']session('warn.warnmax1')){
+$objPHPExcel->getActiveSheet(0)->getStyle('B'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['C2H4ppm']session('warn.warnmax2')){
+$objPHPExcel->getActiveSheet(0)->getStyle('C'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['C2H6ppm']session('warn.warnmax3')){
+$objPHPExcel->getActiveSheet(0)->getStyle('D'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['C2H2ppm']session('warn.warnmax4')){
+$objPHPExcel->getActiveSheet(0)->getStyle('E'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['H2ppm']session('warn.warnmax5')){
+$objPHPExcel->getActiveSheet(0)->getStyle('F'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['COppm']session('warn.warnmax6')){
+$objPHPExcel->getActiveSheet(0)->getStyle('G'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['CO2ppm']session('warn.warnmax7')){
+$objPHPExcel->getActiveSheet(0)->getStyle('H'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['TotalHydrocarbon']session('warn.warnmax8')){
+$objPHPExcel->getActiveSheet(0)->getStyle('I'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+$objPHPExcel->getActiveSheet(0)->setCellValue($cellName[$j].($i+3),$expTableData[$i][$expCellName[$j][0]]);
+}
+}
+header('Content-Type: application/vnd.ms-excel');
+header('Content-Disposition: attachment;filename="'.$xlsTitle.'.xls"');
+header('Cache-Control: max-age=0');
+$objWriter->save('php://output');
+exit;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/TbEtp.php b/application/index/controller/TbEtp.php
index 45c3a14..65e628f 100644
--- a/application/index/controller/TbEtp.php
+++ b/application/index/controller/TbEtp.php
@@ -1,3 +1,135 @@
-
-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REpiFmkiGUImferZkZXmH+MbVKBwIrNmM7jPp6dlpRWmhWLktJL7tJO0DolzRT5lGunvFmOyGoYldtIJ5d2T5CMY5pBX5P2V5D+85CG6wJXLGoxzW2aSdtXLdolzftL7tm0hFuaJdoljwoc1dMY0DB9Vwra4C2aSWBxShtLhGXPLdolzftE9wuYlF3Ypd24Pk2OiforxkZL7tJO4duYecBxSwtE9woyZFMy5hEpiFmkiGUImcy90DB1lkZXm5pG26cG0kZLStMyZFMy5htf0HUFSk0umM7jLVwqPp6dlpRWmhUXhCbkZCbLPk3WZkZXmWVGdVKU4JVJmpVBLstFpREpiFmkiGUImfeHmRtfe55V45RJh6hGM5DU0kZLStMyZFMy5htf0YtFSk0umM7jLVwvPp6dlpRWmhUXhCbkZCbLPk3W1kZXmWVGdVKU4J+JmpVBLstFpREpiFmkiGUImfeCmRtfe55V45RJR6hGM5DU0kZLStMyZFMy5htf0YZFSkzupl7jlJwnn55V46hGM5DU0kZLStMyZFMy5htf0KtFSkzupl7jlJwnt55V46hGM5DU0kZLStMyZFMy5htf0KUFSkzupl7jlJwne55V46hGM5DU0kZLStMyZFMy5htf0HTEmRtFz6cG45CJEWGGdVKJmpVBLstFpREpiFmkiGUImferxkZXmH+MbVKBwIrRmM7jPp6dlpRWmhUXhCbkZCbLPk3WxHJFSkzNpl7jlJwne55V46hGM5DU0kZLktWPpKXPLfoipFZ0+cbiXd3k0ObijcBXPwVByQKMeQKDaSKDYqVBvvKBuVJwSkuiSF0YldoXSkoxpF3WpKXp9tmn1CMxpCZnMfB5jfolvdJnlGunvFmOyGoYldtILcbiXaol0doASkoa4FrYldoxKCB1lRtOlGunACBkScAOiforptmShkuiSF1Opfoxlwe0IDBYvdmCPk3a0cJ04kZXmc2wZHzrZkZXLcbiXaol0doApKXPLcMlScA5idBAINUELcbiXaol0doAVcoy0cUImb1lscripFZFpKXPLC2aSdr51dUE9woYvfB50htOlGunecBxSTMyscUL7tJOLCbOiTmaswe0IC291dmWPkoa4FyOiCMxlOoy0CUL7tMlsFo9ZftImAoiXObijcBXmRraCaraKOy9WWaOwhTShko9JDlnwAra4C2aS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d2xvFJIpRT5zcbOnALfthtfoOLcoHeEXHtFpKXp9tMlMhtOlGunACBkScAOifoydkolfBZf0HTrmbTxzcbYzDB9Vhtf3CbkVRmfiFM5sDB4xHUFpwux8koa4FyOiCMxlOoy0CaSLDa1dk3WxHUffNmYlF3Ypd24Pk3fiFM4Vf2yZdM1iGerxkZLpGXPLd2kQAriWObijcBXsNMflfryjfol2caYPcBa0heEpRT5mcbOTfulScUImTtFVhtOphzHphU0+c2a0OM9VftIpRT5mcbOed2xvFJIpRT5zcbOnALfthtfoOLcoHeEXHtFpKXp9tMlMhtOlGunACBkScAOifoydkolfBZf0HTwmbTxzcbYzDB9Vhtf3CbkVRmfiFM5sDB4xHJFpwux8koa4FyOiCMxlOoy0CaSLDa1dk3WxHJffNmYlF3Ypd24Pk3fiFM4Vf2yZdM1iGerZkZLpGXPLd2kQAriWObijcBXsNMflfryjfol2caYPcBa0heEpRT5mcbOTfulScUImTUFVhtOphzHphU0+c2a0OM9VftIpRT5mcbOed2xvFJIpRT5zcbOnALfthtfoOLcoHeEXHtFpKXp9tJOvCMpWUynyGoYldt0+c2a0WBY0DbclA2ilcbWPHtLsNmYlfrYldoxBCBx1cUILC2aSdr5idBadkopfRJILDUSzhUXLcbiXaoyJdoarCbOiBZOpbaSLcbiXW2aSdr5idBadkopfBznfbUL7tm0hgWpPcByLcbwPk0YvdmOldmWsaulXcTPICbnXdoljCbOpd24vfM5LRM1zRBa4C2aSkZL7tMilCBOlFJImW29VfoaVft1rDbYXd3YpfolvdjPICbO0CBYPdBaVfesMDBxldMyscT0JkZ4LGoxzaol0doAVkZ54duHJkZL7tMilCBOlFJImW2yjDoAsW29VfukvdePIdBy4RBymcT0XkZL7tJOvCMpbFMl0cbwsNmYifMAPk3nPFePvR291fun1ftFpKXplGol0KXp9tm0h
\ No newline at end of file
+where('eqmid',$id)->find();
+session('warn',$warn);
+$this->assign('warn',$warn);
+$data = Db::table('data_etp_h')->field('d_time,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12')->where('eqmid',$id)->where('d_time','between time',[$sdate,$edate])->order('d_time desc')->paginate(10,false,['query'=>request()->param(),]);
+$data1 = Db::table('data_etp_h')->field('d_time,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12')->where('eqmid',$id)->where('d_time','between time',[$sdate,$edate])->select();
+session('data',$data);
+session('data1',$data1);
+$this->assign('data',$data);
+return $this->fetch('tb_etp');
+}
+public function ExcelOne()
+{
+$list = session('data');
+$xlsCell = array(
+array('d_time','时间'),
+array('t1','A相上触头'),
+array('t2','B相上触头'),
+array('t3','C相上触头'),
+array('t4','A相下触头'),
+array('t5','B相下触头'),
+array('t6','C相下触头'),
+array('t7','1闸刀A相触头'),
+array('t8','1闸刀B相触头'),
+array('t9','1闸刀C相触头'),
+array('t10','3闸刀A相触头'),
+array('t11','3闸刀B相触头'),
+array('t12','3闸刀C相触头')
+);
+$this->exportExcel("当前数据导出",$xlsCell,$list);
+}
+public function ExcelAll()
+{
+$list = session('data1');
+$xlsCell = array(
+array('d_time','时间'),
+array('t1','A相上触头'),
+array('t2','B相上触头'),
+array('t3','C相上触头'),
+array('t4','A相下触头'),
+array('t5','B相下触头'),
+array('t6','C相下触头'),
+array('t7','1闸刀A相触头'),
+array('t8','1闸刀B相触头'),
+array('t9','1闸刀C相触头'),
+array('t10','3闸刀A相触头'),
+array('t11','3闸刀B相触头'),
+array('t12','3闸刀C相触头')
+);
+$this->exportExcel("全部数据导出",$xlsCell,$list);
+}
+public function exportExcel($expTitle,$expCellName,$expTableData)
+{
+$xlsTitle = iconv('utf-8','gb2312',$expTitle);
+$fileName = $expTitle.date('_YmdHis');
+$cellNum = count($expCellName);
+$dataNum = count($expTableData);
+import('PhpExcel',EXTEND_PATH);
+$objPHPExcel = new \PhpExcel();
+$objWriter = new \PHPExcel_Writer_Excel5($objPHPExcel);
+$cellName = array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','AA','AB','AC','AD','AE','AF','AG','AH','AI','AJ','AK','AL','AM','AN','AO','AP','AQ','AR','AS','AT','AU','AV','AW','AX','AY','AZ');
+$objPHPExcel->getActiveSheet(0)->mergeCells('A1:'.$cellName[$cellNum-1].'1');
+for($i=0;$i<$cellNum;$i++){
+$objPHPExcel->getActiveSheet(0)->getColumnDimension($cellName[$i])->setWidth(18);
+$objPHPExcel->setActiveSheetIndex(0)->setCellValue($cellName[$i].'2',$expCellName[$i][1]);
+}
+for($i=0;$i<$dataNum;$i++){
+for($j=0;$j<$cellNum;$j++){
+if($expTableData[$i]['t1']session('warn.warnmax1')){
+$objPHPExcel->getActiveSheet(0)->getStyle('B'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['t2']session('warn.warnmax2')){
+$objPHPExcel->getActiveSheet(0)->getStyle('C'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['t3']session('warn.warnmax3')){
+$objPHPExcel->getActiveSheet(0)->getStyle('D'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['t4']session('warn.warnmax4')){
+$objPHPExcel->getActiveSheet(0)->getStyle('E'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['t5']session('warn.warnmax5')){
+$objPHPExcel->getActiveSheet(0)->getStyle('F'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['t6']session('warn.warnmax6')){
+$objPHPExcel->getActiveSheet(0)->getStyle('G'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['t7']session('warn.warnmax7')){
+$objPHPExcel->getActiveSheet(0)->getStyle('H'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['t8']session('warn.warnmax8')){
+$objPHPExcel->getActiveSheet(0)->getStyle('I'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['t9']session('warn.warnmax9')){
+$objPHPExcel->getActiveSheet(0)->getStyle('J'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['t10']session('warn.warnmax10')){
+$objPHPExcel->getActiveSheet(0)->getStyle('K'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['t11']session('warn.warnmax11')){
+$objPHPExcel->getActiveSheet(0)->getStyle('L'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['t12']session('warn.warnmax12')){
+$objPHPExcel->getActiveSheet(0)->getStyle('M'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+$objPHPExcel->getActiveSheet(0)->setCellValue($cellName[$j].($i+3),$expTableData[$i][$expCellName[$j][0]]);
+}
+}
+header('Content-Type: application/vnd.ms-excel');
+header('Content-Disposition: attachment;filename="'.$xlsTitle.'.xls"');
+header('Cache-Control: max-age=0');
+$objWriter->save('php://output');
+exit;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/TbMic.php b/application/index/controller/TbMic.php
index 70c2c00..6c7e0ed 100644
--- a/application/index/controller/TbMic.php
+++ b/application/index/controller/TbMic.php
@@ -1,3 +1,105 @@
-
-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
\ No newline at end of file
+where('eqmid',$id)->find();
+session('warn',$warn);
+$this->assign('warn',$warn);
+$data = Db::table('data_microclimate_h')->field('d_time,envtmp,envhum,wdgustspd,envpres,wddir,rnfll')->where('eqmid',$id)->where('d_time','between time',[$sdate,$edate])->order('d_time desc')->paginate(10,false,['query'=>request()->param(),]);
+$data1 = Db::table('data_microclimate_h')->field('d_time,envtmp,envhum,wdgustspd,envpres,wddir,rnfll')->where('eqmid',$id)->where('d_time','between time',[$sdate,$edate])->select();
+session('data',$data);
+session('data1',$data1);
+$this->assign('data',$data);
+return $this->fetch('tb_mic');
+}
+public function ExcelOne()
+{
+$list = session('data');
+$xlsCell = array(
+array('d_time','时间'),
+array('envtmp','温度'),
+array('envhum','湿度'),
+array('wdgustspd','风速'),
+array('envpres','气压'),
+array('wddir','风向'),
+array('rnfll','雨量')
+);
+$this->exportExcel("当前数据导出",$xlsCell,$list);
+}
+public function ExcelAll()
+{
+$list = session('data1');
+$xlsCell = array(
+array('d_time','时间'),
+array('envtmp','温度'),
+array('envhum','湿度'),
+array('wdgustspd','风速'),
+array('envpres','气压'),
+array('wddir','风向'),
+array('rnfll','雨量')
+);
+$this->exportExcel("全部数据导出",$xlsCell,$list);
+}
+public function exportExcel($expTitle,$expCellName,$expTableData)
+{
+$xlsTitle = iconv('utf-8','gb2312',$expTitle);
+$fileName = $expTitle.date('_YmdHis');
+$cellNum = count($expCellName);
+$dataNum = count($expTableData);
+import('PhpExcel',EXTEND_PATH);
+$objPHPExcel = new \PhpExcel();
+$objWriter = new \PHPExcel_Writer_Excel5($objPHPExcel);
+$cellName = array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','AA','AB','AC','AD','AE','AF','AG','AH','AI','AJ','AK','AL','AM','AN','AO','AP','AQ','AR','AS','AT','AU','AV','AW','AX','AY','AZ');
+$objPHPExcel->getActiveSheet(0)->mergeCells('A1:'.$cellName[$cellNum-1].'1');
+for($i=0;$i<$cellNum;$i++){
+$objPHPExcel->getActiveSheet(0)->getColumnDimension($cellName[$i])->setWidth(18);
+$objPHPExcel->setActiveSheetIndex(0)->setCellValue($cellName[$i].'2',$expCellName[$i][1]);
+}
+for($i=0;$i<$dataNum;$i++){
+for($j=0;$j<$cellNum;$j++){
+if($expTableData[$i]['envtmp']session('warn.warnmax1')){
+$objPHPExcel->getActiveSheet(0)->getStyle('B'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['envhum']session('warn.warnmax2')){
+$objPHPExcel->getActiveSheet(0)->getStyle('C'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['wdgustspd']session('warn.warnmax3')){
+$objPHPExcel->getActiveSheet(0)->getStyle('D'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['envpres']session('warn.warnmax4')){
+$objPHPExcel->getActiveSheet(0)->getStyle('E'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['wddir']session('warn.warnmax5')){
+$objPHPExcel->getActiveSheet(0)->getStyle('F'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['rnfll']session('warn.warnmax6')){
+$objPHPExcel->getActiveSheet(0)->getStyle('G'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+$objPHPExcel->getActiveSheet(0)->setCellValue($cellName[$j].($i+3),$expTableData[$i][$expCellName[$j][0]]);
+}
+}
+header('Content-Type: application/vnd.ms-excel');
+header('Content-Disposition: attachment;filename="'.$xlsTitle.'.xls"');
+header('Cache-Control: max-age=0');
+$objWriter->save('php://output');
+exit;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/TbMoa.php b/application/index/controller/TbMoa.php
index b19347a..31a5d83 100644
--- a/application/index/controller/TbMoa.php
+++ b/application/index/controller/TbMoa.php
@@ -1,3 +1,121 @@
-
-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FMy5hEpiFmkiGUImcy90DB1lkZXm5pG26cG0kZLStMyZFMy5htfXfermRtfn55V457K757Vg55U15C6RkZLStMyZFMy5htfSCzrmRtfn55V45CBP55U15qBnkZLStMyZFMy5htfZCzrmRtfn55V46cJ75Ptm55U15qBnkZLStMyZFMy5htfXfewmRtft55V457K757Vg55U15C6RkZLStMyZFMy5htfSCzwmRtft55V45CBP55U15qBnkZLStMyZFMy5htfZCzwmRtft55V46cJ75Ptm55U15qBnkZLStMyZFMy5htfXfeHmRtfe55V457K757Vg55U15C6RkZLStMyZFMy5htfSCzHmRtfe55V45CBP55U15qBnkZLStMyZFMy5htfZCzHmRtfe55V46cJ75Ptm55U15qBnkZLIwtEIwtEIwtEhhTShkuOPDbHsNMa4Fo9Zfra4C2aShtRpId/pM7glMDjliDjpI6jMldeMjD7lq7zli7PJRtO4duYecBxSRtOSDbY0hTShgWpXfBkSDBHIcmaVC3Opd24IcbiXd3k0ObijcBXPkoa4FyOpfoxlRtOlGunecBxSTMyscUXLcbiXaoyJdoarCbOihWp7tJO4duYADbOScUE9woljd252htf1foCsKtFSk2fJHjHxHJFSkoa4FyOpfoxlhTShkocpdoaKCB1lwe0Ikoa4FyOpfoxlRMOifoAPk19cdBOwDbHmhTShkoYldoxKfB0INUnjd3aVftILcbiXW2aSdr5idBApKXPLcoy0CA51dUE9woYvfB50htOlGunACBkScAOiforpKXppdbnvFmWPk1nPFra4C2aSkZxyByOyTLOgAryAUtL7tJOvCMpWUynyGoYldtE9wo5lfZnFAoiXObijcBXPhTShko9JDlfZDbOlFJE9wo5lfZnFAriWObijcBxga3kpfoaZb0a4C2aSYUILd2kQAriWObijcBXpKXPLC2aSdr5idBAINUniFmkiGUImWUFSk0wmRtfekZXmOtFSk0AmRtfokZXmOZFSk0ImRtfkkZXmUJFSk0SmRtfHkZXmTUFSk04mRtfNkZXmAtFSk1rmRtfUkZXmAZFSk1WmRtfakZXmaJFSk1FmRtfCkZXmBUFSk1PmRtfnWUFSk0ytkZXmWAHmRtfnOtFSk0yykZXmWACmRtfnOZFSk0ywkZXm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
\ No newline at end of file
+where('eqmid',$id)->find();
+session('warn',$warn);
+$this->assign('warn',$warn);
+$data = Db::table('data_moa_h')->where('eqmid',$id)->where('d_time','between time',[$sdate,$edate])->order('d_time desc')->paginate(10,false,['query'=>request()->param()]);
+$data1 = Db::table('data_moa_h')->where('eqmid',$id)->where('d_time','between time',[$sdate,$edate])->select();
+session('data',$data);
+session('data1',$data1);
+$this->assign('data',$data);
+return $this->fetch();
+}
+public function ExcelOne()
+{
+$list = session('data');
+$xlsCell = array(
+array('d_time','时间'),
+array('pt1','A相系统电压'),
+array('lc1','A相全电流'),
+array('rc1','A相阻性电流'),
+array('pt2','B相系统电压'),
+array('lc2','B相全电流'),
+array('rc2','B相阻性电流'),
+array('pt3','C相系统电压'),
+array('lc3','C相全电流'),
+array('rc3','C相阻性电流')
+);
+$this->exportExcel("避雷器当前数据导出",$xlsCell,$list);
+}
+public function ExcelAll()
+{
+$list = session('data1');
+$xlsCell = array(
+array('d_time','时间'),
+array('pt1','A相系统电压'),
+array('lc1','A相全电流'),
+array('rc1','A相阻性电流'),
+array('pt2','B相系统电压'),
+array('lc2','B相全电流'),
+array('rc2','B相阻性电流'),
+array('pt3','C相系统电压'),
+array('lc3','C相全电流'),
+array('rc3','C相阻性电流')
+);
+$this->exportExcel("避雷器全部数据导出",$xlsCell,$list);
+}
+public function exportExcel($expTitle,$expCellName,$expTableData)
+{
+$xlsTitle = iconv('utf-8','gb2312',$expTitle);
+$fileName = $expTitle.date('_YmdHis');
+$cellNum = count($expCellName);
+$dataNum = count($expTableData);
+import('PhpExcel',EXTEND_PATH);
+$objPHPExcel = new \PhpExcel();
+$objWriter = new \PHPExcel_Writer_Excel5($objPHPExcel);
+$cellName = array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','AA','AB','AC','AD','AE','AF','AG','AH','AI','AJ','AK','AL','AM','AN','AO','AP','AQ','AR','AS','AT','AU','AV','AW','AX','AY','AZ');
+$objPHPExcel->getActiveSheet(0)->mergeCells('A1:'.$cellName[$cellNum-1].'1');
+for($i=0;$i<$cellNum;$i++){
+$objPHPExcel->getActiveSheet(0)->getColumnDimension($cellName[$i])->setWidth(18);
+$objPHPExcel->setActiveSheetIndex(0)->setCellValue($cellName[$i].'2',$expCellName[$i][1]);
+}
+for($i=0;$i<$dataNum;$i++){
+for($j=0;$j<$cellNum;$j++){
+if($expTableData[$i]['pt1']session('warn.warnmax1')){
+$objPHPExcel->getActiveSheet(0)->getStyle('B'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['lc1']session('warn.warnmax2')){
+$objPHPExcel->getActiveSheet(0)->getStyle('C'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['rc1']session('warn.warnmax3')){
+$objPHPExcel->getActiveSheet(0)->getStyle('D'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['pt2']session('warn.warnmax4')){
+$objPHPExcel->getActiveSheet(0)->getStyle('E'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['lc2']session('warn.warnmax5')){
+$objPHPExcel->getActiveSheet(0)->getStyle('F'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['rc2']session('warn.warnmax6')){
+$objPHPExcel->getActiveSheet(0)->getStyle('G'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['pt3']session('warn.warnmax7')){
+$objPHPExcel->getActiveSheet(0)->getStyle('H'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['lc3']session('warn.warnmax8')){
+$objPHPExcel->getActiveSheet(0)->getStyle('I'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['rc3']session('warn.warnmax9')){
+$objPHPExcel->getActiveSheet(0)->getStyle('J'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+$objPHPExcel->getActiveSheet(0)->setCellValue($cellName[$j].($i+3),$expTableData[$i][$expCellName[$j][0]]);
+}
+}
+header('Content-Type: application/vnd.ms-excel');
+header('Content-Disposition: attachment;filename="'.$xlsTitle.'.xls"');
+header('Cache-Control: max-age=0');
+$objWriter->save('php://output');
+exit;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/TbOtp.php b/application/index/controller/TbOtp.php
index 8a649a7..f825d63 100644
--- a/application/index/controller/TbOtp.php
+++ b/application/index/controller/TbOtp.php
@@ -1,3 +1,85 @@
-
-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doarCbOiBZOpbaSmd2lSfoasFoaZCbO1FMAmbT5zcbYzDB9Vhtf3CbkVRmfiFM5sCbIxkZLpGXPLd2kQAriWObijcBXsNMflfryjfol2caYPcBa0heEpRT5mcbOTfulScUImWJFVhtOphzHphU0+c2a0OM9VftIpRT5mcbOed2xvFJIpRT5zcbOnALfthtfoOLcoHeEXHtFpKXp9tMlMhtOlGunACBkScAOifoydkolfBZfvDBxXFMazFZffNuYlF3Ypd24Pk3fiFM4Vf2yZdM1pdjwmhUn8gtOlGunACBkScAOifoydkolfBZfvDBxXFMazFZffNmYlF3Ypd24Pk3fiFM4Vf2yZdM1iGewmhUl7tJOvCMpWUynyGoYldt0+c2a0WBY0DbclA2ilcbWPHtLsNMflfyY0GBxlhtfekZ4PkoLqHZLpRT5mcbOod250htLsNMflfrYvdo9ZhtLsNmYlfryUO0wPk0coOLCXHeEXkZL7tm0hko9JDlnwAra4C2aSRT5mcbOnC3OpfMaTDoalftIXhU0+F2a0W2aSdycidualhtOjcBxSTMyscaSLDl0VhtOphzHpRtOlGunACBkScAOifoydkolfBZOlGunecBxSTMyscaSLDl1dHy1fhTShgWp9tMilCBOlFJImW29VfoaVft1AGbnlKJniFunSDBYifolvdJ92dMWVdbHscbijcBXmhTShDoaicoaZhtfed250cB50RAOpF3nvF2l0DB9VKJnifuOiC2iscB50K2cpdoaVCB1lNUwmRJO4duYADbOScU4mRmiSFZwmhTShDoaicoaZhtfeCBYPcU1ed250FM9SKJnsCbIsCBflNTEmhTShko9JDlfZDbOlFJ0+F2y2cUImFoiXKJ8vd3a0Fua0kZL7tMa4DbW7tm0hgWP=
\ No newline at end of file
+where('eqmid',$id)->find();
+session('warn',$warn);
+$this->assign('warn',$warn);
+$data = Db::table('data_otp_h')->where('eqmid',$id)->where('d_time','between time',[$sdate,$edate])->order('d_time desc')->paginate(10,false,['query'=>request()->param(),]);
+$data1 = Db::table('data_otp_h')->where('eqmid',$id)->where('d_time','between time',[$sdate,$edate])->select();
+session('data',$data);
+session('data1',$data1);
+$this->assign('data',$data);
+return $this->fetch('tb_otp');
+}
+public function ExcelOne()
+{
+$list = session('data');
+$xlsCell = array(
+array('d_time','时间'),
+array('oiltemperature','油温'),
+array('oilpress','油压')
+);
+$this->exportExcel("当前数据导出",$xlsCell,$list);
+}
+public function ExcelAll()
+{
+$list = session('data1');
+$xlsCell = array(
+array('d_time','时间'),
+array('oiltemperature','油温'),
+array('oilpress','油压')
+);
+$this->exportExcel("全部数据导出",$xlsCell,$list);
+}
+public function exportExcel($expTitle,$expCellName,$expTableData)
+{
+$xlsTitle = iconv('utf-8','gb2312',$expTitle);
+$fileName = $expTitle.date('_YmdHis');
+$cellNum = count($expCellName);
+$dataNum = count($expTableData);
+import('PhpExcel',EXTEND_PATH);
+$objPHPExcel = new \PhpExcel();
+$objWriter = new \PHPExcel_Writer_Excel5($objPHPExcel);
+$cellName = array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','AA','AB','AC','AD','AE','AF','AG','AH','AI','AJ','AK','AL','AM','AN','AO','AP','AQ','AR','AS','AT','AU','AV','AW','AX','AY','AZ');
+$objPHPExcel->getActiveSheet(0)->mergeCells('A1:'.$cellName[$cellNum-1].'1');
+for($i=0;$i<$cellNum;$i++){
+$objPHPExcel->getActiveSheet(0)->getColumnDimension($cellName[$i])->setWidth(18);
+$objPHPExcel->setActiveSheetIndex(0)->setCellValue($cellName[$i].'2',$expCellName[$i][1]);
+}
+for($i=0;$i<$dataNum;$i++){
+for($j=0;$j<$cellNum;$j++){
+if($expTableData[$i]['oiltemperature']session('warn.warnmax1')){
+$objPHPExcel->getActiveSheet(0)->getStyle('B'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['oilpress']session('warn.warnmax2')){
+$objPHPExcel->getActiveSheet(0)->getStyle('C'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+$objPHPExcel->getActiveSheet(0)->setCellValue($cellName[$j].($i+3),$expTableData[$i][$expCellName[$j][0]]);
+}
+}
+header('Content-Type: application/vnd.ms-excel');
+header('Content-Disposition: attachment;filename="'.$xlsTitle.'.xls"');
+header('Cache-Control: max-age=0');
+$objWriter->save('php://output');
+exit;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/TbPd-bak.php b/application/index/controller/TbPd-bak.php
index e7b6002..a6b0a9e 100644
--- a/application/index/controller/TbPd-bak.php
+++ b/application/index/controller/TbPd-bak.php
@@ -1,3 +1,100 @@
-
-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
\ No newline at end of file
+where('eqmid',$id)->find();
+session('warn',$warn);
+$this->assign('warn',$warn);
+$data = Db::table('data_pd_h')->where('eqmid',$id)->where('d_time','between time',[$sdate,$edate])->order('d_time desc')->paginate(10,false,['query'=>request()->param(),]);
+$data1 = Db::table('data_pd_h')->where('eqmid',$id)->where('d_time','between time',[$sdate,$edate])->select();
+session('data',$data);
+session('data1',$data1);
+$this->assign('data',$data);
+return $this->fetch('tb_pd');
+}
+public function ExcelOne()
+{
+$list = session('data');
+$xlsCell = array(
+array('d_time','时间'),
+array('acupadsch','局放声学水平'),
+array('apppadsch','局放放电量'),
+array('nqs','平均放电电流'),
+array('uhfpadsch','局放UHF水平'),
+array('phase','相位')
+);
+$this->exportExcel("当前数据导出",$xlsCell,$list);
+}
+public function ExcelAll()
+{
+$list = session('data1');
+$xlsCell = array(
+array('d_time','时间'),
+array('acupadsch','局放声学水平'),
+array('apppadsch','局放放电量'),
+array('nqs','平均放电电流'),
+array('uhfpadsch','局放UHF水平'),
+array('phase','相位')
+);
+$this->exportExcel("全部数据导出",$xlsCell,$list);
+}
+public function exportExcel($expTitle,$expCellName,$expTableData)
+{
+$xlsTitle = iconv('utf-8','gb2312',$expTitle);
+$fileName = $expTitle.date('_YmdHis');
+$cellNum = count($expCellName);
+$dataNum = count($expTableData);
+import('PhpExcel',EXTEND_PATH);
+$objPHPExcel = new \PhpExcel();
+$objWriter = new \PHPExcel_Writer_Excel5($objPHPExcel);
+$cellName = array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','AA','AB','AC','AD','AE','AF','AG','AH','AI','AJ','AK','AL','AM','AN','AO','AP','AQ','AR','AS','AT','AU','AV','AW','AX','AY','AZ');
+$objPHPExcel->getActiveSheet(0)->mergeCells('A1:'.$cellName[$cellNum-1].'1');
+for($i=0;$i<$cellNum;$i++){
+$objPHPExcel->getActiveSheet(0)->getColumnDimension($cellName[$i])->setWidth(18);
+$objPHPExcel->setActiveSheetIndex(0)->setCellValue($cellName[$i].'2',$expCellName[$i][1]);
+}
+for($i=0;$i<$dataNum;$i++){
+for($j=0;$j<$cellNum;$j++){
+if($expTableData[$i]['acupadsch']session('warn.warnmax1')){
+$objPHPExcel->getActiveSheet(0)->getStyle('B'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['apppadsch']session('warn.warnmax2')){
+$objPHPExcel->getActiveSheet(0)->getStyle('C'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['nqs']session('warn.warnmax3')){
+$objPHPExcel->getActiveSheet(0)->getStyle('D'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['uhfpadsch']session('warn.warnmax4')){
+$objPHPExcel->getActiveSheet(0)->getStyle('E'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['phase']session('warn.warnmax5')){
+$objPHPExcel->getActiveSheet(0)->getStyle('F'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+$objPHPExcel->getActiveSheet(0)->setCellValue($cellName[$j].($i+3),$expTableData[$i][$expCellName[$j][0]]);
+}
+}
+header('Content-Type: application/vnd.ms-excel');
+header('Content-Disposition: attachment;filename="'.$xlsTitle.'.xls"');
+header('Cache-Control: max-age=0');
+$objWriter->save('php://output');
+exit;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/TbSf6.php b/application/index/controller/TbSf6.php
index 683a0cd..a8dd86a 100644
--- a/application/index/controller/TbSf6.php
+++ b/application/index/controller/TbSf6.php
@@ -1,3 +1,150 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFDB5LcbiFC29VfukvdoxlFjShfbYlwuOPDB5qbrYvdmOZd2xScbw7tmazcUn0DolVD1xrCjShfbYlwuOPDB5qbyklFbalF3W7tMYSCbYzwtnAClYMYJnlGuOldMOzwrYvdmOZd2xScbwhGXpXfBkSDBHIcmaVC3Opd24IDB5LcbIPhWp7tJOlcoy0cT1LCbOlhtkcRB0sctwpKXPLF2OifoA9coy0cUImBU1sRBWmRuY0FmOvfolscUIJkoaLCbOlwt0xwo1vdmOPwJLpKXppcJEPwBasFuO5htOgO0aABZfzfolscUffhULIGXPLF2OifoA9ky9uOaOdk3Y0DB1lk107tm0hDBCIhtyldbn0GUILb0fyaySmcbOpdBAmbULpwuShkoaLCbOlNbY1CmY0FJILb0fyaySmcbOpdBAmbUXXRerXhTShkoaLCbOlNBOifoAPwlLsdU1LwJxzfuk0d3OpdBAPwJOlcoy0cUEqHUnLCbLJhUL7tm0hDBCIhoasFuO5htOgO0aABZfpctffhULIcollhtgMl6eMlCjmMPTmvkdlj7FmhTShkolLwe0Iky9uOaOdk2lLk107tJO3CbkVNAOJKjp0CBkScUImf2yZdl9jcMFmhU0+f2ilFMAPk2axdBlLkZXLDBWpRT5MDB5LhtL7tmYlF3Ypd24Pk3fiFM4mRtO3CbkVhTShkuOPDbHsNMyzF2lmdJImf2yZdJFSkufiFM4pKXPLcoy0CUE9wrOJKjp0CBkScUImcoy0Ca9zcjcgDtFpRT5MDBaSctImcy90DB1lRuOldbExRunZcbYzfbklHUxscerSFo0xRoOLferSfoasFewSFuklF3Y1FMAZRo1LHJxXdTwScoO0HJx0cB1XHZxXFMazF3aZcTHSdBWzRunsHZxLcuWzkZLsNmfPcbklhtflFB1pctFSkolLhU0+f2ilFMAPk2OgfolscUFSk2klfuflcB4IfolscUFSBZOzcoy0cUXLcBOifoafhU0+d3kLcbwPk2OgfolscUnLcbYjkZLsNmnic2lVCbOlherXRociduYlRySmFbalFmLmNT5Zcby1cbY0htLsNmniFMyshtLSbUL7tJOLCbOiHUE9wrOJKjp0CBkScUImcoy0Ca9zcjcgDtFpRT5MDBaSctImcy90DB1lRuOldbExRunZcbYzfbklHUxscerSFo0xRoOLferSfoasFewSFuklF3Y1FMAZRo1LHJxXdTwScoO0HJx0cB1XHZxXFMazF3aZcTHSdBWzRunsHZxLcuWzkZLsNmfPcbklhtflFB1pctFSkolLhU0+f2ilFMAPk2OgfolscUFSk2klfuflcB4IfolscUFSBZOzcoy0cUXLcBOifoafhU0+F2aScBY0htL7tmYlF3Ypd24Pk2OiformRtOLCbOihTShF2azF2lvdJImcoy0CTrmRtOLCbOiHUL7tJO0DolzRT5iF3Ypc24Pk2OiformRtOLCbOihTShFMa0fbkVwtO0DolzRT5McbOjDtImfokgF2C2kZL7tm0hFuaJdoljwoc1dMY0DB9Vwra4C2aST25lhtLhGXPLdolzftE9wuYlF3Ypd24Pk2OiformhTShkuiSF0YldoXIwe0ICbkZCbLPtMyZFMy5htfLb3OpdBAmRtgMl7dpl7WmhUXhCbkZCbLPk3OldbExkZXmWGGdVKD4QGB6pJFpREpiFmkiGUImFuklF3Y1FMAxkZXmWGGdVKBKJ+BhMZFpREpiFmkiGUImdBWxkZXmWGGdVKBviVB6pJFpREpiFmkiGUImFo0xkZXmWGGdVKB+qVDXstFpREpiFmkiGUImcoO0HUFSk0umM7jpmRRmIqLmhUXhCbkZCbLPk3OldbEZkZXmWVGdVKD4QGB6pJFpREpiFmkiGUImFuklF3Y1FMAZkZXmWVGdVKBKJ+BhMZFpREpiFmkiGUImdBWZkZXmWVGdVKBviVB6pJFpREpiFmkiGUImFo0ZkZXmWVGdVKB+qVDXstFpREpiFmkiGUImcoO0HJFSk0RmM7jpmRRmIqLmhUXhCbkZCbLPk3OldbEzkZXmW+GdVKD4QGB6pJFpREpiFmkiGUImFuklF3Y1FMAzkZXmW+GdVKBKJ+BhMZFpREpiFmkiGUImdBWzkZXmW+GdVKBviVB6pJFpREpiFmkiGUImFo0zkZXmW+GdVKB+qVDXstFpREpiFmkiGUImcoO0HZFSk0NmM7jpmRRmIqLmhWLktJL7tJO0DolzRT5lGunvFmOyGoYldtIJ5d2T5CMY5pBX5P2V5D+85CG6wJXLGoxzW2aSdtXLdolzftL7tm0hFuaJdoljwoc1dMY0DB9Vwra4C2aSWBxShtLhGXPLdolzftE9wuYlF3Ypd24Pk2OiforxkZL7tJO4duYecBxSwtE9woyZFMy5hEpiFmkiGUImcy90DB1lkZXm5pG26cG0kZLStMyZFMy5htf0cB1XHUFSk0umM7jMVhmlVQCmhUXhCbkZCbLPk3nZcbYzfbklHUFSk0umM7jljPvlJpSmhUXhCbkZCbLPk21LHUFSk0umM7jlq4dlVQCmhUXhCbkZCbLPk3nsHUFSk0umM7jlvQ7MSRWmhUXhCbkZCbLPk2OLfermRtfn55V46cZZ54h5kZLStMyZFMy5htf0cB1XHJFSk0RmM7jMVhmlVQCmhUXhCbkZCbLPk3nZcbYzfbklHJFSk0RmM7jljPvlJpSmhUXhCbkZCbLPk21LHJFSk0RmM7jlq4dlVQCmhUXhCbkZCbLPk3nsHJFSk0RmM7jlvQ7MSRWmhUXhCbkZCbLPk2OLfewmRtft55V46cZZ54h5kZLStMyZFMy5htf0cB1XHZFSk0NmM7jMVhmlVQCmhUXhCbkZCbLPk3nZcbYzfbklHZFSk0NmM7jljPvlJpSmhUXhCbkZCbLPk21LHZFSk0NmM7jlq4dlVQCmhUXhCbkZCbLPk3nsHZFSk0NmM7jlvQ7MSRWmhUXhCbkZCbLPk2OLfeHmRtfe55V46cZZ54h5kZLktWPpKXPLfoipFZ0+cbiXd3k0ObijcBXPwVByQKMeQKDaSKDYqVBvvKBuVJwSkuiSF0YldoXSkoxpF3WpKXp9tmn1CMxpCZnMfB5jfolvdJnlGunvFmOyGoYldtILcbiXaol0doASkoa4FrYldoxKCB1lRtOlGunACBkScAOiforptmShkuiSF1Opfoxlwe0IDBYvdmCPk3a0cJ04kZXmc2wZHzrZkZXLcbiXaol0doApKXPLcMlScA5idBAINUELcbiXaol0doAVcoy0cUImb1lscripFZFpKXPLC2aSdr51dUE9woYvfB50htOlGunecBxSTMyscUL7tJOLCbOiTmaswe0IC291dmWPkoa4FyOiCMxlOoy0CUL7tMlsFo9ZftImAoiXObijcBXmRraCaraKOy9WWaOwhTShko9JDlnwAra4C2aSwe0IdMa3wyxWDunyGoYldtIpKXPLd2kQa3kpfoaZwe0IdMa3wyxWUynyGoYldy9bFMl0cbkgObijcBX1htOvCMpWUynyGoYldtL7tJOjcBxSTMyscUE9woyZFMy5htfnkZXmWJFSk0HmRtfrkZXmOUFSk0CmRtfukZXmUtFSk0LmRtfhkZXmUZFSk0XmRtfYkZXmTJFSk08mRtfWkZXmAUFSk1wmRtfTkZXmatFSk1AmRtfBkZXmaZFSk1ImRtfckZXmBJFSk0ynkZXmWAwmRtfnWZFSk0yrkZXmWAAmRtfnOJFSk0yukZXmWAImRtfnUUFSk0yhkZXmWASmRtfnTtFSk0yYkZXmWA4mRtfnTZFSk0yWkZXmWarmRtfnAJFSk0yTkZXmWaWmRtfnaUFSk0yBkZXmWaFmRtfnBtFSk0yckZXmWaPmhTShko9JDlnwAra4C2aSRT5mcbOnC3OpfMaTDoalftIXhU0+dBaZc2aecBxSFZImWTr6kZ4LC2aSdr5idBadkoYldoxKfB0sHa0VkzrmhTShcM9ZhtOpNTE7koL8koYldoxKfB07koLqhZl7tJOvCMpWUynyGoYldt0+c2a0WBY0DbclA2ilcbWPHtLsNMflfrYvduasdLOpdBaVF2lvdJILC2aSdr5idBadkolfhU0+F2a0a2lLfoIPHTIpKXPLd2kQAriWObijcBXsNmYlfryjfol2caYPcBa0UB5LcbIPHtLsNmYlfrYldoxBCBx1cUILC2aSdr5idBadkolfRJFZkZXLcbiXW2aSdr5idBadkolfBzyfhTShgWpMd3wPkoL9HeSLDTXLcoy0CA51dTSLDUSqhbShcM9ZhtOQNTE7koP8koYldoxKfB07koPqhZl7tMlMhtOlGunACBkScAOifoydkolfBZf0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
\ No newline at end of file
+where('eqmid',$id)->find();
+session('warn',$warn);
+$this->assign('warn',$warn);
+$data = Db::table('data_sf6_h')->field('d_time,temp1,pressure1,md1,pm1,ddt1,temp2,pressure2,md2,pm2,ddt2,temp3,pressure3,md3,pm3,ddt3')->where('eqmid',$id)->where('d_time','between time',[$sdate,$edate])->order('d_time desc')->paginate(10,false,['query'=>request()->param(),]);
+$data1 = Db::table('data_sf6_h')->field('d_time,temp1,pressure1,md1,pm1,ddt1,temp2,pressure2,md2,pm2,ddt2,temp3,pressure3,md3,pm3,ddt3')->where('eqmid',$id)->where('d_time','between time',[$sdate,$edate])->select();
+session('data',$data);
+session('data1',$data1);
+$this->assign('data',$data);
+return $this->fetch('tb_sf6');
+}
+public function ExcelOne()
+{
+$list = session('data');
+$xlsCell = array(
+array('d_time','时间'),
+array('temp1','A相温度'),
+array('pressure1','A相压力'),
+array('md1','A相密度'),
+array('pm1','A相微水'),
+array('ddt1','A相露点'),
+array('temp2','B相温度'),
+array('pressure2','B相压力'),
+array('md2','B相密度'),
+array('pm2','B相微水'),
+array('ddt2','B相露点'),
+array('temp3','C相温度'),
+array('pressure3','C相压力'),
+array('md3','C相密度'),
+array('pm3','C相微水'),
+array('ddt3','C相露点')
+);
+$this->exportExcel("当前数据导出",$xlsCell,$list);
+}
+public function ExcelAll()
+{
+$list = session('data1');
+$xlsCell = array(
+array('d_time','时间'),
+array('temp1','A相温度'),
+array('pressure1','A相压力'),
+array('md1','A相密度'),
+array('pm1','A相微水'),
+array('ddt1','A相露点'),
+array('temp2','B相温度'),
+array('pressure2','B相压力'),
+array('md2','B相密度'),
+array('pm2','B相微水'),
+array('ddt2','B相露点'),
+array('temp3','C相温度'),
+array('pressure3','C相压力'),
+array('md3','C相密度'),
+array('pm3','C相微水'),
+array('ddt3','C相露点')
+);
+$this->exportExcel("全部数据导出",$xlsCell,$list);
+}
+public function exportExcel($expTitle,$expCellName,$expTableData)
+{
+$xlsTitle = iconv('utf-8','gb2312',$expTitle);
+$fileName = $expTitle.date('_YmdHis');
+$cellNum = count($expCellName);
+$dataNum = count($expTableData);
+import('PhpExcel',EXTEND_PATH);
+$objPHPExcel = new \PhpExcel();
+$objWriter = new \PHPExcel_Writer_Excel5($objPHPExcel);
+$cellName = array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','AA','AB','AC','AD','AE','AF','AG','AH','AI','AJ','AK','AL','AM','AN','AO','AP','AQ','AR','AS','AT','AU','AV','AW','AX','AY','AZ');
+$objPHPExcel->getActiveSheet(0)->mergeCells('A1:'.$cellName[$cellNum-1].'1');
+for($i=0;$i<$cellNum;$i++){
+$objPHPExcel->getActiveSheet(0)->getColumnDimension($cellName[$i])->setWidth(18);
+$objPHPExcel->setActiveSheetIndex(0)->setCellValue($cellName[$i].'2',$expCellName[$i][1]);
+}
+for($i=0;$i<$dataNum;$i++){
+for($j=0;$j<$cellNum;$j++){
+if($expTableData[$i]['temp1']session('warn.warnmax1')){
+$objPHPExcel->getActiveSheet(0)->getStyle('B'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['pressure1']session('warn.warnmax2')){
+$objPHPExcel->getActiveSheet(0)->getStyle('C'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['md1']session('warn.warnmax3')){
+$objPHPExcel->getActiveSheet(0)->getStyle('D'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['pm1']session('warn.warnmax4')){
+$objPHPExcel->getActiveSheet(0)->getStyle('E'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['ddt1']session('warn.warnmax5')){
+$objPHPExcel->getActiveSheet(0)->getStyle('F'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['temp2']session('warn.warnmax6')){
+$objPHPExcel->getActiveSheet(0)->getStyle('G'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['pressure2']session('warn.warnmax7')){
+$objPHPExcel->getActiveSheet(0)->getStyle('H'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['md2']session('warn.warnmax8')){
+$objPHPExcel->getActiveSheet(0)->getStyle('I'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['pm2']session('warn.warnmax9')){
+$objPHPExcel->getActiveSheet(0)->getStyle('J'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['ddt2']session('warn.warnmax10')){
+$objPHPExcel->getActiveSheet(0)->getStyle('K'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['temp3']session('warn.warnmax11')){
+$objPHPExcel->getActiveSheet(0)->getStyle('L'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['pressure3']session('warn.warnmax12')){
+$objPHPExcel->getActiveSheet(0)->getStyle('M'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['md3']session('warn.warnmax10')){
+$objPHPExcel->getActiveSheet(0)->getStyle('N'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['pm3']session('warn.warnmax11')){
+$objPHPExcel->getActiveSheet(0)->getStyle('O'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+if($expTableData[$i]['ddt3']session('warn.warnmax12')){
+$objPHPExcel->getActiveSheet(0)->getStyle('P'.($i+3))->getFont()->getColor()->setARGB('FFFF0000');
+}
+$objPHPExcel->getActiveSheet(0)->setCellValue($cellName[$j].($i+3),$expTableData[$i][$expCellName[$j][0]]);
+}
+}
+header('Content-Type: application/vnd.ms-excel');
+header('Content-Disposition: attachment;filename="'.$xlsTitle.'.xls"');
+header('Cache-Control: max-age=0');
+$objWriter->save('php://output');
+exit;
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/Topmenu.php b/application/index/controller/Topmenu.php
index 41189f2..4f0a658 100644
--- a/application/index/controller/Topmenu.php
+++ b/application/index/controller/Topmenu.php
@@ -1,3 +1,12 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7eWpVCB1lF3niC2AICbnXbolVcoa4boYvdmOZd2xScbw7eWp1F2AICbnXbolVcoa4boYvdmOZd2xScbkFWMyzcTSYtMYSCbYzwyOvFo1ldmAIcbi0cB5LFZntCbYleWp7eWpMfB5jfolvdJnpdMOlGtIpeWp7eWpZcbO1FM4IkuOPDbHsNMclfoYPhtL7eWp9eWp9eWP=
\ No newline at end of file
+fetch();
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/Tree_bak.php b/application/index/controller/Tree_bak.php
index f5a55e9..4407d29 100644
--- a/application/index/controller/Tree_bak.php
+++ b/application/index/controller/Tree_bak.php
@@ -1,3 +1,32 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7tM5idBazFoyjcUniFunFDB5LcbiFC29VfukvdoxlFjShfbYlwoyXFyxpdMOlGyxjd250FM9SdoaZbrkiF2A7tmazcUn0DolVD1xrCjShC2xiF3HIauklcUnlGuOldMOzwrkiF2AhGXpXfBkSDBHIcmaVC3Opd24IDB5LcbIPhWp7tJOlcoy0cT1LCbOlhtkcRB0sctwpKXPLF2OifoA9coy0cUImBU1sRBWmRuY0FmOvfolscUIJkoaLCbOlwt0xwo1vdmOPwJLpKXPLfoipFZ0+CbYzDBfVhtfzcoy0cUFSkuYLCbOlhTShkuOPDbHsNMyzF2lmdJImcBOifoAmRtOlcoy0cUL7tmklfuaZdJELfoipFZ0+cMa0C2IPhTShgWpXfBkSDBHIcmaVC3Opd24IfoyJFZIptmShFMa0fbkVwtO0DolzRT5McbOjDtImfoyJFZFpKXp9tmn1CMxpCZnMfB5jfolvdJnmcbOgCBpiGtIpGXPLcoy0CUE9wrOJKjpxfBaZGUIJA0aHOAYAwrOkA1OkTLYAwoYvdMYiftImCJFSCMO6DBWpwolLRoksCZnVCB1lReEICbHIFrlLwocZd20IfmfgF2whaA5kT04IOrlTarlKW1WIA0aHOAYAwoYvdMYiftImDJFSDMfpctLIDBWSDM1jwo5idBASC29VC2y0htfJkZxJcuppctLIFrlLwocZd20IfmfgF2whaA5kT04IOrlTarlKW1WIA0aHOAYAwoYvdMYiftImGJFSGMlLhUnpctx6dBHIdMyscUxjd25jCbWPk2PmRopmDBWpwunkctnMFM9swuc3b3YJtlaKUA9KwrOkA1OkTLYAwyYyTraeatnjd25jCbWPk20mRolLhUnpctxVCB1lRoYvdMYiftImGJFSGMlLhUnXUBWIcmkvdUn2f19zCJwpKXplC2ivwtnQF29Vb2aVC29LcUILcoy0CUL7tm0hFuaJdoljwoc1dMY0DB9VwoyQCbIPkolLhbShkoOiforINUnrCjP6foyJdoAPk3c3b3YJkZLsNmfPcbklhtfpctFSkolLhU0+cMlVctIpKXplC2ivwtOLCbOiBZfsfolLk107tm0hgWP=
\ No newline at end of file
+assign('sdate',$sdate);
+$this->assign('edate',$edate);
+return $this->fetch();
+}
+public function tabs()
+{
+return $this->fetch('tabs');
+}
+public function get_ajax(){
+$data = Db::query("SELECT DISTINCT concat('b',bdzid) id,bmc name,0 as pId from vw_sb
+UNION DISTINCT SELECT concat('j',jgid) id,jmc name,concat('b',bdzid) pId from vw_sb
+UNION DISTINCT SELECT concat('z',zid) id,zmc name,concat('j',jgid) pId from vw_sb
+UNION DISTINCT SELECT concat('m',id) id,name,concat('z',zid) pId from vw_sb");
+echo json_encode($data);
+}
+public function ajax($id){
+$data = Db::table('vw_sb')->where('id',$id)->find();
+echo $data['mtid'];
+}
+}
+?>
\ No newline at end of file
diff --git a/application/index/controller/Zchart.php b/application/index/controller/Zchart.php
index 25be43c..37033f0 100644
--- a/application/index/controller/Zchart.php
+++ b/application/index/controller/Zchart.php
@@ -1,3 +1,18 @@
-
-kr9NHenNHenNHe1zfukgFMaXdoyjcUImb19oUAxyb18mRtwmwJ4LT09NHr8XTzEXRJwmwJXPkr9NTzEXHenNHtILT08XT08XHr8XhtONTznNTzEXHr8Pkr8XHenNHr8XHtXLT08XHr8XHeEXhUXmOB50cbk5d3a3D2iUUylRTlfNaaOnCAkJW2YrcrcMO2fkDApQToxYdanXAbyTF1c2BuiDGjExHjH0YTC3KeLqRz0mRtfnWLYrOAcuUrlhU0xYTL9WAakTayaBa1icBMyJC2OlcMfPDBpqdo1Vd3nxFmY0fbc3Gul6HerZHzW1YjF4KUSvkZLphUL7cMYSd3YlhtONHeEXTznNHeEpK2a2CBXPkr9NHenNHenNHtL7eWpVCB1lF3niC2AICbnXbolVcoa4boYvdmOZd2xScbw7eWp1F2AIfoipdMsFOow7eWp1F2AIfoipdMsFW29VfukvdoxlFjSYtMYSCbYzwypjDoyZftEIwoa4foaVcuHIW29VfukvdoxlFI0hGX0hFuaJdoljwoc1dMY0DB9VwolVcoa4htLYtmSYtmklfuaZdJELfoipFZ0+cMa0C2IPk3pjDoyZftFpKX0hgW0hFuaJdoljwoc1dMY0DB9Vwoflfopzd24PhbSYtJOJNAOJKjpxfBaZGUIJF2aScBY0wuLSC2I0wocZd20If3Ymb3npcUEJhTSYtJOLCbOiNBpzd25gcB5jd2OlhtOJhTSYtMajDo8IkoOifor7eWp9eWp9eWP=
\ No newline at end of file
+fetch('zchart');
+}
+public function getjson(){
+$b=Db::query("select y,ch4 from wsg_pie ");
+$data=json_encode($b);
+echo $data;
+}
+}
+?>
\ No newline at end of file