Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust code.

Browse Source
This commit is contained in:
wangyidong
2019-12-25 17:35:52 +08:00
parent a1f9c6b4bd
commit cb60f926d9
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/view/header.lite.html.php
+3 -2
View File
@@ -10,7 +10,7 @@ $clientTheme = $this->app->getClientTheme();
$onlybody = zget($_GET, 'onlybody', 'no');
?>
<!DOCTYPE html>
<html lang='<?php echo $clientLang?>'>
<html lang='<?php echo $clientLang;?>'>
<head>
<meta charset='utf-8'>
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
@@ -32,7 +32,7 @@ $onlybody = zget($_GET, 'onlybody', 'no');
js::import($jsRoot . 'jquery/lib.js');
js::import($jsRoot . 'zui/min.js?t=' . $timestamp);
if($clientLang === 'ja') js::import($jsRoot . 'zui/lang.' .$clientLang . '.min.js?t=' . $timestamp);
if($clientLang === 'ja') js::import($jsRoot . 'zui/lang.' . $clientLang . '.min.js?t=' . $timestamp);
js::import($jsRoot . 'my.full.js?t=' . $timestamp);
}
@@ -42,6 +42,7 @@ $onlybody = zget($_GET, 'onlybody', 'no');
if(!file_exists($this->app->getThemeRoot() . 'default/' . $this->cookie->lang . '.' . $this->cookie->theme . '.css')) $minCssFile = $defaultTheme . 'en.' . $this->cookie->theme . '.css';
css::import($minCssFile);
js::import($jsRoot . 'all.js');
if($clientLang === 'ja') js::import($jsRoot . 'zui/lang.' . $clientLang . '.min.js');
}
if($this->app->getViewType() == 'xhtml') css::import($defaultTheme . 'x.style.css');
module/report/model.php
+1 -1
View File
@@ -536,7 +536,7 @@ class reportModel extends model
* @param string $account
* @param int $year
* @access public
* @return int
* @return object
*/
public function getUserYearEfforts($account, $year)
{