Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17

This commit is contained in:
宋辰轩
2023-02-23 16:15:35 +08:00
638 changed files with 9772 additions and 30503 deletions
+1
View File
@@ -5,3 +5,4 @@ $lang->screen->noscreens = 'No screen yet';
$lang->screen->allDepts = 'All depts';
$lang->screen->allUsers = 'All users';
$lang->screen->noData = 'No Data';
$lang->screen->noDesc = 'No Desc';
+1
View File
@@ -5,3 +5,4 @@ $lang->screen->noscreens = 'No screen yet';
$lang->screen->allDepts = 'All depts';
$lang->screen->allUsers = 'All users';
$lang->screen->noData = 'No Data';
$lang->screen->noDesc = 'No Desc';
+1
View File
@@ -5,3 +5,4 @@ $lang->screen->noscreens = 'No screen yet';
$lang->screen->allDepts = 'All depts';
$lang->screen->allUsers = 'All users';
$lang->screen->noData = 'No Data';
$lang->screen->noDesc = 'No Desc';
+1
View File
@@ -5,3 +5,4 @@ $lang->screen->noscreens = '暂时没有可视化大屏';
$lang->screen->allDepts = '所有部门';
$lang->screen->allUsers = '所有用户';
$lang->screen->noData = '暂时没有数据';
$lang->screen->noDesc = '暂无描述';
+1 -1
View File
@@ -25,7 +25,7 @@
<?php $i++;?>
<?php if($i == 13) $i = 1;?>
<?php endif?>
<div class='bottom' data-builtin='<?php echo $screen->builtin;?>'>
<div class='bottom' data-builtin='<?php echo $screen->builtin;?>' data-status='<?php echo $screen->status;?>'>
<div class='screen-title text-ellipsis' title='<?php echo $screen->name?>'><?php echo $screen->name;?></div>
<div class='screen-desc' title="<?php echo $screen->desc;?>">
<?php echo empty($screen->desc) ? $lang->screen->noDesc : $screen->desc;?>
+2 -2
View File
@@ -1,6 +1,6 @@
<?php include $app->getModuleRoot() . 'common/view/header.lite.html.php';?>
<script type="module" crossorigin src="<?php echo $webRoot;?>static/js/index-67a30bc6.js"></script>
<link rel="stylesheet" href="<?php echo $webRoot;?>static/css/index-c34cea1e.css">
<script type="module" crossorigin src="<?php echo $webRoot;?>static/js/index-ed17d07a.js"></script>
<link rel="stylesheet" href="<?php echo $webRoot;?>static/css/index-bd4452ef.css">
<?php js::set('screen', $screen);?>
<?php js::set('year', $year);?>
<?php js::set('dept', $dept);?>
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show More