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

* Fix bug #32184,32192,32193.

Browse Source
This commit is contained in:
caoyanyi
2023-02-16 11:09:18 +08:00
parent 2a388d06a7
commit b478779676
7 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/helper.class.php
+7 -1
View File
@@ -333,12 +333,18 @@ class helper extends baseHelper
else
{
$dateInterval = new stdClass();
$dateInterval->year = $interval->format('%Y');
$dateInterval->year = $interval->format('%y');
$dateInterval->month = $interval->format('%m');
$dateInterval->day = $interval->format('%d');
$dateInterval->hour = $interval->format('%H');
$dateInterval->minute = $interval->format('%i');
$dateInterval->secound = $interval->format('%s');
$dateInterval->year = trim($dateInterval->year, '0');
$dateInterval->month = trim($dateInterval->month, '0');
$dateInterval->day = trim($dateInterval->day, '0');
$dateInterval->hour = trim($dateInterval->hour, '0');
$dateInterval->minute = trim($dateInterval->minute, '0');
$dateInterval->secound = trim($dateInterval->secound, '0');
}
return $dateInterval;
}
module/admin/css/index.css
+4 -3
View File
@@ -65,11 +65,12 @@
.classItem > .imgBack {flex: 1 1 50%;}
.classItem > .imgBack > .classImg {background-repeat: no-repeat; background-size: contain; aspect-ratio: 16 / 9; background-position: center; margin: 0; border-top-left-radius: 4px; border-top-right-radius: 4px;}
.classItem > .classContent {flex: 1 1 50%; padding: 5px; font-size: 14px; color: #0B0F18; text-align: center; overflow: hidden; height: 24px; margin-bottom: 6px; font-weight: 700;}
.more {float: right; padding-right: 12px; font-weight: normal;}
.more {float: right; padding-right: 12px; font-weight: normal; color: #9EA3B0;}
.panel.publicClass {padding: 0 10px;}
.icon.follow-us {font-size: 20px; padding-left: 10px;}
.setting-help {width: 45px; color: #9EA3B0;}
.setting-help {width: 45px; color: #9EA3B0; padding-top: 15px;}
[lang^='zh'] .setting-help {padding-top: 0;}
.pointer-none {pointer-events: none;}
/* css for without internet */
@@ -83,7 +84,7 @@
.time-block {background: #EDEEF2; padding:2px 4px; border-radius: 4px; color: #0B0F18; font-size: 15px; margin: 0 4px;}
.dynamic-block {height: 74px; padding: 12px 16px; display: flex; justify-content: space-between; position: relative; line-height: 20px; border-top: 1px solid #E3E4E9;}
.dynamic-content {height: 50px; line-height: 25px; overflow: hidden;}
.dynamic-time {white-space: nowrap; position: absolute; right: 12px; bottom: 10px; padding-right: 12px; background: white;}
.dynamic-time {white-space: nowrap; position: absolute; right: 12px; bottom: 10px; padding-right: 12px; background: white; color: #5E626D;}
.time-count {letter-spacing: 1px;}
.patch-block {padding: 10px 16px 12px; line-height: 20px; border-top: 1px solid #E3E4E9;}
module/admin/lang/de.php
-2
View File
@@ -179,8 +179,6 @@ $lang->admin->menuSetting['dev']['desc'] = 'Support for secondary developm
$lang->admin->menuSetting['convert']['name'] = 'Data Import';
$lang->admin->menuSetting['convert']['desc'] = 'Data import from third-party systems.';
$lang->admin->mon = 'Month';
$lang->admin->day = 'Day';
$lang->admin->updateDynamics = 'Dynamics';
$lang->admin->updatePatch = 'Patch';
$lang->admin->upgradeRecommend = 'Recommend Upgrade';
module/admin/lang/en.php
-2
View File
@@ -179,8 +179,6 @@ $lang->admin->menuSetting['dev']['desc'] = 'Support for secondary developm
$lang->admin->menuSetting['convert']['name'] = 'Data Import';
$lang->admin->menuSetting['convert']['desc'] = 'Data import from third-party systems.';
$lang->admin->mon = 'Month';
$lang->admin->day = 'Day';
$lang->admin->updateDynamics = 'Dynamics';
$lang->admin->updatePatch = 'Patch';
$lang->admin->upgradeRecommend = 'Recommend Upgrade';
module/admin/lang/fr.php
-2
View File
@@ -179,8 +179,6 @@ $lang->admin->menuSetting['dev']['desc'] = 'Support for secondary developm
$lang->admin->menuSetting['convert']['name'] = 'Data Import';
$lang->admin->menuSetting['convert']['desc'] = 'Data import from third-party systems.';
$lang->admin->mon = 'Month';
$lang->admin->day = 'Day';
$lang->admin->updateDynamics = 'Dynamics';
$lang->admin->updatePatch = 'Patch';
$lang->admin->upgradeRecommend = 'Recommend Upgrade';
module/admin/lang/zh-cn.php
-2
View File
@@ -179,8 +179,6 @@ $lang->admin->menuSetting['dev']['desc'] = '支持对系统进行二次开
$lang->admin->menuSetting['convert']['name'] = '数据导入';
$lang->admin->menuSetting['convert']['desc'] = '第三方系统的数据导入。';
$lang->admin->mon = '月';
$lang->admin->day = '日';
$lang->admin->updateDynamics = '更新动态';
$lang->admin->updatePatch = '补丁更新';
$lang->admin->upgradeRecommend = '推荐升级';
module/common/lang/zh-cn.php
+1 -1
View File
@@ -298,7 +298,7 @@ $lang->devops->rules = '指令';
$lang->devops->settings = '合并请求设置';
$lang->devops->set = '设置';
$lang->admin->module = '功能设置';
$lang->admin->module = '功能配置';
$lang->admin->system = '系统';
$lang->admin->entry = '应用';
$lang->admin->data = '数据';